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

Constant rename

Browse source
This commit is contained in:
paulevsGitch 2020-11-08 14:07:06 +03:00
parent dc0027afd9
commit a288703f08
27 changed files with 670 additions and 670 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/ru/betterend/blocks/EndPedestal.java
View file

@ -31,16 +31,16 @@ public class EndPedestal extends BlockPedestal {
} }
}; };
if (block.contains("column_top")) { if (block.contains("column_top")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_COLUMN_TOP, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_COLUMN_TOP, textures);
} else if (block.contains("column")) { } else if (block.contains("column")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_COLUMN, textures); return Patterned.createJson(Patterned.BLOKC_PEDESTAL_COLUMN, textures);
} else if (block.contains("top")) { } else if (block.contains("top")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_TOP, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_TOP, textures);
} else if (block.contains("bottom")) { } else if (block.contains("bottom")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_BOTTOM, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_BOTTOM, textures);
} else if (block.contains("pillar")) { } else if (block.contains("pillar")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_PILLAR, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_PILLAR, textures);
} }
return Patterned.createJson(Patterned.PEDESTAL_MODEL_DEFAULT, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_DEFAULT, textures);
} }
} }

12
src/main/java/ru/betterend/blocks/PedestalVanilla.java
View file

@ -30,16 +30,16 @@ public class PedestalVanilla extends BlockPedestal {
} }
}; };
if (block.contains("column_top")) { if (block.contains("column_top")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_COLUMN_TOP, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_COLUMN_TOP, textures);
} else if (block.contains("column")) { } else if (block.contains("column")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_COLUMN, textures); return Patterned.createJson(Patterned.BLOKC_PEDESTAL_COLUMN, textures);
} else if (block.contains("top")) { } else if (block.contains("top")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_TOP, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_TOP, textures);
} else if (block.contains("bottom")) { } else if (block.contains("bottom")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_BOTTOM, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_BOTTOM, textures);
} else if (block.contains("pillar")) { } else if (block.contains("pillar")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_PILLAR, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_PILLAR, textures);
} }
return Patterned.createJson(Patterned.PEDESTAL_MODEL_DEFAULT, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_DEFAULT, textures);
} }
} }

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

@ -16,7 +16,7 @@ public class BlockBark extends BlockPillar {
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
String name = getName(blockId); String name = getName(blockId);
return Patterned.createJson(Patterned.BASE_BLOCK_MODEL, BetterEnd.makeID(name), blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BASE, BetterEnd.makeID(name), blockId.getPath());
} }
@Override @Override

6
src/main/java/ru/betterend/blocks/basis/BlockBarrel.java
View file

@ -97,13 +97,13 @@ public class BlockBarrel extends BarrelBlock implements Patterned {
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
if (block.contains("open")) { if (block.contains("open")) {
return Patterned.createJson(Patterned.BARREL_MODEL_OPEN, blockId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BARREL_OPEN, blockId, blockId.getPath());
} }
return Patterned.createJson(Patterned.BLOCK_BOTTOM_TOP_MODEL, blockId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BOTTOM_TOP, blockId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BARREL_STATES_PATTERN; return Patterned.STATE_BARREL;
} }
} }

4
src/main/java/ru/betterend/blocks/basis/BlockBase.java
View file

@ -31,11 +31,11 @@ public class BlockBase extends Block implements Patterned {
@Override @Override
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
return Patterned.createJson(Patterned.BASE_BLOCK_MODEL, blockId, block); return Patterned.createJson(Patterned.BLOCK_BASE, blockId, block);
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BLOCK_STATES_PATTERN; return Patterned.STATE_SIMPLE;
} }
} }

4
src/main/java/ru/betterend/blocks/basis/BlockBookshelf.java
View file

@ -37,14 +37,14 @@ public class BlockBookshelf extends BlockBase {
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BLOCK_STATES_PATTERN; return Patterned.STATE_SIMPLE;
} }
@Override @Override
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
String name = getName(blockId); String name = getName(blockId);
return Patterned.createJson(Patterned.BOOKSHELF, BetterEnd.makeID(name), blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BOOKSHELF, BetterEnd.makeID(name), blockId.getPath());
} }
@Override @Override

6
src/main/java/ru/betterend/blocks/basis/BlockChest.java
View file

