Merge pull request #131 from TheCricket/dev

Update Revert Branch

src/main/java/com/cricketcraft/chisel/Chisel.java

@@ -54,7 +54,7 @@ import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft")
+@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft")
 public class Chisel {
 
 	public static final List<String> modsSupported = new ArrayList<String>();

src/main/java/com/cricketcraft/chisel/init/Features.java

@@ -2331,26 +2331,21 @@ public enum Features {
 	;
 
 	public static void init() {
-		loadBlocks(true);
-		loadItems(true);
 		loadRecipes();
 	}
 
-	private static void loadBlocks(boolean init) {
+	private static void loadBlocks() {
 		for (Features f : values()) {
-			if (f.enabled() && f.shouldLoad(init)) {
+			if (f.enabled()) {
 				f.addBlocks();
 			}
 		}
-
-		if (!init) {
-			Chisel.proxy.registerTileEntities();
-		}
+		Chisel.proxy.registerTileEntities();
 	}
 
-	private static void loadItems(boolean init) {
+	private static void loadItems() {
 		for (Features f : values()) {
-			if (f.enabled() && f.shouldLoad(init)) {
+			if (f.enabled()) {
 				f.addItems();
 			}
 		}
@@ -2373,8 +2368,8 @@ public enum Features {
 	}
 
 	public static void preInit() {
-		loadBlocks(false);
-		loadItems(false);
+		loadBlocks();
+		loadItems();
 	}
 
 	private Features parent;
@@ -2424,10 +2419,6 @@ public enum Features {
 		return requiredMod;
 	}
 
-	private boolean shouldLoad(boolean init) {
-		return requiredMod == null ? !init : init && Loader.isModLoaded(requiredMod);
-	}
-
 	public static boolean oneModdedFeatureLoaded() {
 		for (Features f : values()) {
 			if (f.getRequiredMod() != null && Loader.isModLoaded(f.getRequiredMod())) {

src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java

@@ -72,6 +72,7 @@ public class ClientProxy extends CommonProxy {
 		RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ChiselItems.smashingrock));
 
 		MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer);
+		MinecraftForgeClient.registerItemRenderer(ChiselItems.diamondChisel, renderer);
 	}
 
 	@Override

src/main/resources/assets/chisel/textures/blocks/hexPlating/hexAnim.png.mcmeta

@@ -1,6 +1,6 @@
 {
 	"animation": {
-		"frametime": 1,
+		"frametime": 2,
 		"frames": [
 			0,
 			1,
@@ -13,4 +13,4 @@
 			8,
 		]
 	}
-}
+}