Start changes model loading (early WIP)

src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java

@@ -60,7 +60,7 @@ public class BulbVineLanternBlock extends EndLanternBlock implements IRenderType
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		Map<String, String> map = Maps.newHashMap();
 		map.put("%glow%", getGlowTexture());

src/main/java/ru/betterend/blocks/ChandelierBlock.java

@@ -46,7 +46,7 @@ public class ChandelierBlock extends AttachedBlock implements IRenderTypeable, B
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		if (block.contains("item")) {
 			return Patterns.createJson(Patterns.ITEM_GENERATED, "item/" + blockId.getPath());

src/main/java/ru/betterend/blocks/EmeraldIceBlock.java

@@ -93,7 +93,7 @@ public class EmeraldIceBlock extends HalfTransparentBlock implements IRenderType
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		return Patterns.createJson(Patterns.BLOCK_BASE, blockId.getPath(), block);
 	}

src/main/java/ru/betterend/blocks/EndPathBlock.java

@@ -55,7 +55,7 @@ public class EndPathBlock extends BlockBaseNotFull {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String name = Registry.BLOCK.getKey(this).getPath();
 		Map<String, String> map = Maps.newHashMap();
 		map.put("%top%", name + "_top");

src/main/java/ru/betterend/blocks/EndPedestal.java

@@ -17,7 +17,7 @@ public class EndPedestal extends PedestalBlock {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(parent);
 		String name = blockId.getPath();
 		Map<String, String> textures = new HashMap<String, String>() {

src/main/java/ru/betterend/blocks/EndTerrainBlock.java

@@ -95,7 +95,7 @@ public class EndTerrainBlock extends BlockBase {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String name = Registry.BLOCK.getKey(this).getPath();
 		Map<String, String> map = Maps.newHashMap();
 		map.put("%top%", "betterend:block/" + name + "_top");

src/main/java/ru/betterend/blocks/HydraluxPetalColoredBlock.java

@@ -36,7 +36,7 @@ public class HydraluxPetalColoredBlock extends HydraluxPetalBlock implements ICo
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String path = "betterend:block/block_petal_colored";
 		return Patterns.createJson(Patterns.BLOCK_PETAL_COLORED, path, path);
 	}

src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java

@@ -73,7 +73,7 @@ public class JellyshroomCapBlock extends SlimeBlock implements IRenderTypeable,
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		return Patterns.createJson(Patterns.BLOCK_COLORED, "jellyshroom_cap");
 	}
 	

src/main/java/ru/betterend/blocks/PedestalVanilla.java

@@ -16,7 +16,7 @@ public class PedestalVanilla extends PedestalBlock {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(parent);
 		String name = blockId.getPath().replace("_block", "");
 		Map<String, String> textures = new HashMap<String, String>() {

src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java

@@ -74,7 +74,7 @@ public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderType
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		return Patterns.createJson(Patterns.BLOCK_BASE, blockId.getPath(), block);
 	}

src/main/java/ru/betterend/blocks/basis/BarkBlock.java

@@ -12,7 +12,7 @@ public class BarkBlock extends EndPillarBlock {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		return Patterns.createJson(Patterns.BLOCK_BASE, getName(blockId), blockId.getPath());
 	}

src/main/java/ru/betterend/blocks/basis/EndAnvilBlock.java

@@ -61,7 +61,7 @@ public class EndAnvilBlock extends AnvilBlock implements BlockPatterned {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		Map<String, String> map = Maps.newHashMap();
 		map.put("%anvil%", blockId.getPath());

src/main/java/ru/betterend/blocks/basis/EndBarrelBlock.java

@@ -95,7 +95,7 @@ public class EndBarrelBlock extends BarrelBlock implements BlockPatterned {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String texture = Registry.BLOCK.getKey(this).getPath();
 		if (block.contains("open")) {
 			return Patterns.createJson(Patterns.BLOCK_BARREL_OPEN, texture, texture);

src/main/java/ru/betterend/blocks/basis/EndBookshelfBlock.java

@@ -40,7 +40,7 @@ public class EndBookshelfBlock extends BlockBase {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		return Patterns.createJson(Patterns.BLOCK_BOOKSHELF, getName(blockId), blockId.getPath());
 	}

src/main/java/ru/betterend/blocks/basis/EndChainBlock.java

@@ -35,7 +35,7 @@ public class EndChainBlock extends ChainBlock implements BlockPatterned, IRender
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		if (block.contains("item")) {
 			return Patterns.createJson(Patterns.ITEM_GENERATED, "item/" + blockId.getPath());

src/main/java/ru/betterend/blocks/basis/EndChestBlock.java

@@ -49,7 +49,7 @@ public class EndChestBlock extends ChestBlock implements BlockPatterned {
 	}
 	
 	@Override
-	public String getModelPattern(String path) {
+	public String getModelString(String path) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (path.contains("item")) {

src/main/java/ru/betterend/blocks/basis/EndComposterBlock.java

@@ -32,7 +32,7 @@ public class EndComposterBlock extends ComposterBlock implements BlockPatterned
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		String blockName = blockId.getPath();
 		return Patterns.createJson(Patterns.BLOCK_COMPOSTER, blockName);

src/main/java/ru/betterend/blocks/basis/EndCraftingTableBlock.java

@@ -33,7 +33,7 @@ public class EndCraftingTableBlock extends CraftingTableBlock implements BlockPa
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		String blockName = blockId.getPath();
 		return Patterns.createJson(Patterns.BLOCK_SIDED, new HashMap<String, String>() {

src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java

@@ -43,7 +43,7 @@ public class EndDoorBlock extends DoorBlock implements IRenderTypeable, BlockPat
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String blockId = Registry.BLOCK.getKey(this).getPath();
 		if (block.contains("item")) {
 			return Patterns.createJson(Patterns.ITEM_GENERATED, block);

src/main/java/ru/betterend/blocks/basis/EndFenceBlock.java

@@ -36,7 +36,7 @@ public class EndFenceBlock extends FenceBlock implements BlockPatterned {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (block.contains("item")) {

src/main/java/ru/betterend/blocks/basis/EndFurnaceBlock.java

@@ -57,7 +57,7 @@ public class EndFurnaceBlock extends FurnaceBlock implements BlockPatterned, IRe
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		Map<String, String> map = Maps.newHashMap();
 		map.put("%top%", blockId.getPath() + "_top");

src/main/java/ru/betterend/blocks/basis/EndGateBlock.java

@@ -36,7 +36,7 @@ public class EndGateBlock extends FenceGateBlock implements BlockPatterned {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (block.contains("wall")) {

src/main/java/ru/betterend/blocks/basis/EndLadderBlock.java

@@ -144,7 +144,7 @@ public class EndLadderBlock extends BlockBaseNotFull implements IRenderTypeable,
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		if (block.contains("item")) {
 			return Patterns.createJson(Patterns.ITEM_BLOCK, blockId.getPath());

src/main/java/ru/betterend/blocks/basis/EndLeavesBlock.java

@@ -60,7 +60,7 @@ public class EndLeavesBlock extends LeavesBlock implements BlockPatterned, IRend
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String blockId = Registry.BLOCK.getKey(this).getPath();
 		return Patterns.createJson(Patterns.BLOCK_BASE, blockId, blockId);
 	}

src/main/java/ru/betterend/blocks/basis/EndMetalPaneBlock.java

@@ -37,7 +37,7 @@ public class EndMetalPaneBlock extends IronBarsBlock implements BlockPatterned,
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		if (block.contains("item")) {
 			return Patterns.createJson(Patterns.ITEM_BLOCK, blockId.getPath());

src/main/java/ru/betterend/blocks/basis/EndMetalPlateBlock.java

@@ -36,7 +36,7 @@ public class EndMetalPlateBlock extends WeightedPressurePlateBlock implements Bl
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (block.contains("down")) {

src/main/java/ru/betterend/blocks/basis/EndOreBlock.java

@@ -78,7 +78,7 @@ public class EndOreBlock extends OreBlock implements BlockPatterned {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		return Patterns.createJson(Patterns.BLOCK_BASE, blockId.getPath(), block);
 	}

src/main/java/ru/betterend/blocks/basis/EndPillarBlock.java

@@ -36,7 +36,7 @@ public class EndPillarBlock extends RotatedPillarBlock implements BlockPatterned
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String texture = Registry.BLOCK.getKey(this).getPath();
 		return Patterns.createJson(Patterns.BLOCK_PILLAR, texture, texture);
 	}

src/main/java/ru/betterend/blocks/basis/EndPlateBlock.java

@@ -36,7 +36,7 @@ public class EndPlateBlock extends PressurePlateBlock implements BlockPatterned
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (block.contains("down")) {

src/main/java/ru/betterend/blocks/basis/EndSignBlock.java

@@ -152,7 +152,7 @@ public class EndSignBlock extends SignBlock implements BlockPatterned, ISpetialI
 	}
 	
 	@Override
-	public String getModelPattern(String path) {
+	public String getModelString(String path) {
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (path.contains("item")) {
 			return Patterns.createJson(Patterns.ITEM_GENERATED, path);

src/main/java/ru/betterend/blocks/basis/EndSlabBlock.java

@@ -36,7 +36,7 @@ public class EndSlabBlock extends SlabBlock implements BlockPatterned {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		return Patterns.createJson(Patterns.BLOCK_SLAB, parentId.getPath(), blockId.getPath());

src/main/java/ru/betterend/blocks/basis/EndStairsBlock.java

@@ -37,7 +37,7 @@ public class EndStairsBlock extends StairBlock implements BlockPatterned {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (block.contains("inner")) {

src/main/java/ru/betterend/blocks/basis/EndStoneButtonBlock.java

@@ -36,7 +36,7 @@ public class EndStoneButtonBlock extends StoneButtonBlock implements BlockPatter
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (block.contains("item")) {

src/main/java/ru/betterend/blocks/basis/EndTrapdoorBlock.java

@@ -40,7 +40,7 @@ public class EndTrapdoorBlock extends TrapDoorBlock implements IRenderTypeable,
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		String name = blockId.getPath();
 		return Patterns.createJson(Patterns.BLOCK_TRAPDOOR, new HashMap<String, String>() {

src/main/java/ru/betterend/blocks/basis/EndWallBlock.java

@@ -37,7 +37,7 @@ public class EndWallBlock extends WallBlock implements BlockPatterned {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (block.contains("item")) {

src/main/java/ru/betterend/blocks/basis/EndWoodenButtonBlock.java

@@ -36,7 +36,7 @@ public class EndWoodenButtonBlock extends WoodButtonBlock implements BlockPatter
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
 		if (block.contains("item")) {

src/main/java/ru/betterend/blocks/basis/FeatureSaplingBlock.java

@@ -104,7 +104,7 @@ public abstract class FeatureSaplingBlock extends BlockBaseNotFull implements Bo
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		if (block.contains("item")) {
 			block = block.split("/")[1];
 			return Patterns.createJson(Patterns.ITEM_BLOCK, block);

src/main/java/ru/betterend/blocks/basis/PedestalBlock.java

@@ -341,7 +341,7 @@ public class PedestalBlock extends BlockBaseNotFull implements EntityBlock {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(parent);
 		String name = blockId.getPath();
 		Map<String, String> textures = new HashMap<String, String>() {

src/main/java/ru/betterend/blocks/basis/SimpleLeavesBlock.java

@@ -43,7 +43,7 @@ public class SimpleLeavesBlock extends BlockBaseNotFull implements IRenderTypeab
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String texture = Registry.BLOCK.getKey(this).getPath();
 		return Patterns.createJson(Patterns.BLOCK_BASE, texture, texture);
 	}

src/main/java/ru/betterend/blocks/basis/StalactiteBlock.java

@@ -192,7 +192,7 @@ public class StalactiteBlock extends BlockBaseNotFull implements SimpleWaterlogg
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		if (block.contains("item")) {
 			return Patterns.createJson(Patterns.ITEM_GENERATED, "item/" + blockId.getPath());

src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java

@@ -68,7 +68,7 @@ public class StoneLanternBlock extends EndLanternBlock implements IColorProvider
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String texture = Registry.BLOCK.getKey(this).getPath();
 		if (block.contains("ceil")) {
 			return Patterns.createJson(Patterns.BLOCK_STONE_LANTERN_CEIL, texture, texture);

src/main/java/ru/betterend/blocks/basis/TripleTerrainBlock.java

@@ -49,7 +49,7 @@ public class TripleTerrainBlock extends EndTerrainBlock {
 	}
 	
 	@Override
-	public String getModelPattern(String block) {
+	public String getModelString(String block) {
 		String name = Registry.BLOCK.getKey(this).getPath();
 		if (block.endsWith("_middle")) {
 			return Patterns.createJson(Patterns.BLOCK_BASE, name + "_top", name + "_top");