From 854fea97a60c29079da888feb217a8763bb313ee Mon Sep 17 00:00:00 2001 From: TehNut Date: Fri, 28 Aug 2015 15:54:38 -0700 Subject: [PATCH] Update to the TeamChisel version of Chisel Also cleans up a bit of code. Removed the Steamcraft chisel because the API really isn't very good. Quite hard to work with. --- src/main/java/tehnut/morechisels/MoreChisels.java | 9 +++++---- .../morechisels/compat/CompatibilityAetherII.java | 10 +++++----- .../morechisels/compat/CompatibilityBotania.java | 6 +++--- .../compat/CompatibilityExtraUtilities.java | 4 ++-- .../compat/CompatibilityGalacticraft.java | 4 ++-- .../compat/CompatibilitySoulShards.java | 4 ++-- .../compat/CompatibilityThaumcraft.java | 6 +++--- .../compat/CompatibilityTwilightForest.java | 10 +++++----- .../morechisels/item/chisel/ItemChiselGem.java | 14 ++------------ .../RecipeRegistry.java} | 5 ++--- 10 files changed, 31 insertions(+), 41 deletions(-) rename src/main/java/tehnut/morechisels/{item/ItemRecipeRegistry.java => registry/RecipeRegistry.java} (98%) diff --git a/src/main/java/tehnut/morechisels/MoreChisels.java b/src/main/java/tehnut/morechisels/MoreChisels.java index 1355c26..3b86ca0 100644 --- a/src/main/java/tehnut/morechisels/MoreChisels.java +++ b/src/main/java/tehnut/morechisels/MoreChisels.java @@ -8,7 +8,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.common.MinecraftForge; import tehnut.morechisels.compat.*; -import tehnut.morechisels.item.ItemRecipeRegistry; +import tehnut.morechisels.registry.RecipeRegistry; import tehnut.morechisels.registry.ItemRegistry; import tehnut.morechisels.proxy.CommonProxy; import tehnut.morechisels.util.EventHandler; @@ -30,8 +30,9 @@ public void preInit(FMLPreInitializationEvent event) { LogHelper.checkLogger(); - MinecraftForge.EVENT_BUS.register(new EventHandler()); - FMLCommonHandler.instance().bus().register(new EventHandler()); + EventHandler handler = new EventHandler(); + MinecraftForge.EVENT_BUS.register(handler); + FMLCommonHandler.instance().bus().register(handler); } @Mod.EventHandler @@ -39,7 +40,7 @@ public void init(FMLInitializationEvent event) { proxy.load(); ItemRegistry.registerItems(); - ItemRecipeRegistry.registerRecipes(); + RecipeRegistry.registerRecipes(); Utils.registerCompat(CompatibilityAetherII.class, "aether"); Utils.registerCompat(CompatibilityBloodMagic.class, "AWWayofTime"); diff --git a/src/main/java/tehnut/morechisels/compat/CompatibilityAetherII.java b/src/main/java/tehnut/morechisels/compat/CompatibilityAetherII.java index 1eba7c1..13284df 100644 --- a/src/main/java/tehnut/morechisels/compat/CompatibilityAetherII.java +++ b/src/main/java/tehnut/morechisels/compat/CompatibilityAetherII.java @@ -5,7 +5,7 @@ import net.minecraft.item.Item; import tehnut.morechisels.item.ChiselType; import tehnut.morechisels.item.ItemChiselBase; -import tehnut.morechisels.item.ItemRecipeRegistry; +import tehnut.morechisels.registry.RecipeRegistry; import tehnut.morechisels.registry.ItemRegistry; import tehnut.morechisels.util.LogHelper; @@ -45,9 +45,9 @@ private static void registerRecipes() { Item zanite = GameRegistry.findItem("aether", "zaniteGemstone"); Block gravitite = GameRegistry.findBlock("aether", "enchantedGravitite"); - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselSkyroot, skyroot, chiselSkyrootEnabled); - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselHolystone, holystone, chiselHolystoneEnabled); - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselZanite, zanite, chiselZaniteEnabled); - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselGravitite, gravitite, chiselGravititeEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselSkyroot, skyroot, chiselSkyrootEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselHolystone, holystone, chiselHolystoneEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselZanite, zanite, chiselZaniteEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselGravitite, gravitite, chiselGravititeEnabled); } } diff --git a/src/main/java/tehnut/morechisels/compat/CompatibilityBotania.java b/src/main/java/tehnut/morechisels/compat/CompatibilityBotania.java index c44c2ee..c00dce5 100644 --- a/src/main/java/tehnut/morechisels/compat/CompatibilityBotania.java +++ b/src/main/java/tehnut/morechisels/compat/CompatibilityBotania.java @@ -1,7 +1,7 @@ package tehnut.morechisels.compat; import net.minecraft.item.Item; -import tehnut.morechisels.item.ItemRecipeRegistry; +import tehnut.morechisels.registry.RecipeRegistry; import tehnut.morechisels.registry.ItemRegistry; import tehnut.morechisels.item.chisel.ItemChiselElementium; import tehnut.morechisels.item.chisel.ItemChiselManasteel; @@ -31,7 +31,7 @@ private static void registerItems() { private static void registerRecipes() { - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselManasteel, "ingotManasteel", chiselManasteelEnabled); - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselElementium, "ingotElvenElementium", chiselElementiumEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselManasteel, "ingotManasteel", chiselManasteelEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselElementium, "ingotElvenElementium", chiselElementiumEnabled); } } diff --git a/src/main/java/tehnut/morechisels/compat/CompatibilityExtraUtilities.java b/src/main/java/tehnut/morechisels/compat/CompatibilityExtraUtilities.java index fa70e59..edf30e9 100644 --- a/src/main/java/tehnut/morechisels/compat/CompatibilityExtraUtilities.java +++ b/src/main/java/tehnut/morechisels/compat/CompatibilityExtraUtilities.java @@ -6,7 +6,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import tehnut.morechisels.item.ChiselType; import tehnut.morechisels.item.ItemChiselBase; -import tehnut.morechisels.item.ItemRecipeRegistry; +import tehnut.morechisels.registry.RecipeRegistry; import tehnut.morechisels.registry.ItemRegistry; import tehnut.morechisels.item.chisel.ItemChiselBedrockium; import tehnut.morechisels.util.LogHelper; @@ -36,7 +36,7 @@ private static void registerItems() { private static void registerRecipes() { Item bedrockiumIngot = GameRegistry.findItem("ExtraUtilities", "bedrockiumIngot"); - ItemRecipeRegistry.addThemedChiselRecipe(chiselBedrockium, bedrockiumIngot, "ingotUnstable", chiselBedrockiumEnabled); + RecipeRegistry.addThemedChiselRecipe(chiselBedrockium, bedrockiumIngot, "ingotUnstable", chiselBedrockiumEnabled); if (chiselUnstableEnabled && bedrockiumIngot != null) GameRegistry.addRecipe(new ShapedOreRecipe(chiselUnstable, "I", "O", 'I', "ingotUnstable", 'O', Blocks.obsidian)); } diff --git a/src/main/java/tehnut/morechisels/compat/CompatibilityGalacticraft.java b/src/main/java/tehnut/morechisels/compat/CompatibilityGalacticraft.java index b59fd54..6eaefff 100644 --- a/src/main/java/tehnut/morechisels/compat/CompatibilityGalacticraft.java +++ b/src/main/java/tehnut/morechisels/compat/CompatibilityGalacticraft.java @@ -6,7 +6,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import tehnut.morechisels.item.ChiselType; import tehnut.morechisels.item.ItemChiselBase; -import tehnut.morechisels.item.ItemRecipeRegistry; +import tehnut.morechisels.registry.RecipeRegistry; import tehnut.morechisels.registry.ItemRegistry; import tehnut.morechisels.util.LogHelper; @@ -37,7 +37,7 @@ private static void registerRecipes() { Item gcStick = GameRegistry.findItem("GalacticraftMars", "item.null"); int gcStickMeta = 1; - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselCheese, cheese, chiselCheeseEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselCheese, cheese, chiselCheeseEnabled); GameRegistry.addRecipe(new ShapedOreRecipe(chiselDesh, " I", "S ", 'I', "ingotDesh", 'S', new ItemStack(gcStick, 1, gcStickMeta))); } } diff --git a/src/main/java/tehnut/morechisels/compat/CompatibilitySoulShards.java b/src/main/java/tehnut/morechisels/compat/CompatibilitySoulShards.java index 1dd7450..709d8e1 100644 --- a/src/main/java/tehnut/morechisels/compat/CompatibilitySoulShards.java +++ b/src/main/java/tehnut/morechisels/compat/CompatibilitySoulShards.java @@ -3,7 +3,7 @@ import net.minecraft.item.Item; import tehnut.morechisels.item.ChiselType; import tehnut.morechisels.item.ItemChiselBase; -import tehnut.morechisels.item.ItemRecipeRegistry; +import tehnut.morechisels.registry.RecipeRegistry; import tehnut.morechisels.registry.ItemRegistry; import tehnut.morechisels.util.LogHelper; @@ -25,6 +25,6 @@ private static void registerItems() { } private static void registerRecipes() { - ItemRecipeRegistry.addThemedChiselRecipe(chiselSoulium, "ingotSoulium", "ingotIron", chiselSouliumEnabled); + RecipeRegistry.addThemedChiselRecipe(chiselSoulium, "ingotSoulium", "ingotIron", chiselSouliumEnabled); } } diff --git a/src/main/java/tehnut/morechisels/compat/CompatibilityThaumcraft.java b/src/main/java/tehnut/morechisels/compat/CompatibilityThaumcraft.java index 48ed322..926d2fe 100644 --- a/src/main/java/tehnut/morechisels/compat/CompatibilityThaumcraft.java +++ b/src/main/java/tehnut/morechisels/compat/CompatibilityThaumcraft.java @@ -1,7 +1,7 @@ package tehnut.morechisels.compat; import net.minecraft.item.Item; -import tehnut.morechisels.item.ItemRecipeRegistry; +import tehnut.morechisels.registry.RecipeRegistry; import tehnut.morechisels.registry.ItemRegistry; import tehnut.morechisels.item.chisel.ItemChiselThaumium; import tehnut.morechisels.item.chisel.ItemChiselVoidmetal; @@ -29,7 +29,7 @@ private static void registerItems() { } private static void registerRecipes() { - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselThaumium, "ingotThaumium", chiselThaumiumEnabled); - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselVoidmetal, "ingotVoid", chiselVoidmetalEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselThaumium, "ingotThaumium", chiselThaumiumEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselVoidmetal, "ingotVoid", chiselVoidmetalEnabled); } } diff --git a/src/main/java/tehnut/morechisels/compat/CompatibilityTwilightForest.java b/src/main/java/tehnut/morechisels/compat/CompatibilityTwilightForest.java index 5963295..d5124a4 100644 --- a/src/main/java/tehnut/morechisels/compat/CompatibilityTwilightForest.java +++ b/src/main/java/tehnut/morechisels/compat/CompatibilityTwilightForest.java @@ -5,7 +5,7 @@ import net.minecraft.item.Item; import tehnut.morechisels.item.ChiselType; import tehnut.morechisels.item.ItemChiselBase; -import tehnut.morechisels.item.ItemRecipeRegistry; +import tehnut.morechisels.registry.RecipeRegistry; import tehnut.morechisels.registry.ItemRegistry; import tehnut.morechisels.util.LogHelper; @@ -42,9 +42,9 @@ private static void registerRecipes() { Item knightmetalIngot = GameRegistry.findItem("TwilightForest", "item.knightMetal"); Item fieryIngot = GameRegistry.findItem("TwilightForest", "item.fieryIngot"); - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselIronwood, "ironwood", chiselIronwoodEnabled); - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselSteeleaf, "steeleaf", chiselSteeleafEnabled); - ItemRecipeRegistry.addConfiguredChiselRecipe(chiselKnightmetal, knightmetalIngot, chiselKnightmetalEnabled); - ItemRecipeRegistry.addThemedChiselRecipe(chiselFiery, fieryIngot, Items.blaze_rod, chiselFieryEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselIronwood, "ironwood", chiselIronwoodEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselSteeleaf, "steeleaf", chiselSteeleafEnabled); + RecipeRegistry.addConfiguredChiselRecipe(chiselKnightmetal, knightmetalIngot, chiselKnightmetalEnabled); + RecipeRegistry.addThemedChiselRecipe(chiselFiery, fieryIngot, Items.blaze_rod, chiselFieryEnabled); } } diff --git a/src/main/java/tehnut/morechisels/item/chisel/ItemChiselGem.java b/src/main/java/tehnut/morechisels/item/chisel/ItemChiselGem.java index a2561ee..699799b 100644 --- a/src/main/java/tehnut/morechisels/item/chisel/ItemChiselGem.java +++ b/src/main/java/tehnut/morechisels/item/chisel/ItemChiselGem.java @@ -49,12 +49,7 @@ public String getItemStackDisplayName(ItemStack stack) { @SideOnly(Side.CLIENT) @Override public int getColorFromItemStack(ItemStack stack, int pass) { - - if (pass == 1) { - return Color.decode(hexColor).getRGB(); - } else { - return super.getColorFromItemStack(stack, pass); - } + return pass == 1 ? Color.decode(hexColor).getRGB() : super.getColorFromItemStack(stack, pass); } @Override @@ -69,11 +64,6 @@ public boolean requiresMultipleRenderPasses() { @Override public IIcon getIcon(ItemStack stack, int pass) { - if (pass == 0) { - return this.itemIcon; - } else if (pass == 1) { - return this.overlayIcon; - } - return getIconFromDamageForRenderPass(stack.getItemDamage(), pass); + return pass == 0 ? this.itemIcon : this.overlayIcon; } } diff --git a/src/main/java/tehnut/morechisels/item/ItemRecipeRegistry.java b/src/main/java/tehnut/morechisels/registry/RecipeRegistry.java similarity index 98% rename from src/main/java/tehnut/morechisels/item/ItemRecipeRegistry.java rename to src/main/java/tehnut/morechisels/registry/RecipeRegistry.java index 8e8a4ee..49d1138 100644 --- a/src/main/java/tehnut/morechisels/item/ItemRecipeRegistry.java +++ b/src/main/java/tehnut/morechisels/registry/RecipeRegistry.java @@ -1,4 +1,4 @@ -package tehnut.morechisels.item; +package tehnut.morechisels.registry; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; @@ -8,9 +8,8 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import team.chisel.config.Configurations; import tehnut.morechisels.ConfigHandler; -import tehnut.morechisels.registry.ItemRegistry; -public class ItemRecipeRegistry { +public class RecipeRegistry { public static void registerRecipes() { for (int i = 0; i < ItemRegistry.chiselGem.length; i++) {