diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index b5adfe559..be4af3ce5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -244,9 +244,9 @@ public final class ModelHandler { registerBlockVariantInventory(ModBlocks.pump); registerBlockVariant(ModBlocks.redStringComparator, "facing=north"); registerBlockVariant(ModBlocks.redStringContainer, "facing=north"); - registerBlockVariant(ModBlocks.redStringDispenser, "facing=north,powered=false"); + registerBlockVariant(ModBlocks.redStringDispenser, "facing=north"); registerBlockVariant(ModBlocks.redStringFertilizer, "facing=north"); - registerBlockVariant(ModBlocks.redStringInterceptor, "facing=north,powered=false"); + registerBlockVariant(ModBlocks.redStringInterceptor, "facing=north"); registerBlockVariant(ModBlocks.redStringRelay, "facing=north"); registerBlockVariantNormal(ModBlocks.rfGenerator); registerBlockVariantNormal(ModBlocks.root); @@ -315,6 +315,9 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + + ModelLoader.setCustomStateMapper(ModBlocks.redStringDispenser, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ModelLoader.setCustomStateMapper(ModBlocks.redStringInterceptor, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); } private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { diff --git a/src/main/resources/assets/botania/blockstates/distributor.json b/src/main/resources/assets/botania/blockstates/distributor.json index 886ce900b..abc49f785 100644 --- a/src/main/resources/assets/botania/blockstates/distributor.json +++ b/src/main/resources/assets/botania/blockstates/distributor.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "botania:blocks/distributor0", - "side": "botania:blocks/distributor1", - "bottom": "botania:blocks/livingrock0" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:mana_distributor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchantedSoil.json b/src/main/resources/assets/botania/blockstates/enchantedSoil.json index ad3fd5ec7..3d5fd4c4a 100644 --- a/src/main/resources/assets/botania/blockstates/enchantedSoil.json +++ b/src/main/resources/assets/botania/blockstates/enchantedSoil.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "minecraft:blocks/dirt", - "top": "botania:blocks/enchantedSoil0", - "side": "botania:blocks/enchantedSoil1" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:enchanted_soil" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchanter.json b/src/main/resources/assets/botania/blockstates/enchanter.json index 317ae0bd2..536e7f653 100644 --- a/src/main/resources/assets/botania/blockstates/enchanter.json +++ b/src/main/resources/assets/botania/blockstates/enchanter.json @@ -1,16 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/enchanter" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "x": {}, - "z": {} - } + "facing=x": { "model": "botania:mana_enchanter" }, + "facing=z": { "model": "botania:mana_enchanter" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json index d509fb021..ccd930d3c 100644 --- a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json +++ b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json @@ -1,17 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/enderEyeBlock0" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": { "textures": { "all": "botania:blocks/enderEyeBlock1" } }, - "false": {} - }, - "powered=false": [{}] + "powered=true": { "model": "botania:ender_eye_block_powered" }, + "powered=false": { "model": "botania:ender_eye_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/felPumpkin.json b/src/main/resources/assets/botania/blockstates/felPumpkin.json index a883a82f2..c07e63156 100644 --- a/src/main/resources/assets/botania/blockstates/felPumpkin.json +++ b/src/main/resources/assets/botania/blockstates/felPumpkin.json @@ -1,20 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "minecraft:blocks/pumpkin_top", - "front": "botania:blocks/felPumpkin", - "side": "minecraft:blocks/pumpkin_side" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 } - } + "facing=north": { "model": "botania:fel_pumpkin" }, + "facing=south": { "model": "botania:fel_pumpkin", "y": 180 }, + "facing=west": { "model": "botania:fel_pumpkin", "y": 270 }, + "facing=east": { "model": "botania:fel_pumpkin", "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/incensePlate.json b/src/main/resources/assets/botania/blockstates/incensePlate.json index 05eb4c866..7fbf37f19 100644 --- a/src/main/resources/assets/botania/blockstates/incensePlate.json +++ b/src/main/resources/assets/botania/blockstates/incensePlate.json @@ -1,18 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:incense_plate", - "textures": { - "all": "botania:model/incensePlate" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": { "y": 180 }, - "south": {}, - "west": { "y": 90 }, - "east": { "y": 270 } - } + "facing=north": { "model": "botania:incense_plate", "y": 180 }, + "facing=south": { "model": "botania:incense_plate" }, + "facing=west": { "model": "botania:incense_plate", "y": 90 }, + "facing=east": { "model": "botania:incense_plate", "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaVoid.json b/src/main/resources/assets/botania/blockstates/manaVoid.json index dde8c8f4b..c2aed8531 100644 --- a/src/main/resources/assets/botania/blockstates/manaVoid.json +++ b/src/main/resources/assets/botania/blockstates/manaVoid.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/manaVoid0" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:mana_void" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/petalBlock.json b/src/main/resources/assets/botania/blockstates/petalBlock.json index ec1198c64..c2e7134c7 100644 --- a/src/main/resources/assets/botania/blockstates/petalBlock.json +++ b/src/main/resources/assets/botania/blockstates/petalBlock.json @@ -1,7 +1,5 @@ { "variants": { - "normal": { - "model": "botania:petal_block" - } + "normal": { "model": "botania:petal_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pistonRelay.json b/src/main/resources/assets/botania/blockstates/pistonRelay.json index bc7045a49..d554e34dc 100644 --- a/src/main/resources/assets/botania/blockstates/pistonRelay.json +++ b/src/main/resources/assets/botania/blockstates/pistonRelay.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/pistonRelay" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:force_relay" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/platform.json b/src/main/resources/assets/botania/blockstates/platform.json index a49c7b032..f2f52b17f 100644 --- a/src/main/resources/assets/botania/blockstates/platform.json +++ b/src/main/resources/assets/botania/blockstates/platform.json @@ -1,14 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "abstruse": { "textures": { "all": "botania:blocks/platform0" } }, - "spectral": { "textures": { "all": "botania:blocks/platform1" } }, - "infrangible": { "textures": { "all": "botania:blocks/platform2" } } - } + "variant=abstruse": { "model": "botania:abstruse_platform" }, + "variant=spectral": { "model": "botania:spectral_platform" }, + "variant=infrangible": { "model": "botania:infrangible_platform" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringComparator.json b/src/main/resources/assets/botania/blockstates/redStringComparator.json index 235c9f735..7ede7d4e9 100644 --- a/src/main/resources/assets/botania/blockstates/redStringComparator.json +++ b/src/main/resources/assets/botania/blockstates/redStringComparator.json @@ -1,22 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringComparator", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringComparator" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - } + "facing=north": { "model": "botania:red_string_comparator" }, + "facing=south": { "model": "botania:red_string_comparator", "y": 180 }, + "facing=west": { "model": "botania:red_string_comparator", "y": 270 }, + "facing=east": { "model": "botania:red_string_comparator", "y": 90 }, + "facing=up": { "model": "botania:red_string_comparator", "x": 270 }, + "facing=down": { "model": "botania:red_string_comparator", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringContainer.json b/src/main/resources/assets/botania/blockstates/redStringContainer.json index 5e69b9040..22728cbf9 100644 --- a/src/main/resources/assets/botania/blockstates/redStringContainer.json +++ b/src/main/resources/assets/botania/blockstates/redStringContainer.json @@ -1,22 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringContainer", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringContainer" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - } + "facing=north": { "model": "botania:red_string_container" }, + "facing=south": { "model": "botania:red_string_container", "y": 180 }, + "facing=west": { "model": "botania:red_string_container", "y": 270 }, + "facing=east": { "model": "botania:red_string_container", "y": 90 }, + "facing=up": { "model": "botania:red_string_container", "x": 270 }, + "facing=down": { "model": "botania:red_string_container", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringDispenser.json b/src/main/resources/assets/botania/blockstates/redStringDispenser.json index b36fdda64..94fe15a9c 100644 --- a/src/main/resources/assets/botania/blockstates/redStringDispenser.json +++ b/src/main/resources/assets/botania/blockstates/redStringDispenser.json @@ -1,26 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringContainer", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringContainer" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - }, - "powered": { - "true": {}, - "false": {} - } + "facing=north": { "model": "botania:red_string_dispenser" }, + "facing=south": { "model": "botania:red_string_dispenser", "y": 180 }, + "facing=west": { "model": "botania:red_string_dispenser", "y": 270 }, + "facing=east": { "model": "botania:red_string_dispenser", "y": 90 }, + "facing=up": { "model": "botania:red_string_dispenser", "x": 270 }, + "facing=down": { "model": "botania:red_string_dispenser", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json index 341542a68..3e9c36371 100644 --- a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json +++ b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json @@ -1,22 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringFertilizer", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringFertilizer" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - } + "facing=north": { "model": "botania:red_string_fertilizer" }, + "facing=south": { "model": "botania:red_string_fertilizer", "y": 180 }, + "facing=west": { "model": "botania:red_string_fertilizer", "y": 270 }, + "facing=east": { "model": "botania:red_string_fertilizer", "y": 90 }, + "facing=up": { "model": "botania:red_string_fertilizer", "x": 270 }, + "facing=down": { "model": "botania:red_string_fertilizer", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json index 2c4f60c88..bbb573d97 100644 --- a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json +++ b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json @@ -1,26 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringInterceptor", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringInterceptor" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - }, - "powered": { - "true": {}, - "false": {} - } + "facing=north": { "model": "botania:red_string_interceptor" }, + "facing=south": { "model": "botania:red_string_interceptor", "y": 180 }, + "facing=west": { "model": "botania:red_string_interceptor", "y": 270 }, + "facing=east": { "model": "botania:red_string_interceptor", "y": 90 }, + "facing=up": { "model": "botania:red_string_interceptor", "x": 270 }, + "facing=down": { "model": "botania:red_string_interceptor", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringRelay.json b/src/main/resources/assets/botania/blockstates/redStringRelay.json index a430ae041..ca75d0680 100644 --- a/src/main/resources/assets/botania/blockstates/redStringRelay.json +++ b/src/main/resources/assets/botania/blockstates/redStringRelay.json @@ -1,22 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringRelay", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringRelay" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - } + "facing=north": { "model": "botania:red_string_relay" }, + "facing=south": { "model": "botania:red_string_relay", "y": 180 }, + "facing=west": { "model": "botania:red_string_relay", "y": 270 }, + "facing=east": { "model": "botania:red_string_relay", "y": 90 }, + "facing=up": { "model": "botania:red_string_relay", "x": 270 }, + "facing=down": { "model": "botania:red_string_relay", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rfGenerator.json b/src/main/resources/assets/botania/blockstates/rfGenerator.json index f7c71579d..83fd6c04c 100644 --- a/src/main/resources/assets/botania/blockstates/rfGenerator.json +++ b/src/main/resources/assets/botania/blockstates/rfGenerator.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/rfGenerator" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:mana_fluxfield" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/runeAltar.json b/src/main/resources/assets/botania/blockstates/runeAltar.json index cc64d8632..d1b467937 100644 --- a/src/main/resources/assets/botania/blockstates/runeAltar.json +++ b/src/main/resources/assets/botania/blockstates/runeAltar.json @@ -1,7 +1,5 @@ { "variants": { - "normal": { - "model": "botania:runic_altar" - } + "normal": { "model": "botania:runic_altar" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spreader.json b/src/main/resources/assets/botania/blockstates/spreader.json index a5efbf935..2f9baaed6 100644 --- a/src/main/resources/assets/botania/blockstates/spreader.json +++ b/src/main/resources/assets/botania/blockstates/spreader.json @@ -1,39 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:spreader", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "mana": { - "textures": { - "inside": "botania:model/spreader_item/mana_inside", - "side": "botania:model/spreader_item/mana_side", - "material": "botania:blocks/livingwood0" - } - }, - "redstone": { - "textures": { - "inside": "botania:model/spreader_item/redstone_inside", - "side": "botania:model/spreader_item/redstone_side", - "material": "botania:model/spreader_item/redstone_material" - } - }, - "elven": { - "textures": { - "inside": "botania:model/spreader_item/elven_inside", - "side": "botania:model/spreader_item/elven_side", - "material": "botania:blocks/dreamwood0" - } - }, - "gaia": { - "textures": { - "inside": "botania:model/spreader_item/gaia_inside", - "side": "botania:model/spreader_item/gaia_side", - "material": "botania:blocks/dreamwood0" - } - } - } + "variant=mana": { "model": "botania:mana_spreader" }, + "variant=redstone": { "model": "botania:redstone_spreader" }, + "variant=elven": { "model": "botania:elven_spreader" }, + "variant=gaia": { "model": "botania:gaia_spreader" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json index 101c43d96..416692109 100644 --- a/src/main/resources/assets/botania/blockstates/storage.json +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "manasteel": { "textures": { "all": "botania:blocks/storage0" } }, - "terrasteel": { "textures": { "all": "botania:blocks/storage1" } }, - "elementium": { "textures": { "all": "botania:blocks/storage2" } }, - "mana_diamond": { "textures": { "all": "botania:blocks/storage3" } }, - "dragonstone": { "textures": { "all": "botania:blocks/storage4" } } - } + "variant=manasteel": { "model": "botania:manasteel_block" }, + "variant=terrasteel": { "model": "botania:terrasteel_block" }, + "variant=elementium": { "model": "botania:elementium_block" }, + "variant=mana_diamond": { "model": "botania:mana_diamond_block" }, + "variant=dragonstone": { "model": "botania:dragonstone_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/abstruse_platform.json b/src/main/resources/assets/botania/models/block/abstruse_platform.json new file mode 100644 index 000000000..f3b6eaa40 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/abstruse_platform.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/platform0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dragonstone_block.json b/src/main/resources/assets/botania/models/block/dragonstone_block.json new file mode 100644 index 000000000..7d0c130d0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dragonstone_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elementium_block.json b/src/main/resources/assets/botania/models/block/elementium_block.json new file mode 100644 index 000000000..a55282f38 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elementium_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elven_spreader.json b/src/main/resources/assets/botania/models/block/elven_spreader.json new file mode 100644 index 000000000..643dfa0c9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elven_spreader.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/spreader", + "textures": { + "inside": "botania:model/spreader_item/elven_inside", + "side": "botania:model/spreader_item/elven_side", + "material": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/enchanted_soil.json b/src/main/resources/assets/botania/models/block/enchanted_soil.json new file mode 100644 index 000000000..94d0bc551 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/enchanted_soil.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/enchantedSoil0", + "side": "botania:blocks/enchantedSoil1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/ender_eye_block.json b/src/main/resources/assets/botania/models/block/ender_eye_block.json new file mode 100644 index 000000000..ece4ad790 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/ender_eye_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/enderEyeBlock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json b/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json new file mode 100644 index 000000000..21db23bae --- /dev/null +++ b/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/enderEyeBlock1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fel_pumpkin.json b/src/main/resources/assets/botania/models/block/fel_pumpkin.json new file mode 100644 index 000000000..8d46f4eb2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fel_pumpkin.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "minecraft:blocks/pumpkin_top", + "front": "botania:blocks/felPumpkin", + "side": "minecraft:blocks/pumpkin_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/force_relay.json b/src/main/resources/assets/botania/models/block/force_relay.json new file mode 100644 index 000000000..e26dd6888 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/force_relay.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pistonRelay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gaia_spreader.json b/src/main/resources/assets/botania/models/block/gaia_spreader.json new file mode 100644 index 000000000..705ca1e5e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/gaia_spreader.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/spreader", + "textures": { + "inside": "botania:model/spreader_item/gaia_inside", + "side": "botania:model/spreader_item/gaia_side", + "material": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/incense_plate.json b/src/main/resources/assets/botania/models/block/incense_plate.json index 71ba93775..dc050fc94 100644 --- a/src/main/resources/assets/botania/models/block/incense_plate.json +++ b/src/main/resources/assets/botania/models/block/incense_plate.json @@ -1,6 +1,8 @@ { + "parent": "minecraft:block/block", "textures": { - "particle": "#all" + "all": "botania:model/incensePlate", + "particle": "botania:model/incensePlate" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/block/infrangible_platform.json b/src/main/resources/assets/botania/models/block/infrangible_platform.json new file mode 100644 index 000000000..090087bbe --- /dev/null +++ b/src/main/resources/assets/botania/models/block/infrangible_platform.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/platform2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_diamond_block.json b/src/main/resources/assets/botania/models/block/mana_diamond_block.json new file mode 100644 index 000000000..4a875189b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_diamond_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_distributor.json b/src/main/resources/assets/botania/models/block/mana_distributor.json new file mode 100644 index 000000000..49a795162 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_distributor.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/distributor0", + "side": "botania:blocks/distributor1", + "bottom": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_enchanter.json b/src/main/resources/assets/botania/models/block/mana_enchanter.json new file mode 100644 index 000000000..3c8590ff9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_enchanter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/enchanter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_fluxfield.json b/src/main/resources/assets/botania/models/block/mana_fluxfield.json new file mode 100644 index 000000000..9423529e7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_fluxfield.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/rfGenerator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_spreader.json b/src/main/resources/assets/botania/models/block/mana_spreader.json new file mode 100644 index 000000000..fbbc73c95 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_spreader.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/spreader", + "textures": { + "inside": "botania:model/spreader_item/mana_inside", + "side": "botania:model/spreader_item/mana_side", + "material": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_void.json b/src/main/resources/assets/botania/models/block/mana_void.json new file mode 100644 index 000000000..402d24915 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_void.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/manaVoid0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manasteel_block.json b/src/main/resources/assets/botania/models/block/manasteel_block.json new file mode 100644 index 000000000..bdb8f0a68 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/manasteel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_comparator.json b/src/main/resources/assets/botania/models/block/red_string_comparator.json new file mode 100644 index 000000000..58070033a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_comparator.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringComparator", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringComparator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_container.json b/src/main/resources/assets/botania/models/block/red_string_container.json new file mode 100644 index 000000000..4a8ebe34c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_container.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringContainer", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringContainer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_dispenser.json b/src/main/resources/assets/botania/models/block/red_string_dispenser.json new file mode 100644 index 000000000..bbddc9883 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_dispenser.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringDispenser", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringDispenser" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_fertilizer.json b/src/main/resources/assets/botania/models/block/red_string_fertilizer.json new file mode 100644 index 000000000..10771f70c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_fertilizer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringFertilizer", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringFertilizer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_interceptor.json b/src/main/resources/assets/botania/models/block/red_string_interceptor.json new file mode 100644 index 000000000..6c31f846b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_interceptor.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringInterceptor", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringInterceptor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_relay.json b/src/main/resources/assets/botania/models/block/red_string_relay.json new file mode 100644 index 000000000..d62841e01 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_relay.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringRelay", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringRelay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/redstone_spreader.json b/src/main/resources/assets/botania/models/block/redstone_spreader.json new file mode 100644 index 000000000..15e48655c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/redstone_spreader.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/spreader", + "textures": { + "inside": "botania:model/spreader_item/redstone_inside", + "side": "botania:model/spreader_item/redstone_side", + "material": "botania:model/spreader_item/redstone_material" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/spreader.json b/src/main/resources/assets/botania/models/block/shapes/spreader.json similarity index 99% rename from src/main/resources/assets/botania/models/block/spreader.json rename to src/main/resources/assets/botania/models/block/shapes/spreader.json index 93cc92e43..32ca9a9a0 100644 --- a/src/main/resources/assets/botania/models/block/spreader.json +++ b/src/main/resources/assets/botania/models/block/shapes/spreader.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#material" }, diff --git a/src/main/resources/assets/botania/models/block/spectral_platform.json b/src/main/resources/assets/botania/models/block/spectral_platform.json new file mode 100644 index 000000000..feee92618 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/spectral_platform.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/platform1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/terrasteel_block.json b/src/main/resources/assets/botania/models/block/terrasteel_block.json new file mode 100644 index 000000000..add746c6d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/terrasteel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage1" + } +} \ No newline at end of file