@ -53,13 +53,13 @@ public class BlockChest extends ChestBlock implements Patterned {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
if (path.contains("item")) { if (path.contains("item")) {
return Patterned.createJson(Patterned.CHEST_ITEM_MODEL, blockId.getPath()); return Patterned.createJson(Patterned.ITEM_CHEST, blockId.getPath());
} }
return Patterned.createJson(Patterned.EMPTY_MODEL, parentId.getPath()); return Patterned.createJson(Patterned.BLOCK_EMPTY, parentId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BLOCK_STATES_PATTERN; return Patterned.STATE_SIMPLE;
} }
} }

4
src/main/java/ru/betterend/blocks/basis/BlockCraftingTable.java
View file

@ -35,7 +35,7 @@ public class BlockCraftingTable extends CraftingTableBlock implements Patterned
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
String blockName = blockId.getPath(); String blockName = blockId.getPath();
return Patterned.createJson(Patterned.SIDED_BLOCK_MODEL, new HashMap<String, String>() { return Patterned.createJson(Patterned.BLOCK_SIDED, new HashMap<String, String>() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
{ {
put("%particle%", blockName + "_front"); put("%particle%", blockName + "_front");
@ -51,6 +51,6 @@ public class BlockCraftingTable extends CraftingTableBlock implements Patterned
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BLOCK_STATES_PATTERN; return Patterned.STATE_SIMPLE;
} }
} }

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

@ -48,19 +48,19 @@ public class BlockDoor extends DoorBlock implements IRenderTypeable, Patterned {
return Patterned.createJson(Patterned.ITEM_MODEL, blockId.getPath()); return Patterned.createJson(Patterned.ITEM_MODEL, blockId.getPath());
} }
if (block.contains("top_hinge")) { if (block.contains("top_hinge")) {
return Patterned.createJson(Patterned.DOOR_MODEL_TOP_HINGE, blockId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_DOOR_TOP_HINGE, blockId, blockId.getPath());
} }
if (block.contains("bottom_hinge")) { if (block.contains("bottom_hinge")) {
return Patterned.createJson(Patterned.DOOR_MODEL_BOTTOM_HINGE, blockId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_DOOR_BOTTOM_HINGE, blockId, blockId.getPath());
} }
if (block.contains("top")) { if (block.contains("top")) {
return Patterned.createJson(Patterned.DOOR_MODEL_TOP, blockId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_DOOR_TOP, blockId, blockId.getPath());
} }
return Patterned.createJson(Patterned.DOOR_MODEL_BOTTOM, blockId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_DOOR_BOTTOM, blockId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.DOOR_STATES_PATTERN; return Patterned.STATE_DOOR;
} }
} }

6
src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java
View file

@ -107,13 +107,13 @@ public abstract class BlockFeatureSapling extends BlockBaseNotFull implements Fe
public String getModelPattern(String block) { public String getModelPattern(String block) {
if (block.contains("item")) { if (block.contains("item")) {
block = block.split("/")[1]; block = block.split("/")[1];
return Patterned.createJson(Patterned.BLOCK_ITEM_MODEL, block); return Patterned.createJson(Patterned.ITEM_BLOCK, block);
} }
return Patterned.createJson(Patterned.SAPLING_MODEL, block); return Patterned.createJson(Patterned.BLOCK_SAPLING, block);
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.SAPLING_STATES_PATTERN; return Patterned.STATE_SAPLING;
} }
} }

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

@ -40,16 +40,16 @@ public class BlockFence extends FenceBlock implements Patterned {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
if (block.contains("item")) { if (block.contains("item")) {
return Patterned.createJson(Patterned.FENCE_ITEM_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.ITEM_FENCE, parentId, blockId.getPath());
} }
if (block.contains("side")) { if (block.contains("side")) {
return Patterned.createJson(Patterned.FENCE_SIDE_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_FENCE_SIDE, parentId, blockId.getPath());
} }
return Patterned.createJson(Patterned.FENCE_POST_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_FENCE_POST, parentId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.FENCE_STATES_PATTERN; return Patterned.STATE_FENCE;
} }
} }

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

