diff --git a/src/generated/resources/assets/botania/models/item/blood_pendant.json b/src/generated/resources/assets/botania/models/item/blood_pendant.json new file mode 100644 index 000000000..089d6cbda --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/blood_pendant.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:item/blood_pendant", + "layer1": "botania:item/blood_pendant_overlay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ender_dagger.json b/src/generated/resources/assets/botania/models/item/ender_dagger.json similarity index 73% rename from src/main/resources/assets/botania/models/item/ender_dagger.json rename to src/generated/resources/assets/botania/models/item/ender_dagger.json index cb85e4514..90063c622 100644 --- a/src/main/resources/assets/botania/models/item/ender_dagger.json +++ b/src/generated/resources/assets/botania/models/item/ender_dagger.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/handheld", + "parent": "item/generated", "textures": { "layer0": "botania:item/ender_dagger", "layer1": "botania:item/ender_dagger_overlay" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/incense_stick.json b/src/generated/resources/assets/botania/models/item/incense_stick.json new file mode 100644 index 000000000..6076a8f7b --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/incense_stick.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:item/incense_stick", + "layer1": "botania:item/incense_stick_overlay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_mirror.json b/src/generated/resources/assets/botania/models/item/mana_mirror.json similarity index 72% rename from src/main/resources/assets/botania/models/item/mana_mirror.json rename to src/generated/resources/assets/botania/models/item/mana_mirror.json index 9fa4caa3c..a4c2ca2e8 100644 --- a/src/main/resources/assets/botania/models/item/mana_mirror.json +++ b/src/generated/resources/assets/botania/models/item/mana_mirror.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/mana_mirror", "layer1": "botania:item/mana_mirror_overlay" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_tablet.json b/src/generated/resources/assets/botania/models/item/mana_tablet.json similarity index 72% rename from src/main/resources/assets/botania/models/item/mana_tablet.json rename to src/generated/resources/assets/botania/models/item/mana_tablet.json index a3337f341..42e9b1258 100644 --- a/src/main/resources/assets/botania/models/item/mana_tablet.json +++ b/src/generated/resources/assets/botania/models/item/mana_tablet.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/mana_tablet", "layer1": "botania:item/mana_tablet_overlay" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/third_eye.json b/src/generated/resources/assets/botania/models/item/third_eye.json new file mode 100644 index 000000000..358fda910 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/third_eye.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:item/third_eye_0", + "layer1": "botania:item/third_eye_1", + "layer2": "botania:item/third_eye_2" + } +} \ 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 badb4e544..7dd884ec0 100644 --- a/src/main/java/vazkii/botania/data/ItemModelProvider.java +++ b/src/main/java/vazkii/botania/data/ItemModelProvider.java @@ -51,9 +51,7 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator .collect(Collectors.toSet()); registerItemBlocks(takeAll(items, i -> i instanceof BlockItem).stream().map(i -> (BlockItem) i).collect(Collectors.toSet())); registerItemOverrides(items); - takeAll(items, i -> i instanceof ItemLens).forEach(i -> getBuilder(name(i)).parent(getExistingFile(GENERATED)) - .texture("layer0", prefix("item/lens")) - .texture("layer1", prefix("item/" + name(i)))); + registerItems(items); } private static String name(Item i) { @@ -63,14 +61,50 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator private static final ResourceLocation GENERATED = new ResourceLocation("item/generated"); private ItemModelBuilder generatedItem(String name) { - return getBuilder(name).parent(getExistingFile(GENERATED)) - .texture("layer0", prefix("item/" + name)); + return withExistingParent(name, GENERATED) + .texture("layer0", prefix("item/" + name)); } private ItemModelBuilder generatedItem(Item i) { return generatedItem(name(i)); } + private void registerItems(Set items) { + // Written manually + items.remove(manaGun); + + takeAll(items, i -> i instanceof ItemLens).forEach(i -> + withExistingParent(name(i), GENERATED) + .texture("layer0", prefix("item/lens")) + .texture("layer1", prefix("item/" + name(i)))); + + generatedItem(bloodPendant) + .texture("layer1", prefix("item/" + name(bloodPendant) + "_overlay")); + items.remove(bloodPendant); + + generatedItem(enderDagger) + .texture("layer1", prefix("item/" + name(enderDagger) + "_overlay")); + items.remove(enderDagger); + + generatedItem(incenseStick) + .texture("layer1", prefix("item/" + name(incenseStick) + "_overlay")); + items.remove(incenseStick); + + generatedItem(manaMirror) + .texture("layer1", prefix("item/" + name(manaMirror) + "_overlay")); + items.remove(manaMirror); + + generatedItem(manaTablet) + .texture("layer1", prefix("item/" + name(manaTablet) + "_overlay")); + items.remove(manaTablet); + + withExistingParent(name(thirdEye), GENERATED) + .texture("layer0", prefix("item/" + name(thirdEye) + "_0")) + .texture("layer1", prefix("item/" + name(thirdEye) + "_1")) + .texture("layer2", prefix("item/" + name(thirdEye) + "_2")); + items.remove(thirdEye); + } + private void registerItemOverrides(Set items) { // Written manually items.remove(livingwoodBow); @@ -86,7 +120,7 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator .texture("layer1", prefix("item/" + name(brewFlask) + "_0")); for (int i = 1; i <= 5; i++) { String overrideName = name(brewFlask) + "_" + i; - ModelFile overrideModel = getBuilder(overrideName) + ModelFile overrideModel = withExistingParent(overrideName, GENERATED) .texture("layer0", prefix("item/" + name(flask))) .texture("layer1", prefix("item/" + overrideName)); flaskBuilder.override() @@ -100,7 +134,7 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator .texture("layer1", prefix("item/" + name(brewVial) + "_0")); for (int i = 1; i <= 3; i++) { String overrideName = name(brewVial) + "_" + i; - ModelFile overrideModel = getBuilder(overrideName) + ModelFile overrideModel = withExistingParent(overrideName, GENERATED) .texture("layer0", prefix("item/" + name(vial))) .texture("layer1", prefix("item/" + overrideName)); vialBuilder.override() @@ -201,12 +235,10 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator .model(generatedItem(name(terraAxe) + "_active")).end(); items.remove(terraAxe); - ModelFile enabledModel = getBuilder(name(terraPick) + "_active") - .parent(getExistingFile(GENERATED)) + ModelFile enabledModel = withExistingParent(name(terraPick) + "_active", GENERATED) .texture("layer0", prefix("item/" + name(terraPick))) .texture("layer1", prefix("item/" + name(terraPick) + "_active")); - ModelFile tippedEnabledModel = getBuilder(name(terraPick) + "_tipped_active") - .parent(getExistingFile(GENERATED)) + ModelFile tippedEnabledModel = withExistingParent(name(terraPick) + "_tipped_active", GENERATED) .texture("layer0", prefix("item/" + name(terraPick) + "_tipped")) .texture("layer1", prefix("item/" + name(terraPick) + "_active")); diff --git a/src/main/resources/assets/botania/models/icon/blood_pendant_chain.json b/src/main/resources/assets/botania/models/icon/blood_pendant_chain.json index 582008b28..4be954329 100644 --- a/src/main/resources/assets/botania/models/icon/blood_pendant_chain.json +++ b/src/main/resources/assets/botania/models/icon/blood_pendant_chain.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:item/pendant_blood_chain" + "layer0": "botania:item/blood_pendant_chain" } } diff --git a/src/main/resources/assets/botania/models/icon/blood_pendant_gem.json b/src/main/resources/assets/botania/models/icon/blood_pendant_gem.json index b660eeb7b..cd4981164 100644 --- a/src/main/resources/assets/botania/models/icon/blood_pendant_gem.json +++ b/src/main/resources/assets/botania/models/icon/blood_pendant_gem.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:item/pendant_blood_gem" + "layer0": "botania:item/blood_pendant_gem" } } diff --git a/src/main/resources/assets/botania/models/item/blood_pendant.json b/src/main/resources/assets/botania/models/item/blood_pendant.json deleted file mode 100644 index 0bbe5a05a..000000000 --- a/src/main/resources/assets/botania/models/item/blood_pendant.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/pendant_blood", - "layer1": "botania:item/pendant_blood_overlay" - } -} diff --git a/src/main/resources/assets/botania/models/item/desu_gun.json b/src/main/resources/assets/botania/models/item/desu_gun.json index 13bf54c56..807a81010 100644 --- a/src/main/resources/assets/botania/models/item/desu_gun.json +++ b/src/main/resources/assets/botania/models/item/desu_gun.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:item/desugun0", - "layer1": "botania:item/desugun1" + "layer0": "botania:item/desu_gun", + "layer1": "botania:item/desu_gun_overlay" } } diff --git a/src/main/resources/assets/botania/models/item/desu_gun_clip.json b/src/main/resources/assets/botania/models/item/desu_gun_clip.json index f0d4f914b..8bb30b71a 100644 --- a/src/main/resources/assets/botania/models/item/desu_gun_clip.json +++ b/src/main/resources/assets/botania/models/item/desu_gun_clip.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:item/desugun2", - "layer1": "botania:item/desugun1" + "layer0": "botania:item/desu_gun_clip", + "layer1": "botania:item/desu_gun_overlay" } } diff --git a/src/main/resources/assets/botania/models/item/incense_stick.json b/src/main/resources/assets/botania/models/item/incense_stick.json deleted file mode 100644 index 5c31d20fc..000000000 --- a/src/main/resources/assets/botania/models/item/incense_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/stick_incense", - "layer1": "botania:item/stick_incense_overlay" - } -} diff --git a/src/main/resources/assets/botania/models/item/third_eye.json b/src/main/resources/assets/botania/models/item/third_eye.json deleted file mode 100644 index 887b0ff66..000000000 --- a/src/main/resources/assets/botania/models/item/third_eye.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:item/third_eye_0", - "layer1": "botania:item/third_eye_1", - "layer2": "botania:item/third_eye_2" - } -} diff --git a/src/main/resources/assets/botania/textures/item/pendant_blood.png b/src/main/resources/assets/botania/textures/item/blood_pendant.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/pendant_blood.png rename to src/main/resources/assets/botania/textures/item/blood_pendant.png diff --git a/src/main/resources/assets/botania/textures/item/pendant_blood_chain.png b/src/main/resources/assets/botania/textures/item/blood_pendant_chain.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/pendant_blood_chain.png rename to src/main/resources/assets/botania/textures/item/blood_pendant_chain.png diff --git a/src/main/resources/assets/botania/textures/item/pendant_blood_gem.png b/src/main/resources/assets/botania/textures/item/blood_pendant_gem.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/pendant_blood_gem.png rename to src/main/resources/assets/botania/textures/item/blood_pendant_gem.png diff --git a/src/main/resources/assets/botania/textures/item/pendant_blood_overlay.png b/src/main/resources/assets/botania/textures/item/blood_pendant_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/pendant_blood_overlay.png rename to src/main/resources/assets/botania/textures/item/blood_pendant_overlay.png diff --git a/src/main/resources/assets/botania/textures/item/desugun0.png b/src/main/resources/assets/botania/textures/item/desu_gun.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/desugun0.png rename to src/main/resources/assets/botania/textures/item/desu_gun.png diff --git a/src/main/resources/assets/botania/textures/item/desugun2.png b/src/main/resources/assets/botania/textures/item/desu_gun_clip.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/desugun2.png rename to src/main/resources/assets/botania/textures/item/desu_gun_clip.png diff --git a/src/main/resources/assets/botania/textures/item/desugun1.png b/src/main/resources/assets/botania/textures/item/desu_gun_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/desugun1.png rename to src/main/resources/assets/botania/textures/item/desu_gun_overlay.png diff --git a/src/main/resources/assets/botania/textures/item/stick_incense.png b/src/main/resources/assets/botania/textures/item/incense_stick.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/stick_incense.png rename to src/main/resources/assets/botania/textures/item/incense_stick.png diff --git a/src/main/resources/assets/botania/textures/item/stick_incense_overlay.png b/src/main/resources/assets/botania/textures/item/incense_stick_overlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/item/stick_incense_overlay.png rename to src/main/resources/assets/botania/textures/item/incense_stick_overlay.png