diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index d2b14a98..773b1e61 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/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 modsSupported = new ArrayList(); diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index bba43d6d..95afd977 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -2339,26 +2339,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(); } } @@ -2381,8 +2376,8 @@ public enum Features { } public static void preInit() { - loadBlocks(false); - loadItems(false); + loadBlocks(); + loadItems(); } private Features parent; @@ -2432,10 +2427,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())) { diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index 1356f0bb..31cf5aa2 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -63,6 +63,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 diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexAnim.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexAnim.png.mcmeta index 6d775966..3a21c060 100644 --- a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexAnim.png.mcmeta +++ b/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, ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/chisel/textures/chiselGUIRevamp.png b/src/main/resources/assets/chisel/textures/chiselGUIRevamp.png new file mode 100644 index 00000000..4e56a217 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/chiselGUIRevamp.png differ