general code cleanup

added new StateMatcher

2 files changed, 36 insertions, 39 deletions

diff --git a/src/main/java/proxy/ClientProxy.java b/src/main/java/proxy/ClientProxy.java
index 1c44f72..09099bd 100644
--- a/src/main/java/proxy/ClientProxy.java
+++ b/src/main/java/proxy/ClientProxy.java
@@ -1,46 +1,42 @@
 package proxy;
 
-import blocks.BasicBlock;
-import items.BasicItem;
 import main.ZCompression;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 
-public class ClientProxy extends ServerProxy{
-	
-	@Override
-	public void registerClientStuff() {
-		// Items
-		registerItemModel(ZCompression.slagiron);
-	
-		// Blocks
-		registerBlockModel(ZCompression.adamantiteOre);
-		registerBlockModel(ZCompression.arcaniteOre);
-		registerBlockModel(ZCompression.basalt);
-		registerBlockModel(ZCompression.bismuthOre);
-		registerBlockModel(ZCompression.eterniteOre);
-		registerBlockModel(ZCompression.karmesineOre);
-		registerBlockModel(ZCompression.ligniteOre);
-		registerBlockModel(ZCompression.meteoriteOre);
-		registerBlockModel(ZCompression.mindoriteOre);
-		registerBlockModel(ZCompression.mythrilOre);
-		registerBlockModel(ZCompression.palladiumOre);
-		registerBlockModel(ZCompression.prometheumOre);
-		registerBlockModel(ZCompression.rottenGround);
-		registerBlockModel(ZCompression.slagironOre); 
-		registerBlockModel(ZCompression.tiberiumOre);
-		registerBlockModel(ZCompression.vibraniumOre);
-		
-		
-	}
-	
-	public static void registerItemModel(Item item){
-		Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory"));
-	}
+public class ClientProxy extends ServerProxy {
 
-	public static void registerBlockModel(Block block){
-		registerItemModel(Item.getItemFromBlock(block));
-	}
+    @Override
+    public void registerClientStuff() {
+        // Items
+        registerItemModel(ZCompression.slagiron);
+
+        // Blocks
+        registerBlockModel(ZCompression.adamantiteOre);
+        registerBlockModel(ZCompression.arcaniteOre);
+        registerBlockModel(ZCompression.basalt);
+        registerBlockModel(ZCompression.bismuthOre);
+        registerBlockModel(ZCompression.eterniteOre);
+        registerBlockModel(ZCompression.karmesineOre);
+        registerBlockModel(ZCompression.ligniteOre);
+        registerBlockModel(ZCompression.meteoriteOre);
+        registerBlockModel(ZCompression.mindoriteOre);
+        registerBlockModel(ZCompression.mythrilOre);
+        registerBlockModel(ZCompression.palladiumOre);
+        registerBlockModel(ZCompression.prometheumOre);
+        registerBlockModel(ZCompression.rottenGround);
+        registerBlockModel(ZCompression.slagironOre);
+        registerBlockModel(ZCompression.tiberiumOre);
+        registerBlockModel(ZCompression.vibraniumOre);
+    }
+
+    private static void registerBlockModel(Block block) {
+        registerItemModel(Item.getItemFromBlock(block));
+    }
+
+    private static void registerItemModel(Item item) {
+        Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory"));
+    }
 }
diff --git a/src/main/java/proxy/ServerProxy.java b/src/main/java/proxy/ServerProxy.java
index c213f2b..08001dc 100644
--- a/src/main/java/proxy/ServerProxy.java
+++ b/src/main/java/proxy/ServerProxy.java
@@ -1,7 +1,8 @@
 package proxy;
 
 public class ServerProxy {
-	
-	public void registerClientStuff() {}
-	
+
+    public void registerClientStuff() {
+
+    }
 }