From 835b2e56d60e095f9d9236b2a7a890ba078e225b Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 15 Oct 2020 15:18:45 +0300 Subject: [PATCH] More patterns fixes --- .../java/ru/betterend/blocks/basis/BlockDoor.java | 11 +++++------ .../java/ru/betterend/blocks/basis/BlockFence.java | 7 ++++--- .../java/ru/betterend/blocks/basis/BlockGate.java | 9 +++++---- .../java/ru/betterend/blocks/basis/BlockPillar.java | 2 +- .../ru/betterend/blocks/basis/BlockPressurePlate.java | 5 +++-- .../java/ru/betterend/blocks/basis/BlockSlab.java | 3 ++- .../java/ru/betterend/blocks/basis/BlockStairs.java | 7 ++++--- .../ru/betterend/blocks/basis/BlockStoneButton.java | 7 ++++--- .../blocks/basis/BlockStonePressurePlate.java | 5 +++-- .../java/ru/betterend/blocks/basis/BlockWall.java | 9 +++++---- .../ru/betterend/blocks/basis/BlockWoodenButton.java | 7 ++++--- 11 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockDoor.java b/src/main/java/ru/betterend/blocks/basis/BlockDoor.java index 78db05e5..45c9cb98 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockDoor.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockDoor.java @@ -45,19 +45,18 @@ public class BlockDoor extends DoorBlock implements IRenderTypeable, Patterned { public String getModelPattern(String block) { Identifier blockId = Registry.BLOCK.getId(this); if (block.contains("item")) { - block = block.split("/")[1]; - return Patterned.createJson(Patterned.ITEM_MODEL, block); + return Patterned.createJson(Patterned.ITEM_MODEL, blockId.getPath()); } if (block.contains("top_hinge")) { - return Patterned.createJson(Patterned.DOOR_MODEL_TOP_HINGE, blockId, block); + return Patterned.createJson(Patterned.DOOR_MODEL_TOP_HINGE, blockId, blockId.getPath()); } if (block.contains("bottom_hinge")) { - return Patterned.createJson(Patterned.DOOR_MODEL_BOTTOM_HINGE, blockId, block); + return Patterned.createJson(Patterned.DOOR_MODEL_BOTTOM_HINGE, blockId, blockId.getPath()); } if (block.contains("top")) { - return Patterned.createJson(Patterned.DOOR_MODEL_TOP, blockId, block); + return Patterned.createJson(Patterned.DOOR_MODEL_TOP, blockId, blockId.getPath()); } - return Patterned.createJson(Patterned.DOOR_MODEL_BOTTOM, blockId, block); + return Patterned.createJson(Patterned.DOOR_MODEL_BOTTOM, blockId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockFence.java b/src/main/java/ru/betterend/blocks/basis/BlockFence.java index f09bf79a..ee51d954 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockFence.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockFence.java @@ -37,14 +37,15 @@ public class BlockFence extends FenceBlock implements Patterned { @Override public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); Identifier parentId = Registry.BLOCK.getId(parent); if (block.contains("item")) { - return Patterned.createJson(Patterned.FENCE_ITEM_MODEL, parentId, block); + return Patterned.createJson(Patterned.FENCE_ITEM_MODEL, parentId, blockId.getPath()); } if (block.contains("side")) { - return Patterned.createJson(Patterned.FENCE_SIDE_MODEL, parentId, block); + return Patterned.createJson(Patterned.FENCE_SIDE_MODEL, parentId, blockId.getPath()); } - return Patterned.createJson(Patterned.FENCE_POST_MODEL, parentId, block); + return Patterned.createJson(Patterned.FENCE_POST_MODEL, parentId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockGate.java b/src/main/java/ru/betterend/blocks/basis/BlockGate.java index 0268a1b1..d8d62312 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockGate.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockGate.java @@ -37,18 +37,19 @@ public class BlockGate extends FenceGateBlock implements Patterned { @Override public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); Identifier parentId = Registry.BLOCK.getId(parent); if (block.contains("wall")) { if (block.contains("open")) { - return Patterned.createJson(Patterned.GATE_MODEL_WALL_OPEN, parentId, block); + return Patterned.createJson(Patterned.GATE_MODEL_WALL_OPEN, parentId, blockId.getPath()); } else { - return Patterned.createJson(Patterned.GATE_MODEL_WALL_CLOSED, parentId, block); + return Patterned.createJson(Patterned.GATE_MODEL_WALL_CLOSED, parentId, blockId.getPath()); } } if (block.contains("open")) { - return Patterned.createJson(Patterned.GATE_MODEL_OPEN, parentId, block); + return Patterned.createJson(Patterned.GATE_MODEL_OPEN, parentId, blockId.getPath()); } - return Patterned.createJson(Patterned.GATE_MODEL_CLOSED, parentId, block); + return Patterned.createJson(Patterned.GATE_MODEL_CLOSED, parentId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPillar.java b/src/main/java/ru/betterend/blocks/basis/BlockPillar.java index f389d92a..9f0cb06f 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPillar.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockPillar.java @@ -31,7 +31,7 @@ public class BlockPillar extends PillarBlock implements Patterned { @Override public String getModelPattern(String block) { Identifier blockId = Registry.BLOCK.getId(this); - return Patterned.createJson(Patterned.PILLAR_BLOCK_MODEL, blockId, block); + return Patterned.createJson(Patterned.PILLAR_BLOCK_MODEL, blockId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java b/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java index 2a0bffd9..991ac043 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java @@ -37,11 +37,12 @@ public class BlockPressurePlate extends PressurePlateBlock implements Patterned @Override public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); 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_DOWN, parentId, blockId.getPath()); } - return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, block); + return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockSlab.java b/src/main/java/ru/betterend/blocks/basis/BlockSlab.java index fafbe19a..1f7e5224 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockSlab.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockSlab.java @@ -37,8 +37,9 @@ public class BlockSlab extends SlabBlock implements Patterned { @Override public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); Identifier parentId = Registry.BLOCK.getId(parent); - return Patterned.createJson(Patterned.SLAB_BLOCK_MODEL, parentId, block); + return Patterned.createJson(Patterned.SLAB_BLOCK_MODEL, parentId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStairs.java b/src/main/java/ru/betterend/blocks/basis/BlockStairs.java index 96f56656..95045f03 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStairs.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockStairs.java @@ -37,14 +37,15 @@ public class BlockStairs extends StairsBlock implements Patterned { @Override public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); Identifier parentId = Registry.BLOCK.getId(parent); if (block.contains("inner")) { - return Patterned.createJson(Patterned.STAIRS_MODEL_INNER, parentId, block); + return Patterned.createJson(Patterned.STAIRS_MODEL_INNER, parentId, blockId.getPath()); } if (block.contains("outer")) { - return Patterned.createJson(Patterned.STAIRS_MODEL_OUTER, parentId, block); + return Patterned.createJson(Patterned.STAIRS_MODEL_OUTER, parentId, blockId.getPath()); } - return Patterned.createJson(Patterned.STAIRS_MODEL, parentId, block); + return Patterned.createJson(Patterned.STAIRS_MODEL, parentId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java b/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java index 8c2154be..4caeba56 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java @@ -37,14 +37,15 @@ public class BlockStoneButton extends StoneButtonBlock implements Patterned { @Override public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); Identifier parentId = Registry.BLOCK.getId(parent); if (block.contains("item")) { - return Patterned.createJson(Patterned.BUTTON_ITEM_MODEL, parentId, block); + return Patterned.createJson(Patterned.BUTTON_ITEM_MODEL, parentId, blockId.getPath()); } if (block.contains("pressed")) { - return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, block); + return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, blockId.getPath()); } - return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, block); + return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java b/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java index ab75866d..5620503d 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java @@ -37,11 +37,12 @@ public class BlockStonePressurePlate extends PressurePlateBlock implements Patte @Override public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); 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_DOWN, parentId, blockId.getPath()); } - return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, block); + return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWall.java b/src/main/java/ru/betterend/blocks/basis/BlockWall.java index 7e511f38..8b35c22d 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWall.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockWall.java @@ -37,17 +37,18 @@ public class BlockWall extends WallBlock implements Patterned { @Override public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); Identifier parentId = Registry.BLOCK.getId(parent); if (block.contains("item")) { - return Patterned.createJson(Patterned.WALL_ITEM_MODEL, parentId, block); + return Patterned.createJson(Patterned.WALL_ITEM_MODEL, parentId, blockId.getPath()); } if (block.contains("side_tall")) { - return Patterned.createJson(Patterned.WALL_SIDE_TALL_MODEL, parentId, block); + return Patterned.createJson(Patterned.WALL_SIDE_TALL_MODEL, parentId, blockId.getPath()); } if (block.contains("side")) { - return Patterned.createJson(Patterned.WALL_SIDE_MODEL, parentId, block); + return Patterned.createJson(Patterned.WALL_SIDE_MODEL, parentId, blockId.getPath()); } - return Patterned.createJson(Patterned.WALL_POST_MODEL, parentId, block); + return Patterned.createJson(Patterned.WALL_POST_MODEL, parentId, blockId.getPath()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java b/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java index 87fe7d29..94a2b67b 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java @@ -37,14 +37,15 @@ public class BlockWoodenButton extends WoodenButtonBlock implements Patterned { @Override public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); Identifier parentId = Registry.BLOCK.getId(parent); if (block.contains("item")) { - return Patterned.createJson(Patterned.BUTTON_ITEM_MODEL, parentId, block); + return Patterned.createJson(Patterned.BUTTON_ITEM_MODEL, parentId, blockId.getPath()); } if (block.contains("pressed")) { - return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, block); + return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, blockId.getPath()); } - return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, block); + return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, blockId.getPath()); } @Override