diff --git a/src/generated/resources/assets/botania/models/block/detector_light_relay.json b/src/generated/resources/assets/botania/models/block/detector_light_relay.json index 6d5e51d25..b885c89a8 100644 --- a/src/generated/resources/assets/botania/models/block/detector_light_relay.json +++ b/src/generated/resources/assets/botania/models/block/detector_light_relay.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "botania:block/luminizer_detector" + "particle": "botania:block/detector_light_relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/fork_light_relay.json b/src/generated/resources/assets/botania/models/block/fork_light_relay.json index 34833a11c..b0b94ea0b 100644 --- a/src/generated/resources/assets/botania/models/block/fork_light_relay.json +++ b/src/generated/resources/assets/botania/models/block/fork_light_relay.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "botania:block/luminizer_fork" + "particle": "botania:block/fork_light_relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_relay.json b/src/generated/resources/assets/botania/models/block/light_relay.json index 3c8b6face..d4d69ea93 100644 --- a/src/generated/resources/assets/botania/models/block/light_relay.json +++ b/src/generated/resources/assets/botania/models/block/light_relay.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "botania:block/luminizer" + "particle": "botania:block/light_relay" } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/toggle_light_relay.json b/src/generated/resources/assets/botania/models/block/toggle_light_relay.json index db7f5fd02..6f2a4dad2 100644 --- a/src/generated/resources/assets/botania/models/block/toggle_light_relay.json +++ b/src/generated/resources/assets/botania/models/block/toggle_light_relay.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "botania:block/luminizer_toggle" + "particle": "botania:block/toggle_light_relay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/abstruse_platform.json b/src/generated/resources/assets/botania/models/item/abstruse_platform.json similarity index 96% rename from src/main/resources/assets/botania/models/item/abstruse_platform.json rename to src/generated/resources/assets/botania/models/item/abstruse_platform.json index 07022013c..5be6db5e3 100644 --- a/src/main/resources/assets/botania/models/item/abstruse_platform.json +++ b/src/generated/resources/assets/botania/models/item/abstruse_platform.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/abstruse_platform" +{ + "parent": "botania:block/abstruse_platform" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/alchemy_catalyst.json b/src/generated/resources/assets/botania/models/item/alchemy_catalyst.json similarity index 96% rename from src/main/resources/assets/botania/models/item/alchemy_catalyst.json rename to src/generated/resources/assets/botania/models/item/alchemy_catalyst.json index ba8f8dbd8..98afa9a95 100644 --- a/src/main/resources/assets/botania/models/item/alchemy_catalyst.json +++ b/src/generated/resources/assets/botania/models/item/alchemy_catalyst.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/alchemy_catalyst" +{ + "parent": "botania:block/alchemy_catalyst" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/alfheim_portal.json b/src/generated/resources/assets/botania/models/item/alfheim_portal.json similarity index 95% rename from src/main/resources/assets/botania/models/item/alfheim_portal.json rename to src/generated/resources/assets/botania/models/item/alfheim_portal.json index bcef690ee..63ff2c1a6 100644 --- a/src/main/resources/assets/botania/models/item/alfheim_portal.json +++ b/src/generated/resources/assets/botania/models/item/alfheim_portal.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/alfheim_portal" +{ + "parent": "botania:block/alfheim_portal" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/animated_torch.json b/src/generated/resources/assets/botania/models/item/animated_torch.json new file mode 100644 index 000000000..e24a1afba --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/animated_torch.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "block/redstone_torch", + "layer1": "botania:block/animated_torch_glimmer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_default.json b/src/generated/resources/assets/botania/models/item/apothecary_default.json similarity index 96% rename from src/main/resources/assets/botania/models/item/apothecary_default.json rename to src/generated/resources/assets/botania/models/item/apothecary_default.json index 15c8b35f7..bfaba3134 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_default.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_default.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_default" +{ + "parent": "botania:block/apothecary_default" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_desert.json b/src/generated/resources/assets/botania/models/item/apothecary_desert.json similarity index 96% rename from src/main/resources/assets/botania/models/item/apothecary_desert.json rename to src/generated/resources/assets/botania/models/item/apothecary_desert.json index fb4d8ef77..41f6ec26f 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_desert.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_desert.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_desert" +{ + "parent": "botania:block/apothecary_desert" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_forest.json b/src/generated/resources/assets/botania/models/item/apothecary_forest.json similarity index 96% rename from src/main/resources/assets/botania/models/item/apothecary_forest.json rename to src/generated/resources/assets/botania/models/item/apothecary_forest.json index 2dd7014e2..c8abd8c7b 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_forest.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_forest.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_forest" +{ + "parent": "botania:block/apothecary_forest" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_fungal.json b/src/generated/resources/assets/botania/models/item/apothecary_fungal.json similarity index 96% rename from src/main/resources/assets/botania/models/item/apothecary_fungal.json rename to src/generated/resources/assets/botania/models/item/apothecary_fungal.json index cea22f012..3a8556291 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_fungal.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_fungal.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_fungal" +{ + "parent": "botania:block/apothecary_fungal" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_mesa.json b/src/generated/resources/assets/botania/models/item/apothecary_mesa.json similarity index 95% rename from src/main/resources/assets/botania/models/item/apothecary_mesa.json rename to src/generated/resources/assets/botania/models/item/apothecary_mesa.json index 5e0333809..25cdfdecb 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_mesa.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_mesa.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_mesa" +{ + "parent": "botania:block/apothecary_mesa" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_mossy.json b/src/generated/resources/assets/botania/models/item/apothecary_mossy.json similarity index 96% rename from src/main/resources/assets/botania/models/item/apothecary_mossy.json rename to src/generated/resources/assets/botania/models/item/apothecary_mossy.json index 892e82638..b82d95369 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_mossy.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_mossy.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_mossy" +{ + "parent": "botania:block/apothecary_mossy" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_mountain.json b/src/generated/resources/assets/botania/models/item/apothecary_mountain.json similarity index 96% rename from src/main/resources/assets/botania/models/item/apothecary_mountain.json rename to src/generated/resources/assets/botania/models/item/apothecary_mountain.json index 7a745f3dc..6dffefa85 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_mountain.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_mountain.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_mountain" +{ + "parent": "botania:block/apothecary_mountain" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_plains.json b/src/generated/resources/assets/botania/models/item/apothecary_plains.json similarity index 96% rename from src/main/resources/assets/botania/models/item/apothecary_plains.json rename to src/generated/resources/assets/botania/models/item/apothecary_plains.json index 39e5df216..13833924b 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_plains.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_plains.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_plains" +{ + "parent": "botania:block/apothecary_plains" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_swamp.json b/src/generated/resources/assets/botania/models/item/apothecary_swamp.json similarity index 96% rename from src/main/resources/assets/botania/models/item/apothecary_swamp.json rename to src/generated/resources/assets/botania/models/item/apothecary_swamp.json index 87ea8e155..b388bf3f4 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_swamp.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_swamp.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_swamp" +{ + "parent": "botania:block/apothecary_swamp" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_taiga.json b/src/generated/resources/assets/botania/models/item/apothecary_taiga.json similarity index 96% rename from src/main/resources/assets/botania/models/item/apothecary_taiga.json rename to src/generated/resources/assets/botania/models/item/apothecary_taiga.json index 40f33053b..e2d2fa0b0 100644 --- a/src/main/resources/assets/botania/models/item/apothecary_taiga.json +++ b/src/generated/resources/assets/botania/models/item/apothecary_taiga.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/apothecary_taiga" +{ + "parent": "botania:block/apothecary_taiga" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/avatar.json b/src/generated/resources/assets/botania/models/item/avatar.json new file mode 100644 index 000000000..eae24b9b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/avatar.json @@ -0,0 +1,82 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_0.json b/src/generated/resources/assets/botania/models/item/azulejo_0.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_0.json rename to src/generated/resources/assets/botania/models/item/azulejo_0.json index eba584a75..cba22ce09 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_0.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_0.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_0" +{ + "parent": "botania:block/azulejo_0" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_1.json b/src/generated/resources/assets/botania/models/item/azulejo_1.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_1.json rename to src/generated/resources/assets/botania/models/item/azulejo_1.json index e123a3f8d..fcfe41e99 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_1.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_1.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_1" +{ + "parent": "botania:block/azulejo_1" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_10.json b/src/generated/resources/assets/botania/models/item/azulejo_10.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_10.json rename to src/generated/resources/assets/botania/models/item/azulejo_10.json index 2a36011f3..3ab489403 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_10.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_10.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_10" +{ + "parent": "botania:block/azulejo_10" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_11.json b/src/generated/resources/assets/botania/models/item/azulejo_11.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_11.json rename to src/generated/resources/assets/botania/models/item/azulejo_11.json index e5b52bfba..1c144b858 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_11.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_11.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_11" +{ + "parent": "botania:block/azulejo_11" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_12.json b/src/generated/resources/assets/botania/models/item/azulejo_12.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_12.json rename to src/generated/resources/assets/botania/models/item/azulejo_12.json index 9972a9579..5cbcfe951 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_12.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_12.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_12" +{ + "parent": "botania:block/azulejo_12" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_13.json b/src/generated/resources/assets/botania/models/item/azulejo_13.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_13.json rename to src/generated/resources/assets/botania/models/item/azulejo_13.json index dbecd2cc2..b75483d64 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_13.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_13.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_13" +{ + "parent": "botania:block/azulejo_13" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_14.json b/src/generated/resources/assets/botania/models/item/azulejo_14.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_14.json rename to src/generated/resources/assets/botania/models/item/azulejo_14.json index f1f234d88..77ce0d8da 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_14.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_14.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_14" +{ + "parent": "botania:block/azulejo_14" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_15.json b/src/generated/resources/assets/botania/models/item/azulejo_15.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_15.json rename to src/generated/resources/assets/botania/models/item/azulejo_15.json index 634ded8da..83794032c 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_15.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_15.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_15" +{ + "parent": "botania:block/azulejo_15" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_2.json b/src/generated/resources/assets/botania/models/item/azulejo_2.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_2.json rename to src/generated/resources/assets/botania/models/item/azulejo_2.json index 037f7af77..463497f2e 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_2.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_2.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_2" +{ + "parent": "botania:block/azulejo_2" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_3.json b/src/generated/resources/assets/botania/models/item/azulejo_3.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_3.json rename to src/generated/resources/assets/botania/models/item/azulejo_3.json index b4fde5d6e..08589be58 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_3.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_3.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_3" +{ + "parent": "botania:block/azulejo_3" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_4.json b/src/generated/resources/assets/botania/models/item/azulejo_4.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_4.json rename to src/generated/resources/assets/botania/models/item/azulejo_4.json index a08c08f28..42f188ed6 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_4.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_4.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_4" +{ + "parent": "botania:block/azulejo_4" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_5.json b/src/generated/resources/assets/botania/models/item/azulejo_5.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_5.json rename to src/generated/resources/assets/botania/models/item/azulejo_5.json index e68d363d0..ae635afa3 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_5.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_5.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_5" +{ + "parent": "botania:block/azulejo_5" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_6.json b/src/generated/resources/assets/botania/models/item/azulejo_6.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_6.json rename to src/generated/resources/assets/botania/models/item/azulejo_6.json index 9f06de846..da3bb718b 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_6.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_6.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_6" +{ + "parent": "botania:block/azulejo_6" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_7.json b/src/generated/resources/assets/botania/models/item/azulejo_7.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_7.json rename to src/generated/resources/assets/botania/models/item/azulejo_7.json index 23a78dfeb..f5f6950d6 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_7.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_7.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_7" +{ + "parent": "botania:block/azulejo_7" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_8.json b/src/generated/resources/assets/botania/models/item/azulejo_8.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_8.json rename to src/generated/resources/assets/botania/models/item/azulejo_8.json index 8f7974d80..215801ec2 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_8.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_8.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_8" +{ + "parent": "botania:block/azulejo_8" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_9.json b/src/generated/resources/assets/botania/models/item/azulejo_9.json similarity index 95% rename from src/main/resources/assets/botania/models/item/azulejo_9.json rename to src/generated/resources/assets/botania/models/item/azulejo_9.json index 4f825c23c..65bbea4e9 100644 --- a/src/main/resources/assets/botania/models/item/azulejo_9.json +++ b/src/generated/resources/assets/botania/models/item/azulejo_9.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/azulejo_9" +{ + "parent": "botania:block/azulejo_9" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/bellows.json b/src/generated/resources/assets/botania/models/item/bellows.json new file mode 100644 index 000000000..eae24b9b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/bellows.json @@ -0,0 +1,82 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bifrost.json b/src/generated/resources/assets/botania/models/item/bifrost.json similarity index 95% rename from src/main/resources/assets/botania/models/item/bifrost.json rename to src/generated/resources/assets/botania/models/item/bifrost.json index b162fa2f5..7e29ee489 100644 --- a/src/main/resources/assets/botania/models/item/bifrost.json +++ b/src/generated/resources/assets/botania/models/item/bifrost.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/bifrost" +{ + "parent": "botania:block/bifrost" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bifrost_pane.json b/src/generated/resources/assets/botania/models/item/bifrost_pane.json similarity index 58% rename from src/main/resources/assets/botania/models/item/bifrost_pane.json rename to src/generated/resources/assets/botania/models/item/bifrost_pane.json index 9a3489328..907b315a0 100644 --- a/src/main/resources/assets/botania/models/item/bifrost_pane.json +++ b/src/generated/resources/assets/botania/models/item/bifrost_pane.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:block/bifrost" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/bifrost_perm.json b/src/generated/resources/assets/botania/models/item/bifrost_perm.json new file mode 100644 index 000000000..f98c1e290 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/bifrost_perm.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/bifrost_perm" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_pavement.json b/src/generated/resources/assets/botania/models/item/black_pavement.json similarity index 95% rename from src/main/resources/assets/botania/models/item/black_pavement.json rename to src/generated/resources/assets/botania/models/item/black_pavement.json index 565c34a8c..163812f55 100644 --- a/src/main/resources/assets/botania/models/item/black_pavement.json +++ b/src/generated/resources/assets/botania/models/item/black_pavement.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/black_pavement" +{ + "parent": "botania:block/black_pavement" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_pavement_slab.json b/src/generated/resources/assets/botania/models/item/black_pavement_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/black_pavement_slab.json rename to src/generated/resources/assets/botania/models/item/black_pavement_slab.json index de1bf3a7e..8f34cee3e 100644 --- a/src/main/resources/assets/botania/models/item/black_pavement_slab.json +++ b/src/generated/resources/assets/botania/models/item/black_pavement_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/black_pavement_slab" +{ + "parent": "botania:block/black_pavement_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_pavement_stairs.json b/src/generated/resources/assets/botania/models/item/black_pavement_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/black_pavement_stairs.json rename to src/generated/resources/assets/botania/models/item/black_pavement_stairs.json index 3ea110aaf..c765e19c1 100644 --- a/src/main/resources/assets/botania/models/item/black_pavement_stairs.json +++ b/src/generated/resources/assets/botania/models/item/black_pavement_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/black_pavement_stairs" -} +{ + "parent": "botania:block/black_pavement_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_petal.json b/src/generated/resources/assets/botania/models/item/black_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/black_petal.json rename to src/generated/resources/assets/botania/models/item/black_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/black_petal.json +++ b/src/generated/resources/assets/botania/models/item/black_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_petal_block.json b/src/generated/resources/assets/botania/models/item/black_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/black_petal_block.json rename to src/generated/resources/assets/botania/models/item/black_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/black_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/black_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blaze_block.json b/src/generated/resources/assets/botania/models/item/blaze_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/blaze_block.json rename to src/generated/resources/assets/botania/models/item/blaze_block.json index 3b087a7b6..a7f6c0e68 100644 --- a/src/main/resources/assets/botania/models/item/blaze_block.json +++ b/src/generated/resources/assets/botania/models/item/blaze_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/blaze_block" +{ + "parent": "botania:block/blaze_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blaze_quartz.json b/src/generated/resources/assets/botania/models/item/blaze_quartz.json similarity index 95% rename from src/main/resources/assets/botania/models/item/blaze_quartz.json rename to src/generated/resources/assets/botania/models/item/blaze_quartz.json index ad939cc2c..3f394dc5e 100644 --- a/src/main/resources/assets/botania/models/item/blaze_quartz.json +++ b/src/generated/resources/assets/botania/models/item/blaze_quartz.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/blaze_quartz" +{ + "parent": "botania:block/blaze_quartz" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blaze_quartz_pillar.json b/src/generated/resources/assets/botania/models/item/blaze_quartz_pillar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/blaze_quartz_pillar.json rename to src/generated/resources/assets/botania/models/item/blaze_quartz_pillar.json diff --git a/src/main/resources/assets/botania/models/item/blaze_quartz_slab.json b/src/generated/resources/assets/botania/models/item/blaze_quartz_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/blaze_quartz_slab.json rename to src/generated/resources/assets/botania/models/item/blaze_quartz_slab.json index 74d163e1e..31ee4122b 100644 --- a/src/main/resources/assets/botania/models/item/blaze_quartz_slab.json +++ b/src/generated/resources/assets/botania/models/item/blaze_quartz_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/blaze_quartz_slab" +{ + "parent": "botania:block/blaze_quartz_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blaze_quartz_stairs.json b/src/generated/resources/assets/botania/models/item/blaze_quartz_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/blaze_quartz_stairs.json rename to src/generated/resources/assets/botania/models/item/blaze_quartz_stairs.json index d2772d51a..6f91e1d20 100644 --- a/src/main/resources/assets/botania/models/item/blaze_quartz_stairs.json +++ b/src/generated/resources/assets/botania/models/item/blaze_quartz_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/blaze_quartz_stairs" -} +{ + "parent": "botania:block/blaze_quartz_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_pavement.json b/src/generated/resources/assets/botania/models/item/blue_pavement.json similarity index 95% rename from src/main/resources/assets/botania/models/item/blue_pavement.json rename to src/generated/resources/assets/botania/models/item/blue_pavement.json index 5a09d8f9d..426588197 100644 --- a/src/main/resources/assets/botania/models/item/blue_pavement.json +++ b/src/generated/resources/assets/botania/models/item/blue_pavement.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/blue_pavement" +{ + "parent": "botania:block/blue_pavement" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_pavement_slab.json b/src/generated/resources/assets/botania/models/item/blue_pavement_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/blue_pavement_slab.json rename to src/generated/resources/assets/botania/models/item/blue_pavement_slab.json index 6b4b31337..ac51bc447 100644 --- a/src/main/resources/assets/botania/models/item/blue_pavement_slab.json +++ b/src/generated/resources/assets/botania/models/item/blue_pavement_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/blue_pavement_slab" +{ + "parent": "botania:block/blue_pavement_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_pavement_stairs.json b/src/generated/resources/assets/botania/models/item/blue_pavement_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/blue_pavement_stairs.json rename to src/generated/resources/assets/botania/models/item/blue_pavement_stairs.json index 60ff128cd..81bb29dad 100644 --- a/src/main/resources/assets/botania/models/item/blue_pavement_stairs.json +++ b/src/generated/resources/assets/botania/models/item/blue_pavement_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/blue_pavement_stairs" -} +{ + "parent": "botania:block/blue_pavement_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_petal.json b/src/generated/resources/assets/botania/models/item/blue_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/blue_petal.json rename to src/generated/resources/assets/botania/models/item/blue_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/blue_petal.json +++ b/src/generated/resources/assets/botania/models/item/blue_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_petal_block.json b/src/generated/resources/assets/botania/models/item/blue_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/blue_petal_block.json rename to src/generated/resources/assets/botania/models/item/blue_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/blue_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/blue_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brewery.json b/src/generated/resources/assets/botania/models/item/brewery.json new file mode 100644 index 000000000..eae24b9b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brewery.json @@ -0,0 +1,82 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_petal.json b/src/generated/resources/assets/botania/models/item/brown_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/brown_petal.json rename to src/generated/resources/assets/botania/models/item/brown_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/brown_petal.json +++ b/src/generated/resources/assets/botania/models/item/brown_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_petal_block.json b/src/generated/resources/assets/botania/models/item/brown_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/brown_petal_block.json rename to src/generated/resources/assets/botania/models/item/brown_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/brown_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/brown_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cacophonium_block.json b/src/generated/resources/assets/botania/models/item/cacophonium_block.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cacophonium_block.json rename to src/generated/resources/assets/botania/models/item/cacophonium_block.json diff --git a/src/main/resources/assets/botania/models/item/cell_block.json b/src/generated/resources/assets/botania/models/item/cell_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/cell_block.json rename to src/generated/resources/assets/botania/models/item/cell_block.json index 2a3af2729..b7061cd82 100644 --- a/src/main/resources/assets/botania/models/item/cell_block.json +++ b/src/generated/resources/assets/botania/models/item/cell_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/cell_block" +{ + "parent": "botania:block/cell_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/chiseled_blaze_quartz.json b/src/generated/resources/assets/botania/models/item/chiseled_blaze_quartz.json similarity index 100% rename from src/main/resources/assets/botania/models/item/chiseled_blaze_quartz.json rename to src/generated/resources/assets/botania/models/item/chiseled_blaze_quartz.json diff --git a/src/main/resources/assets/botania/models/item/chiseled_dark_quartz.json b/src/generated/resources/assets/botania/models/item/chiseled_dark_quartz.json similarity index 100% rename from src/main/resources/assets/botania/models/item/chiseled_dark_quartz.json rename to src/generated/resources/assets/botania/models/item/chiseled_dark_quartz.json diff --git a/src/main/resources/assets/botania/models/item/chiseled_elf_quartz.json b/src/generated/resources/assets/botania/models/item/chiseled_elf_quartz.json similarity index 100% rename from src/main/resources/assets/botania/models/item/chiseled_elf_quartz.json rename to src/generated/resources/assets/botania/models/item/chiseled_elf_quartz.json diff --git a/src/main/resources/assets/botania/models/item/chiseled_lavender_quartz.json b/src/generated/resources/assets/botania/models/item/chiseled_lavender_quartz.json similarity index 100% rename from src/main/resources/assets/botania/models/item/chiseled_lavender_quartz.json rename to src/generated/resources/assets/botania/models/item/chiseled_lavender_quartz.json diff --git a/src/main/resources/assets/botania/models/item/chiseled_livingrock_bricks.json b/src/generated/resources/assets/botania/models/item/chiseled_livingrock_bricks.json similarity index 100% rename from src/main/resources/assets/botania/models/item/chiseled_livingrock_bricks.json rename to src/generated/resources/assets/botania/models/item/chiseled_livingrock_bricks.json diff --git a/src/main/resources/assets/botania/models/item/chiseled_mana_quartz.json b/src/generated/resources/assets/botania/models/item/chiseled_mana_quartz.json similarity index 100% rename from src/main/resources/assets/botania/models/item/chiseled_mana_quartz.json rename to src/generated/resources/assets/botania/models/item/chiseled_mana_quartz.json diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_desert_bricks.json b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_desert_bricks.json similarity index 97% rename from src/main/resources/assets/botania/models/item/chiseled_metamorphic_desert_bricks.json rename to src/generated/resources/assets/botania/models/item/chiseled_metamorphic_desert_bricks.json index e1a9eef3c..7f52823a7 100644 --- a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_desert_bricks.json +++ b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_desert_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/chiseled_metamorphic_desert_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_forest_bricks.json b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_forest_bricks.json similarity index 97% rename from src/main/resources/assets/botania/models/item/chiseled_metamorphic_forest_bricks.json rename to src/generated/resources/assets/botania/models/item/chiseled_metamorphic_forest_bricks.json index 20b5dd2cd..eacf26494 100644 --- a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_forest_bricks.json +++ b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_forest_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/chiseled_metamorphic_forest_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_fungal_bricks.json b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_fungal_bricks.json similarity index 97% rename from src/main/resources/assets/botania/models/item/chiseled_metamorphic_fungal_bricks.json rename to src/generated/resources/assets/botania/models/item/chiseled_metamorphic_fungal_bricks.json index b3eb12b1f..2b3a687d0 100644 --- a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_fungal_bricks.json +++ b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_fungal_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/chiseled_metamorphic_fungal_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mesa_bricks.json b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_mesa_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/chiseled_metamorphic_mesa_bricks.json rename to src/generated/resources/assets/botania/models/item/chiseled_metamorphic_mesa_bricks.json index 08e49acef..95629eafa 100644 --- a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mesa_bricks.json +++ b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_mesa_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/chiseled_metamorphic_mesa_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mountain_bricks.json b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_mountain_bricks.json similarity index 97% rename from src/main/resources/assets/botania/models/item/chiseled_metamorphic_mountain_bricks.json rename to src/generated/resources/assets/botania/models/item/chiseled_metamorphic_mountain_bricks.json index 1c7af86bd..238fdae2d 100644 --- a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mountain_bricks.json +++ b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_mountain_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/chiseled_metamorphic_mountain_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_plains_bricks.json b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_plains_bricks.json similarity index 97% rename from src/main/resources/assets/botania/models/item/chiseled_metamorphic_plains_bricks.json rename to src/generated/resources/assets/botania/models/item/chiseled_metamorphic_plains_bricks.json index 7b85afc20..2f9d4ce73 100644 --- a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_plains_bricks.json +++ b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_plains_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/chiseled_metamorphic_plains_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_swamp_bricks.json b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_swamp_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/chiseled_metamorphic_swamp_bricks.json rename to src/generated/resources/assets/botania/models/item/chiseled_metamorphic_swamp_bricks.json index 76ac6b66f..c0a623010 100644 --- a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_swamp_bricks.json +++ b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_swamp_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/chiseled_metamorphic_swamp_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_taiga_bricks.json b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_taiga_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/chiseled_metamorphic_taiga_bricks.json rename to src/generated/resources/assets/botania/models/item/chiseled_metamorphic_taiga_bricks.json index d4d8e2d86..8f6ba1f1c 100644 --- a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_taiga_bricks.json +++ b/src/generated/resources/assets/botania/models/item/chiseled_metamorphic_taiga_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/chiseled_metamorphic_taiga_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/chiseled_red_quartz.json b/src/generated/resources/assets/botania/models/item/chiseled_red_quartz.json similarity index 100% rename from src/main/resources/assets/botania/models/item/chiseled_red_quartz.json rename to src/generated/resources/assets/botania/models/item/chiseled_red_quartz.json diff --git a/src/main/resources/assets/botania/models/item/chiseled_sunny_quartz.json b/src/generated/resources/assets/botania/models/item/chiseled_sunny_quartz.json similarity index 100% rename from src/main/resources/assets/botania/models/item/chiseled_sunny_quartz.json rename to src/generated/resources/assets/botania/models/item/chiseled_sunny_quartz.json diff --git a/src/main/resources/assets/botania/models/item/cocoon.json b/src/generated/resources/assets/botania/models/item/cocoon.json similarity index 95% rename from src/main/resources/assets/botania/models/item/cocoon.json rename to src/generated/resources/assets/botania/models/item/cocoon.json index b2f44fe7b..29da24e41 100644 --- a/src/main/resources/assets/botania/models/item/cocoon.json +++ b/src/generated/resources/assets/botania/models/item/cocoon.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/cocoon" +{ + "parent": "botania:block/cocoon" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/conjuration_catalyst.json b/src/generated/resources/assets/botania/models/item/conjuration_catalyst.json similarity index 96% rename from src/main/resources/assets/botania/models/item/conjuration_catalyst.json rename to src/generated/resources/assets/botania/models/item/conjuration_catalyst.json index 5f0971a8b..61c49d66b 100644 --- a/src/main/resources/assets/botania/models/item/conjuration_catalyst.json +++ b/src/generated/resources/assets/botania/models/item/conjuration_catalyst.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/conjuration_catalyst" +{ + "parent": "botania:block/conjuration_catalyst" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporea_funnel.json b/src/generated/resources/assets/botania/models/item/corporea_funnel.json similarity index 95% rename from src/main/resources/assets/botania/models/item/corporea_funnel.json rename to src/generated/resources/assets/botania/models/item/corporea_funnel.json index 3f3f5facd..7fe2790b1 100644 --- a/src/main/resources/assets/botania/models/item/corporea_funnel.json +++ b/src/generated/resources/assets/botania/models/item/corporea_funnel.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/corporea_funnel" +{ + "parent": "botania:block/corporea_funnel" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/corporea_index.json b/src/generated/resources/assets/botania/models/item/corporea_index.json new file mode 100644 index 000000000..eae24b9b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/corporea_index.json @@ -0,0 +1,82 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporea_interceptor.json b/src/generated/resources/assets/botania/models/item/corporea_interceptor.json similarity index 96% rename from src/main/resources/assets/botania/models/item/corporea_interceptor.json rename to src/generated/resources/assets/botania/models/item/corporea_interceptor.json index c83807aeb..ba2aaf537 100644 --- a/src/main/resources/assets/botania/models/item/corporea_interceptor.json +++ b/src/generated/resources/assets/botania/models/item/corporea_interceptor.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/corporea_interceptor" +{ + "parent": "botania:block/corporea_interceptor" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporea_retainer.json b/src/generated/resources/assets/botania/models/item/corporea_retainer.json similarity index 96% rename from src/main/resources/assets/botania/models/item/corporea_retainer.json rename to src/generated/resources/assets/botania/models/item/corporea_retainer.json index 327fae404..1438efd72 100644 --- a/src/main/resources/assets/botania/models/item/corporea_retainer.json +++ b/src/generated/resources/assets/botania/models/item/corporea_retainer.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/corporea_retainer" +{ + "parent": "botania:block/corporea_retainer" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cracked_livingrock_bricks.json b/src/generated/resources/assets/botania/models/item/cracked_livingrock_bricks.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cracked_livingrock_bricks.json rename to src/generated/resources/assets/botania/models/item/cracked_livingrock_bricks.json diff --git a/src/main/resources/assets/botania/models/item/crafty_crate.json b/src/generated/resources/assets/botania/models/item/crafty_crate.json similarity index 95% rename from src/main/resources/assets/botania/models/item/crafty_crate.json rename to src/generated/resources/assets/botania/models/item/crafty_crate.json index 543ee0e63..7c6968b1a 100644 --- a/src/main/resources/assets/botania/models/item/crafty_crate.json +++ b/src/generated/resources/assets/botania/models/item/crafty_crate.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/crafty_crate" +{ + "parent": "botania:block/crafty_crate" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/creative_pool.json b/src/generated/resources/assets/botania/models/item/creative_pool.json similarity index 81% rename from src/main/resources/assets/botania/models/item/creative_pool.json rename to src/generated/resources/assets/botania/models/item/creative_pool.json index 25024663b..6ffa336a5 100644 --- a/src/main/resources/assets/botania/models/item/creative_pool.json +++ b/src/generated/resources/assets/botania/models/item/creative_pool.json @@ -1,11 +1,11 @@ -{ - "parent": "botania:block/creative_pool", - "overrides": [ - { - "predicate": { - "botania:full": 1 - }, - "model": "botania:block/creative_pool_full" - } - ] +{ + "parent": "botania:block/creative_pool", + "overrides": [ + { + "predicate": { + "botania:full": 1.0 + }, + "model": "botania:block/creative_pool_full" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_petal.json b/src/generated/resources/assets/botania/models/item/cyan_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/cyan_petal.json rename to src/generated/resources/assets/botania/models/item/cyan_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/cyan_petal.json +++ b/src/generated/resources/assets/botania/models/item/cyan_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_petal_block.json b/src/generated/resources/assets/botania/models/item/cyan_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/cyan_petal_block.json rename to src/generated/resources/assets/botania/models/item/cyan_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/cyan_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/cyan_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dark_quartz.json b/src/generated/resources/assets/botania/models/item/dark_quartz.json similarity index 95% rename from src/main/resources/assets/botania/models/item/dark_quartz.json rename to src/generated/resources/assets/botania/models/item/dark_quartz.json index f9c13f2fc..f0e6c6f21 100644 --- a/src/main/resources/assets/botania/models/item/dark_quartz.json +++ b/src/generated/resources/assets/botania/models/item/dark_quartz.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dark_quartz" +{ + "parent": "botania:block/dark_quartz" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dark_quartz_pillar.json b/src/generated/resources/assets/botania/models/item/dark_quartz_pillar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/dark_quartz_pillar.json rename to src/generated/resources/assets/botania/models/item/dark_quartz_pillar.json diff --git a/src/main/resources/assets/botania/models/item/dark_quartz_slab.json b/src/generated/resources/assets/botania/models/item/dark_quartz_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/dark_quartz_slab.json rename to src/generated/resources/assets/botania/models/item/dark_quartz_slab.json index ebe130e0d..442ff2371 100644 --- a/src/main/resources/assets/botania/models/item/dark_quartz_slab.json +++ b/src/generated/resources/assets/botania/models/item/dark_quartz_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dark_quartz_slab" +{ + "parent": "botania:block/dark_quartz_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dark_quartz_stairs.json b/src/generated/resources/assets/botania/models/item/dark_quartz_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/dark_quartz_stairs.json rename to src/generated/resources/assets/botania/models/item/dark_quartz_stairs.json index 43a16e87f..a4a62ea8d 100644 --- a/src/main/resources/assets/botania/models/item/dark_quartz_stairs.json +++ b/src/generated/resources/assets/botania/models/item/dark_quartz_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dark_quartz_stairs" -} +{ + "parent": "botania:block/dark_quartz_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/detector_light_relay.json b/src/generated/resources/assets/botania/models/item/detector_light_relay.json new file mode 100644 index 000000000..754729d8b --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/detector_light_relay.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/detector_light_relay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/diluted_pool.json b/src/generated/resources/assets/botania/models/item/diluted_pool.json similarity index 81% rename from src/main/resources/assets/botania/models/item/diluted_pool.json rename to src/generated/resources/assets/botania/models/item/diluted_pool.json index 10b4ce484..8b62e8097 100644 --- a/src/main/resources/assets/botania/models/item/diluted_pool.json +++ b/src/generated/resources/assets/botania/models/item/diluted_pool.json @@ -1,11 +1,11 @@ -{ - "parent": "botania:block/diluted_pool", - "overrides": [ - { - "predicate": { - "botania:full": 1 - }, - "model": "botania:block/diluted_pool_full" - } - ] +{ + "parent": "botania:block/diluted_pool", + "overrides": [ + { + "predicate": { + "botania:full": 1.0 + }, + "model": "botania:block/diluted_pool_full" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dragonstone_block.json b/src/generated/resources/assets/botania/models/item/dragonstone_block.json similarity index 96% rename from src/main/resources/assets/botania/models/item/dragonstone_block.json rename to src/generated/resources/assets/botania/models/item/dragonstone_block.json index dbf2538ce..a01bcf495 100644 --- a/src/main/resources/assets/botania/models/item/dragonstone_block.json +++ b/src/generated/resources/assets/botania/models/item/dragonstone_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dragonstone_block" +{ + "parent": "botania:block/dragonstone_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood.json b/src/generated/resources/assets/botania/models/item/dreamwood.json similarity index 95% rename from src/main/resources/assets/botania/models/item/dreamwood.json rename to src/generated/resources/assets/botania/models/item/dreamwood.json index 3f80b2c01..7c8a922c9 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood.json +++ b/src/generated/resources/assets/botania/models/item/dreamwood.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dreamwood" +{ + "parent": "botania:block/dreamwood" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood_fence.json b/src/generated/resources/assets/botania/models/item/dreamwood_fence.json similarity index 58% rename from src/main/resources/assets/botania/models/item/dreamwood_fence.json rename to src/generated/resources/assets/botania/models/item/dreamwood_fence.json index c34ea7ae5..9be5ac10c 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood_fence.json +++ b/src/generated/resources/assets/botania/models/item/dreamwood_fence.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/fence_inventory", + "parent": "block/fence_inventory", "textures": { "texture": "botania:block/dreamwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood_fence_gate.json b/src/generated/resources/assets/botania/models/item/dreamwood_fence_gate.json similarity index 100% rename from src/main/resources/assets/botania/models/item/dreamwood_fence_gate.json rename to src/generated/resources/assets/botania/models/item/dreamwood_fence_gate.json diff --git a/src/main/resources/assets/botania/models/item/dreamwood_planks.json b/src/generated/resources/assets/botania/models/item/dreamwood_planks.json similarity index 100% rename from src/main/resources/assets/botania/models/item/dreamwood_planks.json rename to src/generated/resources/assets/botania/models/item/dreamwood_planks.json diff --git a/src/main/resources/assets/botania/models/item/dreamwood_planks_slab.json b/src/generated/resources/assets/botania/models/item/dreamwood_planks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/dreamwood_planks_slab.json rename to src/generated/resources/assets/botania/models/item/dreamwood_planks_slab.json index fe15fab78..bc8ab710a 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood_planks_slab.json +++ b/src/generated/resources/assets/botania/models/item/dreamwood_planks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dreamwood_planks_slab" +{ + "parent": "botania:block/dreamwood_planks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood_planks_stairs.json b/src/generated/resources/assets/botania/models/item/dreamwood_planks_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/dreamwood_planks_stairs.json rename to src/generated/resources/assets/botania/models/item/dreamwood_planks_stairs.json index 56edb8c3a..86a61c72b 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood_planks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/dreamwood_planks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dreamwood_planks_stairs" -} +{ + "parent": "botania:block/dreamwood_planks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood_slab.json b/src/generated/resources/assets/botania/models/item/dreamwood_slab.json similarity index 95% rename from src/main/resources/assets/botania/models/item/dreamwood_slab.json rename to src/generated/resources/assets/botania/models/item/dreamwood_slab.json index f8371b37f..e57d0575f 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood_slab.json +++ b/src/generated/resources/assets/botania/models/item/dreamwood_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dreamwood_slab" +{ + "parent": "botania:block/dreamwood_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood_stairs.json b/src/generated/resources/assets/botania/models/item/dreamwood_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/dreamwood_stairs.json rename to src/generated/resources/assets/botania/models/item/dreamwood_stairs.json index 823f2e61c..9860feef4 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood_stairs.json +++ b/src/generated/resources/assets/botania/models/item/dreamwood_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dreamwood_stairs" -} +{ + "parent": "botania:block/dreamwood_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood_wall.json b/src/generated/resources/assets/botania/models/item/dreamwood_wall.json similarity index 55% rename from src/main/resources/assets/botania/models/item/dreamwood_wall.json rename to src/generated/resources/assets/botania/models/item/dreamwood_wall.json index 836ab6f87..e317a925a 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood_wall.json +++ b/src/generated/resources/assets/botania/models/item/dreamwood_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/dreamwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_canopy.json b/src/generated/resources/assets/botania/models/item/drum_canopy.json similarity index 95% rename from src/main/resources/assets/botania/models/item/drum_canopy.json rename to src/generated/resources/assets/botania/models/item/drum_canopy.json index 177319ed6..58385e894 100644 --- a/src/main/resources/assets/botania/models/item/drum_canopy.json +++ b/src/generated/resources/assets/botania/models/item/drum_canopy.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/drum_canopy" +{ + "parent": "botania:block/drum_canopy" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_gathering.json b/src/generated/resources/assets/botania/models/item/drum_gathering.json similarity index 95% rename from src/main/resources/assets/botania/models/item/drum_gathering.json rename to src/generated/resources/assets/botania/models/item/drum_gathering.json index 5ecd2593a..b18a74edb 100644 --- a/src/main/resources/assets/botania/models/item/drum_gathering.json +++ b/src/generated/resources/assets/botania/models/item/drum_gathering.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/drum_gathering" +{ + "parent": "botania:block/drum_gathering" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_wild.json b/src/generated/resources/assets/botania/models/item/drum_wild.json similarity index 95% rename from src/main/resources/assets/botania/models/item/drum_wild.json rename to src/generated/resources/assets/botania/models/item/drum_wild.json index 0f9d3c85a..3ec534da6 100644 --- a/src/main/resources/assets/botania/models/item/drum_wild.json +++ b/src/generated/resources/assets/botania/models/item/drum_wild.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/drum_wild" +{ + "parent": "botania:block/drum_wild" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dry_grass.json b/src/generated/resources/assets/botania/models/item/dry_grass.json similarity index 95% rename from src/main/resources/assets/botania/models/item/dry_grass.json rename to src/generated/resources/assets/botania/models/item/dry_grass.json index 26f6f9fc3..26bb7be66 100644 --- a/src/main/resources/assets/botania/models/item/dry_grass.json +++ b/src/generated/resources/assets/botania/models/item/dry_grass.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/dry_grass" +{ + "parent": "botania:block/dry_grass" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementium_block.json b/src/generated/resources/assets/botania/models/item/elementium_block.json similarity index 96% rename from src/main/resources/assets/botania/models/item/elementium_block.json rename to src/generated/resources/assets/botania/models/item/elementium_block.json index cc72d139b..0ec375f38 100644 --- a/src/main/resources/assets/botania/models/item/elementium_block.json +++ b/src/generated/resources/assets/botania/models/item/elementium_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/elementium_block" +{ + "parent": "botania:block/elementium_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elf_glass.json b/src/generated/resources/assets/botania/models/item/elf_glass.json similarity index 95% rename from src/main/resources/assets/botania/models/item/elf_glass.json rename to src/generated/resources/assets/botania/models/item/elf_glass.json index b3ef9239f..8283759a9 100644 --- a/src/main/resources/assets/botania/models/item/elf_glass.json +++ b/src/generated/resources/assets/botania/models/item/elf_glass.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/elf_glass_0" +{ + "parent": "botania:block/elf_glass_0" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elf_glass_pane.json b/src/generated/resources/assets/botania/models/item/elf_glass_pane.json similarity index 59% rename from src/main/resources/assets/botania/models/item/elf_glass_pane.json rename to src/generated/resources/assets/botania/models/item/elf_glass_pane.json index 3df3838ef..14ad6adca 100644 --- a/src/main/resources/assets/botania/models/item/elf_glass_pane.json +++ b/src/generated/resources/assets/botania/models/item/elf_glass_pane.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:block/elf_glass" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elf_quartz.json b/src/generated/resources/assets/botania/models/item/elf_quartz.json similarity index 95% rename from src/main/resources/assets/botania/models/item/elf_quartz.json rename to src/generated/resources/assets/botania/models/item/elf_quartz.json index 56b873e26..66d00f3ef 100644 --- a/src/main/resources/assets/botania/models/item/elf_quartz.json +++ b/src/generated/resources/assets/botania/models/item/elf_quartz.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/elf_quartz" +{ + "parent": "botania:block/elf_quartz" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elf_quartz_pillar.json b/src/generated/resources/assets/botania/models/item/elf_quartz_pillar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/elf_quartz_pillar.json rename to src/generated/resources/assets/botania/models/item/elf_quartz_pillar.json diff --git a/src/main/resources/assets/botania/models/item/elf_quartz_slab.json b/src/generated/resources/assets/botania/models/item/elf_quartz_slab.json similarity index 95% rename from src/main/resources/assets/botania/models/item/elf_quartz_slab.json rename to src/generated/resources/assets/botania/models/item/elf_quartz_slab.json index 4f2e24fab..a69432db1 100644 --- a/src/main/resources/assets/botania/models/item/elf_quartz_slab.json +++ b/src/generated/resources/assets/botania/models/item/elf_quartz_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/elf_quartz_slab" +{ + "parent": "botania:block/elf_quartz_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elf_quartz_stairs.json b/src/generated/resources/assets/botania/models/item/elf_quartz_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/elf_quartz_stairs.json rename to src/generated/resources/assets/botania/models/item/elf_quartz_stairs.json index d9cc327b0..68acdb3dd 100644 --- a/src/main/resources/assets/botania/models/item/elf_quartz_stairs.json +++ b/src/generated/resources/assets/botania/models/item/elf_quartz_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/elf_quartz_stairs" -} +{ + "parent": "botania:block/elf_quartz_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elven_spreader.json b/src/generated/resources/assets/botania/models/item/elven_spreader.json similarity index 53% rename from src/main/resources/assets/botania/models/item/elven_spreader.json rename to src/generated/resources/assets/botania/models/item/elven_spreader.json index ab306d7d0..60cbe2937 100644 --- a/src/main/resources/assets/botania/models/item/elven_spreader.json +++ b/src/generated/resources/assets/botania/models/item/elven_spreader.json @@ -1,8 +1,8 @@ -{ - "parent": "botania:block/shapes/spreader_item", - "textures": { - "inside": "botania:block/elven_spreader_inside", - "side": "botania:block/elven_spreader_side", - "material": "botania:block/dreamwood" - } -} +{ + "parent": "botania:block/shapes/spreader_item", + "textures": { + "side": "botania:block/elven_spreader_side", + "material": "botania:block/dreamwood", + "inside": "botania:block/elven_spreader_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enchanted_soil.json b/src/generated/resources/assets/botania/models/item/enchanted_soil.json similarity index 95% rename from src/main/resources/assets/botania/models/item/enchanted_soil.json rename to src/generated/resources/assets/botania/models/item/enchanted_soil.json index f59daf58f..448f7ac94 100644 --- a/src/main/resources/assets/botania/models/item/enchanted_soil.json +++ b/src/generated/resources/assets/botania/models/item/enchanted_soil.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/enchanted_soil" +{ + "parent": "botania:block/enchanted_soil" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enchanter.json b/src/generated/resources/assets/botania/models/item/enchanter.json similarity index 100% rename from src/main/resources/assets/botania/models/item/enchanter.json rename to src/generated/resources/assets/botania/models/item/enchanter.json diff --git a/src/main/resources/assets/botania/models/item/ender_eye_block.json b/src/generated/resources/assets/botania/models/item/ender_eye_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/ender_eye_block.json rename to src/generated/resources/assets/botania/models/item/ender_eye_block.json index 7f87db387..65e01ad80 100644 --- a/src/main/resources/assets/botania/models/item/ender_eye_block.json +++ b/src/generated/resources/assets/botania/models/item/ender_eye_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/ender_eye_block" +{ + "parent": "botania:block/ender_eye_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fabulous_pool.json b/src/generated/resources/assets/botania/models/item/fabulous_pool.json similarity index 81% rename from src/main/resources/assets/botania/models/item/fabulous_pool.json rename to src/generated/resources/assets/botania/models/item/fabulous_pool.json index 801b49b36..29bb04ed4 100644 --- a/src/main/resources/assets/botania/models/item/fabulous_pool.json +++ b/src/generated/resources/assets/botania/models/item/fabulous_pool.json @@ -1,11 +1,11 @@ -{ - "parent": "botania:block/fabulous_pool", - "overrides": [ - { - "predicate": { - "botania:full": 1 - }, - "model": "botania:block/fabulous_pool_full" - } - ] +{ + "parent": "botania:block/fabulous_pool", + "overrides": [ + { + "predicate": { + "botania:full": 1.0 + }, + "model": "botania:block/fabulous_pool_full" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fel_pumpkin.json b/src/generated/resources/assets/botania/models/item/fel_pumpkin.json similarity index 95% rename from src/main/resources/assets/botania/models/item/fel_pumpkin.json rename to src/generated/resources/assets/botania/models/item/fel_pumpkin.json index ddc5b84b8..472c25017 100644 --- a/src/main/resources/assets/botania/models/item/fel_pumpkin.json +++ b/src/generated/resources/assets/botania/models/item/fel_pumpkin.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/fel_pumpkin" +{ + "parent": "botania:block/fel_pumpkin" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/forest_eye.json b/src/generated/resources/assets/botania/models/item/forest_eye.json similarity index 95% rename from src/main/resources/assets/botania/models/item/forest_eye.json rename to src/generated/resources/assets/botania/models/item/forest_eye.json index 1dce51bc7..6d7ad862d 100644 --- a/src/main/resources/assets/botania/models/item/forest_eye.json +++ b/src/generated/resources/assets/botania/models/item/forest_eye.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/forest_eye" +{ + "parent": "botania:block/forest_eye" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/fork_light_relay.json b/src/generated/resources/assets/botania/models/item/fork_light_relay.json new file mode 100644 index 000000000..fb7ad4471 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/fork_light_relay.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/fork_light_relay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/framed_dreamwood.json b/src/generated/resources/assets/botania/models/item/framed_dreamwood.json similarity index 100% rename from src/main/resources/assets/botania/models/item/framed_dreamwood.json rename to src/generated/resources/assets/botania/models/item/framed_dreamwood.json diff --git a/src/main/resources/assets/botania/models/item/framed_livingwood.json b/src/generated/resources/assets/botania/models/item/framed_livingwood.json similarity index 100% rename from src/main/resources/assets/botania/models/item/framed_livingwood.json rename to src/generated/resources/assets/botania/models/item/framed_livingwood.json diff --git a/src/main/resources/assets/botania/models/item/gaia_head.json b/src/generated/resources/assets/botania/models/item/gaia_head.json similarity index 100% rename from src/main/resources/assets/botania/models/item/gaia_head.json rename to src/generated/resources/assets/botania/models/item/gaia_head.json diff --git a/src/generated/resources/assets/botania/models/item/gaia_pylon.json b/src/generated/resources/assets/botania/models/item/gaia_pylon.json new file mode 100644 index 000000000..eae24b9b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/gaia_pylon.json @@ -0,0 +1,82 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gaia_spreader.json b/src/generated/resources/assets/botania/models/item/gaia_spreader.json similarity index 50% rename from src/main/resources/assets/botania/models/item/gaia_spreader.json rename to src/generated/resources/assets/botania/models/item/gaia_spreader.json index 52332a4db..5facc712a 100644 --- a/src/main/resources/assets/botania/models/item/gaia_spreader.json +++ b/src/generated/resources/assets/botania/models/item/gaia_spreader.json @@ -1,8 +1,8 @@ -{ - "parent": "botania:block/shapes/spreader_item", - "textures": { - "inside": "botania:block/gaia_spreader_inside", - "side": "botania:block/gaia_spreader_side", - "material": "botania:block/gaia_spreader_material" - } -} +{ + "parent": "botania:block/shapes/spreader_item", + "textures": { + "side": "botania:block/gaia_spreader_side", + "material": "botania:block/gaia_spreader_material", + "inside": "botania:block/gaia_spreader_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ghost_rail.json b/src/generated/resources/assets/botania/models/item/ghost_rail.json similarity index 60% rename from src/main/resources/assets/botania/models/item/ghost_rail.json rename to src/generated/resources/assets/botania/models/item/ghost_rail.json index bc1b42eef..3ba46e194 100644 --- a/src/main/resources/assets/botania/models/item/ghost_rail.json +++ b/src/generated/resources/assets/botania/models/item/ghost_rail.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:block/ghost_rail" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/glimmering_dreamwood.json b/src/generated/resources/assets/botania/models/item/glimmering_dreamwood.json similarity index 100% rename from src/main/resources/assets/botania/models/item/glimmering_dreamwood.json rename to src/generated/resources/assets/botania/models/item/glimmering_dreamwood.json diff --git a/src/main/resources/assets/botania/models/item/glimmering_livingwood.json b/src/generated/resources/assets/botania/models/item/glimmering_livingwood.json similarity index 100% rename from src/main/resources/assets/botania/models/item/glimmering_livingwood.json rename to src/generated/resources/assets/botania/models/item/glimmering_livingwood.json diff --git a/src/main/resources/assets/botania/models/item/golden_grass.json b/src/generated/resources/assets/botania/models/item/golden_grass.json similarity index 95% rename from src/main/resources/assets/botania/models/item/golden_grass.json rename to src/generated/resources/assets/botania/models/item/golden_grass.json index 62caf1f78..ca09a27b7 100644 --- a/src/main/resources/assets/botania/models/item/golden_grass.json +++ b/src/generated/resources/assets/botania/models/item/golden_grass.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/golden_grass" +{ + "parent": "botania:block/golden_grass" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_petal.json b/src/generated/resources/assets/botania/models/item/gray_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/gray_petal.json rename to src/generated/resources/assets/botania/models/item/gray_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/gray_petal.json +++ b/src/generated/resources/assets/botania/models/item/gray_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_petal_block.json b/src/generated/resources/assets/botania/models/item/gray_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/gray_petal_block.json rename to src/generated/resources/assets/botania/models/item/gray_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/gray_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/gray_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_pavement.json b/src/generated/resources/assets/botania/models/item/green_pavement.json similarity index 95% rename from src/main/resources/assets/botania/models/item/green_pavement.json rename to src/generated/resources/assets/botania/models/item/green_pavement.json index 20d059256..f646bdb1c 100644 --- a/src/main/resources/assets/botania/models/item/green_pavement.json +++ b/src/generated/resources/assets/botania/models/item/green_pavement.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/green_pavement" +{ + "parent": "botania:block/green_pavement" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_pavement_slab.json b/src/generated/resources/assets/botania/models/item/green_pavement_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/green_pavement_slab.json rename to src/generated/resources/assets/botania/models/item/green_pavement_slab.json index 6fed04c7b..a0580c849 100644 --- a/src/main/resources/assets/botania/models/item/green_pavement_slab.json +++ b/src/generated/resources/assets/botania/models/item/green_pavement_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/green_pavement_slab" +{ + "parent": "botania:block/green_pavement_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_pavement_stairs.json b/src/generated/resources/assets/botania/models/item/green_pavement_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/green_pavement_stairs.json rename to src/generated/resources/assets/botania/models/item/green_pavement_stairs.json index 83da410e6..c0bd8860c 100644 --- a/src/main/resources/assets/botania/models/item/green_pavement_stairs.json +++ b/src/generated/resources/assets/botania/models/item/green_pavement_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/green_pavement_stairs" -} +{ + "parent": "botania:block/green_pavement_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_petal.json b/src/generated/resources/assets/botania/models/item/green_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/green_petal.json rename to src/generated/resources/assets/botania/models/item/green_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/green_petal.json +++ b/src/generated/resources/assets/botania/models/item/green_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_petal_block.json b/src/generated/resources/assets/botania/models/item/green_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/green_petal_block.json rename to src/generated/resources/assets/botania/models/item/green_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/green_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/green_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/hourglass.json b/src/generated/resources/assets/botania/models/item/hourglass.json new file mode 100644 index 000000000..eae24b9b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/hourglass.json @@ -0,0 +1,82 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/incense_plate.json b/src/generated/resources/assets/botania/models/item/incense_plate.json similarity index 95% rename from src/main/resources/assets/botania/models/item/incense_plate.json rename to src/generated/resources/assets/botania/models/item/incense_plate.json index a149f2dd1..92058c1b5 100644 --- a/src/main/resources/assets/botania/models/item/incense_plate.json +++ b/src/generated/resources/assets/botania/models/item/incense_plate.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/incense_plate" +{ + "parent": "botania:block/incense_plate" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infrangible_platform.json b/src/generated/resources/assets/botania/models/item/infrangible_platform.json similarity index 96% rename from src/main/resources/assets/botania/models/item/infrangible_platform.json rename to src/generated/resources/assets/botania/models/item/infrangible_platform.json index 9d0d95613..dffc904ac 100644 --- a/src/main/resources/assets/botania/models/item/infrangible_platform.json +++ b/src/generated/resources/assets/botania/models/item/infrangible_platform.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/infrangible_platform" +{ + "parent": "botania:block/infrangible_platform" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infused_grass.json b/src/generated/resources/assets/botania/models/item/infused_grass.json similarity index 95% rename from src/main/resources/assets/botania/models/item/infused_grass.json rename to src/generated/resources/assets/botania/models/item/infused_grass.json index 6a48255b5..40727340f 100644 --- a/src/main/resources/assets/botania/models/item/infused_grass.json +++ b/src/generated/resources/assets/botania/models/item/infused_grass.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/infused_grass" +{ + "parent": "botania:block/infused_grass" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lavender_quartz.json b/src/generated/resources/assets/botania/models/item/lavender_quartz.json similarity index 95% rename from src/main/resources/assets/botania/models/item/lavender_quartz.json rename to src/generated/resources/assets/botania/models/item/lavender_quartz.json index 94a7ab53e..c590a2fff 100644 --- a/src/main/resources/assets/botania/models/item/lavender_quartz.json +++ b/src/generated/resources/assets/botania/models/item/lavender_quartz.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/lavender_quartz" +{ + "parent": "botania:block/lavender_quartz" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lavender_quartz_pillar.json b/src/generated/resources/assets/botania/models/item/lavender_quartz_pillar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lavender_quartz_pillar.json rename to src/generated/resources/assets/botania/models/item/lavender_quartz_pillar.json diff --git a/src/main/resources/assets/botania/models/item/lavender_quartz_slab.json b/src/generated/resources/assets/botania/models/item/lavender_quartz_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/lavender_quartz_slab.json rename to src/generated/resources/assets/botania/models/item/lavender_quartz_slab.json index 090568b47..dbfe19c38 100644 --- a/src/main/resources/assets/botania/models/item/lavender_quartz_slab.json +++ b/src/generated/resources/assets/botania/models/item/lavender_quartz_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/lavender_quartz_slab" +{ + "parent": "botania:block/lavender_quartz_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lavender_quartz_stairs.json b/src/generated/resources/assets/botania/models/item/lavender_quartz_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/lavender_quartz_stairs.json rename to src/generated/resources/assets/botania/models/item/lavender_quartz_stairs.json index 86574fe39..d1f720506 100644 --- a/src/main/resources/assets/botania/models/item/lavender_quartz_stairs.json +++ b/src/generated/resources/assets/botania/models/item/lavender_quartz_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/lavender_quartz_stairs" -} +{ + "parent": "botania:block/lavender_quartz_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_petal.json b/src/generated/resources/assets/botania/models/item/light_blue_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/light_blue_petal.json rename to src/generated/resources/assets/botania/models/item/light_blue_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/light_blue_petal.json +++ b/src/generated/resources/assets/botania/models/item/light_blue_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_petal_block.json b/src/generated/resources/assets/botania/models/item/light_blue_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/light_blue_petal_block.json rename to src/generated/resources/assets/botania/models/item/light_blue_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/light_blue_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/light_blue_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_gray_petal.json b/src/generated/resources/assets/botania/models/item/light_gray_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/light_gray_petal.json rename to src/generated/resources/assets/botania/models/item/light_gray_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/light_gray_petal.json +++ b/src/generated/resources/assets/botania/models/item/light_gray_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_gray_petal_block.json b/src/generated/resources/assets/botania/models/item/light_gray_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/light_gray_petal_block.json rename to src/generated/resources/assets/botania/models/item/light_gray_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/light_gray_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/light_gray_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_launcher.json b/src/generated/resources/assets/botania/models/item/light_launcher.json similarity index 95% rename from src/main/resources/assets/botania/models/item/light_launcher.json rename to src/generated/resources/assets/botania/models/item/light_launcher.json index 91106001d..9dd9d2fc2 100644 --- a/src/main/resources/assets/botania/models/item/light_launcher.json +++ b/src/generated/resources/assets/botania/models/item/light_launcher.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/light_launcher" +{ + "parent": "botania:block/light_launcher" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_relay.json b/src/generated/resources/assets/botania/models/item/light_relay.json similarity index 52% rename from src/main/resources/assets/botania/models/item/light_relay.json rename to src/generated/resources/assets/botania/models/item/light_relay.json index a2d814bc9..0abcdee78 100644 --- a/src/main/resources/assets/botania/models/item/light_relay.json +++ b/src/generated/resources/assets/botania/models/item/light_relay.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/luminizer" - } -} +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/light_relay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_petal.json b/src/generated/resources/assets/botania/models/item/lime_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/lime_petal.json rename to src/generated/resources/assets/botania/models/item/lime_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/lime_petal.json +++ b/src/generated/resources/assets/botania/models/item/lime_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_petal_block.json b/src/generated/resources/assets/botania/models/item/lime_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/lime_petal_block.json rename to src/generated/resources/assets/botania/models/item/lime_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/lime_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/lime_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock.json b/src/generated/resources/assets/botania/models/item/livingrock.json similarity index 95% rename from src/main/resources/assets/botania/models/item/livingrock.json rename to src/generated/resources/assets/botania/models/item/livingrock.json index 43e2b0562..07bea39e7 100644 --- a/src/main/resources/assets/botania/models/item/livingrock.json +++ b/src/generated/resources/assets/botania/models/item/livingrock.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingrock" +{ + "parent": "botania:block/livingrock" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_bricks.json b/src/generated/resources/assets/botania/models/item/livingrock_bricks.json similarity index 100% rename from src/main/resources/assets/botania/models/item/livingrock_bricks.json rename to src/generated/resources/assets/botania/models/item/livingrock_bricks.json diff --git a/src/main/resources/assets/botania/models/item/livingrock_bricks_slab.json b/src/generated/resources/assets/botania/models/item/livingrock_bricks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/livingrock_bricks_slab.json rename to src/generated/resources/assets/botania/models/item/livingrock_bricks_slab.json index f5e324328..b9c575695 100644 --- a/src/main/resources/assets/botania/models/item/livingrock_bricks_slab.json +++ b/src/generated/resources/assets/botania/models/item/livingrock_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingrock_bricks_slab" +{ + "parent": "botania:block/livingrock_bricks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_bricks_stairs.json b/src/generated/resources/assets/botania/models/item/livingrock_bricks_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/livingrock_bricks_stairs.json rename to src/generated/resources/assets/botania/models/item/livingrock_bricks_stairs.json index 673e44207..888fece69 100644 --- a/src/main/resources/assets/botania/models/item/livingrock_bricks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/livingrock_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingrock_bricks_stairs" -} +{ + "parent": "botania:block/livingrock_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_slab.json b/src/generated/resources/assets/botania/models/item/livingrock_slab.json similarity index 95% rename from src/main/resources/assets/botania/models/item/livingrock_slab.json rename to src/generated/resources/assets/botania/models/item/livingrock_slab.json index a022793dc..e51fbe513 100644 --- a/src/main/resources/assets/botania/models/item/livingrock_slab.json +++ b/src/generated/resources/assets/botania/models/item/livingrock_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingrock_slab" +{ + "parent": "botania:block/livingrock_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_stairs.json b/src/generated/resources/assets/botania/models/item/livingrock_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/livingrock_stairs.json rename to src/generated/resources/assets/botania/models/item/livingrock_stairs.json index 8b9d3ab3a..e86f06f5e 100644 --- a/src/main/resources/assets/botania/models/item/livingrock_stairs.json +++ b/src/generated/resources/assets/botania/models/item/livingrock_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingrock_stairs" -} +{ + "parent": "botania:block/livingrock_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_wall.json b/src/generated/resources/assets/botania/models/item/livingrock_wall.json similarity index 55% rename from src/main/resources/assets/botania/models/item/livingrock_wall.json rename to src/generated/resources/assets/botania/models/item/livingrock_wall.json index f5a2b95bf..575904110 100644 --- a/src/main/resources/assets/botania/models/item/livingrock_wall.json +++ b/src/generated/resources/assets/botania/models/item/livingrock_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/livingrock" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood.json b/src/generated/resources/assets/botania/models/item/livingwood.json similarity index 95% rename from src/main/resources/assets/botania/models/item/livingwood.json rename to src/generated/resources/assets/botania/models/item/livingwood.json index 109cd89e8..e17bddb69 100644 --- a/src/main/resources/assets/botania/models/item/livingwood.json +++ b/src/generated/resources/assets/botania/models/item/livingwood.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingwood" +{ + "parent": "botania:block/livingwood" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_fence.json b/src/generated/resources/assets/botania/models/item/livingwood_fence.json similarity index 59% rename from src/main/resources/assets/botania/models/item/livingwood_fence.json rename to src/generated/resources/assets/botania/models/item/livingwood_fence.json index 2d70f4d1b..3531e50a3 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_fence.json +++ b/src/generated/resources/assets/botania/models/item/livingwood_fence.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/fence_inventory", + "parent": "block/fence_inventory", "textures": { "texture": "botania:block/livingwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_fence_gate.json b/src/generated/resources/assets/botania/models/item/livingwood_fence_gate.json similarity index 100% rename from src/main/resources/assets/botania/models/item/livingwood_fence_gate.json rename to src/generated/resources/assets/botania/models/item/livingwood_fence_gate.json diff --git a/src/main/resources/assets/botania/models/item/livingwood_planks.json b/src/generated/resources/assets/botania/models/item/livingwood_planks.json similarity index 100% rename from src/main/resources/assets/botania/models/item/livingwood_planks.json rename to src/generated/resources/assets/botania/models/item/livingwood_planks.json diff --git a/src/main/resources/assets/botania/models/item/livingwood_planks_slab.json b/src/generated/resources/assets/botania/models/item/livingwood_planks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/livingwood_planks_slab.json rename to src/generated/resources/assets/botania/models/item/livingwood_planks_slab.json index ca523f1c2..21cea9946 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_planks_slab.json +++ b/src/generated/resources/assets/botania/models/item/livingwood_planks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingwood_planks_slab" +{ + "parent": "botania:block/livingwood_planks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_planks_stairs.json b/src/generated/resources/assets/botania/models/item/livingwood_planks_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/livingwood_planks_stairs.json rename to src/generated/resources/assets/botania/models/item/livingwood_planks_stairs.json index 7598a30fd..2a099b851 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_planks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/livingwood_planks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingwood_planks_stairs" -} +{ + "parent": "botania:block/livingwood_planks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_slab.json b/src/generated/resources/assets/botania/models/item/livingwood_slab.json similarity index 95% rename from src/main/resources/assets/botania/models/item/livingwood_slab.json rename to src/generated/resources/assets/botania/models/item/livingwood_slab.json index b162f5eb6..35ba5c749 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_slab.json +++ b/src/generated/resources/assets/botania/models/item/livingwood_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingwood_slab" +{ + "parent": "botania:block/livingwood_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_stairs.json b/src/generated/resources/assets/botania/models/item/livingwood_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/livingwood_stairs.json rename to src/generated/resources/assets/botania/models/item/livingwood_stairs.json index 66c916f50..4045fdd3f 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_stairs.json +++ b/src/generated/resources/assets/botania/models/item/livingwood_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/livingwood_stairs" -} +{ + "parent": "botania:block/livingwood_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_wall.json b/src/generated/resources/assets/botania/models/item/livingwood_wall.json similarity index 55% rename from src/main/resources/assets/botania/models/item/livingwood_wall.json rename to src/generated/resources/assets/botania/models/item/livingwood_wall.json index da7961bf4..1c7a15100 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_wall.json +++ b/src/generated/resources/assets/botania/models/item/livingwood_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/livingwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_petal.json b/src/generated/resources/assets/botania/models/item/magenta_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/magenta_petal.json rename to src/generated/resources/assets/botania/models/item/magenta_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/magenta_petal.json +++ b/src/generated/resources/assets/botania/models/item/magenta_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_petal_block.json b/src/generated/resources/assets/botania/models/item/magenta_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/magenta_petal_block.json rename to src/generated/resources/assets/botania/models/item/magenta_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/magenta_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/magenta_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_bomb.json b/src/generated/resources/assets/botania/models/item/mana_bomb.json similarity index 95% rename from src/main/resources/assets/botania/models/item/mana_bomb.json rename to src/generated/resources/assets/botania/models/item/mana_bomb.json index 11a136a75..c85c9a8a9 100644 --- a/src/main/resources/assets/botania/models/item/mana_bomb.json +++ b/src/generated/resources/assets/botania/models/item/mana_bomb.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_bomb" +{ + "parent": "botania:block/mana_bomb" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_detector.json b/src/generated/resources/assets/botania/models/item/mana_detector.json similarity index 95% rename from src/main/resources/assets/botania/models/item/mana_detector.json rename to src/generated/resources/assets/botania/models/item/mana_detector.json index f3d2aaefe..a806fe7d7 100644 --- a/src/main/resources/assets/botania/models/item/mana_detector.json +++ b/src/generated/resources/assets/botania/models/item/mana_detector.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_detector" +{ + "parent": "botania:block/mana_detector" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_diamond_block.json b/src/generated/resources/assets/botania/models/item/mana_diamond_block.json similarity index 96% rename from src/main/resources/assets/botania/models/item/mana_diamond_block.json rename to src/generated/resources/assets/botania/models/item/mana_diamond_block.json index 309e4cf36..35785ba3a 100644 --- a/src/main/resources/assets/botania/models/item/mana_diamond_block.json +++ b/src/generated/resources/assets/botania/models/item/mana_diamond_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_diamond_block" +{ + "parent": "botania:block/mana_diamond_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_distributor.json b/src/generated/resources/assets/botania/models/item/mana_distributor.json similarity index 96% rename from src/main/resources/assets/botania/models/item/mana_distributor.json rename to src/generated/resources/assets/botania/models/item/mana_distributor.json index 882099de8..bef8cb7dd 100644 --- a/src/main/resources/assets/botania/models/item/mana_distributor.json +++ b/src/generated/resources/assets/botania/models/item/mana_distributor.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_distributor" +{ + "parent": "botania:block/mana_distributor" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_fluxfield.json b/src/generated/resources/assets/botania/models/item/mana_fluxfield.json similarity index 95% rename from src/main/resources/assets/botania/models/item/mana_fluxfield.json rename to src/generated/resources/assets/botania/models/item/mana_fluxfield.json index c99a9105b..a9639ad56 100644 --- a/src/main/resources/assets/botania/models/item/mana_fluxfield.json +++ b/src/generated/resources/assets/botania/models/item/mana_fluxfield.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_fluxfield" +{ + "parent": "botania:block/mana_fluxfield" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_glass.json b/src/generated/resources/assets/botania/models/item/mana_glass.json similarity index 95% rename from src/main/resources/assets/botania/models/item/mana_glass.json rename to src/generated/resources/assets/botania/models/item/mana_glass.json index 337796ebd..0797093de 100644 --- a/src/main/resources/assets/botania/models/item/mana_glass.json +++ b/src/generated/resources/assets/botania/models/item/mana_glass.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_glass" +{ + "parent": "botania:block/mana_glass" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_glass_pane.json b/src/generated/resources/assets/botania/models/item/mana_glass_pane.json similarity index 60% rename from src/main/resources/assets/botania/models/item/mana_glass_pane.json rename to src/generated/resources/assets/botania/models/item/mana_glass_pane.json index e053379f2..6fd17fbff 100644 --- a/src/main/resources/assets/botania/models/item/mana_glass_pane.json +++ b/src/generated/resources/assets/botania/models/item/mana_glass_pane.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:block/mana_glass" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_pool.json b/src/generated/resources/assets/botania/models/item/mana_pool.json similarity index 80% rename from src/main/resources/assets/botania/models/item/mana_pool.json rename to src/generated/resources/assets/botania/models/item/mana_pool.json index c9016260d..1ccb3aa05 100644 --- a/src/main/resources/assets/botania/models/item/mana_pool.json +++ b/src/generated/resources/assets/botania/models/item/mana_pool.json @@ -1,11 +1,11 @@ -{ - "parent": "botania:block/mana_pool", - "overrides": [ - { - "predicate": { - "botania:full": 1 - }, - "model": "botania:block/mana_pool_full" - } - ] +{ + "parent": "botania:block/mana_pool", + "overrides": [ + { + "predicate": { + "botania:full": 1.0 + }, + "model": "botania:block/mana_pool_full" + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/mana_pylon.json b/src/generated/resources/assets/botania/models/item/mana_pylon.json new file mode 100644 index 000000000..eae24b9b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/mana_pylon.json @@ -0,0 +1,82 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_quartz.json b/src/generated/resources/assets/botania/models/item/mana_quartz.json similarity index 95% rename from src/main/resources/assets/botania/models/item/mana_quartz.json rename to src/generated/resources/assets/botania/models/item/mana_quartz.json index 78c4b7966..09b494854 100644 --- a/src/main/resources/assets/botania/models/item/mana_quartz.json +++ b/src/generated/resources/assets/botania/models/item/mana_quartz.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_quartz" +{ + "parent": "botania:block/mana_quartz" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_quartz_pillar.json b/src/generated/resources/assets/botania/models/item/mana_quartz_pillar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/mana_quartz_pillar.json rename to src/generated/resources/assets/botania/models/item/mana_quartz_pillar.json diff --git a/src/main/resources/assets/botania/models/item/mana_quartz_slab.json b/src/generated/resources/assets/botania/models/item/mana_quartz_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/mana_quartz_slab.json rename to src/generated/resources/assets/botania/models/item/mana_quartz_slab.json index 3b07828ab..26e07c3e5 100644 --- a/src/main/resources/assets/botania/models/item/mana_quartz_slab.json +++ b/src/generated/resources/assets/botania/models/item/mana_quartz_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_quartz_slab" +{ + "parent": "botania:block/mana_quartz_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_quartz_stairs.json b/src/generated/resources/assets/botania/models/item/mana_quartz_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/mana_quartz_stairs.json rename to src/generated/resources/assets/botania/models/item/mana_quartz_stairs.json index 75c0208ff..afd52a520 100644 --- a/src/main/resources/assets/botania/models/item/mana_quartz_stairs.json +++ b/src/generated/resources/assets/botania/models/item/mana_quartz_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_quartz_stairs" -} +{ + "parent": "botania:block/mana_quartz_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_spreader.json b/src/generated/resources/assets/botania/models/item/mana_spreader.json similarity index 53% rename from src/main/resources/assets/botania/models/item/mana_spreader.json rename to src/generated/resources/assets/botania/models/item/mana_spreader.json index d1708e30a..a387ebfc4 100644 --- a/src/main/resources/assets/botania/models/item/mana_spreader.json +++ b/src/generated/resources/assets/botania/models/item/mana_spreader.json @@ -1,8 +1,8 @@ -{ - "parent": "botania:block/shapes/spreader_item", - "textures": { - "inside": "botania:block/mana_spreader_inside", - "side": "botania:block/mana_spreader_side", - "material": "botania:block/livingwood" - } -} +{ + "parent": "botania:block/shapes/spreader_item", + "textures": { + "side": "botania:block/mana_spreader_side", + "material": "botania:block/livingwood", + "inside": "botania:block/mana_spreader_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_void.json b/src/generated/resources/assets/botania/models/item/mana_void.json similarity index 95% rename from src/main/resources/assets/botania/models/item/mana_void.json rename to src/generated/resources/assets/botania/models/item/mana_void.json index d8695c0af..647005fe6 100644 --- a/src/main/resources/assets/botania/models/item/mana_void.json +++ b/src/generated/resources/assets/botania/models/item/mana_void.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mana_void" +{ + "parent": "botania:block/mana_void" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteel_block.json b/src/generated/resources/assets/botania/models/item/manasteel_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/manasteel_block.json rename to src/generated/resources/assets/botania/models/item/manasteel_block.json index 72d6a2802..6b5b605b2 100644 --- a/src/main/resources/assets/botania/models/item/manasteel_block.json +++ b/src/generated/resources/assets/botania/models/item/manasteel_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/manasteel_block" +{ + "parent": "botania:block/manasteel_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_bricks.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_bricks.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_bricks.json index dd804d01b..295100760 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_bricks.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_desert_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_bricks_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_bricks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_bricks_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_bricks_slab.json index 578b0f3b6..b0c582a8a 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_bricks_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_desert_bricks_slab" +{ + "parent": "botania:block/metamorphic_desert_bricks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_bricks_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_bricks_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_bricks_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_bricks_stairs.json index d0ff5b813..7dd6e63e0 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_bricks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_desert_bricks_stairs" -} +{ + "parent": "botania:block/metamorphic_desert_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone.json index 8d7c17c66..9a851f4bc 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_desert_cobblestone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone_slab.json similarity index 97% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone_slab.json index 5a5f7b13c..faf1a68be 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_desert_cobblestone_slab" +{ + "parent": "botania:block/metamorphic_desert_cobblestone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone_stairs.json similarity index 93% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone_stairs.json index 077d1cad5..cbb5ae3b8 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_desert_cobblestone_stairs" -} +{ + "parent": "botania:block/metamorphic_desert_cobblestone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_wall.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone_wall.json similarity index 62% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_wall.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone_wall.json index 01ddc115b..685a41e7b 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_cobblestone_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/metamorphic_desert_cobblestone" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_stone.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_stone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_stone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_stone.json index 8498c9254..63263e0e7 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_stone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_stone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_desert_stone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_stone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_stone_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_stone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_stone_slab.json index 027dd2e4d..3a7af598e 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_stone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_stone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_desert_stone_slab" +{ + "parent": "botania:block/metamorphic_desert_stone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_stone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_desert_stone_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_desert_stone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_desert_stone_stairs.json index efba387e6..b26e501ad 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_desert_stone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_desert_stone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_desert_stone_stairs" -} +{ + "parent": "botania:block/metamorphic_desert_stone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_bricks.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_bricks.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_bricks.json index 08608a473..549cfca37 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_bricks.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_forest_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_bricks_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_bricks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_bricks_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_bricks_slab.json index 35519d28e..0e8361586 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_bricks_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_forest_bricks_slab" +{ + "parent": "botania:block/metamorphic_forest_bricks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_bricks_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_bricks_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_bricks_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_bricks_stairs.json index b796598d3..515c1273b 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_bricks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_forest_bricks_stairs" -} +{ + "parent": "botania:block/metamorphic_forest_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone.json index 6d2e83d75..ed760ebaf 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_forest_cobblestone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone_slab.json similarity index 97% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone_slab.json index 4796c6407..54c05fecd 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_forest_cobblestone_slab" +{ + "parent": "botania:block/metamorphic_forest_cobblestone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone_stairs.json similarity index 93% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone_stairs.json index a46999032..7b26ad9d1 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_forest_cobblestone_stairs" -} +{ + "parent": "botania:block/metamorphic_forest_cobblestone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_wall.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone_wall.json similarity index 62% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_wall.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone_wall.json index 4310f41ba..f214546ca 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_cobblestone_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/metamorphic_forest_cobblestone" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_stone.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_stone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_stone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_stone.json index f92c77769..2942b178e 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_stone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_stone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_forest_stone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_stone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_stone_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_stone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_stone_slab.json index 526bfcc6c..f369bf152 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_stone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_stone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_forest_stone_slab" +{ + "parent": "botania:block/metamorphic_forest_stone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_stone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_forest_stone_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_forest_stone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_forest_stone_stairs.json index fda73af08..cd87d0721 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_forest_stone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_forest_stone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_forest_stone_stairs" -} +{ + "parent": "botania:block/metamorphic_forest_stone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_bricks.json index e6d4942c5..fca104468 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_fungal_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_bricks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_bricks_slab.json index 37681b6bc..a3a13e683 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_fungal_bricks_slab" +{ + "parent": "botania:block/metamorphic_fungal_bricks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_bricks_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_bricks_stairs.json index 74df33f62..1f410613e 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_fungal_bricks_stairs" -} +{ + "parent": "botania:block/metamorphic_fungal_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone.json index cf12efc6e..f1600021a 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_fungal_cobblestone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_slab.json similarity index 97% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_slab.json index 7641e01d7..b9044164b 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_fungal_cobblestone_slab" +{ + "parent": "botania:block/metamorphic_fungal_cobblestone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_stairs.json similarity index 93% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_stairs.json index 6b7d96e33..27f2aac93 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_fungal_cobblestone_stairs" -} +{ + "parent": "botania:block/metamorphic_fungal_cobblestone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_wall.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_wall.json similarity index 62% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_wall.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_wall.json index 01c406453..b93027200 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/metamorphic_fungal_cobblestone" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_stone.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_stone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_stone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_stone.json index 221ac37a4..ef719ba2e 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_stone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_stone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_fungal_stone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_stone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_stone_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_stone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_stone_slab.json index d3ed14af1..29374a38a 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_stone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_stone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_fungal_stone_slab" +{ + "parent": "botania:block/metamorphic_fungal_stone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_stone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_stone_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_fungal_stone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_fungal_stone_stairs.json index fc26bce69..843e04017 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_fungal_stone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_fungal_stone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_fungal_stone_stairs" -} +{ + "parent": "botania:block/metamorphic_fungal_stone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_bricks.json index fd0c9e1ec..c52507119 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_mesa_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_bricks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_bricks_slab.json index 96eaca860..d89e82fd1 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mesa_bricks_slab" +{ + "parent": "botania:block/metamorphic_mesa_bricks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_bricks_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_bricks_stairs.json index 525aafc31..0c5a00876 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mesa_bricks_stairs" -} +{ + "parent": "botania:block/metamorphic_mesa_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone.json index be33a5911..bc9bc9716 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_mesa_cobblestone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_slab.json similarity index 97% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_slab.json index 94f72b5cd..cf642fd85 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mesa_cobblestone_slab" +{ + "parent": "botania:block/metamorphic_mesa_cobblestone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_stairs.json index fcc307ac7..dbcc5e933 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mesa_cobblestone_stairs" -} +{ + "parent": "botania:block/metamorphic_mesa_cobblestone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_wall.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_wall.json similarity index 62% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_wall.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_wall.json index 90e1c2cd8..872accd08 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/metamorphic_mesa_cobblestone" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_stone.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_stone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_stone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_stone.json index db4262843..f756efb2a 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_stone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_stone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_mesa_stone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_stone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_stone_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_stone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_stone_slab.json index 4b6964932..b05946441 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_stone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_stone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mesa_stone_slab" +{ + "parent": "botania:block/metamorphic_mesa_stone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_stone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_stone_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_mesa_stone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mesa_stone_stairs.json index 0e0dd1db8..faf2a0e52 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mesa_stone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mesa_stone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mesa_stone_stairs" -} +{ + "parent": "botania:block/metamorphic_mesa_stone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_bricks.json index e83aa1965..0cf6b791d 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_mountain_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_bricks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_bricks_slab.json index 7a19de9b4..f6ffe898d 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mountain_bricks_slab" +{ + "parent": "botania:block/metamorphic_mountain_bricks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_bricks_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_bricks_stairs.json index 20cf10a68..4fa8c5a05 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mountain_bricks_stairs" -} +{ + "parent": "botania:block/metamorphic_mountain_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone.json index bf20aa1c2..12d70b4ec 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_mountain_cobblestone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_slab.json similarity index 97% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_slab.json index f11183fc9..08fd6bd9a 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mountain_cobblestone_slab" +{ + "parent": "botania:block/metamorphic_mountain_cobblestone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_stairs.json similarity index 93% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_stairs.json index 639dd3d6c..faf46e94a 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mountain_cobblestone_stairs" -} +{ + "parent": "botania:block/metamorphic_mountain_cobblestone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_wall.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_wall.json similarity index 63% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_wall.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_wall.json index 18b24c8de..4900cdab9 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/metamorphic_mountain_cobblestone" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_stone.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_stone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_stone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_stone.json index c79db53be..bf88f1d76 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_stone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_stone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_mountain_stone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_stone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_stone_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_stone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_stone_slab.json index bae573363..8ad272f73 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_stone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_stone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mountain_stone_slab" +{ + "parent": "botania:block/metamorphic_mountain_stone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_stone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_stone_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_mountain_stone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_mountain_stone_stairs.json index 11ff013d2..a8c65e196 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_mountain_stone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_mountain_stone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_mountain_stone_stairs" -} +{ + "parent": "botania:block/metamorphic_mountain_stone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_bricks.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_bricks.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_bricks.json index eccde8a9c..ba1c9cbe4 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_bricks.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_plains_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_bricks_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_bricks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_bricks_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_bricks_slab.json index 2b288f085..0ae761c7f 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_bricks_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_plains_bricks_slab" +{ + "parent": "botania:block/metamorphic_plains_bricks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_bricks_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_bricks_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_bricks_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_bricks_stairs.json index 9d4ae72f5..80275ecb0 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_bricks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_plains_bricks_stairs" -} +{ + "parent": "botania:block/metamorphic_plains_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone.json index bfd77c19a..742bc741f 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_plains_cobblestone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone_slab.json similarity index 97% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone_slab.json index ae17f75b6..3bfe606ca 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_plains_cobblestone_slab" +{ + "parent": "botania:block/metamorphic_plains_cobblestone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone_stairs.json similarity index 93% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone_stairs.json index cf21c1d72..b9525725a 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_plains_cobblestone_stairs" -} +{ + "parent": "botania:block/metamorphic_plains_cobblestone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_wall.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone_wall.json similarity index 62% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_wall.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone_wall.json index 5f8faf219..1ccea8570 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_cobblestone_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/metamorphic_plains_cobblestone" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_stone.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_stone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_stone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_stone.json index a2b18ded5..870bf0e7e 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_stone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_stone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_plains_stone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_stone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_stone_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_stone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_stone_slab.json index 71ddab277..067bd9bdd 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_stone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_stone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_plains_stone_slab" +{ + "parent": "botania:block/metamorphic_plains_stone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_stone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_plains_stone_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_plains_stone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_plains_stone_stairs.json index b846a1d77..e2790f437 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_plains_stone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_plains_stone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_plains_stone_stairs" -} +{ + "parent": "botania:block/metamorphic_plains_stone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_bricks.json index 42417982b..d911d991d 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_swamp_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_bricks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_bricks_slab.json index 9cdafbaca..4d9cf4cff 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_swamp_bricks_slab" +{ + "parent": "botania:block/metamorphic_swamp_bricks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_bricks_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_bricks_stairs.json index f53ff8b9d..2457a41af 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_swamp_bricks_stairs" -} +{ + "parent": "botania:block/metamorphic_swamp_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone.json index c463bfc60..ad0cda5ab 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_swamp_cobblestone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_slab.json similarity index 97% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_slab.json index 86a1ba22e..1338ab720 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_swamp_cobblestone_slab" +{ + "parent": "botania:block/metamorphic_swamp_cobblestone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_stairs.json similarity index 93% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_stairs.json index 4387d97b7..8f520b030 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_swamp_cobblestone_stairs" -} +{ + "parent": "botania:block/metamorphic_swamp_cobblestone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_wall.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_wall.json similarity index 62% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_wall.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_wall.json index 3d74c7686..e3bf53d34 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/metamorphic_swamp_cobblestone" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_stone.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_stone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_stone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_stone.json index 35c8c33f8..5f2351e93 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_stone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_stone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_swamp_stone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_stone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_stone_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_stone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_stone_slab.json index 1646f5934..5101c1143 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_stone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_stone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_swamp_stone_slab" +{ + "parent": "botania:block/metamorphic_swamp_stone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_stone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_stone_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_swamp_stone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_swamp_stone_stairs.json index 3282b29f4..abb955141 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_swamp_stone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_swamp_stone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_swamp_stone_stairs" -} +{ + "parent": "botania:block/metamorphic_swamp_stone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_bricks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_bricks.json index 944753924..c8babb8da 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_bricks.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_taiga_bricks" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_bricks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_bricks_slab.json index 1d9c2a639..9f29a1aff 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_taiga_bricks_slab" +{ + "parent": "botania:block/metamorphic_taiga_bricks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_bricks_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_bricks_stairs.json index 6d513b9b1..e4628fc57 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_taiga_bricks_stairs" -} +{ + "parent": "botania:block/metamorphic_taiga_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone.json index 9d33ab5ac..faf5b48d3 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_taiga_cobblestone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_slab.json similarity index 97% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_slab.json index f75b22e5a..18d812569 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_taiga_cobblestone_slab" +{ + "parent": "botania:block/metamorphic_taiga_cobblestone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_stairs.json similarity index 93% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_stairs.json index b6ea34737..df311fbe2 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_taiga_cobblestone_stairs" -} +{ + "parent": "botania:block/metamorphic_taiga_cobblestone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_wall.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_wall.json similarity index 62% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_wall.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_wall.json index 3216e2823..6e8fac0d1 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/wall_inventory", + "parent": "block/wall_inventory", "textures": { "wall": "botania:block/metamorphic_taiga_cobblestone" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_stone.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_stone.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_stone.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_stone.json index 09bfcf42e..9b9c0c4c5 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_stone.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_stone.json @@ -1,3 +1,3 @@ { "parent": "botania:block/metamorphic_taiga_stone" -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_stone_slab.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_stone_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_stone_slab.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_stone_slab.json index 38306ad35..ee258fbad 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_stone_slab.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_stone_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_taiga_stone_slab" +{ + "parent": "botania:block/metamorphic_taiga_stone_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_stone_stairs.json b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_stone_stairs.json similarity index 92% rename from src/main/resources/assets/botania/models/item/metamorphic_taiga_stone_stairs.json rename to src/generated/resources/assets/botania/models/item/metamorphic_taiga_stone_stairs.json index 6a546b6ef..fb4e7b5f7 100644 --- a/src/main/resources/assets/botania/models/item/metamorphic_taiga_stone_stairs.json +++ b/src/generated/resources/assets/botania/models/item/metamorphic_taiga_stone_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/metamorphic_taiga_stone_stairs" -} +{ + "parent": "botania:block/metamorphic_taiga_stone_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mossy_dreamwood_planks.json b/src/generated/resources/assets/botania/models/item/mossy_dreamwood_planks.json similarity index 100% rename from src/main/resources/assets/botania/models/item/mossy_dreamwood_planks.json rename to src/generated/resources/assets/botania/models/item/mossy_dreamwood_planks.json diff --git a/src/main/resources/assets/botania/models/item/mossy_livingrock_bricks.json b/src/generated/resources/assets/botania/models/item/mossy_livingrock_bricks.json similarity index 100% rename from src/main/resources/assets/botania/models/item/mossy_livingrock_bricks.json rename to src/generated/resources/assets/botania/models/item/mossy_livingrock_bricks.json diff --git a/src/main/resources/assets/botania/models/item/mossy_livingwood_planks.json b/src/generated/resources/assets/botania/models/item/mossy_livingwood_planks.json similarity index 100% rename from src/main/resources/assets/botania/models/item/mossy_livingwood_planks.json rename to src/generated/resources/assets/botania/models/item/mossy_livingwood_planks.json diff --git a/src/main/resources/assets/botania/models/item/mutated_grass.json b/src/generated/resources/assets/botania/models/item/mutated_grass.json similarity index 95% rename from src/main/resources/assets/botania/models/item/mutated_grass.json rename to src/generated/resources/assets/botania/models/item/mutated_grass.json index 64aef3bf6..892c3f53f 100644 --- a/src/main/resources/assets/botania/models/item/mutated_grass.json +++ b/src/generated/resources/assets/botania/models/item/mutated_grass.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/mutated_grass" +{ + "parent": "botania:block/mutated_grass" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/natura_pylon.json b/src/generated/resources/assets/botania/models/item/natura_pylon.json new file mode 100644 index 000000000..eae24b9b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/natura_pylon.json @@ -0,0 +1,82 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/open_crate.json b/src/generated/resources/assets/botania/models/item/open_crate.json similarity index 95% rename from src/main/resources/assets/botania/models/item/open_crate.json rename to src/generated/resources/assets/botania/models/item/open_crate.json index d54fbaf4b..e194cd91d 100644 --- a/src/main/resources/assets/botania/models/item/open_crate.json +++ b/src/generated/resources/assets/botania/models/item/open_crate.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/open_crate" +{ + "parent": "botania:block/open_crate" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_petal.json b/src/generated/resources/assets/botania/models/item/orange_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/orange_petal.json rename to src/generated/resources/assets/botania/models/item/orange_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/orange_petal.json +++ b/src/generated/resources/assets/botania/models/item/orange_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_petal_block.json b/src/generated/resources/assets/botania/models/item/orange_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/orange_petal_block.json rename to src/generated/resources/assets/botania/models/item/orange_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/orange_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/orange_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pattern_framed_dreamwood.json b/src/generated/resources/assets/botania/models/item/pattern_framed_dreamwood.json similarity index 100% rename from src/main/resources/assets/botania/models/item/pattern_framed_dreamwood.json rename to src/generated/resources/assets/botania/models/item/pattern_framed_dreamwood.json diff --git a/src/main/resources/assets/botania/models/item/pattern_framed_livingwood.json b/src/generated/resources/assets/botania/models/item/pattern_framed_livingwood.json similarity index 100% rename from src/main/resources/assets/botania/models/item/pattern_framed_livingwood.json rename to src/generated/resources/assets/botania/models/item/pattern_framed_livingwood.json diff --git a/src/main/resources/assets/botania/models/item/pink_petal.json b/src/generated/resources/assets/botania/models/item/pink_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/pink_petal.json rename to src/generated/resources/assets/botania/models/item/pink_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/pink_petal.json +++ b/src/generated/resources/assets/botania/models/item/pink_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pink_petal_block.json b/src/generated/resources/assets/botania/models/item/pink_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/pink_petal_block.json rename to src/generated/resources/assets/botania/models/item/pink_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/pink_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/pink_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/piston_relay.json b/src/generated/resources/assets/botania/models/item/piston_relay.json similarity index 95% rename from src/main/resources/assets/botania/models/item/piston_relay.json rename to src/generated/resources/assets/botania/models/item/piston_relay.json index c9a1b3dcc..5900aadcf 100644 --- a/src/main/resources/assets/botania/models/item/piston_relay.json +++ b/src/generated/resources/assets/botania/models/item/piston_relay.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/piston_relay" +{ + "parent": "botania:block/piston_relay" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/prism.json b/src/generated/resources/assets/botania/models/item/prism.json similarity index 94% rename from src/main/resources/assets/botania/models/item/prism.json rename to src/generated/resources/assets/botania/models/item/prism.json index 7d4dc00ea..89266beb5 100644 --- a/src/main/resources/assets/botania/models/item/prism.json +++ b/src/generated/resources/assets/botania/models/item/prism.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/prism" +{ + "parent": "botania:block/prism" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/pump.json b/src/generated/resources/assets/botania/models/item/pump.json new file mode 100644 index 000000000..ec55ea204 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/pump.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/pump" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_petal.json b/src/generated/resources/assets/botania/models/item/purple_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/purple_petal.json rename to src/generated/resources/assets/botania/models/item/purple_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/purple_petal.json +++ b/src/generated/resources/assets/botania/models/item/purple_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_petal_block.json b/src/generated/resources/assets/botania/models/item/purple_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/purple_petal_block.json rename to src/generated/resources/assets/botania/models/item/purple_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/purple_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/purple_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_pavement.json b/src/generated/resources/assets/botania/models/item/red_pavement.json similarity index 95% rename from src/main/resources/assets/botania/models/item/red_pavement.json rename to src/generated/resources/assets/botania/models/item/red_pavement.json index 013a31fb5..299265e26 100644 --- a/src/main/resources/assets/botania/models/item/red_pavement.json +++ b/src/generated/resources/assets/botania/models/item/red_pavement.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_pavement" +{ + "parent": "botania:block/red_pavement" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_pavement_slab.json b/src/generated/resources/assets/botania/models/item/red_pavement_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/red_pavement_slab.json rename to src/generated/resources/assets/botania/models/item/red_pavement_slab.json index ebec03967..f56dd9220 100644 --- a/src/main/resources/assets/botania/models/item/red_pavement_slab.json +++ b/src/generated/resources/assets/botania/models/item/red_pavement_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_pavement_slab" +{ + "parent": "botania:block/red_pavement_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_pavement_stairs.json b/src/generated/resources/assets/botania/models/item/red_pavement_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/red_pavement_stairs.json rename to src/generated/resources/assets/botania/models/item/red_pavement_stairs.json index e1f8c7f93..362e584c3 100644 --- a/src/main/resources/assets/botania/models/item/red_pavement_stairs.json +++ b/src/generated/resources/assets/botania/models/item/red_pavement_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_pavement_stairs" -} +{ + "parent": "botania:block/red_pavement_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_petal.json b/src/generated/resources/assets/botania/models/item/red_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/red_petal.json rename to src/generated/resources/assets/botania/models/item/red_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/red_petal.json +++ b/src/generated/resources/assets/botania/models/item/red_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_petal_block.json b/src/generated/resources/assets/botania/models/item/red_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/red_petal_block.json rename to src/generated/resources/assets/botania/models/item/red_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/red_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/red_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_quartz.json b/src/generated/resources/assets/botania/models/item/red_quartz.json similarity index 95% rename from src/main/resources/assets/botania/models/item/red_quartz.json rename to src/generated/resources/assets/botania/models/item/red_quartz.json index df0eed000..3e08d7df7 100644 --- a/src/main/resources/assets/botania/models/item/red_quartz.json +++ b/src/generated/resources/assets/botania/models/item/red_quartz.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_quartz" +{ + "parent": "botania:block/red_quartz" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_quartz_pillar.json b/src/generated/resources/assets/botania/models/item/red_quartz_pillar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/red_quartz_pillar.json rename to src/generated/resources/assets/botania/models/item/red_quartz_pillar.json diff --git a/src/main/resources/assets/botania/models/item/red_quartz_slab.json b/src/generated/resources/assets/botania/models/item/red_quartz_slab.json similarity index 95% rename from src/main/resources/assets/botania/models/item/red_quartz_slab.json rename to src/generated/resources/assets/botania/models/item/red_quartz_slab.json index 49cb0b327..8a2bf23d8 100644 --- a/src/main/resources/assets/botania/models/item/red_quartz_slab.json +++ b/src/generated/resources/assets/botania/models/item/red_quartz_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_quartz_slab" +{ + "parent": "botania:block/red_quartz_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_quartz_stairs.json b/src/generated/resources/assets/botania/models/item/red_quartz_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/red_quartz_stairs.json rename to src/generated/resources/assets/botania/models/item/red_quartz_stairs.json index 634c27bd0..e82b78cb6 100644 --- a/src/main/resources/assets/botania/models/item/red_quartz_stairs.json +++ b/src/generated/resources/assets/botania/models/item/red_quartz_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/red_quartz_stairs" -} +{ + "parent": "botania:block/red_quartz_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redstone_spreader.json b/src/generated/resources/assets/botania/models/item/redstone_spreader.json similarity index 53% rename from src/main/resources/assets/botania/models/item/redstone_spreader.json rename to src/generated/resources/assets/botania/models/item/redstone_spreader.json index 0b08131c2..2783a1172 100644 --- a/src/main/resources/assets/botania/models/item/redstone_spreader.json +++ b/src/generated/resources/assets/botania/models/item/redstone_spreader.json @@ -1,8 +1,8 @@ -{ - "parent": "botania:block/shapes/spreader_item", - "textures": { - "inside": "botania:block/redstone_spreader_inside", - "side": "botania:block/redstone_spreader_side", - "material": "botania:block/livingwood" - } -} +{ + "parent": "botania:block/shapes/spreader_item", + "textures": { + "side": "botania:block/redstone_spreader_side", + "material": "botania:block/livingwood", + "inside": "botania:block/redstone_spreader_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/root.json b/src/generated/resources/assets/botania/models/item/root.json similarity index 100% rename from src/main/resources/assets/botania/models/item/root.json rename to src/generated/resources/assets/botania/models/item/root.json diff --git a/src/main/resources/assets/botania/models/item/runic_altar.json b/src/generated/resources/assets/botania/models/item/runic_altar.json similarity index 95% rename from src/main/resources/assets/botania/models/item/runic_altar.json rename to src/generated/resources/assets/botania/models/item/runic_altar.json index 72b86eb1d..942906288 100644 --- a/src/main/resources/assets/botania/models/item/runic_altar.json +++ b/src/generated/resources/assets/botania/models/item/runic_altar.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/runic_altar" +{ + "parent": "botania:block/runic_altar" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/scorched_grass.json b/src/generated/resources/assets/botania/models/item/scorched_grass.json similarity index 95% rename from src/main/resources/assets/botania/models/item/scorched_grass.json rename to src/generated/resources/assets/botania/models/item/scorched_grass.json index 28387e912..8691b7329 100644 --- a/src/main/resources/assets/botania/models/item/scorched_grass.json +++ b/src/generated/resources/assets/botania/models/item/scorched_grass.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/scorched_grass" +{ + "parent": "botania:block/scorched_grass" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shimmerrock.json b/src/generated/resources/assets/botania/models/item/shimmerrock.json similarity index 95% rename from src/main/resources/assets/botania/models/item/shimmerrock.json rename to src/generated/resources/assets/botania/models/item/shimmerrock.json index cc694a684..1ef67b881 100644 --- a/src/main/resources/assets/botania/models/item/shimmerrock.json +++ b/src/generated/resources/assets/botania/models/item/shimmerrock.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/shimmerrock" +{ + "parent": "botania:block/shimmerrock" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shimmerrock_slab.json b/src/generated/resources/assets/botania/models/item/shimmerrock_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/shimmerrock_slab.json rename to src/generated/resources/assets/botania/models/item/shimmerrock_slab.json index 4020fd26f..d66ee8d99 100644 --- a/src/main/resources/assets/botania/models/item/shimmerrock_slab.json +++ b/src/generated/resources/assets/botania/models/item/shimmerrock_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/shimmerrock_slab" +{ + "parent": "botania:block/shimmerrock_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shimmerrock_stairs.json b/src/generated/resources/assets/botania/models/item/shimmerrock_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/shimmerrock_stairs.json rename to src/generated/resources/assets/botania/models/item/shimmerrock_stairs.json index 21d3b3843..231a6ea51 100644 --- a/src/main/resources/assets/botania/models/item/shimmerrock_stairs.json +++ b/src/generated/resources/assets/botania/models/item/shimmerrock_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/shimmerrock_stairs" -} +{ + "parent": "botania:block/shimmerrock_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shimmerwood_planks.json b/src/generated/resources/assets/botania/models/item/shimmerwood_planks.json similarity index 96% rename from src/main/resources/assets/botania/models/item/shimmerwood_planks.json rename to src/generated/resources/assets/botania/models/item/shimmerwood_planks.json index ff12b2b24..4dcd358fa 100644 --- a/src/main/resources/assets/botania/models/item/shimmerwood_planks.json +++ b/src/generated/resources/assets/botania/models/item/shimmerwood_planks.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/shimmerwood_planks" +{ + "parent": "botania:block/shimmerwood_planks" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shimmerwood_planks_slab.json b/src/generated/resources/assets/botania/models/item/shimmerwood_planks_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/shimmerwood_planks_slab.json rename to src/generated/resources/assets/botania/models/item/shimmerwood_planks_slab.json index f132cc42a..591e8ba8f 100644 --- a/src/main/resources/assets/botania/models/item/shimmerwood_planks_slab.json +++ b/src/generated/resources/assets/botania/models/item/shimmerwood_planks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/shimmerwood_planks_slab" +{ + "parent": "botania:block/shimmerwood_planks_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shimmerwood_planks_stairs.json b/src/generated/resources/assets/botania/models/item/shimmerwood_planks_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/shimmerwood_planks_stairs.json rename to src/generated/resources/assets/botania/models/item/shimmerwood_planks_stairs.json index 5cc5cc9b9..af9850882 100644 --- a/src/main/resources/assets/botania/models/item/shimmerwood_planks_stairs.json +++ b/src/generated/resources/assets/botania/models/item/shimmerwood_planks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/shimmerwood_planks_stairs" -} +{ + "parent": "botania:block/shimmerwood_planks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spark_changer.json b/src/generated/resources/assets/botania/models/item/spark_changer.json similarity index 95% rename from src/main/resources/assets/botania/models/item/spark_changer.json rename to src/generated/resources/assets/botania/models/item/spark_changer.json index f9d9b9229..a01b574d6 100644 --- a/src/main/resources/assets/botania/models/item/spark_changer.json +++ b/src/generated/resources/assets/botania/models/item/spark_changer.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/spark_changer" +{ + "parent": "botania:block/spark_changer" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spawner_claw.json b/src/generated/resources/assets/botania/models/item/spawner_claw.json similarity index 95% rename from src/main/resources/assets/botania/models/item/spawner_claw.json rename to src/generated/resources/assets/botania/models/item/spawner_claw.json index 387373246..5bf1cac15 100644 --- a/src/main/resources/assets/botania/models/item/spawner_claw.json +++ b/src/generated/resources/assets/botania/models/item/spawner_claw.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/spawner_claw" +{ + "parent": "botania:block/spawner_claw" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spectral_platform.json b/src/generated/resources/assets/botania/models/item/spectral_platform.json similarity index 96% rename from src/main/resources/assets/botania/models/item/spectral_platform.json rename to src/generated/resources/assets/botania/models/item/spectral_platform.json index d19e1abb4..5d81e26b2 100644 --- a/src/main/resources/assets/botania/models/item/spectral_platform.json +++ b/src/generated/resources/assets/botania/models/item/spectral_platform.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/spectral_platform" +{ + "parent": "botania:block/spectral_platform" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/starfield.json b/src/generated/resources/assets/botania/models/item/starfield.json similarity index 95% rename from src/main/resources/assets/botania/models/item/starfield.json rename to src/generated/resources/assets/botania/models/item/starfield.json index b8103a680..ee7035612 100644 --- a/src/main/resources/assets/botania/models/item/starfield.json +++ b/src/generated/resources/assets/botania/models/item/starfield.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/starfield" +{ + "parent": "botania:block/starfield" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sunny_quartz.json b/src/generated/resources/assets/botania/models/item/sunny_quartz.json similarity index 95% rename from src/main/resources/assets/botania/models/item/sunny_quartz.json rename to src/generated/resources/assets/botania/models/item/sunny_quartz.json index 5e2f0e5f4..3ff4850c5 100644 --- a/src/main/resources/assets/botania/models/item/sunny_quartz.json +++ b/src/generated/resources/assets/botania/models/item/sunny_quartz.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/sunny_quartz" +{ + "parent": "botania:block/sunny_quartz" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sunny_quartz_pillar.json b/src/generated/resources/assets/botania/models/item/sunny_quartz_pillar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/sunny_quartz_pillar.json rename to src/generated/resources/assets/botania/models/item/sunny_quartz_pillar.json diff --git a/src/main/resources/assets/botania/models/item/sunny_quartz_slab.json b/src/generated/resources/assets/botania/models/item/sunny_quartz_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/sunny_quartz_slab.json rename to src/generated/resources/assets/botania/models/item/sunny_quartz_slab.json index c665374fa..8cb426518 100644 --- a/src/main/resources/assets/botania/models/item/sunny_quartz_slab.json +++ b/src/generated/resources/assets/botania/models/item/sunny_quartz_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/sunny_quartz_slab" +{ + "parent": "botania:block/sunny_quartz_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sunny_quartz_stairs.json b/src/generated/resources/assets/botania/models/item/sunny_quartz_stairs.json similarity index 90% rename from src/main/resources/assets/botania/models/item/sunny_quartz_stairs.json rename to src/generated/resources/assets/botania/models/item/sunny_quartz_stairs.json index 5641bc7d4..43b190267 100644 --- a/src/main/resources/assets/botania/models/item/sunny_quartz_stairs.json +++ b/src/generated/resources/assets/botania/models/item/sunny_quartz_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/sunny_quartz_stairs" -} +{ + "parent": "botania:block/sunny_quartz_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terra_plate.json b/src/generated/resources/assets/botania/models/item/terra_plate.json similarity index 95% rename from src/main/resources/assets/botania/models/item/terra_plate.json rename to src/generated/resources/assets/botania/models/item/terra_plate.json index b66a72f2d..dd6a18f0a 100644 --- a/src/main/resources/assets/botania/models/item/terra_plate.json +++ b/src/generated/resources/assets/botania/models/item/terra_plate.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/terra_plate" +{ + "parent": "botania:block/terra_plate" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteel_block.json b/src/generated/resources/assets/botania/models/item/terrasteel_block.json similarity index 96% rename from src/main/resources/assets/botania/models/item/terrasteel_block.json rename to src/generated/resources/assets/botania/models/item/terrasteel_block.json index f7e9afb63..5aa363221 100644 --- a/src/main/resources/assets/botania/models/item/terrasteel_block.json +++ b/src/generated/resources/assets/botania/models/item/terrasteel_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/terrasteel_block" +{ + "parent": "botania:block/terrasteel_block" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/teru_teru_bozu.json b/src/generated/resources/assets/botania/models/item/teru_teru_bozu.json new file mode 100644 index 000000000..eae24b9b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/teru_teru_bozu.json @@ -0,0 +1,82 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ + 30, + 45, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "fixed": { + "rotation": [ + 0, + 180, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 75, + 315, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 315, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tiny_planet_block.json b/src/generated/resources/assets/botania/models/item/tiny_planet_block.json similarity index 96% rename from src/main/resources/assets/botania/models/item/tiny_planet_block.json rename to src/generated/resources/assets/botania/models/item/tiny_planet_block.json index c8a964556..0cdec7a07 100644 --- a/src/main/resources/assets/botania/models/item/tiny_planet_block.json +++ b/src/generated/resources/assets/botania/models/item/tiny_planet_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/tiny_planet_block" +{ + "parent": "botania:block/tiny_planet_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tiny_potato.json b/src/generated/resources/assets/botania/models/item/tiny_potato.json similarity index 95% rename from src/main/resources/assets/botania/models/item/tiny_potato.json rename to src/generated/resources/assets/botania/models/item/tiny_potato.json index f839aad9d..cc8d19818 100644 --- a/src/main/resources/assets/botania/models/item/tiny_potato.json +++ b/src/generated/resources/assets/botania/models/item/tiny_potato.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/tiny_potato" +{ + "parent": "botania:block/tiny_potato" } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/toggle_light_relay.json b/src/generated/resources/assets/botania/models/item/toggle_light_relay.json new file mode 100644 index 000000000..0fc95c686 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/toggle_light_relay.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/toggle_light_relay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/turntable.json b/src/generated/resources/assets/botania/models/item/turntable.json similarity index 95% rename from src/main/resources/assets/botania/models/item/turntable.json rename to src/generated/resources/assets/botania/models/item/turntable.json index a79a59674..12a8b8375 100644 --- a/src/main/resources/assets/botania/models/item/turntable.json +++ b/src/generated/resources/assets/botania/models/item/turntable.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/turntable" +{ + "parent": "botania:block/turntable" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vivid_grass.json b/src/generated/resources/assets/botania/models/item/vivid_grass.json similarity index 95% rename from src/main/resources/assets/botania/models/item/vivid_grass.json rename to src/generated/resources/assets/botania/models/item/vivid_grass.json index 5bcedfb38..0110a4263 100644 --- a/src/main/resources/assets/botania/models/item/vivid_grass.json +++ b/src/generated/resources/assets/botania/models/item/vivid_grass.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/vivid_grass" +{ + "parent": "botania:block/vivid_grass" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_pavement.json b/src/generated/resources/assets/botania/models/item/white_pavement.json similarity index 95% rename from src/main/resources/assets/botania/models/item/white_pavement.json rename to src/generated/resources/assets/botania/models/item/white_pavement.json index 71c7a2a46..448f9f0e1 100644 --- a/src/main/resources/assets/botania/models/item/white_pavement.json +++ b/src/generated/resources/assets/botania/models/item/white_pavement.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/white_pavement" +{ + "parent": "botania:block/white_pavement" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_pavement_slab.json b/src/generated/resources/assets/botania/models/item/white_pavement_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/white_pavement_slab.json rename to src/generated/resources/assets/botania/models/item/white_pavement_slab.json index 63b7d8c7b..0461b1359 100644 --- a/src/main/resources/assets/botania/models/item/white_pavement_slab.json +++ b/src/generated/resources/assets/botania/models/item/white_pavement_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/white_pavement_slab" +{ + "parent": "botania:block/white_pavement_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_pavement_stairs.json b/src/generated/resources/assets/botania/models/item/white_pavement_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/white_pavement_stairs.json rename to src/generated/resources/assets/botania/models/item/white_pavement_stairs.json index b3fbd1fba..99717e68b 100644 --- a/src/main/resources/assets/botania/models/item/white_pavement_stairs.json +++ b/src/generated/resources/assets/botania/models/item/white_pavement_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/white_pavement_stairs" -} +{ + "parent": "botania:block/white_pavement_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_petal.json b/src/generated/resources/assets/botania/models/item/white_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/white_petal.json rename to src/generated/resources/assets/botania/models/item/white_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/white_petal.json +++ b/src/generated/resources/assets/botania/models/item/white_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_petal_block.json b/src/generated/resources/assets/botania/models/item/white_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/white_petal_block.json rename to src/generated/resources/assets/botania/models/item/white_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/white_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/white_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_pavement.json b/src/generated/resources/assets/botania/models/item/yellow_pavement.json similarity index 95% rename from src/main/resources/assets/botania/models/item/yellow_pavement.json rename to src/generated/resources/assets/botania/models/item/yellow_pavement.json index 22d83cf65..d42cb9c53 100644 --- a/src/main/resources/assets/botania/models/item/yellow_pavement.json +++ b/src/generated/resources/assets/botania/models/item/yellow_pavement.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/yellow_pavement" +{ + "parent": "botania:block/yellow_pavement" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_pavement_slab.json b/src/generated/resources/assets/botania/models/item/yellow_pavement_slab.json similarity index 96% rename from src/main/resources/assets/botania/models/item/yellow_pavement_slab.json rename to src/generated/resources/assets/botania/models/item/yellow_pavement_slab.json index 9bcb680b9..6d8c95e6f 100644 --- a/src/main/resources/assets/botania/models/item/yellow_pavement_slab.json +++ b/src/generated/resources/assets/botania/models/item/yellow_pavement_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/yellow_pavement_slab" +{ + "parent": "botania:block/yellow_pavement_slab" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_pavement_stairs.json b/src/generated/resources/assets/botania/models/item/yellow_pavement_stairs.json similarity index 91% rename from src/main/resources/assets/botania/models/item/yellow_pavement_stairs.json rename to src/generated/resources/assets/botania/models/item/yellow_pavement_stairs.json index d4e80187b..55451ecc4 100644 --- a/src/main/resources/assets/botania/models/item/yellow_pavement_stairs.json +++ b/src/generated/resources/assets/botania/models/item/yellow_pavement_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/yellow_pavement_stairs" -} +{ + "parent": "botania:block/yellow_pavement_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_petal.json b/src/generated/resources/assets/botania/models/item/yellow_petal.json similarity index 57% rename from src/main/resources/assets/botania/models/item/yellow_petal.json rename to src/generated/resources/assets/botania/models/item/yellow_petal.json index 4e750bde0..0557d5a65 100644 --- a/src/main/resources/assets/botania/models/item/yellow_petal.json +++ b/src/generated/resources/assets/botania/models/item/yellow_petal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "item/generated", "textures": { "layer0": "botania:item/petal" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_petal_block.json b/src/generated/resources/assets/botania/models/item/yellow_petal_block.json similarity index 95% rename from src/main/resources/assets/botania/models/item/yellow_petal_block.json rename to src/generated/resources/assets/botania/models/item/yellow_petal_block.json index cd679de07..f8bb788c2 100644 --- a/src/main/resources/assets/botania/models/item/yellow_petal_block.json +++ b/src/generated/resources/assets/botania/models/item/yellow_petal_block.json @@ -1,3 +1,3 @@ -{ - "parent": "botania:block/petal_block" +{ + "parent": "botania:block/petal_block" } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 699ec2bb5..c1638730c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -43,9 +43,9 @@ public class MiscellaneousIcons { public TextureAtlasSprite alfPortalTex, lightRelayWorldIcon, - lightRelayWorldIconRed, - lightRelayWorldIconGreen, - lightRelayWorldIconPurple, + lightRelayDetectorWorldIcon, + lightRelayForkWorldIcon, + lightRelayToggleWorldIcon, alchemyCatalystOverlay, conjurationCatalystOverlay, enchanterOverlay, @@ -197,10 +197,6 @@ public class MiscellaneousIcons { evt.addSprite(prefix("block/alfheim_portal_swirl")); evt.addSprite(prefix("block/alfheim_portal_swirl")); - evt.addSprite(prefix("block/luminizer")); - evt.addSprite(prefix("block/luminizer_detector")); - evt.addSprite(prefix("block/luminizer_fork")); - evt.addSprite(prefix("block/luminizer_toggle")); evt.addSprite(prefix("block/alchemy_catalyst_overlay")); evt.addSprite(prefix("block/conjuration_catalyst_overlay")); evt.addSprite(prefix("block/enchanter_overlay")); @@ -234,10 +230,10 @@ public class MiscellaneousIcons { } alfPortalTex = get(evt.getMap(), "block/alfheim_portal_swirl"); - lightRelayWorldIcon = get(evt.getMap(), "block/luminizer"); - lightRelayWorldIconRed = get(evt.getMap(), "block/luminizer_detector"); - lightRelayWorldIconGreen = get(evt.getMap(), "block/luminizer_fork"); - lightRelayWorldIconPurple = get(evt.getMap(), "block/luminizer_toggle"); + lightRelayWorldIcon = get(evt.getMap(), "block/light_relay"); + lightRelayDetectorWorldIcon = get(evt.getMap(), "block/detector_light_relay"); + lightRelayForkWorldIcon = get(evt.getMap(), "block/fork_light_relay"); + lightRelayToggleWorldIcon = get(evt.getMap(), "block/toggle_light_relay"); alchemyCatalystOverlay = get(evt.getMap(), "block/alchemy_catalyst_overlay"); conjurationCatalystOverlay = get(evt.getMap(), "block/conjuration_catalyst_overlay"); enchanterOverlay = get(evt.getMap(), "block/enchanter_overlay"); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 5f2936446..086c4c638 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -270,6 +270,7 @@ public class ClientProxy implements IProxy { RenderTypeLookup.setRenderLayer(ModBlocks.ghostRail, RenderType.getCutout()); RenderTypeLookup.setRenderLayer(ModBlocks.solidVines, RenderType.getCutout()); + RenderTypeLookup.setRenderLayer(ModBlocks.corporeaCrystalCube, RenderType.getTranslucent()); RenderTypeLookup.setRenderLayer(ModBlocks.manaGlass, RenderType.getTranslucent()); RenderTypeLookup.setRenderLayer(ModFluffBlocks.managlassPane, RenderType.getTranslucent()); RenderTypeLookup.setRenderLayer(ModBlocks.elfGlass, RenderType.getTranslucent()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 79d786d16..1f7070ccf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -50,9 +50,9 @@ public class RenderTileLightRelay extends TileEntityRenderer { Minecraft mc = Minecraft.getInstance(); if (sprites.isEmpty()) { sprites.put(LuminizerVariant.DEFAULT, MiscellaneousIcons.INSTANCE.lightRelayWorldIcon); - sprites.put(LuminizerVariant.DETECTOR, MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed); - sprites.put(LuminizerVariant.FORK, MiscellaneousIcons.INSTANCE.lightRelayWorldIconGreen); - sprites.put(LuminizerVariant.TOGGLE, MiscellaneousIcons.INSTANCE.lightRelayWorldIconPurple); + sprites.put(LuminizerVariant.DETECTOR, MiscellaneousIcons.INSTANCE.lightRelayDetectorWorldIcon); + sprites.put(LuminizerVariant.FORK, MiscellaneousIcons.INSTANCE.lightRelayForkWorldIcon); + sprites.put(LuminizerVariant.TOGGLE, MiscellaneousIcons.INSTANCE.lightRelayToggleWorldIcon); } TextureAtlasSprite iicon = sprites.get(((BlockLightRelay) state.getBlock()).variant); diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 5157eafc6..cab72764c 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -226,20 +226,20 @@ public class BlockstateProvider extends BlockStateProvider { particleOnly(remainingBlocks, bellows, prefix("block/livingwood")); particleOnly(remainingBlocks, brewery, prefix("block/livingrock")); particleOnly(remainingBlocks, corporeaIndex, prefix("block/elementium_block")); - particleOnly(remainingBlocks, lightRelayDetector, prefix("block/luminizer_detector")); + particleOnly(remainingBlocks, lightRelayDetector, prefix("block/detector_light_relay")); simpleBlock(fakeAir, models().getBuilder(Registry.BLOCK.getKey(ModBlocks.fakeAir).getPath())); remainingBlocks.remove(fakeAir); - particleOnly(remainingBlocks, lightRelayFork, prefix("block/luminizer_fork")); + particleOnly(remainingBlocks, lightRelayFork, prefix("block/fork_light_relay")); particleOnly(remainingBlocks, gaiaHead, new ResourceLocation("block/soul_sand")); particleOnly(remainingBlocks, gaiaHeadWall, new ResourceLocation("block/soul_sand")); particleOnly(remainingBlocks, gaiaPylon, prefix("block/elementium_block")); particleOnly(remainingBlocks, hourglass, prefix("block/mana_glass")); - particleOnly(remainingBlocks, lightRelayDefault, prefix("block/luminizer")); + particleOnly(remainingBlocks, lightRelayDefault, prefix("block/light_relay")); particleOnly(remainingBlocks, manaFlame, new ResourceLocation("block/fire_0")); particleOnly(remainingBlocks, manaPylon, prefix("block/manasteel_block")); particleOnly(remainingBlocks, naturaPylon, prefix("block/terrasteel_block")); particleOnly(remainingBlocks, teruTeruBozu, new ResourceLocation("block/white_wool")); - particleOnly(remainingBlocks, lightRelayToggle, prefix("block/luminizer_toggle")); + particleOnly(remainingBlocks, lightRelayToggle, prefix("block/toggle_light_relay")); // Block groups Predicate flowers = b -> b instanceof BlockSpecialFlower @@ -465,8 +465,9 @@ public class BlockstateProvider extends BlockStateProvider { blocks.remove(b); } + // ? extends T technically not correct, but is more convenient in ItemModelProvider @SafeVarargs - private static Iterable takeAll(Set src, T... items) { + public static Collection takeAll(Set src, T... items) { List ret = Arrays.asList(items); if (!src.removeAll(ret)) { Botania.LOGGER.warn("takeAll array didn't yield anything ({})", Arrays.toString(items)); @@ -474,7 +475,7 @@ public class BlockstateProvider extends BlockStateProvider { return ret; } - private static Iterable takeAll(Set src, Predicate pred) { + public static Collection takeAll(Set src, Predicate pred) { List ret = new ArrayList<>(); Iterator iter = src.iterator(); diff --git a/src/main/java/vazkii/botania/data/ItemModelProvider.java b/src/main/java/vazkii/botania/data/ItemModelProvider.java index dcd466c00..5fd680746 100644 --- a/src/main/java/vazkii/botania/data/ItemModelProvider.java +++ b/src/main/java/vazkii/botania/data/ItemModelProvider.java @@ -9,23 +9,38 @@ package vazkii.botania.data; import net.minecraft.block.Block; +import net.minecraft.block.FenceBlock; +import net.minecraft.block.PaneBlock; +import net.minecraft.block.WallBlock; import net.minecraft.data.DataGenerator; import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.client.model.generators.ExistingFileHelper; -import vazkii.botania.common.block.BlockModDoubleFlower; -import vazkii.botania.common.block.BlockModFlower; -import vazkii.botania.common.block.BlockSpecialFlower; +import net.minecraftforge.client.model.generators.ModelBuilder; +import net.minecraftforge.client.model.generators.ModelFile; +import vazkii.botania.common.block.*; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.BlockModMushroom; +import vazkii.botania.common.block.decor.BlockPetalBlock; import vazkii.botania.common.block.decor.BlockShinyFlower; +import vazkii.botania.common.block.mana.BlockPool; +import vazkii.botania.common.block.mana.BlockSpreader; import vazkii.botania.common.block.string.BlockRedString; +import vazkii.botania.common.item.material.ItemPetal; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; +import static vazkii.botania.data.BlockstateProvider.takeAll; public class ItemModelProvider extends net.minecraftforge.client.model.generators.ItemModelProvider { public ItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { @@ -34,22 +49,143 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator @Override protected void registerModels() { - Registry.ITEM.stream().filter(i -> LibMisc.MOD_ID.equals(Registry.ITEM.getKey(i).getNamespace())) - .forEach(i -> { - // todo 1.15 expand to all item models that simply reference their parent - if (i instanceof BlockItem) { - Block b = ((BlockItem) i).getBlock(); - String name = Registry.ITEM.getKey(i).getPath(); - if (b instanceof BlockSpecialFlower || b instanceof BlockModMushroom - || b instanceof BlockModFlower) { - withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name)); - } else if (b instanceof BlockFloatingFlower || b instanceof BlockRedString) { - withExistingParent(name, prefix("block/" + name)); - } else if (b instanceof BlockModDoubleFlower) { - withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name + "_top")); - } - } - }); + Set items = Registry.ITEM.stream().filter(i -> LibMisc.MOD_ID.equals(Registry.ITEM.getKey(i).getNamespace())) + .collect(Collectors.toSet()); + registerItemBlocks(takeAll(items, i -> i instanceof BlockItem).stream().map(i -> (BlockItem) i).collect(Collectors.toSet())); + } + + private void registerItemBlocks(Set itemBlocks) { + // Manually written + itemBlocks.remove(ModBlocks.corporeaCrystalCube.asItem()); + + String animatedTorchName = Registry.ITEM.getKey(ModBlocks.animatedTorch.asItem()).getPath(); + withExistingParent(animatedTorchName, "item/generated") + .texture("layer0", new ResourceLocation("block/redstone_torch")) + .texture("layer1", prefix("block/animated_torch_glimmer")); + itemBlocks.remove(ModBlocks.animatedTorch.asItem()); + + String gaiaHeadName = Registry.ITEM.getKey(ModBlocks.gaiaHead.asItem()).getPath(); + withExistingParent(gaiaHeadName, "item/template_skull"); + itemBlocks.remove(ModBlocks.gaiaHead.asItem()); + + takeAll(itemBlocks, i -> i.getBlock() instanceof BlockModDoubleFlower).forEach(i -> { + String name = Registry.ITEM.getKey(i).getPath(); + withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name + "_top")); + }); + + takeAll(itemBlocks, i -> i.getBlock() instanceof BlockPetalBlock).forEach(i -> { + String name = Registry.ITEM.getKey(i).getPath(); + withExistingParent(name, prefix("block/petal_block")); + }); + + takeAll(itemBlocks, i -> i.getBlock() instanceof PaneBlock).forEach(i -> { + String name = Registry.ITEM.getKey(i).getPath(); + String baseName = name.substring(0, name.length() - "_pane".length()); + withExistingParent(name, "item/generated") + .texture("layer0", prefix("block/" + baseName)); + }); + + Predicate defaultGenerated = i -> { + Block b = i.getBlock(); + return b instanceof BlockSpecialFlower || b instanceof BlockModMushroom + || b instanceof BlockLightRelay + || b instanceof BlockModFlower + || b == ModBlocks.ghostRail; + }; + takeAll(itemBlocks, defaultGenerated).forEach(i -> { + String name = Registry.ITEM.getKey(i).getPath(); + withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name)); + }); + + takeAll(itemBlocks, i -> i.getBlock() instanceof BlockPool).forEach(i -> { + String name = Registry.ITEM.getKey(i).getPath(); + withExistingParent(name, prefix("block/" + name)) + .override().predicate(prefix("full"), 1).model(getExistingFile(prefix("block/" + name + "_full"))).end(); + }); + + takeAll(itemBlocks, i -> i.getBlock() instanceof WallBlock).forEach(i -> { + String name = Registry.ITEM.getKey(i).getPath(); + String baseName = name.substring(0, name.length() - "_wall".length()); + withExistingParent(name, new ResourceLocation("block/wall_inventory")) + .texture("wall", prefix("block/" + baseName)); + }); + + takeAll(itemBlocks, i -> i.getBlock() instanceof BlockSpreader).forEach(i -> { + String name = Registry.ITEM.getKey(i).getPath(); + String material; + if (i.getBlock() == ModBlocks.elvenSpreader) { + material = "dreamwood"; + } else if (i.getBlock() == ModBlocks.gaiaSpreader) { + material = name + "_material"; + } else { + material = "livingwood"; + } + withExistingParent(name, prefix("block/shapes/spreader_item")) + .texture("side", prefix("block/" + name + "_side")) + .texture("material", prefix("block/" + material)) + .texture("inside", prefix("block/" + name + "_inside")); + }); + + takeAll(itemBlocks, ModBlocks.avatar.asItem(), ModBlocks.bellows.asItem(), + ModBlocks.brewery.asItem(), ModBlocks.corporeaIndex.asItem(), ModBlocks.gaiaPylon.asItem(), + ModBlocks.hourglass.asItem(), ModBlocks.manaPylon.asItem(), ModBlocks.naturaPylon.asItem(), ModBlocks.teruTeruBozu.asItem()) + .forEach(this::builtinEntity); + + takeAll(itemBlocks, i -> i instanceof ItemPetal).forEach(i -> { + String name = Registry.ITEM.getKey(i).getPath(); + withExistingParent(name, "item/generated").texture("layer0", prefix("item/petal")); + }); + + String dreamwoodFenceName = Registry.ITEM.getKey(ModFluffBlocks.dreamwoodFence.asItem()).getPath(); + withExistingParent(dreamwoodFenceName, "block/fence_inventory") + .texture("texture", prefix("block/dreamwood_planks")); + itemBlocks.remove(ModFluffBlocks.dreamwoodFence.asItem()); + + String livingwoodFenceName = Registry.ITEM.getKey(ModFluffBlocks.livingwoodFence.asItem()).getPath(); + withExistingParent(livingwoodFenceName, "block/fence_inventory") + .texture("texture", prefix("block/livingwood_planks")); + itemBlocks.remove(ModFluffBlocks.livingwoodFence.asItem()); + + String elfGlassName = Registry.ITEM.getKey(ModBlocks.elfGlass.asItem()).getPath(); + withExistingParent(elfGlassName, prefix("block/elf_glass_0")); + itemBlocks.remove(ModBlocks.elfGlass.asItem()); + + itemBlocks.forEach(i -> { + String name = Registry.ITEM.getKey(i).getPath(); + withExistingParent(name, prefix("block/" + name)); + }); + } + + private void builtinEntity(Item i) { + // [VanillaCopy] from item/chest.json + String name = Registry.ITEM.getKey(i).getPath(); + getBuilder(name).parent(new ModelFile.UncheckedModelFile("builtin/entity")) + .transforms() + .transform(ModelBuilder.Perspective.GUI) + .rotation(30, 45, 0) + .scale(0.625F) + .end() + .transform(ModelBuilder.Perspective.GROUND) + .translation(0, 3, 0) + .scale(0.25F) + .end() + .transform(ModelBuilder.Perspective.HEAD) + .rotation(0, 180, 0) + .end() + .transform(ModelBuilder.Perspective.FIXED) + .rotation(0, 180, 0) + .scale(0.5F) + .end() + .transform(ModelBuilder.Perspective.THIRDPERSON_RIGHT) + .rotation(75, 315, 0) + .translation(0, 2.5F, 0) + .scale(0.375F) + .end() + .transform(ModelBuilder.Perspective.FIRSTPERSON_RIGHT) + .rotation(0, 315, 0) + .scale(0.4F) + .end() + .end(); } @Nonnull diff --git a/src/main/resources/assets/botania/models/item/animated_torch.json b/src/main/resources/assets/botania/models/item/animated_torch.json deleted file mode 100644 index 64d126669..000000000 --- a/src/main/resources/assets/botania/models/item/animated_torch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "minecraft:block/redstone_torch", - "layer1": "botania:block/animated_torch_glimmer" - } -} diff --git a/src/main/resources/assets/botania/models/item/avatar.json b/src/main/resources/assets/botania/models/item/avatar.json deleted file mode 100644 index 4b66e09de..000000000 --- a/src/main/resources/assets/botania/models/item/avatar.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bellows.json b/src/main/resources/assets/botania/models/item/bellows.json deleted file mode 100644 index 3326413b3..000000000 --- a/src/main/resources/assets/botania/models/item/bellows.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bifrost_perm.json b/src/main/resources/assets/botania/models/item/bifrost_perm.json deleted file mode 100644 index b162fa2f5..000000000 --- a/src/main/resources/assets/botania/models/item/bifrost_perm.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/bifrost" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brewery.json b/src/main/resources/assets/botania/models/item/brewery.json deleted file mode 100644 index 3326413b3..000000000 --- a/src/main/resources/assets/botania/models/item/brewery.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporea_index.json b/src/main/resources/assets/botania/models/item/corporea_index.json deleted file mode 100644 index 3326413b3..000000000 --- a/src/main/resources/assets/botania/models/item/corporea_index.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/detector_light_relay.json b/src/main/resources/assets/botania/models/item/detector_light_relay.json deleted file mode 100644 index 830049eb2..000000000 --- a/src/main/resources/assets/botania/models/item/detector_light_relay.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/luminizer_detector" - } -} diff --git a/src/main/resources/assets/botania/models/item/fork_light_relay.json b/src/main/resources/assets/botania/models/item/fork_light_relay.json deleted file mode 100644 index 05123e7a7..000000000 --- a/src/main/resources/assets/botania/models/item/fork_light_relay.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/luminizer_fork" - } -} diff --git a/src/main/resources/assets/botania/models/item/gaia_pylon.json b/src/main/resources/assets/botania/models/item/gaia_pylon.json deleted file mode 100644 index 3326413b3..000000000 --- a/src/main/resources/assets/botania/models/item/gaia_pylon.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/hourglass.json b/src/main/resources/assets/botania/models/item/hourglass.json deleted file mode 100644 index 3326413b3..000000000 --- a/src/main/resources/assets/botania/models/item/hourglass.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_pylon.json b/src/main/resources/assets/botania/models/item/mana_pylon.json deleted file mode 100644 index 3326413b3..000000000 --- a/src/main/resources/assets/botania/models/item/mana_pylon.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manadiamondchunk.json b/src/main/resources/assets/botania/models/item/manadiamondchunk.json deleted file mode 100644 index 331ba0f66..000000000 --- a/src/main/resources/assets/botania/models/item/manadiamondchunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:item/mana_diamond_chunk" - } -} diff --git a/src/main/resources/assets/botania/models/item/manapearlshard.json b/src/main/resources/assets/botania/models/item/manapearlshard.json deleted file mode 100644 index 0304d73e5..000000000 --- a/src/main/resources/assets/botania/models/item/manapearlshard.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:item/mana_pearl_shard" - } -} diff --git a/src/main/resources/assets/botania/models/item/natura_pylon.json b/src/main/resources/assets/botania/models/item/natura_pylon.json deleted file mode 100644 index 3326413b3..000000000 --- a/src/main/resources/assets/botania/models/item/natura_pylon.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pump.json b/src/main/resources/assets/botania/models/item/pump.json deleted file mode 100644 index 33f97f7be..000000000 --- a/src/main/resources/assets/botania/models/item/pump.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "Comment0": "Combination of block/pump and block/pump_head", - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "minecraft:block/block", - "textures": { - "structure": "botania:block/pump_structure", - "head_sheet": "botania:block/pump_head_sheet", - "particle": "botania:block/livingrock" - }, - "elements": [ - { - "Comment": "end_east", - "from": [ 4, 0, 14 ], - "to": [ 12, 8, 16 ], - "faces": { - "down": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure" }, - "up": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure" }, - "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#structure" }, - "south": { "uv": [ 0, 0, 8, 8 ], "texture": "#structure" }, - "west": { "uv": [ 8, 2, 16, 0 ], "texture": "#structure", "rotation": 90 }, - "east": { "uv": [ 8, 0, 16, 2 ], "texture": "#structure", "rotation": 90 } - } - }, - { - "Comment": "end_west", - "from": [ 4, 0, 0 ], - "to": [ 12, 8, 2 ], - "faces": { - "down": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure" }, - "up": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure" }, - "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#structure" }, - "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#structure" }, - "west": { "uv": [ 8, 4, 16, 2 ], "texture": "#structure", "rotation": 90 }, - "east": { "uv": [ 8, 2, 16, 4 ], "texture": "#structure", "rotation": 90 } - } - }, - { - "Comment": "tube", - "from": [ 6, 2, 2 ], - "to": [ 10, 6, 10 ], - "faces": { - "down": { "uv": [ 12, 8, 16, 16 ], "texture": "#structure" }, - "up": { "uv": [ 12, 8, 16, 16 ], "texture": "#structure" }, - "north": { "uv": [ 8, 12, 12, 16 ], "texture": "#structure" }, - "south": { "uv": [ 8, 8, 12, 12 ], "texture": "#structure" }, - "west": { "uv": [ 8, 4, 16, 8 ], "texture": "#structure" }, - "east": { "uv": [ 8, 4, 16, 8 ], "texture": "#structure" } - } - }, - { - "Comment": "sheet", - "from": [ 4, 0, 10 ], - "to": [ 12, 8, 14 ], - "faces": { - "down": { "uv": [ 8, 4, 16, 8 ], "texture": "#head_sheet" }, - "up": { "uv": [ 8, 0, 16, 4 ], "texture": "#head_sheet" }, - "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#head_sheet" }, - "south": { "uv": [ 0, 0, 8, 8 ], "texture": "#head_sheet" }, - "west": { "uv": [ 8, 8, 16, 4 ], "texture": "#head_sheet", "rotation": 90 }, - "east": { "uv": [ 8, 4, 16, 8 ], "texture": "#head_sheet", "rotation": 90 } - } - }, - { - "Comment": "head", - "from": [ 5, 1, 2 ], - "to": [ 11, 7, 6 ], - "faces": { - "down": { "uv": [ 6, 8, 12, 12 ], "texture": "#head_sheet" }, - "up": { "uv": [ 6, 8, 12, 12 ], "texture": "#head_sheet" }, - "north": { "uv": [ 0, 8, 6, 14 ], "texture": "#head_sheet" }, - "south": { "uv": [ 0, 8, 6, 14 ], "texture": "#head_sheet" }, - "west": { "uv": [ 6, 12, 12, 8 ], "texture": "#head_sheet", "rotation": 90 }, - "east": { "uv": [ 6, 8, 12, 12 ], "texture": "#head_sheet", "rotation": 90 } - } - } - ] -} diff --git a/src/main/resources/assets/botania/models/item/teru_teru_bozu.json b/src/main/resources/assets/botania/models/item/teru_teru_bozu.json deleted file mode 100644 index c3fec2d6f..000000000 --- a/src/main/resources/assets/botania/models/item/teru_teru_bozu.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "builtin/entity", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0], - "scale":[ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/toggle_light_relay.json b/src/main/resources/assets/botania/models/item/toggle_light_relay.json deleted file mode 100644 index 2be527478..000000000 --- a/src/main/resources/assets/botania/models/item/toggle_light_relay.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/luminizer_toggle" - } -} diff --git a/src/main/resources/assets/botania/textures/block/luminizer_detector.png b/src/main/resources/assets/botania/textures/block/detector_light_relay.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/luminizer_detector.png rename to src/main/resources/assets/botania/textures/block/detector_light_relay.png diff --git a/src/main/resources/assets/botania/textures/block/luminizer_fork.png b/src/main/resources/assets/botania/textures/block/fork_light_relay.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/luminizer_fork.png rename to src/main/resources/assets/botania/textures/block/fork_light_relay.png diff --git a/src/main/resources/assets/botania/textures/block/luminizer.png b/src/main/resources/assets/botania/textures/block/light_relay.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/luminizer.png rename to src/main/resources/assets/botania/textures/block/light_relay.png diff --git a/src/main/resources/assets/botania/textures/block/luminizer_toggle.png b/src/main/resources/assets/botania/textures/block/toggle_light_relay.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/luminizer_toggle.png rename to src/main/resources/assets/botania/textures/block/toggle_light_relay.png diff --git a/src/main/resources/assets/botania/textures/item/mana_diamond_chunk.png b/src/main/resources/assets/botania/textures/item/mana_diamond_chunk.png deleted file mode 100644 index ea0cca4e5..000000000 Binary files a/src/main/resources/assets/botania/textures/item/mana_diamond_chunk.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/item/mana_pearl_shard.png b/src/main/resources/assets/botania/textures/item/mana_pearl_shard.png deleted file mode 100644 index e0e3f70d5..000000000 Binary files a/src/main/resources/assets/botania/textures/item/mana_pearl_shard.png and /dev/null differ