diff --git a/blockbench/master_sword.bbmodel b/blockbench/master_sword.bbmodel index 96a81705..b8c9569f 100644 --- a/blockbench/master_sword.bbmodel +++ b/blockbench/master_sword.bbmodel @@ -1 +1 @@ -{"meta":{"format_version":"3.6","creation_time":1622580956,"model_format":"java_block","box_uv":false},"name":"master_sword","parent":"forge:item/default","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"resolution":{"width":16,"height":16},"elements":[{"name":"blade","rescale":false,"from":[5.999999999999997,13,8.000000000000004],"to":[9.999999999999998,30,8.000000000000004],"autouv":0,"color":7,"locked":false,"origin":[7.999999999999998,21.5,8.000000000000004],"faces":{"north":{"uv":[0,0,3,16],"texture":0},"east":{"uv":[0,0,1,16],"texture":0},"south":{"uv":[0,0,3,16],"texture":0},"west":{"uv":[0,0,1,16],"texture":0},"up":{"uv":[0,0,1,3],"rotation":90,"texture":0},"down":{"uv":[0,0,1,3],"rotation":270,"texture":0}},"uuid":"aaf79074-d592-8e4e-a28b-df4c4687ed74"},{"name":"handguard_inner","rescale":false,"from":[5.499999999999989,9,7.000000000000005],"to":[10.499999999999991,11,9.000000000000005],"autouv":0,"color":7,"locked":false,"origin":[7.99999999999999,10,8.000000000000005],"faces":{"north":{"uv":[13,0,16,3],"texture":0},"east":{"uv":[13,0,16,1],"texture":0},"south":{"uv":[13,0,16,3],"texture":0},"west":{"uv":[13,0,16,1],"texture":0},"up":{"uv":[13,0,16,3],"rotation":270,"texture":0},"down":{"uv":[13,0,16,3],"rotation":90,"texture":0}},"uuid":"a5ffbf16-796c-1a30-5ed1-f1d7d469cbbb"},{"name":"pommel","rescale":false,"from":[6,0,8.000000000000005],"to":[10,3,8.000000000000005],"autouv":0,"color":7,"locked":false,"origin":[8,1.5,8.000000000000005],"faces":{"north":{"uv":[13,12,16,16],"texture":0},"east":{"uv":[13,14,16,16],"texture":0},"south":{"uv":[13,12,16,16],"texture":0},"west":{"uv":[13,14,16,16],"texture":0},"up":{"uv":[13,11,16,14],"texture":0},"down":{"uv":[13,11,16,14],"texture":0}},"uuid":"bc97d4b7-36ef-852f-dec5-55ea442c2128"},{"name":"blade","rescale":false,"from":[6.9999999999999964,12,7.500000000000005],"to":[8.999999999999996,31,8.500000000000005],"autouv":0,"color":7,"locked":false,"origin":[7.9999999999999964,21.5,8.000000000000005],"faces":{"north":{"uv":[0,0,2,16],"texture":0},"east":{"uv":[0,0,1,16],"texture":0},"south":{"uv":[0,0,2,16],"texture":0},"west":{"uv":[0,0,1,16],"texture":0},"up":{"uv":[0,0,1,2],"rotation":90,"texture":0},"down":{"uv":[0,0,1,2],"rotation":270,"texture":0}},"uuid":"fb1e8b98-517b-5524-cdea-9b2caeeaa4a0"},{"name":"handguard_inner","rescale":false,"from":[6,11,7.500000000000005],"to":[10.000000000000002,12,8.500000000000005],"autouv":0,"color":7,"locked":false,"origin":[8,11.5,8.000000000000005],"faces":{"north":{"uv":[13,0,16,1],"texture":0},"east":{"uv":[13,0,16,1],"texture":0},"south":{"uv":[13,0,16,1],"texture":0},"west":{"uv":[13,0,16,1],"texture":0},"up":{"uv":[13,0,16,3],"rotation":270,"texture":0},"down":{"uv":[13,0,16,3],"rotation":90,"texture":0}},"uuid":"883a5785-e5e6-c31c-e221-c7cb0c5f33bf"},{"name":"handguard_inner","rescale":false,"from":[4,9.250000000000004,7.500000000000005],"to":[12.000000000000002,10.250000000000004,8.500000000000005],"autouv":0,"color":7,"locked":false,"origin":[8,9.750000000000004,8.000000000000005],"faces":{"north":{"uv":[13,0,16,1],"texture":0},"east":{"uv":[13,0,16,1],"texture":0},"south":{"uv":[13,0,16,1],"texture":0},"west":{"uv":[13,0,16,1],"texture":0},"up":{"uv":[13,0,16,3],"rotation":270,"texture":0},"down":{"uv":[13,0,16,3],"rotation":90,"texture":0}},"uuid":"aa42abed-b866-408e-11f1-626ee673c252"},{"name":"handle","rescale":false,"from":[7.5123685207504,2,7.470139749457896],"to":[8.5123685207504,9,8.470139749457896],"autouv":0,"color":6,"locked":false,"rotation":[0,45,0],"origin":[8.012368520750398,5.5,7.970139749457895],"faces":{"north":{"uv":[5,8,6,15],"texture":0},"east":{"uv":[5,8,6,15],"texture":0},"south":{"uv":[5,8,6,15],"texture":0},"west":{"uv":[5,8,6,15],"texture":0},"up":{"uv":[5,8,6,9],"rotation":90,"texture":0},"down":{"uv":[5,9,6,10],"rotation":270,"texture":0}},"uuid":"0731ae31-28f7-d982-a3e4-805690efc839"},{"name":"handle","rescale":false,"from":[7.499999999999997,2,7.500000000000005],"to":[8.499999999999998,9,8.500000000000005],"autouv":0,"color":6,"locked":false,"origin":[7.999999999999998,5.5,8.000000000000005],"faces":{"north":{"uv":[5,8,6,15],"texture":0},"east":{"uv":[5,8,6,15],"texture":0},"south":{"uv":[5,8,6,15],"texture":0},"west":{"uv":[5,8,6,15],"texture":0},"up":{"uv":[5,8,6,9],"texture":0},"down":{"uv":[5,9,6,10],"texture":0}},"uuid":"96fefb0e-5486-4393-d862-bffd945afee4"},{"name":"pommel","rescale":false,"from":[3,9.5,8.000000000000005],"to":[5,11.5,8.000000000000005],"autouv":0,"color":7,"locked":false,"origin":[4,10.5,8.000000000000005],"faces":{"north":{"uv":[13,13,15,15],"texture":0},"east":{"uv":[13,14,16,16],"texture":0},"south":{"uv":[14,13,16,15],"texture":0},"west":{"uv":[13,14,16,16],"texture":0},"up":{"uv":[13,11,16,14],"texture":0},"down":{"uv":[13,11,16,14],"texture":0}},"uuid":"12e58443-e2c0-5f50-f9aa-21160e16e7db"},{"name":"pommel","rescale":false,"from":[11,9.5,8.000000000000005],"to":[13,11.5,8.000000000000005],"autouv":0,"color":7,"locked":false,"origin":[12,10.5,8.000000000000005],"faces":{"north":{"uv":[14,13,16,15],"texture":0},"east":{"uv":[13,14,16,16],"texture":0},"south":{"uv":[13,13,15,15],"texture":0},"west":{"uv":[13,14,16,16],"texture":0},"up":{"uv":[13,11,16,14],"rotation":180,"texture":0},"down":{"uv":[13,11,16,14],"rotation":180,"texture":0}},"uuid":"e775309d-8d24-b350-1447-2e553965117f"}],"outliner":[{"name":"blade","origin":[8,8,8],"uuid":"beb6a69e-5040-5673-3714-d017e0029a6f","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["aaf79074-d592-8e4e-a28b-df4c4687ed74","fb1e8b98-517b-5524-cdea-9b2caeeaa4a0","a5ffbf16-796c-1a30-5ed1-f1d7d469cbbb","883a5785-e5e6-c31c-e221-c7cb0c5f33bf","aa42abed-b866-408e-11f1-626ee673c252","0731ae31-28f7-d982-a3e4-805690efc839","96fefb0e-5486-4393-d862-bffd945afee4","bc97d4b7-36ef-852f-dec5-55ea442c2128","12e58443-e2c0-5f50-f9aa-21160e16e7db","e775309d-8d24-b350-1447-2e553965117f"]}],"textures":[{"path":"","name":"Shardblade_blue","folder":"block","namespace":"","id":"1","particle":true,"visible":true,"mode":"bitmap","saved":false,"uuid":"db0555e9-6e9e-c8b2-f6e1-d38f4235504d","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAsElEQVQ4T2N88vL/fwYGBoab104xODuaM4LYhIC1Wx5YDwgwkmvA3GmcDMlZ38k3AMUFIOeDALFeQPYi2AuD1wAnJyd4aO/btw9rDNHGC55hnf+3ryonKk1gdQHFBoBS2tFdk4hzwd79J+EBBUsHhFyAHLiM5BgAciH7nysMP1l0GLAaQMgLGJmpu7udwc/bGZ6UCXkBJP/pw1MGPgFpBsb8kjZwGCAbQCg7g+RhlgAASjKeoxXtPPAAAAAASUVORK5CYII="}],"display":{"thirdperson_righthand":{"rotation":[0,90,0],"translation":[-0.5,0.75,0]},"thirdperson_lefthand":{"rotation":[0,90,0],"translation":[-0.5,0.75,0]},"firstperson_righthand":{"rotation":[0,90,0]},"firstperson_lefthand":{"rotation":[0,90,0]},"ground":{"translation":[0,4,0]},"gui":{"rotation":[0,0,-45],"translation":[-3.5,-3.5,-2],"scale":[0.67,0.67,0.67]},"head":{"rotation":[50,0,0],"translation":[0,2.75,0]},"fixed":{"rotation":[0,0,46],"translation":[4.5,-3.75,-1.25],"scale":[0.78,0.78,0.78]}}} \ No newline at end of file +{"meta":{"format_version":"3.6","creation_time":1622607559,"model_format":"java_block","box_uv":false},"name":"master_sword","parent":"forge:item/default","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"resolution":{"width":16,"height":16},"elements":[{"name":"blade_sides","rescale":false,"from":[5.999999999999997,11.500000000000002,8.000000000000004],"to":[9.999999999999998,28.49999999999999,8.000000000000004],"autouv":0,"color":7,"locked":false,"origin":[7.999999999999998,21.5,8.000000000000004],"faces":{"north":{"uv":[0,0,3,16],"texture":0},"east":{"uv":[0,0,1,16],"texture":0},"south":{"uv":[0,0,3,16],"texture":0},"west":{"uv":[0,0,1,16],"texture":0},"up":{"uv":[0,0,1,3],"rotation":90,"texture":0},"down":{"uv":[0,0,1,3],"rotation":270,"texture":0}},"uuid":"aaf79074-d592-8e4e-a28b-df4c4687ed74"},{"name":"handguard_inner","rescale":false,"from":[5.499999999999989,7.5000000000000036,7.000000000000005],"to":[10.499999999999991,9.500000000000002,9.000000000000005],"autouv":0,"color":7,"locked":false,"origin":[7.99999999999999,10,8.000000000000005],"faces":{"north":{"uv":[13,0,16,3],"texture":0},"east":{"uv":[13,0,16,1],"texture":0},"south":{"uv":[13,0,16,3],"texture":0},"west":{"uv":[13,0,16,1],"texture":0},"up":{"uv":[13,0,16,3],"rotation":270,"texture":0},"down":{"uv":[13,0,16,3],"rotation":90,"texture":0}},"uuid":"a5ffbf16-796c-1a30-5ed1-f1d7d469cbbb"},{"name":"pommel","rescale":false,"from":[6,0,8.000000000000005],"to":[10,3,8.000000000000005],"autouv":0,"color":7,"locked":false,"origin":[8,1.5,8.000000000000005],"faces":{"north":{"uv":[13,12,16,16],"texture":0},"east":{"uv":[13,14,16,16],"texture":0},"south":{"uv":[13,12,16,16],"texture":0},"west":{"uv":[13,14,16,16],"texture":0},"up":{"uv":[13,11,16,14],"texture":0},"down":{"uv":[13,11,16,14],"texture":0}},"uuid":"bc97d4b7-36ef-852f-dec5-55ea442c2128"},{"name":"blade_tall","rescale":false,"from":[6.9999999999999964,10.500000000000002,7.500000000000005],"to":[8.999999999999996,32,8.500000000000005],"autouv":0,"color":7,"locked":false,"origin":[7.9999999999999964,21.5,8.000000000000005],"faces":{"north":{"uv":[0,0,2,16],"texture":0},"east":{"uv":[0,0,1,16],"texture":0},"south":{"uv":[0,0,2,16],"texture":0},"west":{"uv":[0,0,1,16],"texture":0},"up":{"uv":[0,0,1,2],"rotation":90,"texture":0},"down":{"uv":[0,0,1,2],"rotation":270,"texture":0}},"uuid":"fb1e8b98-517b-5524-cdea-9b2caeeaa4a0"},{"name":"handguard_upper","rescale":false,"from":[6,9.500000000000002,7.500000000000005],"to":[10.000000000000002,10.500000000000002,8.500000000000005],"autouv":0,"color":7,"locked":false,"origin":[8,11.5,8.000000000000005],"faces":{"north":{"uv":[13,0,16,1],"texture":0},"east":{"uv":[13,0,16,1],"texture":0},"south":{"uv":[13,0,16,1],"texture":0},"west":{"uv":[13,0,16,1],"texture":0},"up":{"uv":[13,0,16,3],"rotation":270,"texture":0},"down":{"uv":[13,0,16,3],"rotation":90,"texture":0}},"uuid":"883a5785-e5e6-c31c-e221-c7cb0c5f33bf"},{"name":"handguard_outer","rescale":false,"from":[4,7.750000000000005,7.500000000000005],"to":[12.000000000000002,8.750000000000005,8.500000000000005],"autouv":0,"color":7,"locked":false,"origin":[8,9.750000000000004,8.000000000000005],"faces":{"north":{"uv":[13,0,16,1],"texture":0},"east":{"uv":[13,0,16,1],"texture":0},"south":{"uv":[13,0,16,1],"texture":0},"west":{"uv":[13,0,16,1],"texture":0},"up":{"uv":[13,0,16,3],"rotation":270,"texture":0},"down":{"uv":[13,0,16,3],"rotation":90,"texture":0}},"uuid":"aa42abed-b866-408e-11f1-626ee673c252"},{"name":"handle","rescale":false,"from":[7.5123685207504,2,7.470139749457896],"to":[8.5123685207504,7.499999999999998,8.470139749457896],"autouv":0,"color":6,"locked":false,"rotation":[0,45,0],"origin":[8.012368520750398,5.5,7.970139749457895],"faces":{"north":{"uv":[5,8,6,15],"texture":0},"east":{"uv":[5,8,6,15],"texture":0},"south":{"uv":[5,8,6,15],"texture":0},"west":{"uv":[5,8,6,15],"texture":0},"up":{"uv":[5,8,6,9],"rotation":90,"texture":0},"down":{"uv":[5,9,6,10],"rotation":270,"texture":0}},"uuid":"0731ae31-28f7-d982-a3e4-805690efc839"},{"name":"handle","rescale":false,"from":[7.499999999999997,2,7.500000000000005],"to":[8.499999999999998,7.499999999999998,8.500000000000005],"autouv":0,"color":6,"locked":false,"origin":[7.999999999999998,5.5,8.000000000000005],"faces":{"north":{"uv":[5,8,6,15],"texture":0},"east":{"uv":[5,8,6,15],"texture":0},"south":{"uv":[5,8,6,15],"texture":0},"west":{"uv":[5,8,6,15],"texture":0},"up":{"uv":[5,8,6,9],"texture":0},"down":{"uv":[5,9,6,10],"texture":0}},"uuid":"96fefb0e-5486-4393-d862-bffd945afee4"},{"name":"handguard_side","rescale":false,"from":[3,8.000000000000002,8.000000000000005],"to":[5,10.000000000000002,8.000000000000005],"autouv":0,"color":7,"locked":false,"origin":[4,10.5,8.000000000000005],"faces":{"north":{"uv":[13,13,15,15],"texture":0},"east":{"uv":[13,14,16,16],"texture":0},"south":{"uv":[14,13,16,15],"texture":0},"west":{"uv":[13,14,16,16],"texture":0},"up":{"uv":[13,11,16,14],"texture":0},"down":{"uv":[13,11,16,14],"texture":0}},"uuid":"12e58443-e2c0-5f50-f9aa-21160e16e7db"},{"name":"handguard_side","rescale":false,"from":[11,8.000000000000002,8.000000000000005],"to":[13,10.000000000000002,8.000000000000005],"autouv":0,"color":7,"locked":false,"origin":[12,10.5,8.000000000000005],"faces":{"north":{"uv":[14,13,16,15],"texture":0},"east":{"uv":[13,14,16,16],"texture":0},"south":{"uv":[13,13,15,15],"texture":0},"west":{"uv":[13,14,16,16],"texture":0},"up":{"uv":[13,11,16,14],"rotation":180,"texture":0},"down":{"uv":[13,11,16,14],"rotation":180,"texture":0}},"uuid":"e775309d-8d24-b350-1447-2e553965117f"}],"outliner":[{"name":"blade","origin":[8,8,8],"uuid":"beb6a69e-5040-5673-3714-d017e0029a6f","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["aaf79074-d592-8e4e-a28b-df4c4687ed74","fb1e8b98-517b-5524-cdea-9b2caeeaa4a0","a5ffbf16-796c-1a30-5ed1-f1d7d469cbbb","883a5785-e5e6-c31c-e221-c7cb0c5f33bf","aa42abed-b866-408e-11f1-626ee673c252","e775309d-8d24-b350-1447-2e553965117f","12e58443-e2c0-5f50-f9aa-21160e16e7db","0731ae31-28f7-d982-a3e4-805690efc839","96fefb0e-5486-4393-d862-bffd945afee4","bc97d4b7-36ef-852f-dec5-55ea442c2128"]}],"textures":[{"path":"E:\\Repo\\LabDay\\Minecraft\\cosmere\\src\\main\\resources\\assets\\cosmere\\textures\\item\\models\\shardblade_model\\master_sword.png","name":"master_sword.png","folder":"item/models/shardblade_model","namespace":"cosmere","id":"1","particle":true,"visible":true,"mode":"bitmap","saved":true,"uuid":"db0555e9-6e9e-c8b2-f6e1-d38f4235504d","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAsElEQVQ4T2N88vL/fwYGBoab104xODuaM4LYhIC1Wx5YDwgwkmvA3GmcDMlZ38k3AMUFIOeDALFeQPYi2AuD1wAnJyd4aO/btw9rDNHGC55hnf+3ryonKk1gdQHFBoBS2tFdk4hzwd79J+EBBUsHhFyAHLiM5BgAciH7nysMP1l0GLAaQMgLGJmpu7udwc/bGZ6UCXkBJP/pw1MGPgFpBsb8kjZwGCAbQCg7g+RhlgAASjKeoxXtPPAAAAAASUVORK5CYII="}],"display":{"thirdperson_righthand":{"rotation":[0,90,0],"translation":[-0.5,0.75,0]},"thirdperson_lefthand":{"rotation":[0,90,0],"translation":[-0.5,0.75,0]},"firstperson_righthand":{"rotation":[0,90,0]},"firstperson_lefthand":{"rotation":[0,90,0]},"ground":{"translation":[0,4,0]},"gui":{"rotation":[0,0,-45],"translation":[-3.5,-3.5,-2],"scale":[0.67,0.67,0.67]},"head":{"rotation":[50,0,0],"translation":[0,2.75,0]},"fixed":{"rotation":[0,0,46],"translation":[4.5,-3.75,-1.25],"scale":[0.78,0.78,0.78]}}} \ No newline at end of file diff --git a/src/main/generated/.cache/cache b/src/main/generated/.cache/cache index cf19539c..b30b5526 100644 --- a/src/main/generated/.cache/cache +++ b/src/main/generated/.cache/cache @@ -30,7 +30,7 @@ edaa7877000a497242bfd5901b6773cfa26fc309 assets/cosmere/blockstates/tin_block.js b118f65ac1078511bdff353013a20ebe62732b22 assets/cosmere/blockstates/tin_ore.json edaa7877000a497242bfd5901b6773cfa26fc309 assets/cosmere/blockstates/zinc_block.json b118f65ac1078511bdff353013a20ebe62732b22 assets/cosmere/blockstates/zinc_ore.json -36eca81a90d2cd07b2a287cd22cedf54a038d66d assets/cosmere/lang/en_us.json +3e85f76d55843632fb3dfa1ac16665029ae51448 assets/cosmere/lang/en_us.json e9fe228cb639a8823d11fe37d1d1b079e9bd4cb7 assets/cosmere/models/block/gem_block.json b66394816822b5feda05810c580e11ddb986f4a0 assets/cosmere/models/block/metal_block.json 645553d67807b60210c1bfae147ccd31ec88eaf0 assets/cosmere/models/block/ore_block.json diff --git a/src/main/generated/assets/cosmere/lang/en_us.json b/src/main/generated/assets/cosmere/lang/en_us.json index 3d7aadb3..f2030c15 100644 --- a/src/main/generated/assets/cosmere/lang/en_us.json +++ b/src/main/generated/assets/cosmere/lang/en_us.json @@ -176,6 +176,7 @@ "item.cosmere.lerasium_spike": "Lerasium Spike", "item.cosmere.malatium_ingot": "Malatium Ingot", "item.cosmere.malatium_nugget": "Malatium Nugget", + "item.cosmere.master_sword": "Master Sword", "item.cosmere.metal_file": "Metal File", "item.cosmere.metal_vial": "Metal Vial", "item.cosmere.mist_cloak": "Mist Cloak", diff --git a/src/main/java/leaf/cosmere/items/ShardbladeItem.java b/src/main/java/leaf/cosmere/items/ShardbladeItem.java index 4394f1bc..1db11c3c 100644 --- a/src/main/java/leaf/cosmere/items/ShardbladeItem.java +++ b/src/main/java/leaf/cosmere/items/ShardbladeItem.java @@ -13,4 +13,10 @@ public ShardbladeItem(IItemTier tier, int attackDamageIn, float attackSpeedIn, P { super(tier, attackDamageIn, attackSpeedIn, builderIn); } + + @Override + public boolean isImmuneToFire() + { + return true; + } } diff --git a/src/main/java/leaf/cosmere/properties/PropTypes.java b/src/main/java/leaf/cosmere/properties/PropTypes.java index 99e1a2a8..6655336a 100644 --- a/src/main/java/leaf/cosmere/properties/PropTypes.java +++ b/src/main/java/leaf/cosmere/properties/PropTypes.java @@ -7,7 +7,7 @@ import leaf.cosmere.itemgroups.CosmereItemGroups; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.item.Item; +import net.minecraft.item.*; import net.minecraftforge.common.ToolType; import java.util.function.Supplier; @@ -24,6 +24,15 @@ public static class Blocks public static class Items { + public static final Supplier SHARDBLADE = () -> new Item.Properties() + .group(CosmereItemGroups.ITEMS) + .maxStackSize(1) + .defaultMaxDamage(0) + .maxDamage(0) + .setNoRepair() + .rarity(Rarity.EPIC); + + public static final Supplier ONE = () -> new Item.Properties().group(CosmereItemGroups.ITEMS).maxStackSize(1); public static final Supplier SIXTEEN = () -> new Item.Properties().group(CosmereItemGroups.ITEMS).maxStackSize(16); diff --git a/src/main/java/leaf/cosmere/registry/ItemsRegistry.java b/src/main/java/leaf/cosmere/registry/ItemsRegistry.java index 15b15358..1b9da1e3 100644 --- a/src/main/java/leaf/cosmere/registry/ItemsRegistry.java +++ b/src/main/java/leaf/cosmere/registry/ItemsRegistry.java @@ -41,8 +41,9 @@ public class ItemsRegistry public static final RegistryObject MIST_CLOAK = ITEMS.register("mist_cloak", () -> createItem(new ElytraItem(PropTypes.Items.ONE.get()))); public static final RegistryObject OBSIDIAN_DAGGER = ITEMS.register("obsidian_dagger", () -> createItem(new SwordItem(ItemTier.DIAMOND, 2, -1.4F, PropTypes.Items.ONE.get().rarity(Rarity.UNCOMMON)))); - public static final RegistryObject NIGHT_BLOOD = ITEMS.register("night_blood", () -> createItem(new ShardbladeItem(ItemTier.NETHERITE, 10, -1.4F, PropTypes.Items.ONE.get().setNoRepair().rarity(Rarity.EPIC)))); - public static final RegistryObject TEST_BLADE = ITEMS.register("test_blade", () -> createItem(new ShardbladeItem(ItemTier.NETHERITE, 10, -1.4F, PropTypes.Items.ONE.get().setNoRepair().rarity(Rarity.EPIC)))); + public static final RegistryObject NIGHT_BLOOD = ITEMS.register("night_blood", () -> createItem(new ShardbladeItem(ItemTier.NETHERITE, 10, -1.4F, PropTypes.Items.SHARDBLADE.get()))); + public static final RegistryObject TEST_BLADE = ITEMS.register("test_blade", () -> createItem(new ShardbladeItem(ItemTier.NETHERITE, 10, -1.4F, PropTypes.Items.SHARDBLADE.get()))); + public static final RegistryObject MASTER_SWORD = ITEMS.register("master_sword", () -> createItem(new ShardbladeItem(ItemTier.NETHERITE, 10, -1.4F, PropTypes.Items.SHARDBLADE.get()))); public static final RegistryObject COPPER_CLIP = ITEMS.register("copper_clip", () -> createItem(new MetalNuggetItem(Metals.MetalType.COPPER))); public static final RegistryObject GOLD_BOXING = ITEMS.register("gold_boxing", () -> createItem(new MetalNuggetItem(Metals.MetalType.GOLD))); diff --git a/src/main/resources/assets/cosmere/models/item/master_sword.json b/src/main/resources/assets/cosmere/models/item/master_sword.json new file mode 100644 index 00000000..1f345a79 --- /dev/null +++ b/src/main/resources/assets/cosmere/models/item/master_sword.json @@ -0,0 +1,186 @@ +{ + "credit": "Made with Blockbench", + "parent": "forge:item/default", + "textures": { + "1": "cosmere:item/models/shardblade_model/master_sword", + "particle": "cosmere:item/models/shardblade_model/master_sword" + }, + "elements": [ + { + "name": "blade_sides", + "from": [6, 11.5, 8], + "to": [10, 28.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 1, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 3, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#1"} + } + }, + { + "name": "blade_tall", + "from": [7, 10.5, 7.5], + "to": [9, 32, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 21.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 1, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 1, 2], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 1, 2], "rotation": 270, "texture": "#1"} + } + }, + { + "name": "handguard_inner", + "from": [5.5, 7.5, 7], + "to": [10.5, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, + "faces": { + "north": {"uv": [13, 0, 16, 3], "texture": "#1"}, + "east": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "south": {"uv": [13, 0, 16, 3], "texture": "#1"}, + "west": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "up": {"uv": [13, 0, 16, 3], "rotation": 270, "texture": "#1"}, + "down": {"uv": [13, 0, 16, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "handguard_upper", + "from": [6, 9.5, 7.5], + "to": [10, 10.5, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 8]}, + "faces": { + "north": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "east": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "south": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "west": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "up": {"uv": [13, 0, 16, 3], "rotation": 270, "texture": "#1"}, + "down": {"uv": [13, 0, 16, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "handguard_outer", + "from": [4, 7.75, 7.5], + "to": [12, 8.75, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9.75, 8]}, + "faces": { + "north": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "east": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "south": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "west": {"uv": [13, 0, 16, 1], "texture": "#1"}, + "up": {"uv": [13, 0, 16, 3], "rotation": 270, "texture": "#1"}, + "down": {"uv": [13, 0, 16, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "handguard_side", + "from": [11, 8, 8], + "to": [13, 10, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 10.5, 8]}, + "faces": { + "north": {"uv": [14, 13, 16, 15], "texture": "#1"}, + "east": {"uv": [13, 14, 16, 16], "texture": "#1"}, + "south": {"uv": [13, 13, 15, 15], "texture": "#1"}, + "west": {"uv": [13, 14, 16, 16], "texture": "#1"}, + "up": {"uv": [13, 11, 16, 14], "rotation": 180, "texture": "#1"}, + "down": {"uv": [13, 11, 16, 14], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "handguard_side", + "from": [3, 8, 8], + "to": [5, 10, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 10.5, 8]}, + "faces": { + "north": {"uv": [13, 13, 15, 15], "texture": "#1"}, + "east": {"uv": [13, 14, 16, 16], "texture": "#1"}, + "south": {"uv": [14, 13, 16, 15], "texture": "#1"}, + "west": {"uv": [13, 14, 16, 16], "texture": "#1"}, + "up": {"uv": [13, 11, 16, 14], "texture": "#1"}, + "down": {"uv": [13, 11, 16, 14], "texture": "#1"} + } + }, + { + "name": "handle", + "from": [7.51237, 2, 7.47014], + "to": [8.51237, 7.5, 8.47014], + "rotation": {"angle": 45, "axis": "y", "origin": [8.01237, 5.5, 7.97014]}, + "faces": { + "north": {"uv": [5, 8, 6, 15], "texture": "#1"}, + "east": {"uv": [5, 8, 6, 15], "texture": "#1"}, + "south": {"uv": [5, 8, 6, 15], "texture": "#1"}, + "west": {"uv": [5, 8, 6, 15], "texture": "#1"}, + "up": {"uv": [5, 8, 6, 9], "rotation": 90, "texture": "#1"}, + "down": {"uv": [5, 9, 6, 10], "rotation": 270, "texture": "#1"} + } + }, + { + "name": "handle", + "from": [7.5, 2, 7.5], + "to": [8.5, 7.5, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 8]}, + "faces": { + "north": {"uv": [5, 8, 6, 15], "texture": "#1"}, + "east": {"uv": [5, 8, 6, 15], "texture": "#1"}, + "south": {"uv": [5, 8, 6, 15], "texture": "#1"}, + "west": {"uv": [5, 8, 6, 15], "texture": "#1"}, + "up": {"uv": [5, 8, 6, 9], "texture": "#1"}, + "down": {"uv": [5, 9, 6, 10], "texture": "#1"} + } + }, + { + "name": "pommel", + "from": [6, 0, 8], + "to": [10, 3, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 8]}, + "faces": { + "north": {"uv": [13, 12, 16, 16], "texture": "#1"}, + "east": {"uv": [13, 14, 16, 16], "texture": "#1"}, + "south": {"uv": [13, 12, 16, 16], "texture": "#1"}, + "west": {"uv": [13, 14, 16, 16], "texture": "#1"}, + "up": {"uv": [13, 11, 16, 14], "texture": "#1"}, + "down": {"uv": [13, 11, 16, 14], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, 90, 0], + "translation": [-0.5, 0.75, 0] + }, + "thirdperson_lefthand": { + "rotation": [0, 90, 0], + "translation": [-0.5, 0.75, 0] + }, + "firstperson_righthand": { + "rotation": [0, 90, 0] + }, + "firstperson_lefthand": { + "rotation": [0, 90, 0] + }, + "ground": { + "translation": [0, 4, 0] + }, + "gui": { + "rotation": [0, 0, -45], + "translation": [-3.5, -3.5, -2], + "scale": [0.67, 0.67, 0.67] + }, + "fixed": { + "rotation": [0, 0, 46], + "translation": [4.5, -3.75, -1.25], + "scale": [0.78, 0.78, 0.78] + } + }, + "groups": [ + { + "name": "blade", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/cosmere/models/item/test_blade.json b/src/main/resources/assets/cosmere/models/item/test_blade.json index de95387e..2fc6b8fa 100644 --- a/src/main/resources/assets/cosmere/models/item/test_blade.json +++ b/src/main/resources/assets/cosmere/models/item/test_blade.json @@ -100,10 +100,6 @@ "translation": [-3.5, -3.5, -2], "scale": [0.67, 0.67, 0.67] }, - "head": { - "rotation": [50, 0, 0], - "translation": [0, 2.75, 0] - }, "fixed": { "rotation": [0, 0, 46], "translation": [4.5, -3.75, -1.25], diff --git a/src/main/resources/assets/cosmere/textures/item/models/shardblade_model/master_sword.png b/src/main/resources/assets/cosmere/textures/item/models/shardblade_model/master_sword.png new file mode 100644 index 00000000..1e366f9d Binary files /dev/null and b/src/main/resources/assets/cosmere/textures/item/models/shardblade_model/master_sword.png differ