From 8fd0534fe93668025bec15584e170594ba3d8d69 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 19 Jul 2020 17:31:58 -0500 Subject: [PATCH] Generate more stuff --- .../botania/models/item/brew_flask.json | 18 ++++---- .../botania/models/item/brew_flask_1.json | 6 +++ .../botania/models/item/brew_flask_2.json | 6 +++ .../botania/models/item/brew_flask_3.json | 6 +++ .../botania/models/item/brew_flask_4.json | 6 +++ .../botania/models/item/brew_flask_5.json | 6 +++ .../assets/botania/models/item/brew_vial.json | 14 +++--- .../botania/models/item/brew_vial_1.json | 6 +++ .../botania/models/item/brew_vial_2.json | 6 +++ .../botania/models/item/brew_vial_3.json | 6 +++ .../botania/models/item/mana_bottle.json | 16 +++---- .../botania/models/item/mana_bottle_1.json | 6 +++ .../botania/models/item/mana_bottle_2.json | 6 +++ .../botania/models/item/mana_bottle_3.json | 6 +++ .../botania/models/item/mana_bottle_4.json | 6 +++ .../botania/models/item/mana_bottle_5.json | 6 +++ .../botania/data/ItemModelProvider.java | 41 ++++++++++++++++++ .../botania/models/item/brew_flask_1.json | 7 --- .../botania/models/item/brew_flask_2.json | 7 --- .../botania/models/item/brew_flask_3.json | 7 --- .../botania/models/item/brew_flask_4.json | 7 --- .../botania/models/item/brew_flask_5.json | 7 --- .../botania/models/item/brew_vial_1.json | 7 --- .../botania/models/item/brew_vial_2.json | 7 --- .../botania/models/item/brew_vial_3.json | 7 --- .../botania/models/item/crystal_bow.json | 2 +- .../models/item/crystal_bow_pulling_1.json | 2 +- .../models/item/crystal_bow_pulling_2.json | 2 +- .../models/item/crystal_bow_pulling_3.json | 2 +- .../models/item/crystal_bow_pulling_4.json | 2 +- .../models/item/crystal_bow_pulling_5.json | 2 +- .../botania/models/item/elucidator.json | 6 --- .../botania/models/item/livingwood_bow.json | 2 +- .../models/item/livingwood_bow_pulling_1.json | 2 +- .../models/item/livingwood_bow_pulling_2.json | 2 +- .../models/item/livingwood_bow_pulling_3.json | 2 +- .../botania/models/item/mana_bottle_1.json | 6 --- .../botania/models/item/mana_bottle_2.json | 6 --- .../botania/models/item/mana_bottle_3.json | 6 --- .../botania/models/item/mana_bottle_4.json | 6 --- .../botania/models/item/mana_bottle_5.json | 6 --- .../botania/models/item/totalbiscuit.json | 6 --- .../item/{flask1_0.png => brew_flask_0.png} | Bin .../item/{flask1_1.png => brew_flask_1.png} | Bin .../item/{flask1_2.png => brew_flask_2.png} | Bin .../item/{flask1_3.png => brew_flask_3.png} | Bin .../item/{flask1_4.png => brew_flask_4.png} | Bin .../item/{flask1_5.png => brew_flask_5.png} | Bin .../item/{vial1_0.png => brew_vial_0.png} | Bin .../item/{vial1_1.png => brew_vial_1.png} | Bin .../item/{vial1_2.png => brew_vial_2.png} | Bin .../item/{vial1_3.png => brew_vial_3.png} | Bin .../item/{bow_crystal.png => crystal_bow.png} | Bin ...ulling_1.png => crystal_bow_pulling_1.png} | Bin ...ulling_2.png => crystal_bow_pulling_2.png} | Bin ...ulling_3.png => crystal_bow_pulling_3.png} | Bin ...ulling_4.png => crystal_bow_pulling_4.png} | Bin ...ulling_5.png => crystal_bow_pulling_5.png} | Bin .../textures/item/{flask0.png => flask.png} | Bin ...{bow_livingwood.png => livingwood_bow.png} | Bin ...ing_1.png => livingwood_bow_pulling_1.png} | Bin ...ing_2.png => livingwood_bow_pulling_2.png} | Bin ...ing_3.png => livingwood_bow_pulling_3.png} | Bin .../{bottle_mana_0.png => mana_bottle.png} | Bin .../{bottle_mana_1.png => mana_bottle_1.png} | Bin .../{bottle_mana_2.png => mana_bottle_2.png} | Bin .../{bottle_mana_3.png => mana_bottle_3.png} | Bin .../{bottle_mana_4.png => mana_bottle_4.png} | Bin .../{bottle_mana_5.png => mana_bottle_5.png} | Bin .../textures/item/{vial0.png => vial.png} | Bin 70 files changed, 153 insertions(+), 132 deletions(-) rename src/{main => generated}/resources/assets/botania/models/item/brew_flask.json (62%) create mode 100644 src/generated/resources/assets/botania/models/item/brew_flask_1.json create mode 100644 src/generated/resources/assets/botania/models/item/brew_flask_2.json create mode 100644 src/generated/resources/assets/botania/models/item/brew_flask_3.json create mode 100644 src/generated/resources/assets/botania/models/item/brew_flask_4.json create mode 100644 src/generated/resources/assets/botania/models/item/brew_flask_5.json rename src/{main => generated}/resources/assets/botania/models/item/brew_vial.json (58%) create mode 100644 src/generated/resources/assets/botania/models/item/brew_vial_1.json create mode 100644 src/generated/resources/assets/botania/models/item/brew_vial_2.json create mode 100644 src/generated/resources/assets/botania/models/item/brew_vial_3.json rename src/{main => generated}/resources/assets/botania/models/item/mana_bottle.json (65%) create mode 100644 src/generated/resources/assets/botania/models/item/mana_bottle_1.json create mode 100644 src/generated/resources/assets/botania/models/item/mana_bottle_2.json create mode 100644 src/generated/resources/assets/botania/models/item/mana_bottle_3.json create mode 100644 src/generated/resources/assets/botania/models/item/mana_bottle_4.json create mode 100644 src/generated/resources/assets/botania/models/item/mana_bottle_5.json delete mode 100644 src/main/resources/assets/botania/models/item/brew_flask_1.json delete mode 100644 src/main/resources/assets/botania/models/item/brew_flask_2.json delete mode 100644 src/main/resources/assets/botania/models/item/brew_flask_3.json delete mode 100644 src/main/resources/assets/botania/models/item/brew_flask_4.json delete mode 100644 src/main/resources/assets/botania/models/item/brew_flask_5.json delete mode 100644 src/main/resources/assets/botania/models/item/brew_vial_1.json delete mode 100644 src/main/resources/assets/botania/models/item/brew_vial_2.json delete mode 100644 src/main/resources/assets/botania/models/item/brew_vial_3.json delete mode 100644 src/main/resources/assets/botania/models/item/elucidator.json delete mode 100644 src/main/resources/assets/botania/models/item/mana_bottle_1.json delete mode 100644 src/main/resources/assets/botania/models/item/mana_bottle_2.json delete mode 100644 src/main/resources/assets/botania/models/item/mana_bottle_3.json delete mode 100644 src/main/resources/assets/botania/models/item/mana_bottle_4.json delete mode 100644 src/main/resources/assets/botania/models/item/mana_bottle_5.json delete mode 100644 src/main/resources/assets/botania/models/item/totalbiscuit.json rename src/main/resources/assets/botania/textures/item/{flask1_0.png => brew_flask_0.png} (100%) rename src/main/resources/assets/botania/textures/item/{flask1_1.png => brew_flask_1.png} (100%) rename src/main/resources/assets/botania/textures/item/{flask1_2.png => brew_flask_2.png} (100%) rename src/main/resources/assets/botania/textures/item/{flask1_3.png => brew_flask_3.png} (100%) rename src/main/resources/assets/botania/textures/item/{flask1_4.png => brew_flask_4.png} (100%) rename src/main/resources/assets/botania/textures/item/{flask1_5.png => brew_flask_5.png} (100%) rename src/main/resources/assets/botania/textures/item/{vial1_0.png => brew_vial_0.png} (100%) rename src/main/resources/assets/botania/textures/item/{vial1_1.png => brew_vial_1.png} (100%) rename src/main/resources/assets/botania/textures/item/{vial1_2.png => brew_vial_2.png} (100%) rename src/main/resources/assets/botania/textures/item/{vial1_3.png => brew_vial_3.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_crystal.png => crystal_bow.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_crystal_pulling_1.png => crystal_bow_pulling_1.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_crystal_pulling_2.png => crystal_bow_pulling_2.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_crystal_pulling_3.png => crystal_bow_pulling_3.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_crystal_pulling_4.png => crystal_bow_pulling_4.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_crystal_pulling_5.png => crystal_bow_pulling_5.png} (100%) rename src/main/resources/assets/botania/textures/item/{flask0.png => flask.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_livingwood.png => livingwood_bow.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_livingwood_pulling_1.png => livingwood_bow_pulling_1.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_livingwood_pulling_2.png => livingwood_bow_pulling_2.png} (100%) rename src/main/resources/assets/botania/textures/item/{bow_livingwood_pulling_3.png => livingwood_bow_pulling_3.png} (100%) rename src/main/resources/assets/botania/textures/item/{bottle_mana_0.png => mana_bottle.png} (100%) rename src/main/resources/assets/botania/textures/item/{bottle_mana_1.png => mana_bottle_1.png} (100%) rename src/main/resources/assets/botania/textures/item/{bottle_mana_2.png => mana_bottle_2.png} (100%) rename src/main/resources/assets/botania/textures/item/{bottle_mana_3.png => mana_bottle_3.png} (100%) rename src/main/resources/assets/botania/textures/item/{bottle_mana_4.png => mana_bottle_4.png} (100%) rename src/main/resources/assets/botania/textures/item/{bottle_mana_5.png => mana_bottle_5.png} (100%) rename src/main/resources/assets/botania/textures/item/{vial0.png => vial.png} (100%) diff --git a/src/main/resources/assets/botania/models/item/brew_flask.json b/src/generated/resources/assets/botania/models/item/brew_flask.json similarity index 62% rename from src/main/resources/assets/botania/models/item/brew_flask.json rename to src/generated/resources/assets/botania/models/item/brew_flask.json index da672a0ac..f9fed24e7 100644 --- a/src/main/resources/assets/botania/models/item/brew_flask.json +++ b/src/generated/resources/assets/botania/models/item/brew_flask.json @@ -1,39 +1,39 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { - "layer0": "botania:item/flask0", - "layer1": "botania:item/flask1_0" + "layer0": "botania:item/flask", + "layer1": "botania:item/brew_flask_0" }, "overrides": [ { "predicate": { - "botania:swigs_taken": 1 + "botania:swigs_taken": 1.0 }, "model": "botania:item/brew_flask_1" }, { "predicate": { - "botania:swigs_taken": 2 + "botania:swigs_taken": 2.0 }, "model": "botania:item/brew_flask_2" }, { "predicate": { - "botania:swigs_taken": 3 + "botania:swigs_taken": 3.0 }, "model": "botania:item/brew_flask_3" }, { "predicate": { - "botania:swigs_taken": 4 + "botania:swigs_taken": 4.0 }, "model": "botania:item/brew_flask_4" }, { "predicate": { - "botania:swigs_taken": 5 + "botania:swigs_taken": 5.0 }, "model": "botania:item/brew_flask_5" } ] -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brew_flask_1.json b/src/generated/resources/assets/botania/models/item/brew_flask_1.json new file mode 100644 index 000000000..82c9327e1 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brew_flask_1.json @@ -0,0 +1,6 @@ +{ + "textures": { + "layer0": "botania:item/flask", + "layer1": "botania:item/brew_flask_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brew_flask_2.json b/src/generated/resources/assets/botania/models/item/brew_flask_2.json new file mode 100644 index 000000000..5aedd5125 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brew_flask_2.json @@ -0,0 +1,6 @@ +{ + "textures": { + "layer0": "botania:item/flask", + "layer1": "botania:item/brew_flask_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brew_flask_3.json b/src/generated/resources/assets/botania/models/item/brew_flask_3.json new file mode 100644 index 000000000..6ffbce08f --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brew_flask_3.json @@ -0,0 +1,6 @@ +{ + "textures": { + "layer0": "botania:item/flask", + "layer1": "botania:item/brew_flask_3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brew_flask_4.json b/src/generated/resources/assets/botania/models/item/brew_flask_4.json new file mode 100644 index 000000000..e9a3ed69f --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brew_flask_4.json @@ -0,0 +1,6 @@ +{ + "textures": { + "layer0": "botania:item/flask", + "layer1": "botania:item/brew_flask_4" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brew_flask_5.json b/src/generated/resources/assets/botania/models/item/brew_flask_5.json new file mode 100644 index 000000000..71bbaae7a --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brew_flask_5.json @@ -0,0 +1,6 @@ +{ + "textures": { + "layer0": "botania:item/flask", + "layer1": "botania:item/brew_flask_5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brew_vial.json b/src/generated/resources/assets/botania/models/item/brew_vial.json similarity index 58% rename from src/main/resources/assets/botania/models/item/brew_vial.json rename to src/generated/resources/assets/botania/models/item/brew_vial.json index 6f8e39a2a..2056589e7 100644 --- a/src/main/resources/assets/botania/models/item/brew_vial.json +++ b/src/generated/resources/assets/botania/models/item/brew_vial.json @@ -1,27 +1,27 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { - "layer0": "botania:item/vial0", - "layer1": "botania:item/vial1_0" + "layer0": "botania:item/vial", + "layer1": "botania:item/brew_vial_0" }, "overrides": [ { "predicate": { - "botania:swigs_taken": 1 + "botania:swigs_taken": 1.0 }, "model": "botania:item/brew_vial_1" }, { "predicate": { - "botania:swigs_taken": 2 + "botania:swigs_taken": 2.0 }, "model": "botania:item/brew_vial_2" }, { "predicate": { - "botania:swigs_taken": 3 + "botania:swigs_taken": 3.0 }, "model": "botania:item/brew_vial_3" } ] -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brew_vial_1.json b/src/generated/resources/assets/botania/models/item/brew_vial_1.json new file mode 100644 index 000000000..60b1790f5 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brew_vial_1.json @@ -0,0 +1,6 @@ +{ + "textures": { + "layer0": "botania:item/vial", + "layer1": "botania:item/brew_vial_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brew_vial_2.json b/src/generated/resources/assets/botania/models/item/brew_vial_2.json new file mode 100644 index 000000000..af9cd48ff --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brew_vial_2.json @@ -0,0 +1,6 @@ +{ + "textures": { + "layer0": "botania:item/vial", + "layer1": "botania:item/brew_vial_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brew_vial_3.json b/src/generated/resources/assets/botania/models/item/brew_vial_3.json new file mode 100644 index 000000000..936a9d842 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brew_vial_3.json @@ -0,0 +1,6 @@ +{ + "textures": { + "layer0": "botania:item/vial", + "layer1": "botania:item/brew_vial_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_bottle.json b/src/generated/resources/assets/botania/models/item/mana_bottle.json similarity index 65% rename from src/main/resources/assets/botania/models/item/mana_bottle.json rename to src/generated/resources/assets/botania/models/item/mana_bottle.json index 8e0f54d1c..fb4f24050 100644 --- a/src/main/resources/assets/botania/models/item/mana_bottle.json +++ b/src/generated/resources/assets/botania/models/item/mana_bottle.json @@ -1,38 +1,38 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { - "layer0": "botania:item/bottle_mana_0" + "layer0": "botania:item/mana_bottle" }, "overrides": [ { "predicate": { - "botania:swigs_taken": 1 + "botania:swigs_taken": 1.0 }, "model": "botania:item/mana_bottle_1" }, { "predicate": { - "botania:swigs_taken": 2 + "botania:swigs_taken": 2.0 }, "model": "botania:item/mana_bottle_2" }, { "predicate": { - "botania:swigs_taken": 3 + "botania:swigs_taken": 3.0 }, "model": "botania:item/mana_bottle_3" }, { "predicate": { - "botania:swigs_taken": 4 + "botania:swigs_taken": 4.0 }, "model": "botania:item/mana_bottle_4" }, { "predicate": { - "botania:swigs_taken": 5 + "botania:swigs_taken": 5.0 }, "model": "botania:item/mana_bottle_5" } ] -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/mana_bottle_1.json b/src/generated/resources/assets/botania/models/item/mana_bottle_1.json new file mode 100644 index 000000000..1e64a438c --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/mana_bottle_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:item/mana_bottle_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/mana_bottle_2.json b/src/generated/resources/assets/botania/models/item/mana_bottle_2.json new file mode 100644 index 000000000..3b248350f --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/mana_bottle_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:item/mana_bottle_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/mana_bottle_3.json b/src/generated/resources/assets/botania/models/item/mana_bottle_3.json new file mode 100644 index 000000000..7ed817ef5 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/mana_bottle_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:item/mana_bottle_3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/mana_bottle_4.json b/src/generated/resources/assets/botania/models/item/mana_bottle_4.json new file mode 100644 index 000000000..25f461e75 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/mana_bottle_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:item/mana_bottle_4" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/mana_bottle_5.json b/src/generated/resources/assets/botania/models/item/mana_bottle_5.json new file mode 100644 index 000000000..ce75e7082 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/mana_bottle_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:item/mana_bottle_5" + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/ItemModelProvider.java b/src/main/java/vazkii/botania/data/ItemModelProvider.java index dbcf34c27..badb4e544 100644 --- a/src/main/java/vazkii/botania/data/ItemModelProvider.java +++ b/src/main/java/vazkii/botania/data/ItemModelProvider.java @@ -72,11 +72,43 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator } private void registerItemOverrides(Set items) { + // Written manually + items.remove(livingwoodBow); + items.remove(crystalBow); + generatedItem(blackHoleTalisman).override() .predicate(prefix("active"), 1) .model(generatedItem(name(blackHoleTalisman) + "_active")).end(); items.remove(blackHoleTalisman); + ItemModelBuilder flaskBuilder = withExistingParent(name(brewFlask), GENERATED) + .texture("layer0", prefix("item/" + name(flask))) + .texture("layer1", prefix("item/" + name(brewFlask) + "_0")); + for (int i = 1; i <= 5; i++) { + String overrideName = name(brewFlask) + "_" + i; + ModelFile overrideModel = getBuilder(overrideName) + .texture("layer0", prefix("item/" + name(flask))) + .texture("layer1", prefix("item/" + overrideName)); + flaskBuilder.override() + .predicate(prefix("swigs_taken"), i) + .model(overrideModel).end(); + } + items.remove(brewFlask); + + ItemModelBuilder vialBuilder = withExistingParent(name(brewVial), GENERATED) + .texture("layer0", prefix("item/" + name(vial))) + .texture("layer1", prefix("item/" + name(brewVial) + "_0")); + for (int i = 1; i <= 3; i++) { + String overrideName = name(brewVial) + "_" + i; + ModelFile overrideModel = getBuilder(overrideName) + .texture("layer0", prefix("item/" + name(vial))) + .texture("layer1", prefix("item/" + overrideName)); + vialBuilder.override() + .predicate(prefix("swigs_taken"), i) + .model(overrideModel).end(); + } + items.remove(brewVial); + generatedItem(elementiumShears).override() .predicate(prefix("reddit"), 1) .model(generatedItem("dammitreddit")).end(); @@ -110,6 +142,15 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator .model(generatedItem(name(magnetRingGreater) + "_active")).end(); items.remove(magnetRingGreater); + ItemModelBuilder bottle = generatedItem(manaBottle); + for (int i = 1; i <= 5; i++) { + ModelFile overrideModel = generatedItem(name(manaBottle) + "_" + i); + bottle.override() + .predicate(prefix("swigs_taken"), i) + .model(overrideModel).end(); + } + items.remove(manaBottle); + generatedItem(manaCookie).override() .predicate(prefix("totalbiscuit"), 1) .model(generatedItem("totalbiscuit")).end(); diff --git a/src/main/resources/assets/botania/models/item/brew_flask_1.json b/src/main/resources/assets/botania/models/item/brew_flask_1.json deleted file mode 100644 index d4a5111dd..000000000 --- a/src/main/resources/assets/botania/models/item/brew_flask_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/flask0", - "layer1": "botania:item/flask1_1" - } -} diff --git a/src/main/resources/assets/botania/models/item/brew_flask_2.json b/src/main/resources/assets/botania/models/item/brew_flask_2.json deleted file mode 100644 index e5d50ef27..000000000 --- a/src/main/resources/assets/botania/models/item/brew_flask_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/flask0", - "layer1": "botania:item/flask1_2" - } -} diff --git a/src/main/resources/assets/botania/models/item/brew_flask_3.json b/src/main/resources/assets/botania/models/item/brew_flask_3.json deleted file mode 100644 index 2443467e1..000000000 --- a/src/main/resources/assets/botania/models/item/brew_flask_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/flask0", - "layer1": "botania:item/flask1_3" - } -} diff --git a/src/main/resources/assets/botania/models/item/brew_flask_4.json b/src/main/resources/assets/botania/models/item/brew_flask_4.json deleted file mode 100644 index 34a086856..000000000 --- a/src/main/resources/assets/botania/models/item/brew_flask_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/flask0", - "layer1": "botania:item/flask1_4" - } -} diff --git a/src/main/resources/assets/botania/models/item/brew_flask_5.json b/src/main/resources/assets/botania/models/item/brew_flask_5.json deleted file mode 100644 index cb5acc2f1..000000000 --- a/src/main/resources/assets/botania/models/item/brew_flask_5.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/flask0", - "layer1": "botania:item/flask1_5" - } -} diff --git a/src/main/resources/assets/botania/models/item/brew_vial_1.json b/src/main/resources/assets/botania/models/item/brew_vial_1.json deleted file mode 100644 index 9da86557c..000000000 --- a/src/main/resources/assets/botania/models/item/brew_vial_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/vial0", - "layer1": "botania:item/vial1_1" - } -} diff --git a/src/main/resources/assets/botania/models/item/brew_vial_2.json b/src/main/resources/assets/botania/models/item/brew_vial_2.json deleted file mode 100644 index 13e168729..000000000 --- a/src/main/resources/assets/botania/models/item/brew_vial_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/vial0", - "layer1": "botania:item/vial1_2" - } -} diff --git a/src/main/resources/assets/botania/models/item/brew_vial_3.json b/src/main/resources/assets/botania/models/item/brew_vial_3.json deleted file mode 100644 index 5cb6fb4f8..000000000 --- a/src/main/resources/assets/botania/models/item/brew_vial_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/vial0", - "layer1": "botania:item/vial1_3" - } -} diff --git a/src/main/resources/assets/botania/models/item/crystal_bow.json b/src/main/resources/assets/botania/models/item/crystal_bow.json index cd6ebf0dc..551b8bcb7 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:item/bow_crystal" + "layer0": "botania:item/crystal_bow" }, "display": { "thirdperson_righthand": { diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_1.json index 8ddb03f29..b2c19cf87 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_1.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystal_bow", "textures": { - "layer0": "botania:item/bow_crystal_pulling_1" + "layer0": "botania:item/crystal_bow_pulling_1" } } diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_2.json index c59427767..49002cead 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_2.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystal_bow", "textures": { - "layer0": "botania:item/bow_crystal_pulling_2" + "layer0": "botania:item/crystal_bow_pulling_2" } } diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_3.json index a55d7f79a..8d2cadf94 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_3.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystal_bow", "textures": { - "layer0": "botania:item/bow_crystal_pulling_3" + "layer0": "botania:item/crystal_bow_pulling_3" } } diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_4.json index 5dc7bf6be..6dd9928fd 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_4.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_4.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystal_bow", "textures": { - "layer0": "botania:item/bow_crystal_pulling_4" + "layer0": "botania:item/crystal_bow_pulling_4" } } diff --git a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_5.json index d3a6465cb..311dd5260 100644 --- a/src/main/resources/assets/botania/models/item/crystal_bow_pulling_5.json +++ b/src/main/resources/assets/botania/models/item/crystal_bow_pulling_5.json @@ -1,6 +1,6 @@ { "parent": "botania:item/crystal_bow", "textures": { - "layer0": "botania:item/bow_crystal_pulling_5" + "layer0": "botania:item/crystal_bow_pulling_5" } } diff --git a/src/main/resources/assets/botania/models/item/elucidator.json b/src/main/resources/assets/botania/models/item/elucidator.json deleted file mode 100644 index 94d73cc48..000000000 --- a/src/main/resources/assets/botania/models/item/elucidator.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:item/special_elucidator" - } -} diff --git a/src/main/resources/assets/botania/models/item/livingwood_bow.json b/src/main/resources/assets/botania/models/item/livingwood_bow.json index d9402e4fc..5cc9e0b83 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_bow.json +++ b/src/main/resources/assets/botania/models/item/livingwood_bow.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:item/bow_livingwood" + "layer0": "botania:item/livingwood_bow" }, "display": { "thirdperson_righthand": { diff --git a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_1.json index 98d775422..677fb9bc6 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_1.json @@ -1,6 +1,6 @@ { "parent": "botania:item/livingwood_bow", "textures": { - "layer0": "botania:item/bow_livingwood_pulling_1" + "layer0": "botania:item/livingwood_bow_pulling_1" } } diff --git a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_2.json index 7ee38e798..150cff9a2 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_2.json @@ -1,6 +1,6 @@ { "parent": "botania:item/livingwood_bow", "textures": { - "layer0": "botania:item/bow_livingwood_pulling_2" + "layer0": "botania:item/livingwood_bow_pulling_2" } } diff --git a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_3.json index 3a1b34e55..16e7d76e5 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/livingwood_bow_pulling_3.json @@ -1,6 +1,6 @@ { "parent": "botania:item/livingwood_bow", "textures": { - "layer0": "botania:item/bow_livingwood_pulling_3" + "layer0": "botania:item/livingwood_bow_pulling_3" } } diff --git a/src/main/resources/assets/botania/models/item/mana_bottle_1.json b/src/main/resources/assets/botania/models/item/mana_bottle_1.json deleted file mode 100644 index c8fce0eb2..000000000 --- a/src/main/resources/assets/botania/models/item/mana_bottle_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/bottle_mana_1" - } -} diff --git a/src/main/resources/assets/botania/models/item/mana_bottle_2.json b/src/main/resources/assets/botania/models/item/mana_bottle_2.json deleted file mode 100644 index 9d518f99b..000000000 --- a/src/main/resources/assets/botania/models/item/mana_bottle_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/bottle_mana_2" - } -} diff --git a/src/main/resources/assets/botania/models/item/mana_bottle_3.json b/src/main/resources/assets/botania/models/item/mana_bottle_3.json deleted file mode 100644 index 3ab90b242..000000000 --- a/src/main/resources/assets/botania/models/item/mana_bottle_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/bottle_mana_3" - } -} diff --git a/src/main/resources/assets/botania/models/item/mana_bottle_4.json b/src/main/resources/assets/botania/models/item/mana_bottle_4.json deleted file mode 100644 index be81715b9..000000000 --- a/src/main/resources/assets/botania/models/item/mana_bottle_4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/bottle_mana_4" - } -} diff --git a/src/main/resources/assets/botania/models/item/mana_bottle_5.json b/src/main/resources/assets/botania/models/item/mana_bottle_5.json deleted file mode 100644 index 6b1fbdd79..000000000 --- a/src/main/resources/assets/botania/models/item/mana_bottle_5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/bottle_mana_5" - } -} diff --git a/src/main/resources/assets/botania/models/item/totalbiscuit.json b/src/main/resources/assets/botania/models/item/totalbiscuit.json deleted file mode 100644 index 07d693fd8..000000000 --- a/src/main/resources/assets/botania/models/item/totalbiscuit.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/special_totalbiscuit" - } -} diff --git a/src/main/resources/assets/botania/textures/item/flask1_0.png b/src/main/resources/assets/botania/textures/item/brew_flask_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/flask1_0.png rename to src/main/resources/assets/botania/textures/item/brew_flask_0.png diff --git a/src/main/resources/assets/botania/textures/item/flask1_1.png b/src/main/resources/assets/botania/textures/item/brew_flask_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/flask1_1.png rename to src/main/resources/assets/botania/textures/item/brew_flask_1.png diff --git a/src/main/resources/assets/botania/textures/item/flask1_2.png b/src/main/resources/assets/botania/textures/item/brew_flask_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/flask1_2.png rename to src/main/resources/assets/botania/textures/item/brew_flask_2.png diff --git a/src/main/resources/assets/botania/textures/item/flask1_3.png b/src/main/resources/assets/botania/textures/item/brew_flask_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/flask1_3.png rename to src/main/resources/assets/botania/textures/item/brew_flask_3.png diff --git a/src/main/resources/assets/botania/textures/item/flask1_4.png b/src/main/resources/assets/botania/textures/item/brew_flask_4.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/flask1_4.png rename to src/main/resources/assets/botania/textures/item/brew_flask_4.png diff --git a/src/main/resources/assets/botania/textures/item/flask1_5.png b/src/main/resources/assets/botania/textures/item/brew_flask_5.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/flask1_5.png rename to src/main/resources/assets/botania/textures/item/brew_flask_5.png diff --git a/src/main/resources/assets/botania/textures/item/vial1_0.png b/src/main/resources/assets/botania/textures/item/brew_vial_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/vial1_0.png rename to src/main/resources/assets/botania/textures/item/brew_vial_0.png diff --git a/src/main/resources/assets/botania/textures/item/vial1_1.png b/src/main/resources/assets/botania/textures/item/brew_vial_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/vial1_1.png rename to src/main/resources/assets/botania/textures/item/brew_vial_1.png diff --git a/src/main/resources/assets/botania/textures/item/vial1_2.png b/src/main/resources/assets/botania/textures/item/brew_vial_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/vial1_2.png rename to src/main/resources/assets/botania/textures/item/brew_vial_2.png diff --git a/src/main/resources/assets/botania/textures/item/vial1_3.png b/src/main/resources/assets/botania/textures/item/brew_vial_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/vial1_3.png rename to src/main/resources/assets/botania/textures/item/brew_vial_3.png diff --git a/src/main/resources/assets/botania/textures/item/bow_crystal.png b/src/main/resources/assets/botania/textures/item/crystal_bow.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_crystal.png rename to src/main/resources/assets/botania/textures/item/crystal_bow.png diff --git a/src/main/resources/assets/botania/textures/item/bow_crystal_pulling_1.png b/src/main/resources/assets/botania/textures/item/crystal_bow_pulling_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_crystal_pulling_1.png rename to src/main/resources/assets/botania/textures/item/crystal_bow_pulling_1.png diff --git a/src/main/resources/assets/botania/textures/item/bow_crystal_pulling_2.png b/src/main/resources/assets/botania/textures/item/crystal_bow_pulling_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_crystal_pulling_2.png rename to src/main/resources/assets/botania/textures/item/crystal_bow_pulling_2.png diff --git a/src/main/resources/assets/botania/textures/item/bow_crystal_pulling_3.png b/src/main/resources/assets/botania/textures/item/crystal_bow_pulling_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_crystal_pulling_3.png rename to src/main/resources/assets/botania/textures/item/crystal_bow_pulling_3.png diff --git a/src/main/resources/assets/botania/textures/item/bow_crystal_pulling_4.png b/src/main/resources/assets/botania/textures/item/crystal_bow_pulling_4.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_crystal_pulling_4.png rename to src/main/resources/assets/botania/textures/item/crystal_bow_pulling_4.png diff --git a/src/main/resources/assets/botania/textures/item/bow_crystal_pulling_5.png b/src/main/resources/assets/botania/textures/item/crystal_bow_pulling_5.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_crystal_pulling_5.png rename to src/main/resources/assets/botania/textures/item/crystal_bow_pulling_5.png diff --git a/src/main/resources/assets/botania/textures/item/flask0.png b/src/main/resources/assets/botania/textures/item/flask.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/flask0.png rename to src/main/resources/assets/botania/textures/item/flask.png diff --git a/src/main/resources/assets/botania/textures/item/bow_livingwood.png b/src/main/resources/assets/botania/textures/item/livingwood_bow.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_livingwood.png rename to src/main/resources/assets/botania/textures/item/livingwood_bow.png diff --git a/src/main/resources/assets/botania/textures/item/bow_livingwood_pulling_1.png b/src/main/resources/assets/botania/textures/item/livingwood_bow_pulling_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_livingwood_pulling_1.png rename to src/main/resources/assets/botania/textures/item/livingwood_bow_pulling_1.png diff --git a/src/main/resources/assets/botania/textures/item/bow_livingwood_pulling_2.png b/src/main/resources/assets/botania/textures/item/livingwood_bow_pulling_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_livingwood_pulling_2.png rename to src/main/resources/assets/botania/textures/item/livingwood_bow_pulling_2.png diff --git a/src/main/resources/assets/botania/textures/item/bow_livingwood_pulling_3.png b/src/main/resources/assets/botania/textures/item/livingwood_bow_pulling_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bow_livingwood_pulling_3.png rename to src/main/resources/assets/botania/textures/item/livingwood_bow_pulling_3.png diff --git a/src/main/resources/assets/botania/textures/item/bottle_mana_0.png b/src/main/resources/assets/botania/textures/item/mana_bottle.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bottle_mana_0.png rename to src/main/resources/assets/botania/textures/item/mana_bottle.png diff --git a/src/main/resources/assets/botania/textures/item/bottle_mana_1.png b/src/main/resources/assets/botania/textures/item/mana_bottle_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bottle_mana_1.png rename to src/main/resources/assets/botania/textures/item/mana_bottle_1.png diff --git a/src/main/resources/assets/botania/textures/item/bottle_mana_2.png b/src/main/resources/assets/botania/textures/item/mana_bottle_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bottle_mana_2.png rename to src/main/resources/assets/botania/textures/item/mana_bottle_2.png diff --git a/src/main/resources/assets/botania/textures/item/bottle_mana_3.png b/src/main/resources/assets/botania/textures/item/mana_bottle_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bottle_mana_3.png rename to src/main/resources/assets/botania/textures/item/mana_bottle_3.png diff --git a/src/main/resources/assets/botania/textures/item/bottle_mana_4.png b/src/main/resources/assets/botania/textures/item/mana_bottle_4.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bottle_mana_4.png rename to src/main/resources/assets/botania/textures/item/mana_bottle_4.png diff --git a/src/main/resources/assets/botania/textures/item/bottle_mana_5.png b/src/main/resources/assets/botania/textures/item/mana_bottle_5.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/bottle_mana_5.png rename to src/main/resources/assets/botania/textures/item/mana_bottle_5.png diff --git a/src/main/resources/assets/botania/textures/item/vial0.png b/src/main/resources/assets/botania/textures/item/vial.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/vial0.png rename to src/main/resources/assets/botania/textures/item/vial.png