@ -41,19 +41,19 @@ public class BlockGate extends FenceGateBlock implements Patterned {
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
if (block.contains("wall")) { if (block.contains("wall")) {
if (block.contains("open")) { if (block.contains("open")) {
return Patterned.createJson(Patterned.GATE_MODEL_WALL_OPEN, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_GATE_OPEN_WALL, parentId, blockId.getPath());
} else { } else {
return Patterned.createJson(Patterned.GATE_MODEL_WALL_CLOSED, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_GATE_CLOSED_WALL, parentId, blockId.getPath());
} }
} }
if (block.contains("open")) { if (block.contains("open")) {
return Patterned.createJson(Patterned.GATE_MODEL_OPEN, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_GATE_OPEN, parentId, blockId.getPath());
} }
return Patterned.createJson(Patterned.GATE_MODEL_CLOSED, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_GATE_CLOSED, parentId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.GATE_STATES_PATTERN; return Patterned.STATE_GATE;
} }
} }

6
src/main/java/ru/betterend/blocks/basis/BlockLadder.java
View file

@ -146,13 +146,13 @@ public class BlockLadder extends BlockBaseNotFull implements IRenderTypeable, Pa
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
if (block.contains("item")) { if (block.contains("item")) {
return Patterned.createJson(Patterned.BLOCK_ITEM_MODEL, blockId.getPath()); return Patterned.createJson(Patterned.ITEM_BLOCK, blockId.getPath());
} }
return Patterned.createJson(Patterned.LADDER_MODEL, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_LADDER, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.LADDER_STATES_PATTERN; return Patterned.STATE_LADDER;
} }
} }

4
src/main/java/ru/betterend/blocks/basis/BlockLeaves.java
View file

@ -39,12 +39,12 @@ public class BlockLeaves extends LeavesBlock implements Patterned, IRenderTypeab
@Override @Override
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
return Patterned.createJson(Patterned.BASE_BLOCK_MODEL, blockId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BASE, blockId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BLOCK_STATES_PATTERN; return Patterned.STATE_SIMPLE;
} }
@Override @Override

14
src/main/java/ru/betterend/blocks/basis/BlockPedestal.java
View file

@ -325,22 +325,22 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid
} }
}; };
if (block.contains("column_top")) { if (block.contains("column_top")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_COLUMN_TOP, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_COLUMN_TOP, textures);
} else if (block.contains("column")) { } else if (block.contains("column")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_COLUMN, textures); return Patterned.createJson(Patterned.BLOKC_PEDESTAL_COLUMN, textures);
} else if (block.contains("top")) { } else if (block.contains("top")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_TOP, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_TOP, textures);
} else if (block.contains("bottom")) { } else if (block.contains("bottom")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_BOTTOM, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_BOTTOM, textures);
} else if (block.contains("pillar")) { } else if (block.contains("pillar")) {
return Patterned.createJson(Patterned.PEDESTAL_MODEL_PILLAR, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_PILLAR, textures);
} }
return Patterned.createJson(Patterned.PEDESTAL_MODEL_DEFAULT, textures); return Patterned.createJson(Patterned.BLOCK_PEDESTAL_DEFAULT, textures);
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.PEDESTAL_STATES_PATTERN; return Patterned.STATE_PEDESTAL;
} }
static { static {

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

@ -31,11 +31,11 @@ public class BlockPillar extends PillarBlock implements Patterned {
@Override @Override
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
return Patterned.createJson(Patterned.PILLAR_BLOCK_MODEL, blockId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_PILLAR, blockId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.PILLAR_STATES_PATTERN; return Patterned.STATE_PILLAR;
} }
} }

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

@ -40,13 +40,13 @@ public class BlockPressurePlate extends PressurePlateBlock implements Patterned
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
if (block.contains("down")) { if (block.contains("down")) {
return Patterned.createJson(Patterned.PLATE_MODEL_DOWN, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_PLATE_DOWN, parentId, blockId.getPath());
} }
return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_PLATE_UP, parentId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.PLATE_STATES_PATTERN; return Patterned.STATE_PLATE;
} }
} }

4
src/main/java/ru/betterend/blocks/basis/BlockSign.java
View file

@ -164,12 +164,12 @@ public class BlockSign extends AbstractSignBlock implements Patterned {
if (path.contains("item")) { if (path.contains("item")) {
return Patterned.createJson(Patterned.ITEM_MODEL, blockId.getPath()); return Patterned.createJson(Patterned.ITEM_MODEL, blockId.getPath());
} }
return Patterned.createJson(Patterned.EMPTY_MODEL, parentId.getPath()); return Patterned.createJson(Patterned.BLOCK_EMPTY, parentId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BLOCK_STATES_PATTERN; return Patterned.STATE_SIMPLE;
} }
@Override @Override

