MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More patterns fixes

Browse source
This commit is contained in:
Aleksey 2020-10-15 15:18:45 +03:00
parent 8306f245e1
commit 835b2e56d6
11 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/ru/betterend/blocks/basis/BlockDoor.java
View file

@ -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

7
src/main/java/ru/betterend/blocks/basis/BlockFence.java
View file

@ -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

9
src/main/java/ru/betterend/blocks/basis/BlockGate.java
View file

@ -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

2
src/main/java/ru/betterend/blocks/basis/BlockPillar.java
View file

@ -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

5
src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java
View file

@ -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

3
src/main/java/ru/betterend/blocks/basis/BlockSlab.java
View file

@ -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

7
src/main/java/ru/betterend/blocks/basis/BlockStairs.java
View file

@ -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

7
src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java
View file

@ -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

5
src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java
View file

@ -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

9
src/main/java/ru/betterend/blocks/basis/BlockWall.java
View file

@ -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

7
src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java
View file

@ -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