diff --git a/src/main/resources/assets/botania/models/item/lens_bounce.json b/src/generated/resources/assets/botania/models/item/lens_bounce.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_bounce.json rename to src/generated/resources/assets/botania/models/item/lens_bounce.json index cddcf65b4..ef73c8fd2 100644 --- a/src/main/resources/assets/botania/models/item/lens_bounce.json +++ b/src/generated/resources/assets/botania/models/item/lens_bounce.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_bounce" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_damage.json b/src/generated/resources/assets/botania/models/item/lens_damage.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_damage.json rename to src/generated/resources/assets/botania/models/item/lens_damage.json index c85cb2d7f..1c6ccb431 100644 --- a/src/main/resources/assets/botania/models/item/lens_damage.json +++ b/src/generated/resources/assets/botania/models/item/lens_damage.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_damage" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_efficiency.json b/src/generated/resources/assets/botania/models/item/lens_efficiency.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_efficiency.json rename to src/generated/resources/assets/botania/models/item/lens_efficiency.json index af70bace6..6451d5188 100644 --- a/src/main/resources/assets/botania/models/item/lens_efficiency.json +++ b/src/generated/resources/assets/botania/models/item/lens_efficiency.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_efficiency" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_explosive.json b/src/generated/resources/assets/botania/models/item/lens_explosive.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_explosive.json rename to src/generated/resources/assets/botania/models/item/lens_explosive.json index bd4326c79..1a442071c 100644 --- a/src/main/resources/assets/botania/models/item/lens_explosive.json +++ b/src/generated/resources/assets/botania/models/item/lens_explosive.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_explosive" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_fire.json b/src/generated/resources/assets/botania/models/item/lens_fire.json similarity index 69% rename from src/main/resources/assets/botania/models/item/lens_fire.json rename to src/generated/resources/assets/botania/models/item/lens_fire.json index 19ef52d4e..32220e722 100644 --- a/src/main/resources/assets/botania/models/item/lens_fire.json +++ b/src/generated/resources/assets/botania/models/item/lens_fire.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_fire" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_firework.json b/src/generated/resources/assets/botania/models/item/lens_firework.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_firework.json rename to src/generated/resources/assets/botania/models/item/lens_firework.json index 1f385041c..e2d3129b7 100644 --- a/src/main/resources/assets/botania/models/item/lens_firework.json +++ b/src/generated/resources/assets/botania/models/item/lens_firework.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_firework" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_flare.json b/src/generated/resources/assets/botania/models/item/lens_flare.json similarity index 69% rename from src/main/resources/assets/botania/models/item/lens_flare.json rename to src/generated/resources/assets/botania/models/item/lens_flare.json index ab1ae34a8..37a1eb079 100644 --- a/src/main/resources/assets/botania/models/item/lens_flare.json +++ b/src/generated/resources/assets/botania/models/item/lens_flare.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_flare" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_gravity.json b/src/generated/resources/assets/botania/models/item/lens_gravity.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_gravity.json rename to src/generated/resources/assets/botania/models/item/lens_gravity.json index 108e2f7c5..499e50589 100644 --- a/src/main/resources/assets/botania/models/item/lens_gravity.json +++ b/src/generated/resources/assets/botania/models/item/lens_gravity.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_gravity" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_influence.json b/src/generated/resources/assets/botania/models/item/lens_influence.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_influence.json rename to src/generated/resources/assets/botania/models/item/lens_influence.json index ca7801ac3..37a65d0cc 100644 --- a/src/main/resources/assets/botania/models/item/lens_influence.json +++ b/src/generated/resources/assets/botania/models/item/lens_influence.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_influence" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_light.json b/src/generated/resources/assets/botania/models/item/lens_light.json similarity index 69% rename from src/main/resources/assets/botania/models/item/lens_light.json rename to src/generated/resources/assets/botania/models/item/lens_light.json index 7ad8b620d..7d61d1b3e 100644 --- a/src/main/resources/assets/botania/models/item/lens_light.json +++ b/src/generated/resources/assets/botania/models/item/lens_light.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_light" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_magnet.json b/src/generated/resources/assets/botania/models/item/lens_magnet.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_magnet.json rename to src/generated/resources/assets/botania/models/item/lens_magnet.json index 1fa824767..8006d0de6 100644 --- a/src/main/resources/assets/botania/models/item/lens_magnet.json +++ b/src/generated/resources/assets/botania/models/item/lens_magnet.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_magnet" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_messenger.json b/src/generated/resources/assets/botania/models/item/lens_messenger.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_messenger.json rename to src/generated/resources/assets/botania/models/item/lens_messenger.json index d31a62845..68c9a1319 100644 --- a/src/main/resources/assets/botania/models/item/lens_messenger.json +++ b/src/generated/resources/assets/botania/models/item/lens_messenger.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_messenger" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_mine.json b/src/generated/resources/assets/botania/models/item/lens_mine.json similarity index 69% rename from src/main/resources/assets/botania/models/item/lens_mine.json rename to src/generated/resources/assets/botania/models/item/lens_mine.json index 4e96c0af8..c566a80b8 100644 --- a/src/main/resources/assets/botania/models/item/lens_mine.json +++ b/src/generated/resources/assets/botania/models/item/lens_mine.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_mine" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_normal.json b/src/generated/resources/assets/botania/models/item/lens_normal.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_normal.json rename to src/generated/resources/assets/botania/models/item/lens_normal.json index e823122f6..a0da34ce8 100644 --- a/src/main/resources/assets/botania/models/item/lens_normal.json +++ b/src/generated/resources/assets/botania/models/item/lens_normal.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_normal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_paint.json b/src/generated/resources/assets/botania/models/item/lens_paint.json similarity index 69% rename from src/main/resources/assets/botania/models/item/lens_paint.json rename to src/generated/resources/assets/botania/models/item/lens_paint.json index 26eb4fe83..308ab7495 100644 --- a/src/main/resources/assets/botania/models/item/lens_paint.json +++ b/src/generated/resources/assets/botania/models/item/lens_paint.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_paint" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_phantom.json b/src/generated/resources/assets/botania/models/item/lens_phantom.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_phantom.json rename to src/generated/resources/assets/botania/models/item/lens_phantom.json index 04cf84064..2588424ec 100644 --- a/src/main/resources/assets/botania/models/item/lens_phantom.json +++ b/src/generated/resources/assets/botania/models/item/lens_phantom.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_phantom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_piston.json b/src/generated/resources/assets/botania/models/item/lens_piston.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_piston.json rename to src/generated/resources/assets/botania/models/item/lens_piston.json index b436ec11c..7f23f81fd 100644 --- a/src/main/resources/assets/botania/models/item/lens_piston.json +++ b/src/generated/resources/assets/botania/models/item/lens_piston.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_piston" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_power.json b/src/generated/resources/assets/botania/models/item/lens_power.json similarity index 69% rename from src/main/resources/assets/botania/models/item/lens_power.json rename to src/generated/resources/assets/botania/models/item/lens_power.json index 8d651f195..d000eee14 100644 --- a/src/main/resources/assets/botania/models/item/lens_power.json +++ b/src/generated/resources/assets/botania/models/item/lens_power.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_power" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_redirect.json b/src/generated/resources/assets/botania/models/item/lens_redirect.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_redirect.json rename to src/generated/resources/assets/botania/models/item/lens_redirect.json index a3e1f92f5..14571c00b 100644 --- a/src/main/resources/assets/botania/models/item/lens_redirect.json +++ b/src/generated/resources/assets/botania/models/item/lens_redirect.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_redirect" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_speed.json b/src/generated/resources/assets/botania/models/item/lens_speed.json similarity index 69% rename from src/main/resources/assets/botania/models/item/lens_speed.json rename to src/generated/resources/assets/botania/models/item/lens_speed.json index 46c3b73ac..7151233e2 100644 --- a/src/main/resources/assets/botania/models/item/lens_speed.json +++ b/src/generated/resources/assets/botania/models/item/lens_speed.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_speed" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/lens_storm.json b/src/generated/resources/assets/botania/models/item/lens_storm.json new file mode 100644 index 000000000..aa2f8d192 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/lens_storm.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:item/lens", + "layer1": "botania:item/lens_storm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_time.json b/src/generated/resources/assets/botania/models/item/lens_time.json similarity index 69% rename from src/main/resources/assets/botania/models/item/lens_time.json rename to src/generated/resources/assets/botania/models/item/lens_time.json index 88cf605d4..758c6ac35 100644 --- a/src/main/resources/assets/botania/models/item/lens_time.json +++ b/src/generated/resources/assets/botania/models/item/lens_time.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_time" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_tripwire.json b/src/generated/resources/assets/botania/models/item/lens_tripwire.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_tripwire.json rename to src/generated/resources/assets/botania/models/item/lens_tripwire.json index 5268cd6a6..c4b8936e4 100644 --- a/src/main/resources/assets/botania/models/item/lens_tripwire.json +++ b/src/generated/resources/assets/botania/models/item/lens_tripwire.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_tripwire" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_warp.json b/src/generated/resources/assets/botania/models/item/lens_warp.json similarity index 69% rename from src/main/resources/assets/botania/models/item/lens_warp.json rename to src/generated/resources/assets/botania/models/item/lens_warp.json index e3435d774..a2c71b08f 100644 --- a/src/main/resources/assets/botania/models/item/lens_warp.json +++ b/src/generated/resources/assets/botania/models/item/lens_warp.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_warp" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lens_weight.json b/src/generated/resources/assets/botania/models/item/lens_weight.json similarity index 70% rename from src/main/resources/assets/botania/models/item/lens_weight.json rename to src/generated/resources/assets/botania/models/item/lens_weight.json index 041b8a90a..5e38b53d7 100644 --- a/src/main/resources/assets/botania/models/item/lens_weight.json +++ b/src/generated/resources/assets/botania/models/item/lens_weight.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/lens", "layer1": "botania:item/lens_weight" } -} +} \ 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 30afb16d3..3f519853a 100644 --- a/src/main/java/vazkii/botania/data/ItemModelProvider.java +++ b/src/main/java/vazkii/botania/data/ItemModelProvider.java @@ -26,6 +26,7 @@ import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.mana.BlockSpreader; +import vazkii.botania.common.item.lens.ItemLens; import vazkii.botania.common.item.material.ItemPetal; import vazkii.botania.common.lib.LibMisc; @@ -50,6 +51,10 @@ 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)))); } private static String name(Item i) { diff --git a/src/main/resources/assets/botania/models/item/lens_storm.json b/src/main/resources/assets/botania/models/item/lens_storm.json deleted file mode 100644 index e823122f6..000000000 --- a/src/main/resources/assets/botania/models/item/lens_storm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:item/lens", - "layer1": "botania:item/lens_normal" - } -} diff --git a/src/main/resources/assets/botania/textures/item/lens_storm.png b/src/main/resources/assets/botania/textures/item/lens_storm.png new file mode 100644 index 000000000..8c71aea33 Binary files /dev/null and b/src/main/resources/assets/botania/textures/item/lens_storm.png differ