4
src/main/java/ru/betterend/blocks/basis/BlockSimpleLeaves.java
View file

@ -45,12 +45,12 @@ public class BlockSimpleLeaves extends BlockBaseNotFull implements IRenderTypeab
@Override @Override
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
return Patterned.createJson(Patterned.BASE_BLOCK_MODEL, blockId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BASE, blockId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BLOCK_STATES_PATTERN; return Patterned.STATE_SIMPLE;
} }
@Override @Override

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

@ -39,11 +39,11 @@ public class BlockSlab extends SlabBlock implements Patterned {
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
return Patterned.createJson(Patterned.SLAB_BLOCK_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_SLAB, parentId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.SLAB_STATES_PATTERN; return Patterned.STATE_SLAB;
} }
} }

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

@ -40,16 +40,16 @@ public class BlockStairs extends StairsBlock implements Patterned {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
if (block.contains("inner")) { if (block.contains("inner")) {
return Patterned.createJson(Patterned.STAIRS_MODEL_INNER, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_STAIR_INNER, parentId, blockId.getPath());
} }
if (block.contains("outer")) { if (block.contains("outer")) {
return Patterned.createJson(Patterned.STAIRS_MODEL_OUTER, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_STAIR_OUTER, parentId, blockId.getPath());
} }
return Patterned.createJson(Patterned.STAIRS_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_STAIR, parentId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.STAIRS_STATES_PATTERN; return Patterned.STATE_STAIRS;
} }
} }

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

@ -40,16 +40,16 @@ public class BlockStoneButton extends StoneButtonBlock implements Patterned {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
if (block.contains("item")) { if (block.contains("item")) {
return Patterned.createJson(Patterned.BUTTON_ITEM_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.ITEM_BUTTON, parentId, blockId.getPath());
} }
if (block.contains("pressed")) { if (block.contains("pressed")) {
return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BUTTON_PRESSED, parentId, blockId.getPath());
} }
return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BUTTON, parentId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BUTTON_STATES_PATTERN; return Patterned.STATE_BUTTON;
} }
} }

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

@ -40,13 +40,13 @@ public class BlockStonePressurePlate extends PressurePlateBlock implements Patte
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
if (block.contains("down")) { if (block.contains("down")) {
return Patterned.createJson(Patterned.PLATE_MODEL_DOWN, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_PLATE_DOWN, parentId, blockId.getPath());
} }
return Patterned.createJson(Patterned.PLATE_MODEL_UP, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_PLATE_UP, parentId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.PLATE_STATES_PATTERN; return Patterned.STATE_PLATE;
} }
} }

4
src/main/java/ru/betterend/blocks/basis/BlockTrapdoor.java
View file

@ -42,7 +42,7 @@ public class BlockTrapdoor extends TrapdoorBlock implements IRenderTypeable, Pat
public String getModelPattern(String block) { public String getModelPattern(String block) {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
String name = blockId.getPath(); String name = blockId.getPath();
return Patterned.createJson(Patterned.TRAPDOOR_MODEL, new HashMap<String, String>() { return Patterned.createJson(Patterned.BLOCK_TRAPDOOR, new HashMap<String, String>() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
{ {
put("%block%", name); put("%block%", name);
@ -53,6 +53,6 @@ public class BlockTrapdoor extends TrapdoorBlock implements IRenderTypeable, Pat
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.TRAPDOOR_STATES_PATTERN; return Patterned.STATE_TRAPDOOR;
} }
} }

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

@ -40,19 +40,19 @@ public class BlockWall extends WallBlock implements Patterned {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
if (block.contains("item")) { if (block.contains("item")) {
return Patterned.createJson(Patterned.WALL_ITEM_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.ITEM_WALL, parentId, blockId.getPath());
} }
if (block.contains("side_tall")) { if (block.contains("side_tall")) {
return Patterned.createJson(Patterned.WALL_SIDE_TALL_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_WALL_SIDE_TALL, parentId, blockId.getPath());
} }
if (block.contains("side")) { if (block.contains("side")) {
return Patterned.createJson(Patterned.WALL_SIDE_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_WALL_SIDE, parentId, blockId.getPath());
} }
return Patterned.createJson(Patterned.WALL_POST_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_WALL_POST, parentId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.WALL_STATES_PATTERN; return Patterned.STATE_WALL;
} }
} }

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

@ -40,16 +40,16 @@ public class BlockWoodenButton extends WoodenButtonBlock implements Patterned {
Identifier blockId = Registry.BLOCK.getId(this); Identifier blockId = Registry.BLOCK.getId(this);
Identifier parentId = Registry.BLOCK.getId(parent); Identifier parentId = Registry.BLOCK.getId(parent);
if (block.contains("item")) { if (block.contains("item")) {
return Patterned.createJson(Patterned.BUTTON_ITEM_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.ITEM_BUTTON, parentId, blockId.getPath());
} }
if (block.contains("pressed")) { if (block.contains("pressed")) {
return Patterned.createJson(Patterned.BUTTON_PRESSED_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BUTTON_PRESSED, parentId, blockId.getPath());
} }
return Patterned.createJson(Patterned.BUTTON_BLOCK_MODEL, parentId, blockId.getPath()); return Patterned.createJson(Patterned.BLOCK_BUTTON, parentId, blockId.getPath());
} }
@Override @Override
public Identifier statePatternId() { public Identifier statePatternId() {
return Patterned.BUTTON_STATES_PATTERN; return Patterned.STATE_BUTTON;
} }
} }

