diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 2e66a3f2a..de421c138 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -119,6 +119,8 @@ public final class ModelHandler { registerRunes(); registerBows(); + registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); + registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); /** Special Item Meshers **/ } @@ -225,6 +227,7 @@ public final class ModelHandler { registerItemModel(blackLotus); registerItemModel(blackLotus, 1); registerItemModel(lexicon); + registerItemModel(manaCookie); registerItemModel(manasteelHelm); registerItemModel(manasteelChest); @@ -263,9 +266,18 @@ public final class ModelHandler { registerItemModel(thunderSword); registerItemModel(glassPick); registerItemModel(twigWand); + registerItemModel(flowerBag); registerItemModel(fertilizer); registerItemModel(obedienceStick); + + registerItemModel(dirtRod); + registerItemModel(cobbleRod); + registerItemModel(fireRod); + registerItemModel(rainbowRod); + registerItemModel(skyDirtRod); + registerItemModel(tornadoRod); + registerItemModel(terraformRod); } private static void registerManaResources() { @@ -619,6 +631,13 @@ public final class ModelHandler { } } + private static void registerItemModelMetas(Item item, String loc, int range) { + for(int i = 0; i < range;i++) { + String name = "botania:" + loc + i; + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); + ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); + } + } private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); @@ -634,4 +653,4 @@ public final class ModelHandler { } private ModelHandler() {} -} \ No newline at end of file +} diff --git a/src/main/resources/assets/botania/models/item/cobbleRod.json b/src/main/resources/assets/botania/models/item/cobbleRod.json new file mode 100644 index 000000000..c3bad7553 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cobbleRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cobbleRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic0.json b/src/main/resources/assets/botania/models/item/cosmetic0.json new file mode 100644 index 000000000..c21767177 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic0" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic1.json b/src/main/resources/assets/botania/models/item/cosmetic1.json new file mode 100644 index 000000000..86461ba47 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic1" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic10.json b/src/main/resources/assets/botania/models/item/cosmetic10.json new file mode 100644 index 000000000..e2bd52a37 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic10.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic10" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic11.json b/src/main/resources/assets/botania/models/item/cosmetic11.json new file mode 100644 index 000000000..9c091a21c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic11.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic11" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic12.json b/src/main/resources/assets/botania/models/item/cosmetic12.json new file mode 100644 index 000000000..fe4fa6bc6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic12.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic12" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic13.json b/src/main/resources/assets/botania/models/item/cosmetic13.json new file mode 100644 index 000000000..be7fbcbdf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic13.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic13" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic14.json b/src/main/resources/assets/botania/models/item/cosmetic14.json new file mode 100644 index 000000000..ed958d7c7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic14.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic14" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic15.json b/src/main/resources/assets/botania/models/item/cosmetic15.json new file mode 100644 index 000000000..0430c2229 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic15.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic15" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic16.json b/src/main/resources/assets/botania/models/item/cosmetic16.json new file mode 100644 index 000000000..5c0a0496a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic16.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic16" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic17.json b/src/main/resources/assets/botania/models/item/cosmetic17.json new file mode 100644 index 000000000..153cf8a26 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic17.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic17" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic18.json b/src/main/resources/assets/botania/models/item/cosmetic18.json new file mode 100644 index 000000000..fbfa8eba3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic18.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic18" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic19.json b/src/main/resources/assets/botania/models/item/cosmetic19.json new file mode 100644 index 000000000..81ee5c402 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic19.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic19" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic2.json b/src/main/resources/assets/botania/models/item/cosmetic2.json new file mode 100644 index 000000000..711621f63 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic2" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic20.json b/src/main/resources/assets/botania/models/item/cosmetic20.json new file mode 100644 index 000000000..435ff9a12 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic20.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic20" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic21.json b/src/main/resources/assets/botania/models/item/cosmetic21.json new file mode 100644 index 000000000..a1b4a1be5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic21.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic21" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic22.json b/src/main/resources/assets/botania/models/item/cosmetic22.json new file mode 100644 index 000000000..91fc7d1ee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic22.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic22" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic23.json b/src/main/resources/assets/botania/models/item/cosmetic23.json new file mode 100644 index 000000000..791973a85 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic23.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic23" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic24.json b/src/main/resources/assets/botania/models/item/cosmetic24.json new file mode 100644 index 000000000..58b15d875 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic24.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic24" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic25.json b/src/main/resources/assets/botania/models/item/cosmetic25.json new file mode 100644 index 000000000..3bb2b429d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic25.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic25" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic26.json b/src/main/resources/assets/botania/models/item/cosmetic26.json new file mode 100644 index 000000000..c4c675625 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic26.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic26" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic27.json b/src/main/resources/assets/botania/models/item/cosmetic27.json new file mode 100644 index 000000000..b7ee3c3f8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic27.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic27" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic28.json b/src/main/resources/assets/botania/models/item/cosmetic28.json new file mode 100644 index 000000000..ccdae76cb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic28.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic28" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic29.json b/src/main/resources/assets/botania/models/item/cosmetic29.json new file mode 100644 index 000000000..c3026116a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic29.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic29" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic3.json b/src/main/resources/assets/botania/models/item/cosmetic3.json new file mode 100644 index 000000000..cb4be742f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic3" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic30.json b/src/main/resources/assets/botania/models/item/cosmetic30.json new file mode 100644 index 000000000..7520cffd7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic30.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic30" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic31.json b/src/main/resources/assets/botania/models/item/cosmetic31.json new file mode 100644 index 000000000..299fdec7b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic31.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic31" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic4.json b/src/main/resources/assets/botania/models/item/cosmetic4.json new file mode 100644 index 000000000..38646a52b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic4.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic4" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic5.json b/src/main/resources/assets/botania/models/item/cosmetic5.json new file mode 100644 index 000000000..4e3050457 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic5.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic5" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic6.json b/src/main/resources/assets/botania/models/item/cosmetic6.json new file mode 100644 index 000000000..0fb7e4e1f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic6.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic6" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic7.json b/src/main/resources/assets/botania/models/item/cosmetic7.json new file mode 100644 index 000000000..13765b50d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic7.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic7" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic8.json b/src/main/resources/assets/botania/models/item/cosmetic8.json new file mode 100644 index 000000000..cb8561530 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic8.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic8" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic9.json b/src/main/resources/assets/botania/models/item/cosmetic9.json new file mode 100644 index 000000000..bd7367371 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic9.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cosmetic9" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern0.json b/src/main/resources/assets/botania/models/item/craftPattern0.json new file mode 100644 index 000000000..0165bface --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftPattern0" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern1.json b/src/main/resources/assets/botania/models/item/craftPattern1.json new file mode 100644 index 000000000..a6bd5c7df --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftPattern1" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern2.json b/src/main/resources/assets/botania/models/item/craftPattern2.json new file mode 100644 index 000000000..584762ee1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftPattern2" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern3.json b/src/main/resources/assets/botania/models/item/craftPattern3.json new file mode 100644 index 000000000..c59caed4a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftPattern3" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern4.json b/src/main/resources/assets/botania/models/item/craftPattern4.json new file mode 100644 index 000000000..520c567b7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern4.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftPattern4" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern5.json b/src/main/resources/assets/botania/models/item/craftPattern5.json new file mode 100644 index 000000000..cf605973d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern5.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftPattern5" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern6.json b/src/main/resources/assets/botania/models/item/craftPattern6.json new file mode 100644 index 000000000..50d49ee7a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern6.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftPattern6" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern7.json b/src/main/resources/assets/botania/models/item/craftPattern7.json new file mode 100644 index 000000000..8bdfc0d45 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern7.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftPattern7" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern8.json b/src/main/resources/assets/botania/models/item/craftPattern8.json new file mode 100644 index 000000000..e40bcb68b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern8.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftPattern8" + } +} diff --git a/src/main/resources/assets/botania/models/item/dirtRod.json b/src/main/resources/assets/botania/models/item/dirtRod.json new file mode 100644 index 000000000..729232b6f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dirtRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/dirtRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/fireRod.json b/src/main/resources/assets/botania/models/item/fireRod.json new file mode 100644 index 000000000..a51f8de14 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fireRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/fireRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/rainbowRod.json b/src/main/resources/assets/botania/models/item/rainbowRod.json new file mode 100644 index 000000000..3396ab1b1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rainbowRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rainbowRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/skyDirtRod.json b/src/main/resources/assets/botania/models/item/skyDirtRod.json new file mode 100644 index 000000000..324642961 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/skyDirtRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/skyDirtRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/terraformRod.json b/src/main/resources/assets/botania/models/item/terraformRod.json new file mode 100644 index 000000000..3a6978455 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraformRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/terraformRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/tornadoRod.json b/src/main/resources/assets/botania/models/item/tornadoRod.json new file mode 100644 index 000000000..4eb2022b0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tornadoRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/tornadoRod0" + } +} diff --git a/src/main/resources/assets/botania/models/item/waterRod.json b/src/main/resources/assets/botania/models/item/waterRod.json new file mode 100644 index 000000000..1f77b36b1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/waterRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/waterRod" + } +}