From 46ddb61b7274e8f505dfff65e9eb65f414f6d66f Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sat, 10 Jan 2015 21:09:20 +0000 Subject: [PATCH 1/5] Stop the mod tab crashing --- .../java/com/cricketcraft/chisel/init/ChiselTabs.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index 26089813..bfebf89d 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -52,13 +52,12 @@ public class ChiselTabs { tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.jackolantern[0])); if (atLeastOneModIsLoaded) { - if (Features.ARCANE.enabled()) { - tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.arcane)); - } else if (Features.BLOOD_RUNE.enabled()) { - tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.bloodRune)); - } else { + //This seems to be crashing due to Arcane blocks still being null when the tab is added + //if (Features.ARCANE.enabled()) { + // tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.arcane, 1, 1)); + //} else { tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.voidstone)); - } + //} } } } From 2259ecfba4a5c01b682bc812248a678c4f0c2756 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 10 Jan 2015 17:21:16 -0500 Subject: [PATCH 2/5] Move all block registration to preinit to prevent creative tab issues --- .../java/com/cricketcraft/chisel/Chisel.java | 2 +- .../cricketcraft/chisel/init/ChiselTabs.java | 11 +++++---- .../cricketcraft/chisel/init/Features.java | 23 ++++++------------- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 1150f741..46f6ea07 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/ChiselTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index bfebf89d..26089813 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -52,12 +52,13 @@ public class ChiselTabs { tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.jackolantern[0])); if (atLeastOneModIsLoaded) { - //This seems to be crashing due to Arcane blocks still being null when the tab is added - //if (Features.ARCANE.enabled()) { - // tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.arcane, 1, 1)); - //} else { + if (Features.ARCANE.enabled()) { + tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.arcane)); + } else if (Features.BLOOD_RUNE.enabled()) { + tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.bloodRune)); + } else { tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.voidstone)); - //} + } } } } diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index a834608e..d52f7e8e 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/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())) { From f6e5af67889cb12de6cb37b353eb38534eb3a5a0 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 10 Jan 2015 17:28:25 -0500 Subject: [PATCH 3/5] Add Drullkus changes --- .../blocks/hexPlating/hexAnim.png.mcmeta | 4 ++-- .../assets/chisel/textures/chiselGUIRevamp.png | Bin 0 -> 4676 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/chiselGUIRevamp.png 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..96e5d0b7 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, @@ -11,6 +11,6 @@ 6, 7, 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 0000000000000000000000000000000000000000..4e56a217ab19ddbacaa875e4a587b1d7894c592e GIT binary patch literal 4676 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 Date: Sat, 10 Jan 2015 18:53:42 -0500 Subject: [PATCH 4/5] Forgot to register diamond chisel renderer --- src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index 691dcc01..4a119d61 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/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 From e741a7e43d4f81d456a9eff79e9fd49d7c04a385 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Sat, 10 Jan 2015 17:18:23 -0800 Subject: [PATCH 5/5] #Blame Derpkus --- .../chisel/textures/blocks/hexPlating/hexAnim.png.mcmeta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 96e5d0b7..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 @@ -11,6 +11,6 @@ 6, 7, 8, - ]. + ] } -} \ No newline at end of file +}