120
src/main/java/ru/betterend/interfaces/Patterned.java
View file

@ -16,70 +16,70 @@ import ru.betterend.BetterEnd;
public interface Patterned { public interface Patterned {
//Blockstates //Blockstates
public final static Identifier BLOCK_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_block.json"); public final static Identifier STATE_SIMPLE = 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 STATE_SLAB = 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 STATE_STAIRS = 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 STATE_WALL = BetterEnd.makeID("patterns/blockstate/pattern_wall.json");
public final static Identifier FENCE_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_fence.json"); public final static Identifier STATE_FENCE = BetterEnd.makeID("patterns/blockstate/pattern_fence.json");
public final static Identifier BUTTON_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_button.json"); public final static Identifier STATE_BUTTON = 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 STATE_PILLAR = BetterEnd.makeID("patterns/blockstate/pattern_pillar.json");
public final static Identifier PLATE_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_pressure_plate.json"); public final static Identifier STATE_PLATE = BetterEnd.makeID("patterns/blockstate/pattern_pressure_plate.json");
public final static Identifier DOOR_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_door.json"); public final static Identifier STATE_DOOR = BetterEnd.makeID("patterns/blockstate/pattern_door.json");
public final static Identifier SAPLING_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_sapling.json"); public final static Identifier STATE_SAPLING = BetterEnd.makeID("patterns/blockstate/pattern_sapling.json");
public final static Identifier GATE_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_fence_gate.json"); public final static Identifier STATE_GATE = BetterEnd.makeID("patterns/blockstate/pattern_fence_gate.json");
public final static Identifier TRAPDOOR_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_trapdoor.json"); public final static Identifier STATE_TRAPDOOR = BetterEnd.makeID("patterns/blockstate/pattern_trapdoor.json");
public final static Identifier LADDER_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_ladder.json"); public final static Identifier STATE_LADDER = BetterEnd.makeID("patterns/blockstate/pattern_ladder.json");
public final static Identifier BARREL_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_barrel.json"); public final static Identifier STATE_BARREL = BetterEnd.makeID("patterns/blockstate/pattern_barrel.json");
public final static Identifier PEDESTAL_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_pedestal.json"); public final static Identifier STATE_PEDESTAL = BetterEnd.makeID("patterns/blockstate/pattern_pedestal.json");
public final static Identifier BLOCKSTATE_STONE_LANTERN = BetterEnd.makeID("patterns/blockstate/stone_lantern.json"); public final static Identifier STATE_STONE_LANTERN = BetterEnd.makeID("patterns/blockstate/stone_lantern.json");
//Models Block //Models Block
public final static Identifier EMPTY_MODEL = BetterEnd.makeID("patterns/block/pattern_empty.json"); public final static Identifier BLOCK_EMPTY = BetterEnd.makeID("patterns/block/pattern_empty.json");
public final static Identifier BASE_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_block.json"); public final static Identifier BLOCK_BASE = BetterEnd.makeID("patterns/block/pattern_block.json");
public final static Identifier SIDED_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_block_sided.json"); public final static Identifier BLOCK_SIDED = BetterEnd.makeID("patterns/block/pattern_block_sided.json");
public final static Identifier BLOCK_BOTTOM_TOP_MODEL = BetterEnd.makeID("patterns/block/pattern_block_bottom_top.json"); public final static Identifier BLOCK_BOTTOM_TOP = BetterEnd.makeID("patterns/block/pattern_block_bottom_top.json");
public final static Identifier SLAB_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_slab.json"); public final static Identifier BLOCK_SLAB = BetterEnd.makeID("patterns/block/pattern_slab.json");
public final static Identifier STAIRS_MODEL = BetterEnd.makeID("patterns/block/pattern_stairs.json"); public final static Identifier BLOCK_STAIR = 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 BLOCK_STAIR_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 BLOCK_STAIR_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 BLOCK_WALL_POST = 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 BLOCK_WALL_SIDE = 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 BLOCK_WALL_SIDE_TALL = BetterEnd.makeID("patterns/block/pattern_wall_side_tall.json");
public final static Identifier FENCE_POST_MODEL = BetterEnd.makeID("patterns/block/pattern_fence_post.json"); public final static Identifier BLOCK_FENCE_POST = BetterEnd.makeID("patterns/block/pattern_fence_post.json");
public final static Identifier FENCE_SIDE_MODEL = BetterEnd.makeID("patterns/block/pattern_fence_side.json"); public final static Identifier BLOCK_FENCE_SIDE = BetterEnd.makeID("patterns/block/pattern_fence_side.json");
public final static Identifier BUTTON_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_button.json"); public final static Identifier BLOCK_BUTTON = 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 BLOCK_BUTTON_PRESSED = BetterEnd.makeID("patterns/block/pattern_button_pressed.json");
public final static Identifier PILLAR_BLOCK_MODEL = BetterEnd.makeID("patterns/block/pattern_pillar.json"); public final static Identifier BLOCK_PILLAR = 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 BLOCK_PLATE_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"); public final static Identifier BLOCK_PLATE_DOWN = BetterEnd.makeID("patterns/block/pattern_pressure_plate_down.json");
public final static Identifier DOOR_MODEL_TOP = BetterEnd.makeID("patterns/block/pattern_door_top.json"); public final static Identifier BLOCK_DOOR_TOP = BetterEnd.makeID("patterns/block/pattern_door_top.json");
public final static Identifier DOOR_MODEL_TOP_HINGE = BetterEnd.makeID("patterns/block/pattern_door_top_hinge.json"); public final static Identifier BLOCK_DOOR_TOP_HINGE = BetterEnd.makeID("patterns/block/pattern_door_top_hinge.json");
public final static Identifier DOOR_MODEL_BOTTOM = BetterEnd.makeID("patterns/block/pattern_door_bottom.json"); public final static Identifier BLOCK_DOOR_BOTTOM = BetterEnd.makeID("patterns/block/pattern_door_bottom.json");
public final static Identifier DOOR_MODEL_BOTTOM_HINGE = BetterEnd.makeID("patterns/block/pattern_door_bottom_hinge.json"); public final static Identifier BLOCK_DOOR_BOTTOM_HINGE = BetterEnd.makeID("patterns/block/pattern_door_bottom_hinge.json");
public final static Identifier SAPLING_MODEL = BetterEnd.makeID("patterns/block/pattern_sapling.json"); public final static Identifier BLOCK_SAPLING = BetterEnd.makeID("patterns/block/pattern_sapling.json");
public final static Identifier GATE_MODEL_CLOSED = BetterEnd.makeID("patterns/block/pattern_fence_gate_closed.json"); public final static Identifier BLOCK_GATE_CLOSED = BetterEnd.makeID("patterns/block/pattern_fence_gate_closed.json");
public final static Identifier GATE_MODEL_WALL_CLOSED = BetterEnd.makeID("patterns/block/pattern_wall_gate_closed.json"); public final static Identifier BLOCK_GATE_CLOSED_WALL = BetterEnd.makeID("patterns/block/pattern_wall_gate_closed.json");
public final static Identifier GATE_MODEL_OPEN = BetterEnd.makeID("patterns/block/pattern_fence_gate_open.json"); public final static Identifier BLOCK_GATE_OPEN = BetterEnd.makeID("patterns/block/pattern_fence_gate_open.json");
public final static Identifier GATE_MODEL_WALL_OPEN = BetterEnd.makeID("patterns/block/pattern_wall_gate_open.json"); public final static Identifier BLOCK_GATE_OPEN_WALL = BetterEnd.makeID("patterns/block/pattern_wall_gate_open.json");
public final static Identifier TRAPDOOR_MODEL = BetterEnd.makeID("patterns/block/pattern_trapdoor.json"); public final static Identifier BLOCK_TRAPDOOR = BetterEnd.makeID("patterns/block/pattern_trapdoor.json");
public final static Identifier LADDER_MODEL = BetterEnd.makeID("patterns/block/pattern_ladder.json"); public final static Identifier BLOCK_LADDER = BetterEnd.makeID("patterns/block/pattern_ladder.json");
public final static Identifier BARREL_MODEL_OPEN = BetterEnd.makeID("patterns/block/pattern_barrel_open.json"); public final static Identifier BLOCK_BARREL_OPEN = BetterEnd.makeID("patterns/block/pattern_barrel_open.json");
public final static Identifier PEDESTAL_MODEL_DEFAULT = BetterEnd.makeID("patterns/block/pattern_pedestal_default.json"); public final static Identifier BLOCK_PEDESTAL_DEFAULT = BetterEnd.makeID("patterns/block/pattern_pedestal_default.json");
public final static Identifier PEDESTAL_MODEL_COLUMN = BetterEnd.makeID("patterns/block/pattern_pedestal_column.json"); public final static Identifier BLOKC_PEDESTAL_COLUMN = BetterEnd.makeID("patterns/block/pattern_pedestal_column.json");
public final static Identifier PEDESTAL_MODEL_COLUMN_TOP = BetterEnd.makeID("patterns/block/pattern_pedestal_column_top.json"); public final static Identifier BLOCK_PEDESTAL_COLUMN_TOP = BetterEnd.makeID("patterns/block/pattern_pedestal_column_top.json");
public final static Identifier PEDESTAL_MODEL_TOP = BetterEnd.makeID("patterns/block/pattern_pedestal_top.json"); public final static Identifier BLOCK_PEDESTAL_TOP = BetterEnd.makeID("patterns/block/pattern_pedestal_top.json");
public final static Identifier PEDESTAL_MODEL_BOTTOM = BetterEnd.makeID("patterns/block/pattern_pedestal_bottom.json"); public final static Identifier BLOCK_PEDESTAL_BOTTOM = BetterEnd.makeID("patterns/block/pattern_pedestal_bottom.json");
public final static Identifier PEDESTAL_MODEL_PILLAR = BetterEnd.makeID("patterns/block/pattern_pedestal_pillar.json"); public final static Identifier BLOCK_PEDESTAL_PILLAR = BetterEnd.makeID("patterns/block/pattern_pedestal_pillar.json");
public final static Identifier BOOKSHELF = BetterEnd.makeID("patterns/block/bookshelf.json"); public final static Identifier BLOCK_BOOKSHELF = BetterEnd.makeID("patterns/block/bookshelf.json");
public final static Identifier STONE_LANTERN_CEIL = BetterEnd.makeID("patterns/block/stone_lantern_ceil.json"); public final static Identifier BLOCK_STONE_LANTERN_CEIL = BetterEnd.makeID("patterns/block/stone_lantern_ceil.json");
public final static Identifier STONE_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/stone_lantern_floor.json"); public final static Identifier BLOCK_STONE_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/stone_lantern_floor.json");
//Models Item //Models Item
public final static Identifier WALL_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_wall.json"); public final static Identifier ITEM_WALL = BetterEnd.makeID("patterns/item/pattern_wall.json");
public final static Identifier FENCE_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_fence.json"); public final static Identifier ITEM_FENCE = BetterEnd.makeID("patterns/item/pattern_fence.json");
public final static Identifier BUTTON_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_button.json"); public final static Identifier ITEM_BUTTON = BetterEnd.makeID("patterns/item/pattern_button.json");
public final static Identifier CHEST_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_chest.json"); public final static Identifier ITEM_CHEST = BetterEnd.makeID("patterns/item/pattern_chest.json");
public final static Identifier BLOCK_ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_block_item.json"); public final static Identifier ITEM_BLOCK = BetterEnd.makeID("patterns/item/pattern_block_item.json");
public final static Identifier ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_item.json"); public final static Identifier ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_item.json");
default String getStatesPattern(Reader data) { default String getStatesPattern(Reader data) {