From 1d206295b70dbddad432f8dea04045c36970da20 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 26 Sep 2020 23:36:44 +0300 Subject: [PATCH] Tag mixin & fixes --- src/main/java/ru/betterend/TagHelper.java | 7 + .../blocks/complex/WoodenMaterial.java | 23 +- .../mixin/common/TagGroupLoaderMixin.java | 26 ++ .../models/block/aeternium_block.json | 10 +- .../betterend/models/block/chest_item.json | 230 +++++++++++++--- .../betterend/models/block/end_moss.json | 24 +- .../betterend/models/block/end_mycelium.json | 24 +- .../models/block/end_stone_smelter.json | 14 +- .../models/block/end_stone_smelter_on.json | 14 +- .../betterend/models/block/ender_block.json | 10 +- .../betterend/models/block/ender_ore.json | 10 +- .../betterend/models/block/endstone_dust.json | 10 +- .../assets/betterend/models/block/ladder.json | 87 ++++++ .../models/block/mossy_glowshroom_bark.json | 12 +- .../models/block/mossy_glowshroom_barrel.json | 16 +- .../block/mossy_glowshroom_barrel_open.json | 16 +- .../models/block/mossy_glowshroom_button.json | 12 +- .../mossy_glowshroom_button_inventory.json | 12 +- .../mossy_glowshroom_button_pressed.json | 12 +- .../mossy_glowshroom_crafting_table.json | 24 +- .../block/mossy_glowshroom_door_bottom.json | 14 +- .../mossy_glowshroom_door_bottom_hinge.json | 14 +- .../block/mossy_glowshroom_door_top.json | 14 +- .../mossy_glowshroom_door_top_hinge.json | 14 +- .../models/block/mossy_glowshroom_empty.json | 10 +- .../mossy_glowshroom_fence_gate_closed.json | 12 +- .../mossy_glowshroom_fence_gate_open.json | 12 +- .../mossy_glowshroom_fence_inventory.json | 12 +- .../block/mossy_glowshroom_fence_post.json | 12 +- .../block/mossy_glowshroom_fence_side.json | 12 +- .../block/mossy_glowshroom_half_slab.json | 16 +- .../block/mossy_glowshroom_inner_stairs.json | 16 +- .../models/block/mossy_glowshroom_ladder.json | 13 +- .../models/block/mossy_glowshroom_log.json | 24 +- .../block/mossy_glowshroom_outer_stairs.json | 16 +- .../models/block/mossy_glowshroom_planks.json | 12 +- .../mossy_glowshroom_pressure_plate_down.json | 12 +- .../mossy_glowshroom_pressure_plate_up.json | 12 +- .../models/block/mossy_glowshroom_stairs.json | 16 +- .../block/mossy_glowshroom_striped_bark.json | 12 +- .../block/mossy_glowshroom_striped_log.json | 24 +- .../block/mossy_glowshroom_trapdoor.json | 12 +- .../mossy_glowshroom_wall_gate_closed.json | 12 +- .../mossy_glowshroom_wall_gate_open.json | 12 +- .../models/block/terminite_block.json | 10 +- .../assets/betterend/models/block/test.json | 5 + .../block/mossy_glowshroom_ladder.png | Bin 0 -> 2052 bytes .../block/mossy_glowshroom_planks.png | Bin 0 -> 1906 bytes .../resources/betterend.mixins.common.json | 3 +- utilities/json_pretty_print.py | 22 ++ utility_res/block/%name%_bark.json | 10 +- utility_res/block/%name%_barrel.json | 14 +- utility_res/block/%name%_barrel_open.json | 14 +- utility_res/block/%name%_button.json | 10 +- .../block/%name%_button_inventory.json | 10 +- utility_res/block/%name%_button_pressed.json | 10 +- utility_res/block/%name%_crafting_table.json | 22 +- utility_res/block/%name%_door_bottom.json | 14 +- .../block/%name%_door_bottom_hinge.json | 14 +- utility_res/block/%name%_door_top.json | 14 +- utility_res/block/%name%_door_top_hinge.json | 14 +- utility_res/block/%name%_empty.json | 6 +- .../block/%name%_fence_gate_closed.json | 10 +- utility_res/block/%name%_fence_gate_open.json | 10 +- utility_res/block/%name%_fence_inventory.json | 10 +- utility_res/block/%name%_fence_post.json | 10 +- utility_res/block/%name%_fence_side.json | 10 +- utility_res/block/%name%_half_slab.json | 14 +- utility_res/block/%name%_inner_stairs.json | 14 +- utility_res/block/%name%_ladder.json | 11 +- utility_res/block/%name%_log.json | 20 +- utility_res/block/%name%_outer_stairs.json | 14 +- utility_res/block/%name%_planks.json | 10 +- .../block/%name%_pressure_plate_down.json | 10 +- .../block/%name%_pressure_plate_up.json | 10 +- utility_res/block/%name%_stairs.json | 14 +- utility_res/block/%name%_striped_bark.json | 10 +- utility_res/block/%name%_striped_log.json | 20 +- utility_res/block/%name%_trapdoor.json | 10 +- .../block/%name%_wall_gate_closed.json | 10 +- utility_res/block/%name%_wall_gate_open.json | 10 +- utility_res/blockstates/%name%_bark.json | 17 +- utility_res/blockstates/%name%_barrel.json | 74 +++--- utility_res/blockstates/%name%_button.json | 142 ++++++++-- .../blockstates/%name%_crafting_table.json | 12 +- utility_res/blockstates/%name%_door.json | 160 ++++++++--- utility_res/blockstates/%name%_fence.json | 63 +++-- utility_res/blockstates/%name%_gate.json | 96 +++++-- utility_res/blockstates/%name%_ladder.json | 23 +- utility_res/blockstates/%name%_log.json | 19 +- utility_res/blockstates/%name%_planks.json | 7 +- utility_res/blockstates/%name%_plate.json | 12 +- utility_res/blockstates/%name%_sign.json | 4 +- utility_res/blockstates/%name%_slab.json | 19 +- utility_res/blockstates/%name%_stairs.json | 249 +++++++++++++++--- .../blockstates/%name%_striped_bark.json | 17 +- .../blockstates/%name%_striped_log.json | 19 +- utility_res/blockstates/%name%_trapdoor.json | 97 +++++-- utility_res/item/%name%_bark.json | 4 +- utility_res/item/%name%_barrel.json | 2 +- utility_res/item/%name%_button.json | 4 +- utility_res/item/%name%_chest.json | 10 +- utility_res/item/%name%_crafting_table.json | 4 +- utility_res/item/%name%_door.json | 10 +- utility_res/item/%name%_fence.json | 4 +- utility_res/item/%name%_gate.json | 4 +- utility_res/item/%name%_ladder.json | 10 +- utility_res/item/%name%_log.json | 4 +- utility_res/item/%name%_planks.json | 4 +- utility_res/item/%name%_plate.json | 4 +- utility_res/item/%name%_sign.json | 10 +- utility_res/item/%name%_slab.json | 4 +- utility_res/item/%name%_stairs.json | 4 +- utility_res/item/%name%_striped_bark.json | 4 +- utility_res/item/%name%_striped_log.json | 4 +- utility_res/item/%name%_trapdoor.json | 4 +- 116 files changed, 1669 insertions(+), 802 deletions(-) create mode 100644 src/main/java/ru/betterend/TagHelper.java create mode 100644 src/main/java/ru/betterend/mixin/common/TagGroupLoaderMixin.java create mode 100644 src/main/resources/assets/betterend/models/block/ladder.json create mode 100644 src/main/resources/assets/betterend/models/block/test.json create mode 100644 src/main/resources/assets/betterend/textures/block/mossy_glowshroom_ladder.png create mode 100644 src/main/resources/assets/betterend/textures/block/mossy_glowshroom_planks.png create mode 100644 utilities/json_pretty_print.py diff --git a/src/main/java/ru/betterend/TagHelper.java b/src/main/java/ru/betterend/TagHelper.java new file mode 100644 index 00000000..3c39793d --- /dev/null +++ b/src/main/java/ru/betterend/TagHelper.java @@ -0,0 +1,7 @@ +package ru.betterend; + +import net.minecraft.tag.Tag; + +public class TagHelper { + public static Tag.Entry lastEntry; +} diff --git a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java index 9a83c1fc..e4e3960c 100644 --- a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java @@ -1,10 +1,18 @@ package ru.betterend.blocks.complex; +import java.lang.reflect.Field; + import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tag.TagRegistry; import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; import net.minecraft.item.Items; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.tag.BlockTags; +import net.minecraft.tag.SetTag; +import net.minecraft.tag.Tag; +import net.minecraft.util.Identifier; import ru.betterend.blocks.basis.BlockBarrel; import ru.betterend.blocks.basis.BlockBase; import ru.betterend.blocks.basis.BlockChest; @@ -50,9 +58,10 @@ public class WoodenMaterial public final Block chest; public final Block barrel; + @SuppressWarnings("unchecked") public WoodenMaterial(String name, MaterialColor woodColor, MaterialColor planksColor) { - FabricBlockSettings materialPlanks = FabricBlockSettings.of(Material.WOOD).materialColor(planksColor); + FabricBlockSettings materialPlanks = FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).materialColor(planksColor); log_striped = BlockRegistry.registerBlock(name + "_striped_log", new BlockPillar(materialPlanks)); bark_striped = BlockRegistry.registerBlock(name + "_striped_bark", new BlockPillar(materialPlanks)); @@ -91,6 +100,18 @@ public class WoodenMaterial RecipeBuilder.make(name + "_sign", sign).setOutputCount(3).setShape("###", "###", " I ").addMaterial('#', planks).addMaterial('I', Items.STICK).setGroup("end_signs").build(); RecipeBuilder.make(name + "_chest", chest).setShape("###", "# #", "###").addMaterial('#', planks).setGroup("end_chests").build(); RecipeBuilder.make(name + "_barrel", barrel).setShape("#S#", "# #", "#S#").addMaterial('#', planks).addMaterial('S', slab).setGroup("end_barrels").build(); + + /*try { + Field field = BlockTags.CLIMBABLE.getClass().getDeclaredField("delegate"); + field.setAccessible(true); + SetTag tag = SetTag.empty(); + tag = (SetTag) field.get(tag); + System.out.println(tag.getClass()); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + }*/ + //System.out.println(BlockTags.CLIMBABLE.getClass()); } public boolean isTreeLog(Block block) diff --git a/src/main/java/ru/betterend/mixin/common/TagGroupLoaderMixin.java b/src/main/java/ru/betterend/mixin/common/TagGroupLoaderMixin.java new file mode 100644 index 00000000..908200ef --- /dev/null +++ b/src/main/java/ru/betterend/mixin/common/TagGroupLoaderMixin.java @@ -0,0 +1,26 @@ +package ru.betterend.mixin.common; + +import java.util.Map; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.tag.Tag; +import net.minecraft.tag.TagGroup; +import net.minecraft.tag.TagGroupLoader; +import net.minecraft.util.Identifier; +import ru.betterend.BetterEnd; + +@Mixin(TagGroupLoader.class) +public class TagGroupLoaderMixin { + @Inject(method = "applyReload", at = @At(value = "HEAD")) + private void onReload(Map tags, CallbackInfoReturnable> info) { + tags.forEach((id, builder) -> { + if (id.toString().equals("minecraft:climbable")) { + builder.add(new Identifier(BetterEnd.MOD_ID, "mossy_glowshroom_ladder"), "code"); + } + }); + } +} diff --git a/src/main/resources/assets/betterend/models/block/aeternium_block.json b/src/main/resources/assets/betterend/models/block/aeternium_block.json index 601a957b..b2c0a838 100644 --- a/src/main/resources/assets/betterend/models/block/aeternium_block.json +++ b/src/main/resources/assets/betterend/models/block/aeternium_block.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/aeternium_block" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/aeternium_block" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chest_item.json b/src/main/resources/assets/betterend/models/block/chest_item.json index 500dadc0..3249ae74 100644 --- a/src/main/resources/assets/betterend/models/block/chest_item.json +++ b/src/main/resources/assets/betterend/models/block/chest_item.json @@ -1,42 +1,190 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "elements": [ - { - "__comment": "Box1", - "from": [ 1, 0, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 3.5, 4.75, 7, 8.25 ], "texture": "#texture", "rotation": 180 }, - "north": { "uv": [ 10.5, 10.75, 14, 8.25 ], "texture": "#texture" }, - "south": { "uv": [ 0, 10.75, 3.5, 8.25 ], "texture": "#texture" }, - "west": { "uv": [ 7, 10.75, 10.5, 8.25 ], "texture": "#texture" }, - "east": { "uv": [ 3.5, 10.75, 7, 8.25 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 10, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "up": { "uv": [ 7, 0, 10.5, 3.5 ], "texture": "#texture", "rotation": 180 }, - "north": { "uv": [ 10.5, 4.75, 14, 3.75 ], "texture": "#texture" }, - "south": { "uv": [ 0, 4.75, 3.5, 3.75 ], "texture": "#texture" }, - "west": { "uv": [ 7, 4.75, 10.5, 3.75 ], "texture": "#texture" }, - "east": { "uv": [ 3.5, 4.75, 7, 3.75 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 7, 0 ], - "to": [ 9, 11, 1 ], - "faces": { - "down": { "uv": [ 0.25, 0, 0.75, 0.25 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 0.75, 0, 1.25, 0.25 ], "texture": "#texture", "rotation": 180 }, - "north": { "uv": [ 0.5, 1.25, 1, 0.25 ], "texture": "#texture" }, - "west": { "uv": [ 0, 1.25, 0.25, 0.25 ], "texture": "#texture" }, - "east": { "uv": [ 0, 1.25, 0.25, 0.25 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "elements": [ + { + "__comment": "Box1", + "faces": { + "down": { + "rotation": 180, + "texture": "#texture", + "uv": [ + 3.5, + 4.75, + 7, + 8.25 + ] + }, + "east": { + "texture": "#texture", + "uv": [ + 3.5, + 10.75, + 7, + 8.25 + ] + }, + "north": { + "texture": "#texture", + "uv": [ + 10.5, + 10.75, + 14, + 8.25 + ] + }, + "south": { + "texture": "#texture", + "uv": [ + 0, + 10.75, + 3.5, + 8.25 + ] + }, + "west": { + "texture": "#texture", + "uv": [ + 7, + 10.75, + 10.5, + 8.25 + ] + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 10, + 15 + ] + }, + { + "__comment": "Box1", + "faces": { + "east": { + "texture": "#texture", + "uv": [ + 3.5, + 4.75, + 7, + 3.75 + ] + }, + "north": { + "texture": "#texture", + "uv": [ + 10.5, + 4.75, + 14, + 3.75 + ] + }, + "south": { + "texture": "#texture", + "uv": [ + 0, + 4.75, + 3.5, + 3.75 + ] + }, + "up": { + "rotation": 180, + "texture": "#texture", + "uv": [ + 7, + 0, + 10.5, + 3.5 + ] + }, + "west": { + "texture": "#texture", + "uv": [ + 7, + 4.75, + 10.5, + 3.75 + ] + } + }, + "from": [ + 1, + 10, + 1 + ], + "to": [ + 15, + 14, + 15 + ] + }, + { + "__comment": "Box1", + "faces": { + "down": { + "rotation": 180, + "texture": "#texture", + "uv": [ + 0.25, + 0, + 0.75, + 0.25 + ] + }, + "east": { + "texture": "#texture", + "uv": [ + 0, + 1.25, + 0.25, + 0.25 + ] + }, + "north": { + "texture": "#texture", + "uv": [ + 0.5, + 1.25, + 1, + 0.25 + ] + }, + "up": { + "rotation": 180, + "texture": "#texture", + "uv": [ + 0.75, + 0, + 1.25, + 0.25 + ] + }, + "west": { + "texture": "#texture", + "uv": [ + 0, + 1.25, + 0.25, + 0.25 + ] + } + }, + "from": [ + 7, + 7, + 0 + ], + "to": [ + 9, + 11, + 1 + ] + } + ], + "parent": "block/block" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_moss.json b/src/main/resources/assets/betterend/models/block/end_moss.json index fac6a47a..35190f45 100644 --- a/src/main/resources/assets/betterend/models/block/end_moss.json +++ b/src/main/resources/assets/betterend/models/block/end_moss.json @@ -1,12 +1,12 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/end_moss_side", - "down": "block/end_stone", - "up": "betterend:block/end_moss_top", - "north": "betterend:block/end_moss_side", - "east": "betterend:block/end_moss_side", - "south": "betterend:block/end_moss_side", - "west": "betterend:block/end_moss_side" - } -} +{ + "parent": "block/cube", + "textures": { + "down": "block/end_stone", + "east": "betterend:block/end_moss_side", + "north": "betterend:block/end_moss_side", + "particle": "betterend:block/end_moss_side", + "south": "betterend:block/end_moss_side", + "up": "betterend:block/end_moss_top", + "west": "betterend:block/end_moss_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_mycelium.json b/src/main/resources/assets/betterend/models/block/end_mycelium.json index b39ce5f8..8e0dbd60 100644 --- a/src/main/resources/assets/betterend/models/block/end_mycelium.json +++ b/src/main/resources/assets/betterend/models/block/end_mycelium.json @@ -1,12 +1,12 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/end_mycelium_side", - "down": "block/end_stone", - "up": "betterend:block/end_mycelium_top", - "north": "betterend:block/end_mycelium_side", - "east": "betterend:block/end_mycelium_side", - "south": "betterend:block/end_mycelium_side", - "west": "betterend:block/end_mycelium_side" - } -} +{ + "parent": "block/cube", + "textures": { + "down": "block/end_stone", + "east": "betterend:block/end_mycelium_side", + "north": "betterend:block/end_mycelium_side", + "particle": "betterend:block/end_mycelium_side", + "south": "betterend:block/end_mycelium_side", + "up": "betterend:block/end_mycelium_top", + "west": "betterend:block/end_mycelium_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_stone_smelter.json b/src/main/resources/assets/betterend/models/block/end_stone_smelter.json index 6451115a..32679eca 100644 --- a/src/main/resources/assets/betterend/models/block/end_stone_smelter.json +++ b/src/main/resources/assets/betterend/models/block/end_stone_smelter.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "top": "betterend:block/end_stone_smelter_top", - "front": "betterend:block/end_stone_smelter_front", - "side": "betterend:block/end_stone_smelter_side" - } +{ + "parent": "minecraft:block/orientable", + "textures": { + "front": "betterend:block/end_stone_smelter_front", + "side": "betterend:block/end_stone_smelter_side", + "top": "betterend:block/end_stone_smelter_top" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_stone_smelter_on.json b/src/main/resources/assets/betterend/models/block/end_stone_smelter_on.json index e7d3e22a..5fbc2c58 100644 --- a/src/main/resources/assets/betterend/models/block/end_stone_smelter_on.json +++ b/src/main/resources/assets/betterend/models/block/end_stone_smelter_on.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "top": "betterend:block/end_stone_smelter_top", - "front": "betterend:block/end_stone_smelter_front_on", - "side": "betterend:block/end_stone_smelter_side" - } +{ + "parent": "minecraft:block/orientable", + "textures": { + "front": "betterend:block/end_stone_smelter_front_on", + "side": "betterend:block/end_stone_smelter_side", + "top": "betterend:block/end_stone_smelter_top" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/ender_block.json b/src/main/resources/assets/betterend/models/block/ender_block.json index c355c463..0c1504cc 100644 --- a/src/main/resources/assets/betterend/models/block/ender_block.json +++ b/src/main/resources/assets/betterend/models/block/ender_block.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/ender_block" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/ender_block" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/ender_ore.json b/src/main/resources/assets/betterend/models/block/ender_ore.json index 0cf51384..9102f838 100644 --- a/src/main/resources/assets/betterend/models/block/ender_ore.json +++ b/src/main/resources/assets/betterend/models/block/ender_ore.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/ender_ore" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/ender_ore" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/endstone_dust.json b/src/main/resources/assets/betterend/models/block/endstone_dust.json index 202ee9bb..bbc7873c 100644 --- a/src/main/resources/assets/betterend/models/block/endstone_dust.json +++ b/src/main/resources/assets/betterend/models/block/endstone_dust.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/endstone_dust" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/endstone_dust" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/ladder.json b/src/main/resources/assets/betterend/models/block/ladder.json new file mode 100644 index 00000000..39373d1f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/ladder.json @@ -0,0 +1,87 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/ladder", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 12, 0, 15 ], + "to": [ 14, 16, 16 ], + "faces": { + "down": { "uv": [ 2, 15, 4, 16 ], "texture": "#texture", "cullface": "down", "rotation": 180 }, + "up": { "uv": [ 2, 0, 4, 1 ], "texture": "#texture", "cullface": "up", "rotation": 180 }, + "north": { "uv": [ 2, 0, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 2, 0, 4, 16 ], "texture": "#texture", "cullface": "north" }, + "west": { "uv": [ 3, 0, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 2, 0, 3, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 0, 15 ], + "to": [ 4, 16, 16 ], + "faces": { + "down": { "uv": [ 12, 15, 14, 16 ], "texture": "#texture", "cullface": "down", "rotation": 180 }, + "up": { "uv": [ 12, 0, 14, 1 ], "texture": "#texture", "cullface": "up", "rotation": 180 }, + "north": { "uv": [ 12, 0, 14, 16 ], "texture": "#texture" }, + "south": { "uv": [ 12, 0, 14, 16 ], "texture": "#texture", "cullface": "north" }, + "west": { "uv": [ 3, 0, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 2, 0, 3, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box3", + "from": [ 1, 1, 14.5 ], + "to": [ 15, 3, 15.5 ], + "faces": { + "down": { "uv": [ 1, 14, 15, 15 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 1, 13, 15, 14 ], "texture": "#texture", "rotation": 180 }, + "north": { "uv": [ 1, 13, 15, 15 ], "texture": "#texture" }, + "south": { "uv": [ 1, 13, 15, 15 ], "texture": "#texture" }, + "west": { "uv": [ 14, 13, 15, 15 ], "texture": "#texture" }, + "east": { "uv": [ 1, 13, 2, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box3", + "from": [ 1, 5, 14.5 ], + "to": [ 15, 7, 15.5 ], + "faces": { + "down": { "uv": [ 1, 10, 15, 11 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 1, 9, 15, 10 ], "texture": "#texture", "rotation": 180 }, + "north": { "uv": [ 1, 9, 15, 11 ], "texture": "#texture" }, + "south": { "uv": [ 1, 9, 15, 11 ], "texture": "#texture" }, + "west": { "uv": [ 14, 9, 15, 11 ], "texture": "#texture" }, + "east": { "uv": [ 1, 9, 2, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box3", + "from": [ 1, 9, 14.5 ], + "to": [ 15, 11, 15.5 ], + "faces": { + "down": { "uv": [ 1, 6, 15, 7 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 1, 5, 15, 6 ], "texture": "#texture", "rotation": 180 }, + "north": { "uv": [ 1, 5, 15, 7 ], "texture": "#texture" }, + "south": { "uv": [ 1, 5, 15, 7 ], "texture": "#texture" }, + "west": { "uv": [ 14, 5, 15, 7 ], "texture": "#texture" }, + "east": { "uv": [ 1, 5, 2, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "Box3", + "from": [ 1, 13, 14.5 ], + "to": [ 15, 15, 15.5 ], + "faces": { + "down": { "uv": [ 1, 2, 15, 3 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 1, 1, 15, 2 ], "texture": "#texture", "rotation": 180 }, + "north": { "uv": [ 1, 1, 15, 3 ], "texture": "#texture" }, + "south": { "uv": [ 1, 1, 15, 3 ], "texture": "#texture" }, + "west": { "uv": [ 14, 1, 15, 3 ], "texture": "#texture" }, + "east": { "uv": [ 1, 1, 2, 3 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark.json index 64da8bed..a7a76071 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/mossy_glowshroom_log_side" - } -} +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_log_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_barrel.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_barrel.json index 7c423f60..c55c3def 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_barrel.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_barrel.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "betterend:block/mossy_glowshroom_barrel_top", - "bottom": "betterend:block/mossy_glowshroom_barrel_bottom", - "side": "betterend:block/mossy_glowshroom_barrel_side" - } -} +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_barrel_bottom", + "side": "betterend:block/mossy_glowshroom_barrel_side", + "top": "betterend:block/mossy_glowshroom_barrel_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_barrel_open.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_barrel_open.json index 7df8c564..d4bbad99 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_barrel_open.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_barrel_open.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "betterend:block/mossy_glowshroom_barrel_top_open", - "bottom": "betterend:block/mossy_glowshroom_barrel_bottom", - "side": "betterend:block/mossy_glowshroom_barrel_side" - } -} +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_barrel_bottom", + "side": "betterend:block/mossy_glowshroom_barrel_side", + "top": "betterend:block/mossy_glowshroom_barrel_top_open" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button.json index cdde2743..28cb77e1 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/button", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button_inventory.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button_inventory.json index 51efb0fa..231ec0ac 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button_inventory.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/button_inventory", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button_pressed.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button_pressed.json index 0f7d280b..25600136 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button_pressed.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_button_pressed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/button_pressed", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_crafting_table.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_crafting_table.json index 66f80b30..15eb0e53 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_crafting_table.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_crafting_table.json @@ -1,12 +1,12 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "betterend:block/mossy_glowshroom_crafting_table_front", - "north": "betterend:block/mossy_glowshroom_crafting_table_front", - "south": "betterend:block/mossy_glowshroom_crafting_table_side", - "east": "betterend:block/mossy_glowshroom_crafting_table_side", - "west": "betterend:block/mossy_glowshroom_crafting_table_front", - "up": "betterend:block/mossy_glowshroom_crafting_table_top", - "down": "betterend:block/mossy_glowshroom_crafting_table_bottom" - } -} +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_crafting_table_bottom", + "east": "betterend:block/mossy_glowshroom_crafting_table_side", + "north": "betterend:block/mossy_glowshroom_crafting_table_front", + "particle": "betterend:block/mossy_glowshroom_crafting_table_front", + "south": "betterend:block/mossy_glowshroom_crafting_table_side", + "up": "betterend:block/mossy_glowshroom_crafting_table_top", + "west": "betterend:block/mossy_glowshroom_crafting_table_front" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_bottom.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_bottom.json index cca689ee..151b70db 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_bottom.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_bottom.json @@ -1,7 +1,7 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "betterend:block/mossy_glowshroom_door_bottom", - "top": "betterend:block/mossy_glowshroom_door_bottom" - } -} +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_door_bottom", + "top": "betterend:block/mossy_glowshroom_door_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_bottom_hinge.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_bottom_hinge.json index ac11c0c8..613dec2f 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_bottom_hinge.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_bottom_hinge.json @@ -1,7 +1,7 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "betterend:block/mossy_glowshroom_door_bottom", - "top": "betterend:block/mossy_glowshroom_door_bottom" - } -} +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_door_bottom", + "top": "betterend:block/mossy_glowshroom_door_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_top.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_top.json index 6878acbc..c90d13a0 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_top.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_top.json @@ -1,7 +1,7 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "betterend:block/mossy_glowshroom_door_top", - "top": "betterend:block/mossy_glowshroom_door_top" - } -} +{ + "parent": "block/door_top", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_door_top", + "top": "betterend:block/mossy_glowshroom_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_top_hinge.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_top_hinge.json index 2d395afb..1d9ce900 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_top_hinge.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_door_top_hinge.json @@ -1,7 +1,7 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "betterend:block/mossy_glowshroom_door_top", - "top": "betterend:block/mossy_glowshroom_door_top" - } -} +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_door_top", + "top": "betterend:block/mossy_glowshroom_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_empty.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_empty.json index 0db4b562..c9cfab42 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_empty.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_empty.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "textures": { + "particle": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_gate_closed.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_gate_closed.json index 0dd91e7d..c14a4fed 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_gate_closed.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_gate_closed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/template_fence_gate", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_gate_open.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_gate_open.json index 5fadffa9..3fcf7460 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_gate_open.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_gate_open.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/template_fence_gate_open", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_inventory.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_inventory.json index 9d9e8d1e..8d55ab3e 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_inventory.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_post.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_post.json index 2cb8b987..6c2bcc44 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_post.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_post.json @@ -1,6 +1,6 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/fence_post", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_side.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_side.json index b56aa86f..322ba46d 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_side.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fence_side.json @@ -1,6 +1,6 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/fence_side", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_half_slab.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_half_slab.json index 7c452149..5e556511 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_half_slab.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_half_slab.json @@ -1,8 +1,8 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "betterend:block/mossy_glowshroom_planks", - "top": "betterend:block/mossy_glowshroom_planks", - "side": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/slab", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_planks", + "side": "betterend:block/mossy_glowshroom_planks", + "top": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_inner_stairs.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_inner_stairs.json index c82d0f09..2fb55d8b 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_inner_stairs.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_inner_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "betterend:block/mossy_glowshroom_planks", - "top": "betterend:block/mossy_glowshroom_planks", - "side": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_planks", + "side": "betterend:block/mossy_glowshroom_planks", + "top": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_ladder.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_ladder.json index b3b3957b..bcd06439 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_ladder.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_ladder.json @@ -1,7 +1,6 @@ -{ - "parent": "betterend:block/reeds_ladder", - "textures": { - "particle": "betterend:block/mossy_glowshroom_ladder", - "texture": "betterend:block/mossy_glowshroom_ladder" - } -} +{ + "parent": "betterend:block/ladder", + "textures": { + "texture": "betterend:block/mossy_glowshroom_ladder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log.json index f6fa6f85..ed33292b 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log.json @@ -1,12 +1,12 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/mossy_glowshroom_log_side", - "down": "betterend:block/mossy_glowshroom_log_top", - "up": "betterend:block/mossy_glowshroom_log_top", - "north": "betterend:block/mossy_glowshroom_log_side", - "east": "betterend:block/mossy_glowshroom_log_side", - "south": "betterend:block/mossy_glowshroom_log_side", - "west": "betterend:block/mossy_glowshroom_log_side" - } -} +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_log_top", + "east": "betterend:block/mossy_glowshroom_log_side", + "north": "betterend:block/mossy_glowshroom_log_side", + "particle": "betterend:block/mossy_glowshroom_log_side", + "south": "betterend:block/mossy_glowshroom_log_side", + "up": "betterend:block/mossy_glowshroom_log_top", + "west": "betterend:block/mossy_glowshroom_log_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_outer_stairs.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_outer_stairs.json index bc243594..a9fac1cd 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_outer_stairs.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_outer_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "betterend:block/mossy_glowshroom_planks", - "top": "betterend:block/mossy_glowshroom_planks", - "side": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_planks", + "side": "betterend:block/mossy_glowshroom_planks", + "top": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_planks.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_planks.json index 20ce7e68..a71b28f8 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_planks.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_planks.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_pressure_plate_down.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_pressure_plate_down.json index 4fb34e34..a2ed2ff8 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_pressure_plate_down.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_pressure_plate_down.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/pressure_plate_down", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_pressure_plate_up.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_pressure_plate_up.json index 49b4fd8c..1e08dc0e 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_pressure_plate_up.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_pressure_plate_up.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/pressure_plate_up", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_stairs.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_stairs.json index 2bb0934b..fdfb2433 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_stairs.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "betterend:block/mossy_glowshroom_planks", - "top": "betterend:block/mossy_glowshroom_planks", - "side": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/mossy_glowshroom_planks", + "side": "betterend:block/mossy_glowshroom_planks", + "top": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark.json index 5e0ed835..5c965d62 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/mossy_glowshroom_striped_log_side" - } -} +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_striped_log_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log.json index 028f01a0..0a8079ec 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log.json @@ -1,12 +1,12 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/mossy_glowshroom_striped_log_side", - "down": "betterend:block/mossy_glowshroom_striped_log_top", - "up": "betterend:block/mossy_glowshroom_striped_log_top", - "north": "betterend:block/mossy_glowshroom_striped_log_side", - "east": "betterend:block/mossy_glowshroom_striped_log_side", - "south": "betterend:block/mossy_glowshroom_striped_log_side", - "west": "betterend:block/mossy_glowshroom_striped_log_side" - } -} +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_striped_log_top", + "east": "betterend:block/mossy_glowshroom_striped_log_side", + "north": "betterend:block/mossy_glowshroom_striped_log_side", + "particle": "betterend:block/mossy_glowshroom_striped_log_side", + "south": "betterend:block/mossy_glowshroom_striped_log_side", + "up": "betterend:block/mossy_glowshroom_striped_log_top", + "west": "betterend:block/mossy_glowshroom_striped_log_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_trapdoor.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_trapdoor.json index 22886d67..2bca8991 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_trapdoor.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_trapdoor.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "betterend:block/mossy_glowshroom_trapdoor" - }, -} +{ + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "betterend:block/mossy_glowshroom_trapdoor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_wall_gate_closed.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_wall_gate_closed.json index 1fe7bedc..751d0857 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_wall_gate_closed.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_wall_gate_closed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/template_fence_gate_wall", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_wall_gate_open.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_wall_gate_open.json index 88d18625..903e88e5 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_wall_gate_open.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_wall_gate_open.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "betterend:block/mossy_glowshroom_planks" - } -} +{ + "parent": "block/template_fence_gate_wall_open", + "textures": { + "texture": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/terminite_block.json b/src/main/resources/assets/betterend/models/block/terminite_block.json index c0a21a29..5a335712 100644 --- a/src/main/resources/assets/betterend/models/block/terminite_block.json +++ b/src/main/resources/assets/betterend/models/block/terminite_block.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/terminite_block" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/terminite_block" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/test.json b/src/main/resources/assets/betterend/models/block/test.json new file mode 100644 index 00000000..c9cfab42 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/test.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "betterend:block/mossy_glowshroom_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_ladder.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_ladder.png new file mode 100644 index 0000000000000000000000000000000000000000..004b588ab5d53486ea72debf300b492206fcc8e4 GIT binary patch literal 2052 zcmbVN3rrJd94`~W2QU?8z-T=yGa9|#qc3}-N-3|76*(ReBxsMjYkSc4O7EZrMFliW z;|Q|M2lFw^&`5A5L}#24Wg0gXaH2Tz5$B@f1``7+s8e@^(k+YIoR@s}efNF8@ArTI zZ$nCQLhyuX6GS3Wus$(1RhTDv#<&3CJ#*j{Axz^PiCLUTG%?gO{6w`o!bPI7)0y;4 zKGX0KMzS_3L9w~C)NOMJXptytvD-nA`7{sY(q_i4k@OuqApsalBU!32zy^nowlIk$ zPCBh5Ih`!YC)Jc>@gg9~jR^!cnkN9a&1&Z`w?;C|iwSGbHY5RtA$-0@qV)&_G7Tw! zj&;(2LaGEwM2-R~wG>gpYE-@eKw(4$!72!mfiQx>N=&8(ypKeX=A=wmYHYk$mhh#K zSa{xnL6FPklDcG4)@gn6crkehHoh!pmiGz_FjAI?$evJ7_4C=Ga0fNyill5@(Mp=CH6l%URfeu)}xkv&Mnx zoHW6+&UBWwjs_}alm*b~Jb_sV%w5XZDb~f!^9b_Zp<@Z2)<{qog+W*iqRMm>#$YuD ztLDQp42DOb1|bzFf+yY#%ur!g3I$WfUlf<#JH1R8k zWP~CjtZ&cb3lgSdt*q0)Qi7KS{r=q7>vSnj*2Gwa11>co2GGapl!#ywh)NMpt`FxN zmdJ2IV2i!glSUVKS5^iXPBV-kJ(Zx5ke(EvDT#NRd21Jr(7G(NK>9CvF#_XQ6YnCN zwAL)R`%O|067+{WWjkUD^mi+V&;C;4qi~^bc$U6~C4Bf=9&H!;oKt9M)PZviBGEfl z`dDrH!t-%y$MW98!*a~+tvk`PH%hFZ?IYKOdHRH!$M~_*F}d|QtJX&Yg9z6bbtHfHjmS%_y#tvmHBZ7PYp;LpxFAlt+S9TuKOS0M z$4ujMD#brOn&I#FXv3~WHIWAV&QWGXa~Zz&;m!PuZEz5tyzgaAd3?d9EIhjG^QLvT zU&e&ZGUoLDR#!T7dR+AvMcTT!NH5n zk*=VuE!sn&gIp87qPIU{Tm7Y7w~>m6&kWlecj!JWDVUz5UmM|98;O@>0?`Re(qoPn zO|I%G%-GLXio>qos_vNn^mxS>@#XK*_O)CtuQAT(`8c|2yk!hs@th0L*KF%QWyS}3 z`MlOMIlE&T56{s}nmI2mqPY~R-NHRMU9n0YbEs(@YWTgb>OQEL8W?Dq*D?jTQdr&) z*tNb>7my%caN`^BZfA$9K6$cz@0Sg-DfqIMtdyeQmOV*Z@#^3UyWG`lZkE?0c~#}( z$XZ-hPbkfoHfs%lqQkMI``$J!WN0%!ue8X6HHl*D$^Pue%+j5K__N0B_OhA3tiEOB zLQpLPM%z9xRBqjTaC+vp0jZAukTh z%$ak(^Znm{Isc4Ddv|Z%xNRebVVlFZ?G~=UaAH{Ga%}BH$aUx#62xQGvQ&KF{Rknq` z0z}5P4T+-i`Mf93d7zo57*P}{nx$BlLeh}5LkL)ksTsBgb=+Z;lW@Qe z5J+jsg`82P)va=vP{62yY*37cc3i3eBaxM%xm*=(*`0&PN?Gr1iLJzt0jL38AV9D*OOv!nvOjs1#J$ zmRARcs+JmB4Kxyw!n$S4x&p$X0D(k#G)SN(K~7Dzv@cu672bEL?zDbmN%9Lsyzr0Nwa zY>%26Iy`cAIjf^eMU0$Z5V#cYC%v?&kbas+56&l$oR{{iKEIfxQ-Hu#MM^<4C!uG>mEk!u~P)<`SrH1-%){1M(8dwF6x}r0z zwqx{BZRkKp)Fx`znYr;VF>KBDaHu`uzL1NFcb}!}Z^lN>H6C(LbZu$7wy9;bAsXLv zc0+w*-9nSQXI%|`|GP%_#TTZp?B6xAbMMl3{THq`UmBcjg^!)wGc(bmo?3)mvrm6r zgB^VChj#DdQ&+oYW@d-x4}4V{I@Wp3)qjp3px!xf@MhhO_oOFor7m9H^7FBet}?%$ z{=9?zFcDvSrFmR)i677Jji-};2(^KpFV?TGZ^$=wo&WLp`0L!muYJqC-MZ}_dvWUU zgUXzX4XqoyF@N-%1#41&^6#-v4DnUh;#PEk!}pEMz4g$Ufr+}wCC=aQ{7)M$MSp95 z<$CM{-}btBu9uv@Vz{$6^nS-vqyGRR8FaJ& literal 0 HcmV?d00001 diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json index 08432c01..a79359d4 100644 --- a/src/main/resources/betterend.mixins.common.json +++ b/src/main/resources/betterend.mixins.common.json @@ -6,7 +6,8 @@ "mixins": [ "DimensionTypeMixin", "RecipeManagerMixin", - "ServerPlayNetworkHandlerMixin" + "ServerPlayNetworkHandlerMixin", + "TagGroupLoaderMixin" ], "injectors": { "defaultRequire": 1 diff --git a/utilities/json_pretty_print.py b/utilities/json_pretty_print.py new file mode 100644 index 00000000..88a79785 --- /dev/null +++ b/utilities/json_pretty_print.py @@ -0,0 +1,22 @@ +import json +import os + +data = {} +def save_json(json_file): + with open(json_file) as read_file: + data = json.load(read_file) + with open(json_file, "w") as data_file: + json.dump(data, data_file, indent=4, sort_keys=True) + +path = "D:\\BetterEnd\\BetterEnd_1.16.3\\utility_res\\item" + +files = [] +# r=root, d=directories, f = files +for r, d, f in os.walk(path): + for file in f: + if '.json' in file: + files.append(os.path.join(r, file)) + +for f in files: + print(f) + save_json(f) \ No newline at end of file diff --git a/utility_res/block/%name%_bark.json b/utility_res/block/%name%_bark.json index 89a7f86f..adf52c39 100644 --- a/utility_res/block/%name%_bark.json +++ b/utility_res/block/%name%_bark.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_log_side" - } -} + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/%name%_log_side" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_barrel.json b/utility_res/block/%name%_barrel.json index f83e82a4..a5281570 100644 --- a/utility_res/block/%name%_barrel.json +++ b/utility_res/block/%name%_barrel.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "betterend:block/%name%_barrel_top", - "bottom": "betterend:block/%name%_barrel_bottom", - "side": "betterend:block/%name%_barrel_side" - } +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "betterend:block/%name%_barrel_bottom", + "side": "betterend:block/%name%_barrel_side", + "top": "betterend:block/%name%_barrel_top" + } } \ No newline at end of file diff --git a/utility_res/block/%name%_barrel_open.json b/utility_res/block/%name%_barrel_open.json index f1e117c8..798e4016 100644 --- a/utility_res/block/%name%_barrel_open.json +++ b/utility_res/block/%name%_barrel_open.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "betterend:block/%name%_barrel_top_open", - "bottom": "betterend:block/%name%_barrel_bottom", - "side": "betterend:block/%name%_barrel_side" - } +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "betterend:block/%name%_barrel_bottom", + "side": "betterend:block/%name%_barrel_side", + "top": "betterend:block/%name%_barrel_top_open" + } } \ No newline at end of file diff --git a/utility_res/block/%name%_button.json b/utility_res/block/%name%_button.json index cd30153c..83287ff9 100644 --- a/utility_res/block/%name%_button.json +++ b/utility_res/block/%name%_button.json @@ -1,6 +1,6 @@ { - "parent": "block/button", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/button", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_button_inventory.json b/utility_res/block/%name%_button_inventory.json index cf41b580..2de49594 100644 --- a/utility_res/block/%name%_button_inventory.json +++ b/utility_res/block/%name%_button_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/button_inventory", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/button_inventory", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_button_pressed.json b/utility_res/block/%name%_button_pressed.json index 794c8203..b5e6f56a 100644 --- a/utility_res/block/%name%_button_pressed.json +++ b/utility_res/block/%name%_button_pressed.json @@ -1,6 +1,6 @@ { - "parent": "block/button_pressed", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/button_pressed", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_crafting_table.json b/utility_res/block/%name%_crafting_table.json index 86c1fbeb..ef156ae2 100644 --- a/utility_res/block/%name%_crafting_table.json +++ b/utility_res/block/%name%_crafting_table.json @@ -1,12 +1,12 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "betterend:block/%name%_crafting_table_front", - "north": "betterend:block/%name%_crafting_table_front", - "south": "betterend:block/%name%_crafting_table_side", - "east": "betterend:block/%name%_crafting_table_side", - "west": "betterend:block/%name%_crafting_table_front", - "up": "betterend:block/%name%_crafting_table_top", - "down": "betterend:block/%name%_crafting_table_bottom" - } +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "betterend:block/%name%_crafting_table_bottom", + "east": "betterend:block/%name%_crafting_table_side", + "north": "betterend:block/%name%_crafting_table_front", + "particle": "betterend:block/%name%_crafting_table_front", + "south": "betterend:block/%name%_crafting_table_side", + "up": "betterend:block/%name%_crafting_table_top", + "west": "betterend:block/%name%_crafting_table_front" + } } \ No newline at end of file diff --git a/utility_res/block/%name%_door_bottom.json b/utility_res/block/%name%_door_bottom.json index e42e04ab..bfe8f00d 100644 --- a/utility_res/block/%name%_door_bottom.json +++ b/utility_res/block/%name%_door_bottom.json @@ -1,7 +1,7 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "betterend:block/%name%_door_bottom", - "top": "betterend:block/%name%_door_bottom" - } -} +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "betterend:block/%name%_door_bottom", + "top": "betterend:block/%name%_door_bottom" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_door_bottom_hinge.json b/utility_res/block/%name%_door_bottom_hinge.json index df4ca1bb..e7ac09d7 100644 --- a/utility_res/block/%name%_door_bottom_hinge.json +++ b/utility_res/block/%name%_door_bottom_hinge.json @@ -1,7 +1,7 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "betterend:block/%name%_door_bottom", - "top": "betterend:block/%name%_door_bottom" - } -} +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "betterend:block/%name%_door_bottom", + "top": "betterend:block/%name%_door_bottom" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_door_top.json b/utility_res/block/%name%_door_top.json index c6b7926a..d54c62d2 100644 --- a/utility_res/block/%name%_door_top.json +++ b/utility_res/block/%name%_door_top.json @@ -1,7 +1,7 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "betterend:block/%name%_door_top", - "top": "betterend:block/%name%_door_top" - } -} +{ + "parent": "block/door_top", + "textures": { + "bottom": "betterend:block/%name%_door_top", + "top": "betterend:block/%name%_door_top" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_door_top_hinge.json b/utility_res/block/%name%_door_top_hinge.json index 9c637737..253f10e8 100644 --- a/utility_res/block/%name%_door_top_hinge.json +++ b/utility_res/block/%name%_door_top_hinge.json @@ -1,7 +1,7 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "betterend:block/%name%_door_top", - "top": "betterend:block/%name%_door_top" - } -} +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "betterend:block/%name%_door_top", + "top": "betterend:block/%name%_door_top" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_empty.json b/utility_res/block/%name%_empty.json index b1ce4cd8..ff2eaa83 100644 --- a/utility_res/block/%name%_empty.json +++ b/utility_res/block/%name%_empty.json @@ -1,5 +1,5 @@ { - "textures": { - "particle": "betterend:block/%name%_planks" - } + "textures": { + "particle": "betterend:block/%name%_planks" + } } \ No newline at end of file diff --git a/utility_res/block/%name%_fence_gate_closed.json b/utility_res/block/%name%_fence_gate_closed.json index 4fb47ee0..3bbd7441 100644 --- a/utility_res/block/%name%_fence_gate_closed.json +++ b/utility_res/block/%name%_fence_gate_closed.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/template_fence_gate", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_fence_gate_open.json b/utility_res/block/%name%_fence_gate_open.json index e33ae7f4..3c4d6e5a 100644 --- a/utility_res/block/%name%_fence_gate_open.json +++ b/utility_res/block/%name%_fence_gate_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/template_fence_gate_open", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_fence_inventory.json b/utility_res/block/%name%_fence_inventory.json index 02c8c7bb..1703d001 100644 --- a/utility_res/block/%name%_fence_inventory.json +++ b/utility_res/block/%name%_fence_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_inventory", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/fence_inventory", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_fence_post.json b/utility_res/block/%name%_fence_post.json index e876bdf9..6046614e 100644 --- a/utility_res/block/%name%_fence_post.json +++ b/utility_res/block/%name%_fence_post.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_post", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/fence_post", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_fence_side.json b/utility_res/block/%name%_fence_side.json index 93a638e5..497d8678 100644 --- a/utility_res/block/%name%_fence_side.json +++ b/utility_res/block/%name%_fence_side.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_side", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/fence_side", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_half_slab.json b/utility_res/block/%name%_half_slab.json index 83023604..11cc8ec9 100644 --- a/utility_res/block/%name%_half_slab.json +++ b/utility_res/block/%name%_half_slab.json @@ -1,8 +1,8 @@ { - "parent": "block/slab", - "textures": { - "bottom": "betterend:block/%name%_planks", - "top": "betterend:block/%name%_planks", - "side": "betterend:block/%name%_planks" - } -} + "parent": "block/slab", + "textures": { + "bottom": "betterend:block/%name%_planks", + "side": "betterend:block/%name%_planks", + "top": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_inner_stairs.json b/utility_res/block/%name%_inner_stairs.json index 0c6d1bac..285d5889 100644 --- a/utility_res/block/%name%_inner_stairs.json +++ b/utility_res/block/%name%_inner_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/inner_stairs", - "textures": { - "bottom": "betterend:block/%name%_planks", - "top": "betterend:block/%name%_planks", - "side": "betterend:block/%name%_planks" - } -} + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/%name%_planks", + "side": "betterend:block/%name%_planks", + "top": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_ladder.json b/utility_res/block/%name%_ladder.json index 7a4a601a..5c1bb128 100644 --- a/utility_res/block/%name%_ladder.json +++ b/utility_res/block/%name%_ladder.json @@ -1,7 +1,6 @@ { - "parent": "betterend:block/reeds_ladder", - "textures": { - "particle": "betterend:block/%name%_ladder", - "texture": "betterend:block/%name%_ladder" - } -} + "parent": "betterend:block/ladder", + "textures": { + "texture": "betterend:block/%name%_ladder" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_log.json b/utility_res/block/%name%_log.json index f699fc9b..f39f702c 100644 --- a/utility_res/block/%name%_log.json +++ b/utility_res/block/%name%_log.json @@ -1,12 +1,12 @@ { - "parent": "block/cube", - "textures": { - "particle": "betterend:block/%name%_log_side", - "down": "betterend:block/%name%_log_top", - "up": "betterend:block/%name%_log_top", - "north": "betterend:block/%name%_log_side", - "east": "betterend:block/%name%_log_side", - "south": "betterend:block/%name%_log_side", - "west": "betterend:block/%name%_log_side" - } + "parent": "block/cube", + "textures": { + "down": "betterend:block/%name%_log_top", + "east": "betterend:block/%name%_log_side", + "north": "betterend:block/%name%_log_side", + "particle": "betterend:block/%name%_log_side", + "south": "betterend:block/%name%_log_side", + "up": "betterend:block/%name%_log_top", + "west": "betterend:block/%name%_log_side" + } } \ No newline at end of file diff --git a/utility_res/block/%name%_outer_stairs.json b/utility_res/block/%name%_outer_stairs.json index 2fd9280f..a9d31e13 100644 --- a/utility_res/block/%name%_outer_stairs.json +++ b/utility_res/block/%name%_outer_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/outer_stairs", - "textures": { - "bottom": "betterend:block/%name%_planks", - "top": "betterend:block/%name%_planks", - "side": "betterend:block/%name%_planks" - } -} + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/%name%_planks", + "side": "betterend:block/%name%_planks", + "top": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_planks.json b/utility_res/block/%name%_planks.json index 195b9b39..1f5af9a5 100644 --- a/utility_res/block/%name%_planks.json +++ b/utility_res/block/%name%_planks.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_planks" - } -} + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_pressure_plate_down.json b/utility_res/block/%name%_pressure_plate_down.json index 65000620..45c7fa14 100644 --- a/utility_res/block/%name%_pressure_plate_down.json +++ b/utility_res/block/%name%_pressure_plate_down.json @@ -1,6 +1,6 @@ { - "parent": "block/pressure_plate_down", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/pressure_plate_down", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_pressure_plate_up.json b/utility_res/block/%name%_pressure_plate_up.json index 7c318d35..1fffa964 100644 --- a/utility_res/block/%name%_pressure_plate_up.json +++ b/utility_res/block/%name%_pressure_plate_up.json @@ -1,6 +1,6 @@ { - "parent": "block/pressure_plate_up", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/pressure_plate_up", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_stairs.json b/utility_res/block/%name%_stairs.json index df9bf42e..1ef39de8 100644 --- a/utility_res/block/%name%_stairs.json +++ b/utility_res/block/%name%_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", - "textures": { - "bottom": "betterend:block/%name%_planks", - "top": "betterend:block/%name%_planks", - "side": "betterend:block/%name%_planks" - } -} + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/%name%_planks", + "side": "betterend:block/%name%_planks", + "top": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_striped_bark.json b/utility_res/block/%name%_striped_bark.json index 985dab5c..9f20a2ae 100644 --- a/utility_res/block/%name%_striped_bark.json +++ b/utility_res/block/%name%_striped_bark.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_striped_log_side" - } -} + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/%name%_striped_log_side" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_striped_log.json b/utility_res/block/%name%_striped_log.json index a4a7d2ac..8347919d 100644 --- a/utility_res/block/%name%_striped_log.json +++ b/utility_res/block/%name%_striped_log.json @@ -1,12 +1,12 @@ { - "parent": "block/cube", - "textures": { - "particle": "betterend:block/%name%_striped_log_side", - "down": "betterend:block/%name%_striped_log_top", - "up": "betterend:block/%name%_striped_log_top", - "north": "betterend:block/%name%_striped_log_side", - "east": "betterend:block/%name%_striped_log_side", - "south": "betterend:block/%name%_striped_log_side", - "west": "betterend:block/%name%_striped_log_side" - } + "parent": "block/cube", + "textures": { + "down": "betterend:block/%name%_striped_log_top", + "east": "betterend:block/%name%_striped_log_side", + "north": "betterend:block/%name%_striped_log_side", + "particle": "betterend:block/%name%_striped_log_side", + "south": "betterend:block/%name%_striped_log_side", + "up": "betterend:block/%name%_striped_log_top", + "west": "betterend:block/%name%_striped_log_side" + } } \ No newline at end of file diff --git a/utility_res/block/%name%_trapdoor.json b/utility_res/block/%name%_trapdoor.json index fb8eadb0..eca1f02e 100644 --- a/utility_res/block/%name%_trapdoor.json +++ b/utility_res/block/%name%_trapdoor.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "betterend:block/%name%_trapdoor" - }, +{ + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "betterend:block/%name%_trapdoor" + } } \ No newline at end of file diff --git a/utility_res/block/%name%_wall_gate_closed.json b/utility_res/block/%name%_wall_gate_closed.json index f62fc0df..721da886 100644 --- a/utility_res/block/%name%_wall_gate_closed.json +++ b/utility_res/block/%name%_wall_gate_closed.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/template_fence_gate_wall", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/block/%name%_wall_gate_open.json b/utility_res/block/%name%_wall_gate_open.json index 08bd710d..351d1bbc 100644 --- a/utility_res/block/%name%_wall_gate_open.json +++ b/utility_res/block/%name%_wall_gate_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} + "parent": "block/template_fence_gate_wall_open", + "textures": { + "texture": "betterend:block/%name%_planks" + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_bark.json b/utility_res/blockstates/%name%_bark.json index 4f8b43a3..ccf25d5e 100644 --- a/utility_res/blockstates/%name%_bark.json +++ b/utility_res/blockstates/%name%_bark.json @@ -1,7 +1,16 @@ { - "variants": { - "axis=y": { "model": "betterend:block/%name%_bark" }, - "axis=z": { "model": "betterend:block/%name%_bark", "x": 90 }, - "axis=x": { "model": "betterend:block/%name%_bark", "x": 90, "y": 90 } + "variants": { + "axis=x": { + "model": "betterend:block/%name%_bark", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "betterend:block/%name%_bark" + }, + "axis=z": { + "model": "betterend:block/%name%_bark", + "x": 90 } + } } \ No newline at end of file diff --git a/utility_res/blockstates/%name%_barrel.json b/utility_res/blockstates/%name%_barrel.json index 87c4742e..c7cd6877 100644 --- a/utility_res/blockstates/%name%_barrel.json +++ b/utility_res/blockstates/%name%_barrel.json @@ -1,56 +1,56 @@ { "variants": { "facing=down,open=false": { - "x": 180, - "model": "betterend:block/%name%_barrel" - }, + "model": "betterend:block/%name%_barrel", + "x": 180 + }, "facing=down,open=true": { - "x": 180, - "model": "betterend:block/%name%_barrel_open" - }, + "model": "betterend:block/%name%_barrel_open", + "x": 180 + }, "facing=east,open=false": { - "x": 90, - "y": 90, - "model": "betterend:block/%name%_barrel" - }, + "model": "betterend:block/%name%_barrel", + "x": 90, + "y": 90 + }, "facing=east,open=true": { - "x": 90, - "y": 90, - "model": "betterend:block/%name%_barrel_open" - }, + "model": "betterend:block/%name%_barrel_open", + "x": 90, + "y": 90 + }, "facing=north,open=false": { - "x": 90, - "model": "betterend:block/%name%_barrel" - }, + "model": "betterend:block/%name%_barrel", + "x": 90 + }, "facing=north,open=true": { - "x": 90, - "model": "betterend:block/%name%_barrel_open" - }, + "model": "betterend:block/%name%_barrel_open", + "x": 90 + }, "facing=south,open=false": { - "x": 90, - "y": 180, - "model": "betterend:block/%name%_barrel" - }, + "model": "betterend:block/%name%_barrel", + "x": 90, + "y": 180 + }, "facing=south,open=true": { - "x": 90, - "y": 180, - "model": "betterend:block/%name%_barrel_open" - }, + "model": "betterend:block/%name%_barrel_open", + "x": 90, + "y": 180 + }, "facing=up,open=false": { "model": "betterend:block/%name%_barrel" - }, + }, "facing=up,open=true": { "model": "betterend:block/%name%_barrel_open" - }, + }, "facing=west,open=false": { - "x": 90, - "y": 270, - "model": "betterend:block/%name%_barrel" - }, + "model": "betterend:block/%name%_barrel", + "x": 90, + "y": 270 + }, "facing=west,open=true": { - "x": 90, - "y": 270, - "model": "betterend:block/%name%_barrel_open" + "model": "betterend:block/%name%_barrel_open", + "x": 90, + "y": 270 } } } \ No newline at end of file diff --git a/utility_res/blockstates/%name%_button.json b/utility_res/blockstates/%name%_button.json index d39cd83f..f0a946f9 100644 --- a/utility_res/blockstates/%name%_button.json +++ b/utility_res/blockstates/%name%_button.json @@ -1,28 +1,118 @@ { - "variants": { - "face=floor,facing=east,powered=false": { "model": "betterend:block/%name%_button", "y": 90 }, - "face=floor,facing=west,powered=false": { "model": "betterend:block/%name%_button", "y": 270 }, - "face=floor,facing=south,powered=false": { "model": "betterend:block/%name%_button", "y": 180 }, - "face=floor,facing=north,powered=false": { "model": "betterend:block/%name%_button" }, - "face=wall,facing=east,powered=false": { "model": "betterend:block/%name%_button", "uvlock": true, "x": 90, "y": 90 }, - "face=wall,facing=west,powered=false": { "model": "betterend:block/%name%_button", "uvlock": true, "x": 90, "y": 270 }, - "face=wall,facing=south,powered=false": { "model": "betterend:block/%name%_button", "uvlock": true, "x": 90, "y": 180 }, - "face=wall,facing=north,powered=false": { "model": "betterend:block/%name%_button", "uvlock": true, "x": 90 }, - "face=ceiling,facing=east,powered=false": { "model": "betterend:block/%name%_button", "x": 180, "y": 270 }, - "face=ceiling,facing=west,powered=false": { "model": "betterend:block/%name%_button", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=false": { "model": "betterend:block/%name%_button", "x": 180 }, - "face=ceiling,facing=north,powered=false": { "model": "betterend:block/%name%_button", "x": 180, "y": 180 }, - "face=floor,facing=east,powered=true": { "model": "betterend:block/%name%_button_pressed", "y": 90 }, - "face=floor,facing=west,powered=true": { "model": "betterend:block/%name%_button_pressed", "y": 270 }, - "face=floor,facing=south,powered=true": { "model": "betterend:block/%name%_button_pressed", "y": 180 }, - "face=floor,facing=north,powered=true": { "model": "betterend:block/%name%_button_pressed" }, - "face=wall,facing=east,powered=true": { "model": "betterend:block/%name%_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "face=wall,facing=west,powered=true": { "model": "betterend:block/%name%_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "face=wall,facing=south,powered=true": { "model": "betterend:block/%name%_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "face=wall,facing=north,powered=true": { "model": "betterend:block/%name%_button_pressed", "uvlock": true, "x": 90 }, - "face=ceiling,facing=east,powered=true": { "model": "betterend:block/%name%_button_pressed", "x": 180, "y": 270 }, - "face=ceiling,facing=west,powered=true": { "model": "betterend:block/%name%_button_pressed", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=true": { "model": "betterend:block/%name%_button_pressed", "x": 180 }, - "face=ceiling,facing=north,powered=true": { "model": "betterend:block/%name%_button_pressed", "x": 180, "y": 180 } + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "betterend:block/%name%_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "betterend:block/%name%_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "betterend:block/%name%_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "betterend:block/%name%_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "betterend:block/%name%_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "betterend:block/%name%_button" + }, + "face=floor,facing=north,powered=true": { + "model": "betterend:block/%name%_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "betterend:block/%name%_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "betterend:block/%name%_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "betterend:block/%name%_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "betterend:block/%name%_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "betterend:block/%name%_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "betterend:block/%name%_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 } -} + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_crafting_table.json b/utility_res/blockstates/%name%_crafting_table.json index f135edd1..c9232bea 100644 --- a/utility_res/blockstates/%name%_crafting_table.json +++ b/utility_res/blockstates/%name%_crafting_table.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_crafting_table" - } - } +{ + "variants": { + "": { + "model": "betterend:block/%name%_crafting_table" + } + } } \ No newline at end of file diff --git a/utility_res/blockstates/%name%_door.json b/utility_res/blockstates/%name%_door.json index fe44fede..5abde295 100644 --- a/utility_res/blockstates/%name%_door.json +++ b/utility_res/blockstates/%name%_door.json @@ -1,36 +1,124 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "betterend:block/%name%_door_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "betterend:block/%name%_door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "betterend:block/%name%_door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "betterend:block/%name%_door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "betterend:block/%name%_door_bottom_hinge" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "betterend:block/%name%_door_bottom_hinge", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "betterend:block/%name%_door_bottom_hinge", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "betterend:block/%name%_door_bottom_hinge", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "betterend:block/%name%_door_bottom_hinge", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "betterend:block/%name%_door_bottom_hinge", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "betterend:block/%name%_door_bottom_hinge", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "betterend:block/%name%_door_bottom_hinge" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "betterend:block/%name%_door_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "betterend:block/%name%_door_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "betterend:block/%name%_door_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "betterend:block/%name%_door_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "betterend:block/%name%_door_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "betterend:block/%name%_door_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "betterend:block/%name%_door_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "betterend:block/%name%_door_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "betterend:block/%name%_door_top_hinge" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "betterend:block/%name%_door_top_hinge", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "betterend:block/%name%_door_top_hinge", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "betterend:block/%name%_door_top_hinge", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "betterend:block/%name%_door_top_hinge", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "betterend:block/%name%_door_top_hinge", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "betterend:block/%name%_door_top_hinge", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "betterend:block/%name%_door_top_hinge" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "betterend:block/%name%_door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "betterend:block/%name%_door_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "betterend:block/%name%_door_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "betterend:block/%name%_door_top", "y": 180 } - } -} +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { + "model": "betterend:block/%name%_door_bottom" + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "betterend:block/%name%_door_bottom_hinge", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "betterend:block/%name%_door_bottom_hinge" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "betterend:block/%name%_door_bottom", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "betterend:block/%name%_door_top" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "betterend:block/%name%_door_top_hinge", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "betterend:block/%name%_door_top_hinge" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "betterend:block/%name%_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "betterend:block/%name%_door_bottom", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "betterend:block/%name%_door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "betterend:block/%name%_door_bottom_hinge", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "betterend:block/%name%_door_bottom", + "y": 180 + }, + "facing=north,half=upper,hinge=left,open=false": { + "model": "betterend:block/%name%_door_top", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "betterend:block/%name%_door_top_hinge" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "betterend:block/%name%_door_top_hinge", + "y": 270 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "betterend:block/%name%_door_top", + "y": 180 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "betterend:block/%name%_door_bottom", + "y": 90 + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "betterend:block/%name%_door_bottom_hinge", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "betterend:block/%name%_door_bottom_hinge", + "y": 90 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "betterend:block/%name%_door_bottom" + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "betterend:block/%name%_door_top", + "y": 90 + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "betterend:block/%name%_door_top_hinge", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "betterend:block/%name%_door_top_hinge", + "y": 90 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "betterend:block/%name%_door_top" + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "betterend:block/%name%_door_bottom", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "betterend:block/%name%_door_bottom_hinge", + "y": 270 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "betterend:block/%name%_door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "betterend:block/%name%_door_bottom", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "betterend:block/%name%_door_top", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "betterend:block/%name%_door_top_hinge", + "y": 270 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "betterend:block/%name%_door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "betterend:block/%name%_door_top", + "y": 90 + } + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_fence.json b/utility_res/blockstates/%name%_fence.json index 965a6b33..25a9a18b 100644 --- a/utility_res/blockstates/%name%_fence.json +++ b/utility_res/blockstates/%name%_fence.json @@ -1,17 +1,48 @@ { - "multipart": [ - { "apply": { "model": "betterend:block/%name%_fence_post" }}, - { "when": { "north": true }, - "apply": { "model": "betterend:block/%name%_fence_side", "uvlock": true } - }, - { "when": { "east": true }, - "apply": { "model": "betterend:block/%name%_fence_side", "y": 90, "uvlock": true } - }, - { "when": { "south": true }, - "apply": { "model": "betterend:block/%name%_fence_side", "y": 180, "uvlock": true } - }, - { "when": { "west": true }, - "apply": { "model": "betterend:block/%name%_fence_side", "y": 270, "uvlock": true } - } - ] -} + "multipart": [ + { + "apply": { + "model": "betterend:block/%name%_fence_post" + } + }, + { + "apply": { + "model": "betterend:block/%name%_fence_side", + "uvlock": true + }, + "when": { + "north": true + } + }, + { + "apply": { + "model": "betterend:block/%name%_fence_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": true + } + }, + { + "apply": { + "model": "betterend:block/%name%_fence_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": true + } + }, + { + "apply": { + "model": "betterend:block/%name%_fence_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": true + } + } + ] +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_gate.json b/utility_res/blockstates/%name%_gate.json index 2993f4ce..3ea285ea 100644 --- a/utility_res/blockstates/%name%_gate.json +++ b/utility_res/blockstates/%name%_gate.json @@ -1,20 +1,80 @@ { - "variants": { - "facing=south,in_wall=false,open=false": { "model": "betterend:block/%name%_fence_gate_closed", "uvlock": true }, - "facing=west,in_wall=false,open=false": { "model": "betterend:block/%name%_fence_gate_closed", "uvlock": true, "y": 90 }, - "facing=north,in_wall=false,open=false": { "model": "betterend:block/%name%_fence_gate_closed", "uvlock": true, "y": 180 }, - "facing=east,in_wall=false,open=false": { "model": "betterend:block/%name%_fence_gate_closed", "uvlock": true, "y": 270 }, - "facing=south,in_wall=false,open=true": { "model": "betterend:block/%name%_fence_gate_open", "uvlock": true }, - "facing=west,in_wall=false,open=true": { "model": "betterend:block/%name%_fence_gate_open", "uvlock": true, "y": 90 }, - "facing=north,in_wall=false,open=true": { "model": "betterend:block/%name%_fence_gate_open", "uvlock": true, "y": 180 }, - "facing=east,in_wall=false,open=true": { "model": "betterend:block/%name%_fence_gate_open", "uvlock": true, "y": 270 }, - "facing=south,in_wall=true,open=false": { "model": "betterend:block/%name%_wall_gate_closed", "uvlock": true }, - "facing=west,in_wall=true,open=false": { "model": "betterend:block/%name%_wall_gate_closed", "uvlock": true, "y": 90 }, - "facing=north,in_wall=true,open=false": { "model": "betterend:block/%name%_wall_gate_closed", "uvlock": true, "y": 180 }, - "facing=east,in_wall=true,open=false": { "model": "betterend:block/%name%_wall_gate_closed", "uvlock": true, "y": 270 }, - "facing=south,in_wall=true,open=true": { "model": "betterend:block/%name%_wall_gate_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { "model": "betterend:block/%name%_wall_gate_open", "uvlock": true, "y": 90 }, - "facing=north,in_wall=true,open=true": { "model": "betterend:block/%name%_wall_gate_open", "uvlock": true, "y": 180 }, - "facing=east,in_wall=true,open=true": { "model": "betterend:block/%name%_wall_gate_open", "uvlock": true, "y": 270 } + "variants": { + "facing=east,in_wall=false,open=false": { + "model": "betterend:block/%name%_fence_gate_closed", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=false,open=true": { + "model": "betterend:block/%name%_fence_gate_open", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=true,open=false": { + "model": "betterend:block/%name%_wall_gate_closed", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=true,open=true": { + "model": "betterend:block/%name%_wall_gate_open", + "uvlock": true, + "y": 270 + }, + "facing=north,in_wall=false,open=false": { + "model": "betterend:block/%name%_fence_gate_closed", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=false,open=true": { + "model": "betterend:block/%name%_fence_gate_open", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=true,open=false": { + "model": "betterend:block/%name%_wall_gate_closed", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=true,open=true": { + "model": "betterend:block/%name%_wall_gate_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "betterend:block/%name%_fence_gate_closed", + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "betterend:block/%name%_fence_gate_open", + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "betterend:block/%name%_wall_gate_closed", + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "betterend:block/%name%_wall_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "betterend:block/%name%_fence_gate_closed", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=false,open=true": { + "model": "betterend:block/%name%_fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "betterend:block/%name%_wall_gate_closed", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { + "model": "betterend:block/%name%_wall_gate_open", + "uvlock": true, + "y": 90 } -} + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_ladder.json b/utility_res/blockstates/%name%_ladder.json index d8db75a1..c316f3e0 100644 --- a/utility_res/blockstates/%name%_ladder.json +++ b/utility_res/blockstates/%name%_ladder.json @@ -1,8 +1,19 @@ { - "variants": { - "facing=north": { "model": "betterend:block/%name%_ladder" }, - "facing=east": { "model": "betterend:block/%name%_ladder", "y": 90 }, - "facing=south": { "model": "betterend:block/%name%_ladder", "y": 180 }, - "facing=west": { "model": "betterend:block/%name%_ladder", "y": 270 } + "variants": { + "facing=east": { + "model": "betterend:block/%name%_ladder", + "y": 90 + }, + "facing=north": { + "model": "betterend:block/%name%_ladder" + }, + "facing=south": { + "model": "betterend:block/%name%_ladder", + "y": 180 + }, + "facing=west": { + "model": "betterend:block/%name%_ladder", + "y": 270 } -} + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_log.json b/utility_res/blockstates/%name%_log.json index 5799c52b..ad192214 100644 --- a/utility_res/blockstates/%name%_log.json +++ b/utility_res/blockstates/%name%_log.json @@ -1,7 +1,16 @@ { - "variants": { - "axis=y": { "model": "betterend:block/%name%_log" }, - "axis=z": { "model": "betterend:block/%name%_log", "x": 90 }, - "axis=x": { "model": "betterend:block/%name%_log", "x": 90, "y": 90 } + "variants": { + "axis=x": { + "model": "betterend:block/%name%_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "betterend:block/%name%_log" + }, + "axis=z": { + "model": "betterend:block/%name%_log", + "x": 90 } -} + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_planks.json b/utility_res/blockstates/%name%_planks.json index 9392891e..4037252d 100644 --- a/utility_res/blockstates/%name%_planks.json +++ b/utility_res/blockstates/%name%_planks.json @@ -1,6 +1,7 @@ { - "variants": - { - "": { "model": "betterend:block/%name%_planks" } + "variants": { + "": { + "model": "betterend:block/%name%_planks" } + } } \ No newline at end of file diff --git a/utility_res/blockstates/%name%_plate.json b/utility_res/blockstates/%name%_plate.json index a21597b9..4060f8da 100644 --- a/utility_res/blockstates/%name%_plate.json +++ b/utility_res/blockstates/%name%_plate.json @@ -1,6 +1,10 @@ { - "variants": { - "powered=false": { "model": "betterend:block/%name%_pressure_plate_up" }, - "powered=true": { "model": "betterend:block/%name%_pressure_plate_down" } + "variants": { + "powered=false": { + "model": "betterend:block/%name%_pressure_plate_up" + }, + "powered=true": { + "model": "betterend:block/%name%_pressure_plate_down" } -} + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_sign.json b/utility_res/blockstates/%name%_sign.json index 31456e62..9b653c2b 100644 --- a/utility_res/blockstates/%name%_sign.json +++ b/utility_res/blockstates/%name%_sign.json @@ -1,5 +1,7 @@ { "variants": { - "": { "model": "betterend:block/%name%_empty" } + "": { + "model": "betterend:block/%name%_empty" + } } } \ No newline at end of file diff --git a/utility_res/blockstates/%name%_slab.json b/utility_res/blockstates/%name%_slab.json index 1c90e822..bcf1af27 100644 --- a/utility_res/blockstates/%name%_slab.json +++ b/utility_res/blockstates/%name%_slab.json @@ -1,8 +1,15 @@ { - "variants": - { - "type=bottom": { "model": "betterend:block/%name%_half_slab" }, - "type=top": { "model": "betterend:block/%name%_half_slab", "x": 180, "uvlock": true }, - "type=double": { "model": "betterend:block/%name%_planks" } + "variants": { + "type=bottom": { + "model": "betterend:block/%name%_half_slab" + }, + "type=double": { + "model": "betterend:block/%name%_planks" + }, + "type=top": { + "model": "betterend:block/%name%_half_slab", + "uvlock": true, + "x": 180 } -} + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_stairs.json b/utility_res/blockstates/%name%_stairs.json index 5edafd16..685e1861 100644 --- a/utility_res/blockstates/%name%_stairs.json +++ b/utility_res/blockstates/%name%_stairs.json @@ -1,44 +1,209 @@ { - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "betterend:block/%name%_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "betterend:block/%name%_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "betterend:block/%name%_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "betterend:block/%name%_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "betterend:block/%name%_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "betterend:block/%name%_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "betterend:block/%name%_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "betterend:block/%name%_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "betterend:block/%name%_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "betterend:block/%name%_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "betterend:block/%name%_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "betterend:block/%name%_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "betterend:block/%name%_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "betterend:block/%name%_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "betterend:block/%name%_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "betterend:block/%name%_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "betterend:block/%name%_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "betterend:block/%name%_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "betterend:block/%name%_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "betterend:block/%name%_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "betterend:block/%name%_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "betterend:block/%name%_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "betterend:block/%name%_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "betterend:block/%name%_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "betterend:block/%name%_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "betterend:block/%name%_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "betterend:block/%name%_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "betterend:block/%name%_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "betterend:block/%name%_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "betterend:block/%name%_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "betterend:block/%name%_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "betterend:block/%name%_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "betterend:block/%name%_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "betterend:block/%name%_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "betterend:block/%name%_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "betterend:block/%name%_inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "betterend:block/%name%_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "betterend:block/%name%_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "betterend:block/%name%_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "betterend:block/%name%_inner_stairs", "x": 180, "y": 270, "uvlock": true } + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs" + }, + "facing=east,half=bottom,shape=straight": { + "model": "betterend:block/%name%_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "x": 180, + "y": 180 } -} + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_striped_bark.json b/utility_res/blockstates/%name%_striped_bark.json index 84df3f4b..bafe0e89 100644 --- a/utility_res/blockstates/%name%_striped_bark.json +++ b/utility_res/blockstates/%name%_striped_bark.json @@ -1,7 +1,16 @@ { - "variants": { - "axis=y": { "model": "betterend:block/%name%_striped_bark" }, - "axis=z": { "model": "betterend:block/%name%_striped_bark", "x": 90 }, - "axis=x": { "model": "betterend:block/%name%_striped_bark", "x": 90, "y": 90 } + "variants": { + "axis=x": { + "model": "betterend:block/%name%_striped_bark", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "betterend:block/%name%_striped_bark" + }, + "axis=z": { + "model": "betterend:block/%name%_striped_bark", + "x": 90 } + } } \ No newline at end of file diff --git a/utility_res/blockstates/%name%_striped_log.json b/utility_res/blockstates/%name%_striped_log.json index b68584df..fa8efe83 100644 --- a/utility_res/blockstates/%name%_striped_log.json +++ b/utility_res/blockstates/%name%_striped_log.json @@ -1,7 +1,16 @@ { - "variants": { - "axis=y": { "model": "betterend:block/%name%_striped_log" }, - "axis=z": { "model": "betterend:block/%name%_striped_log", "x": 90 }, - "axis=x": { "model": "betterend:block/%name%_striped_log", "x": 90, "y": 90 } + "variants": { + "axis=x": { + "model": "betterend:block/%name%_striped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "betterend:block/%name%_striped_log" + }, + "axis=z": { + "model": "betterend:block/%name%_striped_log", + "x": 90 } -} + } +} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_trapdoor.json b/utility_res/blockstates/%name%_trapdoor.json index 30028fed..d59b2831 100644 --- a/utility_res/blockstates/%name%_trapdoor.json +++ b/utility_res/blockstates/%name%_trapdoor.json @@ -1,20 +1,77 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { "model": "betterend:block/%name%_trapdoor" }, - "facing=south,half=bottom,open=false": { "model": "betterend:block/%name%_trapdoor", "y": 180 }, - "facing=east,half=bottom,open=false": { "model": "betterend:block/%name%_trapdoor", "y": 90 }, - "facing=west,half=bottom,open=false": { "model": "betterend:block/%name%_trapdoor", "y": 270 }, - "facing=north,half=top,open=false": { "model": "betterend:block/%name%_trapdoor", "x": 180 }, - "facing=south,half=top,open=false": { "model": "betterend:block/%name%_trapdoor", "x": 180, "y": 180 }, - "facing=east,half=top,open=false": { "model": "betterend:block/%name%_trapdoor", "x": 180, "y": 90 }, - "facing=west,half=top,open=false": { "model": "betterend:block/%name%_trapdoor", "x": 180, "y": 270 }, - "facing=north,half=bottom,open=true": { "model": "betterend:block/%name%_trapdoor", "x": 90 }, - "facing=south,half=bottom,open=true": { "model": "betterend:block/%name%_trapdoor", "x": 90, "y": 180 }, - "facing=east,half=bottom,open=true": { "model": "betterend:block/%name%_trapdoor", "x": 90, "y": 90 }, - "facing=west,half=bottom,open=true": { "model": "betterend:block/%name%_trapdoor", "x": 90, "y": 270 }, - "facing=north,half=top,open=true": { "model": "betterend:block/%name%_trapdoor", "x": 270, "y": 180 }, - "facing=south,half=top,open=true": { "model": "betterend:block/%name%_trapdoor", "x": 270, "y": 0 }, - "facing=east,half=top,open=true": { "model": "betterend:block/%name%_trapdoor", "x": 270, "y": 270 }, - "facing=west,half=top,open=true": { "model": "betterend:block/%name%_trapdoor", "x": 270, "y": 90 } - } -} +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "betterend:block/%name%_trapdoor", + "y": 90 + }, + "facing=east,half=bottom,open=true": { + "model": "betterend:block/%name%_trapdoor", + "x": 90, + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "betterend:block/%name%_trapdoor", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "betterend:block/%name%_trapdoor", + "x": 270, + "y": 270 + }, + "facing=north,half=bottom,open=false": { + "model": "betterend:block/%name%_trapdoor" + }, + "facing=north,half=bottom,open=true": { + "model": "betterend:block/%name%_trapdoor", + "x": 90 + }, + "facing=north,half=top,open=false": { + "model": "betterend:block/%name%_trapdoor", + "x": 180 + }, + "facing=north,half=top,open=true": { + "model": "betterend:block/%name%_trapdoor", + "x": 270, + "y": 180 + }, + "facing=south,half=bottom,open=false": { + "model": "betterend:block/%name%_trapdoor", + "y": 180 + }, + "facing=south,half=bottom,open=true": { + "model": "betterend:block/%name%_trapdoor", + "x": 90, + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "betterend:block/%name%_trapdoor", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "betterend:block/%name%_trapdoor", + "x": 270, + "y": 0 + }, + "facing=west,half=bottom,open=false": { + "model": "betterend:block/%name%_trapdoor", + "y": 270 + }, + "facing=west,half=bottom,open=true": { + "model": "betterend:block/%name%_trapdoor", + "x": 90, + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "betterend:block/%name%_trapdoor", + "x": 180, + "y": 270 + }, + "facing=west,half=top,open=true": { + "model": "betterend:block/%name%_trapdoor", + "x": 270, + "y": 90 + } + } +} \ No newline at end of file diff --git a/utility_res/item/%name%_bark.json b/utility_res/item/%name%_bark.json index c75cd721..115e8d98 100644 --- a/utility_res/item/%name%_bark.json +++ b/utility_res/item/%name%_bark.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_bark" -} + "parent": "betterend:block/%name%_bark" +} \ No newline at end of file diff --git a/utility_res/item/%name%_barrel.json b/utility_res/item/%name%_barrel.json index 68c2f007..55386ba8 100644 --- a/utility_res/item/%name%_barrel.json +++ b/utility_res/item/%name%_barrel.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_barrel" + "parent": "betterend:block/%name%_barrel" } \ No newline at end of file diff --git a/utility_res/item/%name%_button.json b/utility_res/item/%name%_button.json index 35b8ce39..240fb2d7 100644 --- a/utility_res/item/%name%_button.json +++ b/utility_res/item/%name%_button.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_button_inventory" -} + "parent": "betterend:block/%name%_button_inventory" +} \ No newline at end of file diff --git a/utility_res/item/%name%_chest.json b/utility_res/item/%name%_chest.json index 54a76ef0..9d917818 100644 --- a/utility_res/item/%name%_chest.json +++ b/utility_res/item/%name%_chest.json @@ -1,6 +1,6 @@ { - "parent": "betterend:block/chest_item", - "textures": { - "texture": "betterend:entity/chest/%name%_chest" - } -} + "parent": "betterend:block/chest_item", + "textures": { + "texture": "betterend:entity/chest/%name%_chest" + } +} \ No newline at end of file diff --git a/utility_res/item/%name%_crafting_table.json b/utility_res/item/%name%_crafting_table.json index 1d94737c..efa83ee1 100644 --- a/utility_res/item/%name%_crafting_table.json +++ b/utility_res/item/%name%_crafting_table.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_crafting_table" -} + "parent": "betterend:block/%name%_crafting_table" +} \ No newline at end of file diff --git a/utility_res/item/%name%_door.json b/utility_res/item/%name%_door.json index 9a1077c7..c3db895a 100644 --- a/utility_res/item/%name%_door.json +++ b/utility_res/item/%name%_door.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/%name%_door" - } -} + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/%name%_door" + } +} \ No newline at end of file diff --git a/utility_res/item/%name%_fence.json b/utility_res/item/%name%_fence.json index ddb139cd..825e7224 100644 --- a/utility_res/item/%name%_fence.json +++ b/utility_res/item/%name%_fence.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_fence_inventory" -} + "parent": "betterend:block/%name%_fence_inventory" +} \ No newline at end of file diff --git a/utility_res/item/%name%_gate.json b/utility_res/item/%name%_gate.json index 200cc73b..634c8f92 100644 --- a/utility_res/item/%name%_gate.json +++ b/utility_res/item/%name%_gate.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_fence_gate_closed" -} + "parent": "betterend:block/%name%_fence_gate_closed" +} \ No newline at end of file diff --git a/utility_res/item/%name%_ladder.json b/utility_res/item/%name%_ladder.json index 09403bc2..31c1ffbd 100644 --- a/utility_res/item/%name%_ladder.json +++ b/utility_res/item/%name%_ladder.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "betterend:block/%name%_ladder" - } -} + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/%name%_ladder" + } +} \ No newline at end of file diff --git a/utility_res/item/%name%_log.json b/utility_res/item/%name%_log.json index 1578eb01..d4b638bc 100644 --- a/utility_res/item/%name%_log.json +++ b/utility_res/item/%name%_log.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_log" -} + "parent": "betterend:block/%name%_log" +} \ No newline at end of file diff --git a/utility_res/item/%name%_planks.json b/utility_res/item/%name%_planks.json index 753419db..205b9d64 100644 --- a/utility_res/item/%name%_planks.json +++ b/utility_res/item/%name%_planks.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_planks" -} + "parent": "betterend:block/%name%_planks" +} \ No newline at end of file diff --git a/utility_res/item/%name%_plate.json b/utility_res/item/%name%_plate.json index 21a189b3..d774f9bc 100644 --- a/utility_res/item/%name%_plate.json +++ b/utility_res/item/%name%_plate.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_pressure_plate_up" -} + "parent": "betterend:block/%name%_pressure_plate_up" +} \ No newline at end of file diff --git a/utility_res/item/%name%_sign.json b/utility_res/item/%name%_sign.json index e7e9e3ac..01b1922f 100644 --- a/utility_res/item/%name%_sign.json +++ b/utility_res/item/%name%_sign.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/%name%_sign" - } -} + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/%name%_sign" + } +} \ No newline at end of file diff --git a/utility_res/item/%name%_slab.json b/utility_res/item/%name%_slab.json index f853bf57..1c83dcd9 100644 --- a/utility_res/item/%name%_slab.json +++ b/utility_res/item/%name%_slab.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_half_slab" -} + "parent": "betterend:block/%name%_half_slab" +} \ No newline at end of file diff --git a/utility_res/item/%name%_stairs.json b/utility_res/item/%name%_stairs.json index b20ad72e..c4871532 100644 --- a/utility_res/item/%name%_stairs.json +++ b/utility_res/item/%name%_stairs.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_stairs" -} + "parent": "betterend:block/%name%_stairs" +} \ No newline at end of file diff --git a/utility_res/item/%name%_striped_bark.json b/utility_res/item/%name%_striped_bark.json index bf0b48be..ea72c0d7 100644 --- a/utility_res/item/%name%_striped_bark.json +++ b/utility_res/item/%name%_striped_bark.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_striped_bark" -} + "parent": "betterend:block/%name%_striped_bark" +} \ No newline at end of file diff --git a/utility_res/item/%name%_striped_log.json b/utility_res/item/%name%_striped_log.json index e033a809..cf488f27 100644 --- a/utility_res/item/%name%_striped_log.json +++ b/utility_res/item/%name%_striped_log.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_striped_log" -} + "parent": "betterend:block/%name%_striped_log" +} \ No newline at end of file diff --git a/utility_res/item/%name%_trapdoor.json b/utility_res/item/%name%_trapdoor.json index 037599c3..8d731e31 100644 --- a/utility_res/item/%name%_trapdoor.json +++ b/utility_res/item/%name%_trapdoor.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/%name%_trapdoor" -} + "parent": "betterend:block/%name%_trapdoor" +} \ No newline at end of file