From f862bc879258ecc1472a2aeeb47b0fa7a949724c Mon Sep 17 00:00:00 2001 From: Aleksey Date: Tue, 13 Oct 2020 17:54:18 +0300 Subject: [PATCH] Patterns --- .../ru/betterend/blocks/basis/BlockBase.java | 22 ++++- .../betterend/blocks/basis/BlockPillar.java | 22 ++++- .../blocks/basis/BlockPressurePlate.java | 29 +++++- .../ru/betterend/blocks/basis/BlockSlab.java | 15 ++-- .../betterend/blocks/basis/BlockStairs.java | 32 ++++++- .../blocks/basis/BlockStoneButton.java | 35 +++++++- .../blocks/basis/BlockStonePressurePlate.java | 29 +++++- .../ru/betterend/blocks/basis/BlockWall.java | 35 +++++++- .../blocks/basis/BlockWoodenButton.java | 33 ++++++- .../blocks/complex/StoneMaterial.java | 20 ++--- .../ru/betterend/blocks/model/SlabModel.java | 2 + .../ru/betterend/interfaces/Patterned.java | 84 ++++++++++++++++-- .../mixin/client/ModelLoaderMixin.java | 59 +++++++++--- .../mixin/client/ModelVariantMapMixin.java | 2 +- .../client/NamespaceResourceManagerMixin.java | 8 +- .../ru/betterend/registry/BlockRegistry.java | 6 +- .../patterns/block/pattern_block.json | 2 +- .../patterns/block/pattern_button.json | 2 +- .../block/pattern_button_inventory.json | 6 -- .../block/pattern_button_pressed.json | 2 +- .../patterns/block/pattern_inner_stairs.json | 6 +- .../patterns/block/pattern_outer_stairs.json | 6 +- .../patterns/block/pattern_pillar.json | 4 +- .../block/pattern_pressure_plate_down.json | 2 +- .../block/pattern_pressure_plate_up.json | 2 +- .../patterns/block/pattern_slab.json | 6 +- .../patterns/block/pattern_small_tiles.json | 6 -- .../patterns/block/pattern_stairs.json | 6 +- .../patterns/block/pattern_tile.json | 6 -- .../block/pattern_wall_inventory.json | 2 +- .../patterns/block/pattern_wall_post.json | 2 +- .../patterns/block/pattern_wall_side.json | 2 +- .../block/pattern_wall_side_tall.json | 2 +- .../patterns/blockstate/pattern_block.json | 2 +- .../patterns/blockstate/pattern_button.json | 48 +++++----- .../patterns/blockstate/pattern_pillar.json | 6 +- .../blockstate/pattern_pressure_plate.json | 4 +- .../patterns/blockstate/pattern_slab.json | 6 +- .../blockstate/pattern_small_tiles.json | 7 -- .../patterns/blockstate/pattern_stairs.json | 80 ++++++++--------- .../patterns/blockstate/pattern_tile.json | 7 -- .../patterns/blockstate/pattern_wall.json | 18 ++-- .../patterns/item/pattern_block.json | 3 - .../patterns/item/pattern_brick_slab.json | 3 - .../patterns/item/pattern_brick_stairs.json | 3 - .../patterns/item/pattern_brick_wall.json | 3 - .../patterns/item/pattern_bricks.json | 3 - .../patterns/item/pattern_button.json | 5 +- .../patterns/item/pattern_pillar.json | 3 - .../patterns/item/pattern_plate.json | 3 - .../betterend/patterns/item/pattern_slab.json | 3 - .../patterns/item/pattern_small_tiles.json | 3 - .../patterns/item/pattern_stairs.json | 3 - .../betterend/patterns/item/pattern_tile.json | 3 - .../betterend/patterns/item/pattern_wall.json | 5 +- ...lecite_tile.png => violecite_polished.png} | Bin ...te_small_tiles.png => violecite_tiles.png} | Bin 57 files changed, 493 insertions(+), 225 deletions(-) delete mode 100644 src/main/resources/assets/betterend/patterns/block/pattern_button_inventory.json delete mode 100644 src/main/resources/assets/betterend/patterns/block/pattern_small_tiles.json delete mode 100644 src/main/resources/assets/betterend/patterns/block/pattern_tile.json delete mode 100644 src/main/resources/assets/betterend/patterns/blockstate/pattern_small_tiles.json delete mode 100644 src/main/resources/assets/betterend/patterns/blockstate/pattern_tile.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_block.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_brick_slab.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_brick_stairs.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_brick_wall.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_bricks.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_pillar.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_plate.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_slab.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_small_tiles.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_stairs.json delete mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_tile.json rename src/main/resources/assets/betterend/textures/block/{violecite_tile.png => violecite_polished.png} (100%) rename src/main/resources/assets/betterend/textures/block/{violecite_small_tiles.png => violecite_tiles.png} (100%) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBase.java b/src/main/java/ru/betterend/blocks/basis/BlockBase.java index 4c408927..bc7320f1 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBase.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockBase.java @@ -1,5 +1,6 @@ package ru.betterend.blocks.basis; +import java.io.Reader; import java.util.Collections; import java.util.List; @@ -7,8 +8,11 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import ru.betterend.interfaces.Patterned; -public class BlockBase extends Block { +public class BlockBase extends Block implements Patterned { public BlockBase(Settings settings) { super(settings); } @@ -17,4 +21,20 @@ public class BlockBase extends Block { public List getDroppedStacks(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } + + @Override + public String getStatesPattern(Reader data, String block) { + Identifier blockId = Registry.BLOCK.getId(this); + return Patterned.createJson(data, blockId, block); + } + + @Override + public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); + return Patterned.createJson(Patterned.BASE_BLOCK_MODEL, blockId, block); + } + + public Identifier statePatternId() { + return Patterned.BLOCK_STATES_PATTERN; + } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPillar.java b/src/main/java/ru/betterend/blocks/basis/BlockPillar.java index 92e67bb8..545caab2 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPillar.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockPillar.java @@ -1,5 +1,6 @@ package ru.betterend.blocks.basis; +import java.io.Reader; import java.util.Collections; import java.util.List; @@ -7,8 +8,11 @@ import net.minecraft.block.BlockState; import net.minecraft.block.PillarBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import ru.betterend.interfaces.Patterned; -public class BlockPillar extends PillarBlock { +public class BlockPillar extends PillarBlock implements Patterned { public BlockPillar(Settings settings) { super(settings); } @@ -17,4 +21,20 @@ public class BlockPillar extends PillarBlock { public List getDroppedStacks(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } + + @Override + public String getStatesPattern(Reader data, String block) { + Identifier blockId = Registry.BLOCK.getId(this); + return Patterned.createJson(data, blockId, block); + } + + @Override + public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); + return Patterned.createJson(Patterned.PILLAR_BLOCK_MODEL, blockId, block); + } + + public Identifier statePatternId() { + return Patterned.PILLAR_STATES_PATTERN; + } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java b/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java index f4226ca6..597536bf 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java @@ -1,5 +1,6 @@ package ru.betterend.blocks.basis; +import java.io.Reader; import java.util.Collections; import java.util.List; @@ -9,14 +10,40 @@ import net.minecraft.block.BlockState; import net.minecraft.block.PressurePlateBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import ru.betterend.interfaces.Patterned; -public class BlockPressurePlate extends PressurePlateBlock { +public class BlockPressurePlate extends PressurePlateBlock implements Patterned { + + private final Block parent; + public BlockPressurePlate(Block source) { super(ActivationRule.EVERYTHING, FabricBlockSettings.copyOf(source).nonOpaque()); + this.parent = source; } @Override public List getDroppedStacks(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } + + @Override + public String getStatesPattern(Reader data, String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + return Patterned.createJson(data, parentId, block); + } + + @Override + public String getModelPattern(String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + if (block.contains("down")) { + return Patterned.createJson(Patterned.PLATE_MODEL_DOWN, parentId, block); + } + return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, block); + } + + public Identifier statePatternId() { + return Patterned.PLATE_STATES_PATTERN; + } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockSlab.java b/src/main/java/ru/betterend/blocks/basis/BlockSlab.java index 4a1246dd..64e19803 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockSlab.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockSlab.java @@ -1,5 +1,6 @@ package ru.betterend.blocks.basis; +import java.io.Reader; import java.util.Collections; import java.util.List; @@ -11,14 +12,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import ru.betterend.BetterEnd; import ru.betterend.interfaces.Patterned; public class BlockSlab extends SlabBlock implements Patterned { - private final static Identifier STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_slab.json"); - private final static Identifier MODEL_PATTERN = BetterEnd.makeID("patterns/block/pattern_slab.json"); - private final Block parent; public BlockSlab(Block source) { @@ -32,18 +29,18 @@ public class BlockSlab extends SlabBlock implements Patterned { } @Override - public String blockStatePattern(String name) { + public String getStatesPattern(Reader data, String block) { Identifier parentId = Registry.BLOCK.getId(parent); - return Patterned.createJson(STATES_PATTERN, parentId.getPath()); + return Patterned.createJson(data, parentId, block); } @Override - public String modelPattern(String name) { + public String getModelPattern(String block) { Identifier parentId = Registry.BLOCK.getId(parent); - return Patterned.createJson(MODEL_PATTERN, parentId.getPath()); + return Patterned.createJson(Patterned.SLAB_BLOCK_MODEL, parentId, block); } public Identifier statePatternId() { - return STATES_PATTERN; + return Patterned.SLAB_STATES_PATTERN; } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStairs.java b/src/main/java/ru/betterend/blocks/basis/BlockStairs.java index f872f5d9..0ba68fc7 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStairs.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockStairs.java @@ -1,5 +1,6 @@ package ru.betterend.blocks.basis; +import java.io.Reader; import java.util.Collections; import java.util.List; @@ -9,14 +10,43 @@ import net.minecraft.block.BlockState; import net.minecraft.block.StairsBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import ru.betterend.interfaces.Patterned; -public class BlockStairs extends StairsBlock { +public class BlockStairs extends StairsBlock implements Patterned { + + private final Block parent; + public BlockStairs(Block source) { super(source.getDefaultState(), FabricBlockSettings.copyOf(source)); + this.parent = source; } @Override public List getDroppedStacks(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } + + @Override + public String getStatesPattern(Reader data, String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + return Patterned.createJson(data, parentId, block); + } + + @Override + public String getModelPattern(String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + if (block.contains("inner")) { + return Patterned.createJson(Patterned.STAIRS_MODEL_INNER, parentId, block); + } + if (block.contains("outer")) { + return Patterned.createJson(Patterned.STAIRS_MODEL_OUTER, parentId, block); + } + return Patterned.createJson(Patterned.STAIRS_MODEL, parentId, block); + } + + public Identifier statePatternId() { + return Patterned.STAIRS_STATES_PATTERN; + } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java b/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java index d01f2007..214c31d1 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java @@ -1,22 +1,55 @@ package ru.betterend.blocks.basis; +import java.io.Reader; import java.util.Collections; import java.util.List; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.StoneButtonBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; -public class BlockStoneButton extends StoneButtonBlock { +import ru.betterend.interfaces.Patterned; + +public class BlockStoneButton extends StoneButtonBlock implements Patterned { + + private final Block parent; + public BlockStoneButton(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); + this.parent = source; } @Override public List getDroppedStacks(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } + + @Override + public String getStatesPattern(Reader data, String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + return Patterned.createJson(data, parentId, block); + } + + @Override + public String getModelPattern(String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + if (block.contains("item")) { + return Patterned.createJson(Patterned.BUTTON_ITEM_MODEL, parentId, block); + } + if (block.contains("pressed")) { + return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, block); + } + return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, block); + } + + @Override + public Identifier statePatternId() { + return Patterned.BUTTON_STATES_PATTERN; + } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java b/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java index f7afd29a..076517ee 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java @@ -1,5 +1,6 @@ package ru.betterend.blocks.basis; +import java.io.Reader; import java.util.Collections; import java.util.List; @@ -9,14 +10,40 @@ import net.minecraft.block.BlockState; import net.minecraft.block.PressurePlateBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import ru.betterend.interfaces.Patterned; -public class BlockStonePressurePlate extends PressurePlateBlock { +public class BlockStonePressurePlate extends PressurePlateBlock implements Patterned { + + private final Block parent; + public BlockStonePressurePlate(Block source) { super(ActivationRule.MOBS, FabricBlockSettings.copyOf(source).nonOpaque()); + this.parent = source; } @Override public List getDroppedStacks(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } + + @Override + public String getStatesPattern(Reader data, String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + return Patterned.createJson(data, parentId, block); + } + + @Override + public String getModelPattern(String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + if (block.contains("down")) { + return Patterned.createJson(Patterned.PLATE_MODEL_DOWN, parentId, block); + } + return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, block); + } + + public Identifier statePatternId() { + return Patterned.PLATE_STATES_PATTERN; + } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWall.java b/src/main/java/ru/betterend/blocks/basis/BlockWall.java index 5758cc5d..0a90ea06 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWall.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockWall.java @@ -1,5 +1,6 @@ package ru.betterend.blocks.basis; +import java.io.Reader; import java.util.Collections; import java.util.List; @@ -9,14 +10,46 @@ import net.minecraft.block.BlockState; import net.minecraft.block.WallBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import ru.betterend.interfaces.Patterned; -public class BlockWall extends WallBlock { +public class BlockWall extends WallBlock implements Patterned { + + private final Block parent; + public BlockWall(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); + this.parent = source; } @Override public List getDroppedStacks(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } + + @Override + public String getStatesPattern(Reader data, String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + return Patterned.createJson(data, parentId, block); + } + + @Override + public String getModelPattern(String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + if (block.contains("item")) { + return Patterned.createJson(Patterned.WALL_ITEM_MODEL, parentId, block); + } + if (block.contains("side_tall")) { + return Patterned.createJson(Patterned.WALL_SIDE_TALL_MODEL, parentId, block); + } + if (block.contains("side")) { + return Patterned.createJson(Patterned.WALL_SIDE_MODEL, parentId, block); + } + return Patterned.createJson(Patterned.WALL_POST_MODEL, parentId, block); + } + + public Identifier statePatternId() { + return Patterned.WALL_STATES_PATTERN; + } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java b/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java index 9b7593d4..361afbd7 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java @@ -1,5 +1,6 @@ package ru.betterend.blocks.basis; +import java.io.Reader; import java.util.Collections; import java.util.List; @@ -9,14 +10,44 @@ import net.minecraft.block.BlockState; import net.minecraft.block.WoodenButtonBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import ru.betterend.interfaces.Patterned; -public class BlockWoodenButton extends WoodenButtonBlock { +public class BlockWoodenButton extends WoodenButtonBlock implements Patterned { + + private final Block parent; + public BlockWoodenButton(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); + this.parent = source; } @Override public List getDroppedStacks(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } + + @Override + public String getStatesPattern(Reader data, String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + return Patterned.createJson(data, parentId, block); + } + + @Override + public String getModelPattern(String block) { + Identifier parentId = Registry.BLOCK.getId(parent); + if (block.contains("item")) { + return Patterned.createJson(Patterned.BUTTON_ITEM_MODEL, parentId, block); + } + if (block.contains("pressed")) { + return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, block); + } + return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, block); + } + + @Override + public Identifier statePatternId() { + return Patterned.BUTTON_STATES_PATTERN; + } } diff --git a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java index cc037c95..861c4671 100644 --- a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java @@ -38,8 +38,8 @@ public class StoneMaterial { FabricBlockSettings material = FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color); stone = BlockRegistry.registerBlock(name, new BlockBase(material)); - tile = BlockRegistry.registerBlock(name + "_tile", new BlockBase(material)); - small_tiles = BlockRegistry.registerBlock(name + "_small_tiles", new BlockBase(material)); + tile = BlockRegistry.registerBlock(name + "_polished", new BlockBase(material)); + small_tiles = BlockRegistry.registerBlock(name + "_tiles", new BlockBase(material)); pillar = BlockRegistry.registerBlock(name + "_pillar", new BlockPillar(material)); stairs = BlockRegistry.registerBlock(name + "_stairs", new BlockStairs(stone)); slab = BlockRegistry.registerBlock(name + "_slab", new BlockSlab(stone)); @@ -48,23 +48,23 @@ public class StoneMaterial { pressure_plate = BlockRegistry.registerBlock(name + "_plate", new BlockStonePressurePlate(stone)); bricks = BlockRegistry.registerBlock(name + "_bricks", new BlockBase(material)); - brick_stairs = BlockRegistry.registerBlock(name + "_brick_stairs", new BlockStairs(bricks)); - brick_slab = BlockRegistry.registerBlock(name + "_brick_slab", new BlockSlab(bricks)); - brick_wall = BlockRegistry.registerBlock(name + "_brick_wall", new BlockWall(bricks)); + brick_stairs = BlockRegistry.registerBlock(name + "_bricks_stairs", new BlockStairs(bricks)); + brick_slab = BlockRegistry.registerBlock(name + "_bricks_slab", new BlockSlab(bricks)); + brick_wall = BlockRegistry.registerBlock(name + "_bricks_wall", new BlockWall(bricks)); // Recipes // RecipeBuilder.make(name + "_bricks", bricks).setOutputCount(4).setShape("##", "##").addMaterial('#', stone).setGroup("end_bricks").build(); - RecipeBuilder.make(name + "_tile", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', bricks).setGroup("end_tile").build(); - RecipeBuilder.make(name + "_small_tiles", small_tiles).setOutputCount(4).setShape("##", "##").addMaterial('#', tile).setGroup("end_small_tile").build(); + RecipeBuilder.make(name + "_polished", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', bricks).setGroup("end_tile").build(); + RecipeBuilder.make(name + "_tiles", small_tiles).setOutputCount(4).setShape("##", "##").addMaterial('#', tile).setGroup("end_small_tile").build(); RecipeBuilder.make(name + "_pillar", pillar).setShape("#", "#").addMaterial('#', slab).setGroup("end_pillar").build(); RecipeBuilder.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', stone).setGroup("end_stone_stairs").build(); RecipeBuilder.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', stone).setGroup("end_stone_slabs").build(); - RecipeBuilder.make(name + "_brick_stairs", brick_stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', bricks).setGroup("end_stone_stairs").build(); - RecipeBuilder.make(name + "_brick_slab", brick_slab).setOutputCount(6).setShape("###").addMaterial('#', bricks).setGroup("end_stone_slabs").build(); + RecipeBuilder.make(name + "_bricks_stairs", brick_stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', bricks).setGroup("end_stone_stairs").build(); + RecipeBuilder.make(name + "_bricks_slab", brick_slab).setOutputCount(6).setShape("###").addMaterial('#', bricks).setGroup("end_stone_slabs").build(); RecipeBuilder.make(name + "_wall", wall).setOutputCount(6).setShape("###", "###").addMaterial('#', stone).setGroup("end_wall").build(); - RecipeBuilder.make(name + "_brick_wall", brick_wall).setOutputCount(6).setShape("###", "###").addMaterial('#', bricks).setGroup("end_wall").build(); + RecipeBuilder.make(name + "_bricks_wall", brick_wall).setOutputCount(6).setShape("###", "###").addMaterial('#', bricks).setGroup("end_wall").build(); RecipeBuilder.make(name + "_button", button).setList("#").addMaterial('#', stone).setGroup("end_stone_buttons").build(); RecipeBuilder.make(name + "_pressure_plate", pressure_plate).setShape("##").addMaterial('#', stone).setGroup("end_stone_plates").build(); diff --git a/src/main/java/ru/betterend/blocks/model/SlabModel.java b/src/main/java/ru/betterend/blocks/model/SlabModel.java index 91e24cb0..093a6f2b 100644 --- a/src/main/java/ru/betterend/blocks/model/SlabModel.java +++ b/src/main/java/ru/betterend/blocks/model/SlabModel.java @@ -18,6 +18,7 @@ import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; + import net.minecraft.block.BlockState; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedQuad; @@ -35,6 +36,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; + import ru.betterend.BetterEnd; public class SlabModel implements UnbakedModel, BakedModel, FabricBakedModel { diff --git a/src/main/java/ru/betterend/interfaces/Patterned.java b/src/main/java/ru/betterend/interfaces/Patterned.java index 6d87dded..bc229533 100644 --- a/src/main/java/ru/betterend/interfaces/Patterned.java +++ b/src/main/java/ru/betterend/interfaces/Patterned.java @@ -3,19 +3,48 @@ package ru.betterend.interfaces; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.Reader; import java.nio.charset.StandardCharsets; +import java.util.Map; +import java.util.Map.Entry; import java.util.stream.Collectors; import net.minecraft.client.MinecraftClient; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; +import ru.betterend.BetterEnd; public interface Patterned { - default String blockStatePattern(String name) { + //Blockstates + public final static Identifier BLOCK_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_block.json"); + public final static Identifier SLAB_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_slab.json"); + public final static Identifier STAIRS_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_stairs.json"); + public final static Identifier WALL_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_wall.json"); + public final static Identifier BUTTON_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_button.json"); + public final static Identifier PILLAR_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_pillar.json"); + public final static Identifier PLATE_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_pressure_plate.json"); + //Models + public final static Identifier BASE_BLOCK_MODEL = BetterEnd.makeID("patterns/blockstate/pattern_block.json"); + public final static Identifier SLAB_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_slab.json"); + public final static Identifier STAIRS_MODEL = BetterEnd.makeID("patterns/block/pattern_stairs.json"); + public final static Identifier STAIRS_MODEL_INNER = BetterEnd.makeID("patterns/block/pattern_inner_stairs.json"); + public final static Identifier STAIRS_MODEL_OUTER = BetterEnd.makeID("patterns/block/pattern_outer_stairs.json"); + public final static Identifier WALL_POST_MODEL = BetterEnd.makeID("patterns/block/pattern_wall_post.json"); + public final static Identifier WALL_SIDE_MODEL = BetterEnd.makeID("patterns/block/pattern_wall_side.json"); + public final static Identifier WALL_SIDE_TALL_MODEL = BetterEnd.makeID("patterns/block/pattern_wall_side_tall.json"); + public final static Identifier WALL_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_wall.json"); + public final static Identifier BUTTON_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_button.json"); + public final static Identifier BUTTON_PRESSED_MODEL = BetterEnd.makeID("patterns/block/pattern_button_pressed.json"); + public final static Identifier BUTTON_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_button.json"); + public final static Identifier PILLAR_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_pillar.json"); + public final static Identifier PLATE_MODEL_UP = BetterEnd.makeID("patterns/block/pattern_pressure_plate_up.json"); + public final static Identifier PLATE_MODEL_DOWN = BetterEnd.makeID("patterns/block/pattern_pressure_plate_down.json"); + + default String getStatesPattern(Reader data, String name) { return null; } - default String modelPattern(String name) { + default String getModelPattern(String name) { return null; } @@ -27,15 +56,52 @@ public interface Patterned { return null; } - public static String createJson(Identifier patternId, String name) { + public static String createJson(Reader data, Identifier parent, String block) { + try (BufferedReader buffer = new BufferedReader(data)) { + return buffer.lines().collect(Collectors.joining()) + .replace("%parent%", parent.getPath()) + .replace("%block%", block); + } catch (Exception ex) { + return null; + } + } + + public static String createJson(Identifier patternId, Identifier parent, String block) { ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager(); try (InputStream input = resourceManager.getResource(patternId).getInputStream()) { return new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8)) - .lines() - .collect(Collectors.joining()).replace("%name%", name); - - } catch (Exception ex) {} - - return null; + .lines().collect(Collectors.joining()) + .replace("%parent%", parent.getPath()) + .replace("%block%", block); + } catch (Exception ex) { + return null; + } + } + + public static String createJson(Identifier patternId, String texture, String block) { + ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager(); + try (InputStream input = resourceManager.getResource(patternId).getInputStream()) { + return new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8)) + .lines().collect(Collectors.joining()) + .replace("%texture%", texture) + .replace("%block%", block); + } catch (Exception ex) { + return null; + } + } + + public static String createJson(Identifier patternId, String block, Map textures) { + ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager(); + try (InputStream input = resourceManager.getResource(patternId).getInputStream()) { + String json = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8)) + .lines().collect(Collectors.joining()) + .replace("%block%", block); + for (Entry texture : textures.entrySet()) { + json = json.replace(texture.getKey(), texture.getValue()); + } + return json; + } catch (Exception ex) { + return null; + } } } diff --git a/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java index 58105e2a..3a6013d0 100644 --- a/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java @@ -1,5 +1,10 @@ package ru.betterend.mixin.client; +import java.io.InputStreamReader; +import java.io.Reader; +import java.nio.charset.StandardCharsets; + +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -12,8 +17,11 @@ import net.minecraft.block.Block; import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.json.JsonUnbakedModel; import net.minecraft.client.render.model.json.ModelVariantMap.DeserializationContext; +import net.minecraft.resource.Resource; +import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; + import ru.betterend.BetterEnd; import ru.betterend.interfaces.IdentifiedContext; import ru.betterend.interfaces.Patterned; @@ -21,19 +29,50 @@ import ru.betterend.interfaces.Patterned; @Mixin(ModelLoader.class) public class ModelLoaderMixin { + @Final @Shadow private DeserializationContext variantMapDeserializationContext; - @Inject(method = "loadModelFromJson", at = @At("HEAD"), cancellable = true) - private void loadModelFromJson(Identifier id, CallbackInfoReturnable info) { - if (id.getNamespace().equals(BetterEnd.MOD_ID) && id.getPath().contains("pattern")) { - String data[] = id.getPath().split("/"); - Identifier blockId = new Identifier(id.getNamespace(), data[1]); - Block block = Registry.BLOCK.get(blockId); - if (block instanceof Patterned) { - String pattern = ((Patterned) block).modelPattern(data[1]); - info.setReturnValue(JsonUnbakedModel.deserialize(pattern)); + @Final + @Shadow + private ResourceManager resourceManager; + + @Inject(method = "loadModelFromJson", cancellable = true, at = @At( + value = "NEW", + target = "net/minecraft/util/Identifier", + shift = Shift.BEFORE)) + private void loadModelPattern(Identifier id, CallbackInfoReturnable info) { + if (id.getNamespace().equals(BetterEnd.MOD_ID)) { + Identifier modelId = new Identifier(id.getNamespace(), "models/" + id.getPath() + ".json"); + JsonUnbakedModel model; + try (Resource resource = this.resourceManager.getResource(modelId)) { + Reader reader = new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8); + model = JsonUnbakedModel.deserialize(reader); + model.id = id.toString(); + info.setReturnValue(model); info.cancel(); + } catch (Exception ex) { + String data[] = id.getPath().split("/"); + if (data.length > 1) { + Identifier blockId = new Identifier(id.getNamespace(), data[1]); + Block block = Registry.BLOCK.get(blockId); + if (block instanceof Patterned) { + String pattern; + if (id.getPath().contains("item")) { + pattern = ((Patterned) block).getModelPattern(id.getPath()); + } else { + if (data.length > 2) { + pattern = ((Patterned) block).getModelPattern(data[2]); + } else { + pattern = ((Patterned) block).getModelPattern(data[1]); + } + } + model = JsonUnbakedModel.deserialize(pattern); + model.id = id.toString(); + info.setReturnValue(model); + info.cancel(); + } + } } } } @@ -42,7 +81,7 @@ public class ModelLoaderMixin { value = "INVOKE", target = "Lnet/minecraft/client/render/model/json/ModelVariantMap$DeserializationContext;setStateFactory(Lnet/minecraft/state/StateManager;)V", shift = Shift.AFTER)) - private void loadModel(Identifier id, CallbackInfo info) { + private void appendContextID(Identifier id, CallbackInfo info) { IdentifiedContext context = IdentifiedContext.class.cast(variantMapDeserializationContext); if (id.getNamespace().equals(BetterEnd.MOD_ID)) { context.setContextId(BetterEnd.makeID("pattern/" + id.getPath())); diff --git a/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java b/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java index 4de7edb4..1f196650 100644 --- a/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java @@ -34,7 +34,7 @@ public abstract class ModelVariantMapMixin { Block block = Registry.BLOCK.get(blockId); idContext.removeId(); if (block instanceof Patterned) { - String pattern = ((Patterned) block).blockStatePattern(data[1]); + String pattern = ((Patterned) block).getStatesPattern(reader, data[1]); info.setReturnValue(deserialize(context, new StringReader(pattern))); info.cancel(); } diff --git a/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java b/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java index e6517755..214f6ffa 100644 --- a/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java +++ b/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java @@ -5,6 +5,7 @@ import java.util.List; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.At.Shift; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @@ -24,8 +25,11 @@ public abstract class NamespaceResourceManagerMixin { @Shadow public abstract Resource getResource(Identifier id); - @Inject(method = "getAllResources", at = @At("HEAD"), cancellable = true) - public void getAllResources(Identifier id, CallbackInfoReturnable> info) { + @Inject(method = "getAllResources", cancellable = true, at = @At( + value = "NEW", + target = "java/io/FileNotFoundException", + shift = Shift.BEFORE)) + public void getStatesPattern(Identifier id, CallbackInfoReturnable> info) { if (id.getNamespace().contains(BetterEnd.MOD_ID)) { String[] data = id.getPath().split("/"); if (data.length > 1) { diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index b2eec064..84734118 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -22,7 +22,6 @@ import ru.betterend.blocks.BlockMossyGlowshroomHymenophore; import ru.betterend.blocks.BlockMossyGlowshroomSapling; import ru.betterend.blocks.BlockOre; import ru.betterend.blocks.BlockPath; -import ru.betterend.blocks.BlockStone; import ru.betterend.blocks.BlockTerrain; import ru.betterend.blocks.BlockUmbrellaMoss; import ru.betterend.blocks.BlockUmbrellaMossTall; @@ -30,10 +29,10 @@ import ru.betterend.blocks.EndStoneSmelter; import ru.betterend.blocks.EnderBlock; import ru.betterend.blocks.TerminiteBlock; import ru.betterend.blocks.basis.BlockGlowingFur; -import ru.betterend.blocks.basis.BlockSlab; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.blocks.complex.WoodenMaterial; + import ru.betterend.tab.CreativeTab; public class BlockRegistry { @@ -49,8 +48,7 @@ public class BlockRegistry { public static final Block CHORUS_NYLIUM_PATH = registerBlock("chorus_nylium_path", new BlockPath(CHORUS_NYLIUM)); // Rocks // - public static final Block FLAVOLITE = registerBlock("flavolite", new BlockStone(MaterialColor.SAND)); - public static final Block FLAVOLITE_SLAB = registerBlock("flavolite_slab", new BlockSlab(FLAVOLITE)); + public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MaterialColor.SAND); public static final StoneMaterial VIOLECITE = new StoneMaterial("violecite", MaterialColor.PURPLE); // Wooden Materials // diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_block.json b/src/main/resources/assets/betterend/patterns/block/pattern_block.json index 15906496..5985f908 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_block.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "betterend:block/%name%" + "all": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_button.json b/src/main/resources/assets/betterend/patterns/block/pattern_button.json index a2e8c3ce..b1b6c2d8 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_button.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_button.json @@ -1,6 +1,6 @@ { "parent": "block/button", "textures": { - "texture": "betterend:block/%name%" + "texture": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_button_inventory.json b/src/main/resources/assets/betterend/patterns/block/pattern_button_inventory.json deleted file mode 100644 index 42b61783..00000000 --- a/src/main/resources/assets/betterend/patterns/block/pattern_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "betterend:block/%name%" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json b/src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json index d0094062..ba85aaba 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json @@ -1,6 +1,6 @@ { "parent": "block/button_pressed", "textures": { - "texture": "betterend:block/%name%" + "texture": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json b/src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json index e95454c6..39b0d96c 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "betterend:block/%name%", - "side": "betterend:block/%name%", - "top": "betterend:block/%name%" + "bottom": "betterend:block/%parent%", + "side": "betterend:block/%parent%", + "top": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json b/src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json index 670e267d..060a9875 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "betterend:block/%name%", - "side": "betterend:block/%name%", - "top": "betterend:block/%name%" + "bottom": "betterend:block/%parent%", + "side": "betterend:block/%parent%", + "top": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pillar.json b/src/main/resources/assets/betterend/patterns/block/pattern_pillar.json index 837248a3..0dafd53c 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pillar.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pillar.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "end": "betterend:block/%name%_pillar_top", - "side": "betterend:block/%name%_pillar_side" + "end": "betterend:block/%parent%_top", + "side": "betterend:block/%parent%_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json b/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json index ef2fec3b..9a9285f7 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json @@ -1,6 +1,6 @@ { "parent": "block/pressure_plate_down", "textures": { - "texture": "betterend:block/%name%" + "texture": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json b/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json index 9fe8a247..e5c7ae95 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json @@ -1,6 +1,6 @@ { "parent": "block/pressure_plate_up", "textures": { - "texture": "betterend:block/%name%" + "texture": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_slab.json b/src/main/resources/assets/betterend/patterns/block/pattern_slab.json index d5f30423..1ac25f99 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_slab.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "bottom": "betterend:block/%name%", - "side": "betterend:block/%name%", - "top": "betterend:block/%name%" + "bottom": "betterend:block/%parent%", + "side": "betterend:block/%parent%", + "top": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_small_tiles.json b/src/main/resources/assets/betterend/patterns/block/pattern_small_tiles.json deleted file mode 100644 index a0c1a8eb..00000000 --- a/src/main/resources/assets/betterend/patterns/block/pattern_small_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_small_tiles" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_stairs.json b/src/main/resources/assets/betterend/patterns/block/pattern_stairs.json index 61115016..b6650ea0 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_stairs.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "betterend:block/%name%", - "side": "betterend:block/%name%", - "top": "betterend:block/%name%" + "bottom": "betterend:block/%parent%", + "side": "betterend:block/%parent%", + "top": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_tile.json b/src/main/resources/assets/betterend/patterns/block/pattern_tile.json deleted file mode 100644 index 632959b1..00000000 --- a/src/main/resources/assets/betterend/patterns/block/pattern_tile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_tile" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json index fdb5d169..76c092af 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "betterend:block/%name%" + "wall": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json index 2c3195b1..23cf5852 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "betterend:block/%name%" + "wall": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json index 2c228e96..f289b66f 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "betterend:block/%name%" + "wall": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json index 4eeefe22..ba283ef7 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "betterend:block/%name%" + "wall": "betterend:block/%parent%" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json index 79dd6729..c2eaaf79 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "betterend:block/%name%" + "model": "betterend:pattern/%block%" } } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json index a65801cf..d4bf513f 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json @@ -1,115 +1,115 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "x": 180, "y": 270 }, "face=ceiling,facing=north,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "x": 180, "y": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "x": 180, "y": 90 }, "face=floor,facing=east,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "betterend:block/%name%_button" + "model": "betterend:pattern/%block%" }, "face=floor,facing=north,powered=true": { - "model": "betterend:block/%name%_button_pressed" + "model": "betterend:pattern/%block%/%block%_pressed" }, "face=floor,facing=south,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "uvlock": true, "x": 90, "y": 90 }, "face=wall,facing=east,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "uvlock": true, "x": 90, "y": 90 }, "face=wall,facing=north,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "uvlock": true, "x": 90 }, "face=wall,facing=north,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "uvlock": true, "x": 90 }, "face=wall,facing=south,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "uvlock": true, "x": 90, "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "uvlock": true, "x": 90, "y": 180 }, "face=wall,facing=west,powered=false": { - "model": "betterend:block/%name%_button", + "model": "betterend:pattern/%block%", "uvlock": true, "x": 90, "y": 270 }, "face=wall,facing=west,powered=true": { - "model": "betterend:block/%name%_button_pressed", + "model": "betterend:pattern/%block%/%block%_pressed", "uvlock": true, "x": 90, "y": 270 diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json index fddcfc6c..f752f00b 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json @@ -1,7 +1,7 @@ { "variants": { - "axis=x": { "model": "betterend:block/%name%_pillar", "x": 90, "y": 90 }, - "axis=y": { "model": "betterend:block/%name%_pillar" }, - "axis=z": { "model": "betterend:block/%name%_pillar", "x": 90 } + "axis=x": { "model": "betterend:pattern/%block%", "x": 90, "y": 90 }, + "axis=y": { "model": "betterend:pattern/%block%" }, + "axis=z": { "model": "betterend:pattern/%block%", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json index f8ad4900..f2781e4b 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json @@ -1,10 +1,10 @@ { "variants": { "powered=false": { - "model": "betterend:block/%name%_pressure_plate_up" + "model": "betterend:pattern/%block%/%block%_up" }, "powered=true": { - "model": "betterend:block/%name%_pressure_plate_down" + "model": "betterend:pattern/%block%/%block%_down" } } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json index ddaf9e4f..2ae9b387 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json @@ -1,13 +1,13 @@ { "variants": { "type=bottom": { - "model": "betterend:pattern/%name%_slab" + "model": "betterend:pattern/%block%" }, "type=double": { - "model": "betterend:block/%name%" + "model": "betterend:block/%parent%" }, "type=top": { - "model": "betterend:pattern/%name%_slab", + "model": "betterend:pattern/%block%", "uvlock": true, "x": 180 } diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_small_tiles.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_small_tiles.json deleted file mode 100644 index 5913e0d4..00000000 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_small_tiles.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_small_tiles" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json index e0a17faf..2fc8f835 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs" + "model": "betterend:pattern/%block%/%block%_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs" + "model": "betterend:pattern/%block%/%block%_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs" + "model": "betterend:pattern/%block%" }, "facing=east,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", + "model": "betterend:pattern/%block%", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs", + "model": "betterend:pattern/%block%", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", + "model": "betterend:pattern/%block%", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs" + "model": "betterend:pattern/%block%/%block%_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs" + "model": "betterend:pattern/%block%/%block%_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs", + "model": "betterend:pattern/%block%", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", + "model": "betterend:pattern/%block%", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs", + "model": "betterend:pattern/%block%", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", + "model": "betterend:pattern/%block%/%block%_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", + "model": "betterend:pattern/%block%/%block%_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", + "model": "betterend:pattern/%block%", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_tile.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_tile.json deleted file mode 100644 index 4dc91e5e..00000000 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_tile.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_tile" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json index 115da727..a09ffd57 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "betterend:block/%name%_wall_post" + "model": "betterend:pattern/%block%/%block%_post" } }, { @@ -13,7 +13,7 @@ "north": "low" }, "apply": { - "model": "betterend:block/%name%_wall_side", + "model": "betterend:pattern/%block%/%block%_side", "uvlock": true } }, @@ -22,7 +22,7 @@ "east": "low" }, "apply": { - "model": "betterend:block/%name%_wall_side", + "model": "betterend:pattern/%block%/%block%_side", "y": 90, "uvlock": true } @@ -32,7 +32,7 @@ "south": "low" }, "apply": { - "model": "betterend:block/%name%_wall_side", + "model": "betterend:pattern/%block%/%block%_side", "y": 180, "uvlock": true } @@ -42,7 +42,7 @@ "west": "low" }, "apply": { - "model": "betterend:block/%name%_wall_side", + "model": "betterend:pattern/%block%/%block%_side", "y": 270, "uvlock": true } @@ -52,7 +52,7 @@ "north": "tall" }, "apply": { - "model": "betterend:block/%name%_wall_side_tall", + "model": "betterend:pattern/%block%/%block%_side_tall", "uvlock": true } }, @@ -61,7 +61,7 @@ "east": "tall" }, "apply": { - "model": "betterend:block/%name%_wall_side_tall", + "model": "betterend:pattern/%block%/%block%_side_tall", "y": 90, "uvlock": true } @@ -71,7 +71,7 @@ "south": "tall" }, "apply": { - "model": "betterend:block/%name%_wall_side_tall", + "model": "betterend:pattern/%block%/%block%_side_tall", "y": 180, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "betterend:block/%name%_wall_side_tall", + "model": "betterend:pattern/%block%/%block%_side_tall", "y": 270, "uvlock": true } diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_block.json b/src/main/resources/assets/betterend/patterns/item/pattern_block.json deleted file mode 100644 index 92b1fef5..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_brick_slab.json b/src/main/resources/assets/betterend/patterns/item/pattern_brick_slab.json deleted file mode 100644 index aee61fa8..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_brick_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_brick_slab" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_brick_stairs.json b/src/main/resources/assets/betterend/patterns/item/pattern_brick_stairs.json deleted file mode 100644 index 89ecaa54..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_brick_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_brick_stairs" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_brick_wall.json b/src/main/resources/assets/betterend/patterns/item/pattern_brick_wall.json deleted file mode 100644 index 8719d7c1..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_brick_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_brick_wall_inventory" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_bricks.json b/src/main/resources/assets/betterend/patterns/item/pattern_bricks.json deleted file mode 100644 index 14d8a30b..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_bricks" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_button.json b/src/main/resources/assets/betterend/patterns/item/pattern_button.json index 3dc32368..ddf66659 100644 --- a/src/main/resources/assets/betterend/patterns/item/pattern_button.json +++ b/src/main/resources/assets/betterend/patterns/item/pattern_button.json @@ -1,3 +1,6 @@ { - "parent": "betterend:block/%name%_button_inventory" + "parent": "block/button_inventory", + "textures": { + "texture": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_pillar.json b/src/main/resources/assets/betterend/patterns/item/pattern_pillar.json deleted file mode 100644 index 0f7de019..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_pillar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_pillar" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_plate.json b/src/main/resources/assets/betterend/patterns/item/pattern_plate.json deleted file mode 100644 index 484a02f9..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_pressure_plate_up" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_slab.json b/src/main/resources/assets/betterend/patterns/item/pattern_slab.json deleted file mode 100644 index 0d93f4ca..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_slab" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_small_tiles.json b/src/main/resources/assets/betterend/patterns/item/pattern_small_tiles.json deleted file mode 100644 index 2d8006df..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_small_tiles.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_small_tiles" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_stairs.json b/src/main/resources/assets/betterend/patterns/item/pattern_stairs.json deleted file mode 100644 index 0f51c6ec..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_stairs" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_tile.json b/src/main/resources/assets/betterend/patterns/item/pattern_tile.json deleted file mode 100644 index 4b981468..00000000 --- a/src/main/resources/assets/betterend/patterns/item/pattern_tile.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_tile" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_wall.json b/src/main/resources/assets/betterend/patterns/item/pattern_wall.json index eee0e6ae..76c092af 100644 --- a/src/main/resources/assets/betterend/patterns/item/pattern_wall.json +++ b/src/main/resources/assets/betterend/patterns/item/pattern_wall.json @@ -1,3 +1,6 @@ { - "parent": "betterend:block/%name%_wall_inventory" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/violecite_tile.png b/src/main/resources/assets/betterend/textures/block/violecite_polished.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/violecite_tile.png rename to src/main/resources/assets/betterend/textures/block/violecite_polished.png diff --git a/src/main/resources/assets/betterend/textures/block/violecite_small_tiles.png b/src/main/resources/assets/betterend/textures/block/violecite_tiles.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/violecite_small_tiles.png rename to src/main/resources/assets/betterend/textures/block/violecite_tiles.png