From 18edba9a6f5fae96ca125424c31b2680d02c04d7 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Mon, 7 Sep 2015 14:07:38 +0100 Subject: [PATCH] Remove copper and brass parts, halving the clutter! --- .../common/compat/CompatabilityLayer.java | 8 +- .../steamcraft/common/compat/ForgeHooks.java | 2 - .../steamcraft/common/init/InitItems.java | 84 ++++++++++++++++--- .../steamcraft/common/init/InitRecipes.java | 8 +- 4 files changed, 77 insertions(+), 25 deletions(-) diff --git a/src/main/java/steamcraft/common/compat/CompatabilityLayer.java b/src/main/java/steamcraft/common/compat/CompatabilityLayer.java index 95c31843..5502563f 100755 --- a/src/main/java/steamcraft/common/compat/CompatabilityLayer.java +++ b/src/main/java/steamcraft/common/compat/CompatabilityLayer.java @@ -218,14 +218,10 @@ public class CompatabilityLayer for (int i = 0; i < partType.length; i++) { - OreDictHelper.registerOreWithAlts(InitItems.itemCopperParts, i, "partCopper" + partType[i], partType[i].toLowerCase() + "Copper"); - OreDictHelper.registerOreWithAlts(InitItems.itemIronParts, i, "partIron" + partType[i], partType[i].toLowerCase() + "Iron"); - OreDictHelper.registerOreWithAlts(InitItems.itemBrassParts, i, "partBrass" + partType[i], partType[i].toLowerCase() + "Brass"); - OreDictHelper.registerOreWithAlts(InitItems.itemSteelParts, i, "partSteel" + partType[i], partType[i].toLowerCase() + "Steel"); + OreDictHelper.registerOreWithAlts(InitItems.itemIronParts, i, "partIron", partType[i], partType[i].toLowerCase() + "Iron"); + OreDictHelper.registerOreWithAlts(InitItems.itemSteelParts, i, "partSteel", partType[i], partType[i].toLowerCase() + "Steel"); - OreDictHelper.registerOre("partTierOne", InitItems.itemCopperParts, i); OreDictHelper.registerOre("partTierOne", InitItems.itemIronParts, i); - OreDictHelper.registerOre("partTierTwo", InitItems.itemBrassParts, i); OreDictHelper.registerOre("partTierTwo", InitItems.itemSteelParts, i); } OreDictionary.registerOre("logWood", InitBlocks.blockRedwoodLog); diff --git a/src/main/java/steamcraft/common/compat/ForgeHooks.java b/src/main/java/steamcraft/common/compat/ForgeHooks.java index c69edde5..1a20f6a5 100644 --- a/src/main/java/steamcraft/common/compat/ForgeHooks.java +++ b/src/main/java/steamcraft/common/compat/ForgeHooks.java @@ -30,8 +30,6 @@ public class ForgeHooks { for (int i = 0; i < 10; i++) { - FishingHooks.addJunk(new WeightedRandomFishable(new ItemStack(InitItems.itemBrassParts, 1, i), 25)); - FishingHooks.addJunk(new WeightedRandomFishable(new ItemStack(InitItems.itemCopperParts, 1, i), 25)); FishingHooks.addJunk(new WeightedRandomFishable(new ItemStack(InitItems.itemSteelParts, 1, i), 25)); FishingHooks.addJunk(new WeightedRandomFishable(new ItemStack(InitItems.itemIronParts, 1, i), 25)); } diff --git a/src/main/java/steamcraft/common/init/InitItems.java b/src/main/java/steamcraft/common/init/InitItems.java index d5c9e608..e19ae60a 100755 --- a/src/main/java/steamcraft/common/init/InitItems.java +++ b/src/main/java/steamcraft/common/init/InitItems.java @@ -12,29 +12,95 @@ */ package steamcraft.common.init; -import boilerplate.common.utils.helpers.RegistryHelper; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; + +import cpw.mods.fml.common.registry.GameRegistry; + import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + +import boilerplate.common.utils.helpers.RegistryHelper; import steamcraft.common.Steamcraft; -import steamcraft.common.items.*; -import steamcraft.common.items.armor.*; +import steamcraft.common.items.BaseItem; +import steamcraft.common.items.ItemCanister; +import steamcraft.common.items.ItemChisel; +import steamcraft.common.items.ItemCoin; +import steamcraft.common.items.ItemCustomBucket; +import steamcraft.common.items.ItemCustomFood; +import steamcraft.common.items.ItemDimensionalPocket; +import steamcraft.common.items.ItemFieldManipulator; +import steamcraft.common.items.ItemFirearm; +import steamcraft.common.items.ItemGrappleGun; +import steamcraft.common.items.ItemGunPart; +import steamcraft.common.items.ItemHandbook; +import steamcraft.common.items.ItemIngot; +import steamcraft.common.items.ItemLoreBook; +import steamcraft.common.items.ItemMachinePart; +import steamcraft.common.items.ItemMatch; +import steamcraft.common.items.ItemMobBottle; +import steamcraft.common.items.ItemMonsterSpawner; +import steamcraft.common.items.ItemNugget; +import steamcraft.common.items.ItemParts; +import steamcraft.common.items.ItemPowder; +import steamcraft.common.items.ItemResource; +import steamcraft.common.items.ItemRocket; +import steamcraft.common.items.ItemRocketLauncher; +import steamcraft.common.items.ItemSheet; +import steamcraft.common.items.ItemSpanner; +import steamcraft.common.items.ItemSplashLightningBottle; +import steamcraft.common.items.ItemTeaSeed; +import steamcraft.common.items.ItemTeacup; +import steamcraft.common.items.ItemTeapot; +import steamcraft.common.items.ItemTimeClock; +import steamcraft.common.items.ItemVanillaPowder; +import steamcraft.common.items.ItemVanillaSheet; +import steamcraft.common.items.ItemWatch; +import steamcraft.common.items.ItemWithCraftingDurability; +import steamcraft.common.items.armor.ItemBrassArmor; +import steamcraft.common.items.armor.ItemBrassGoggles; +import steamcraft.common.items.armor.ItemClockworkWings; +import steamcraft.common.items.armor.ItemDivingHelmet; +import steamcraft.common.items.armor.ItemMonocle; +import steamcraft.common.items.armor.ItemNormalArmor; +import steamcraft.common.items.armor.ItemSteamJetpack; import steamcraft.common.items.compat.ItemSteamcraftCluster; import steamcraft.common.items.compat.ItemThaumicMonocle; import steamcraft.common.items.electric.ElectricItem; import steamcraft.common.items.electric.ItemRayGun; import steamcraft.common.items.electric.ItemShrinkray; -import steamcraft.common.items.modules.*; +import steamcraft.common.items.modules.ItemAqualung; +import steamcraft.common.items.modules.ItemAutofeeder; +import steamcraft.common.items.modules.ItemClimbingSpikes; +import steamcraft.common.items.modules.ItemEmergencyTank; +import steamcraft.common.items.modules.ItemFlippers; +import steamcraft.common.items.modules.ItemFreezeBoots; +import steamcraft.common.items.modules.ItemGogglesModule; +import steamcraft.common.items.modules.ItemLastResort; +import steamcraft.common.items.modules.ItemLegBraces; +import steamcraft.common.items.modules.ItemLifeVest; +import steamcraft.common.items.modules.ItemParachute; +import steamcraft.common.items.modules.ItemPistonBoots; +import steamcraft.common.items.modules.ItemReactivePistonPlating; +import steamcraft.common.items.modules.ItemRollerSkates; +import steamcraft.common.items.modules.ItemSpringHeels; +import steamcraft.common.items.modules.ItemSteelPlating; +import steamcraft.common.items.modules.ItemSuperFreezeBoots; +import steamcraft.common.items.modules.ItemWatchDisplay; +import steamcraft.common.items.modules.ItemWingpackModule; import steamcraft.common.items.tools.ItemElectricDrill; import steamcraft.common.items.tools.ItemElectrifiedSword; -import steamcraft.common.items.tools.steam.*; +import steamcraft.common.items.tools.steam.ItemSteamAxe; +import steamcraft.common.items.tools.steam.ItemSteamDrill; +import steamcraft.common.items.tools.steam.ItemSteamHoe; +import steamcraft.common.items.tools.steam.ItemSteamPickaxe; +import steamcraft.common.items.tools.steam.ItemSteamShovel; +import steamcraft.common.items.tools.steam.ItemSteamSword; import steamcraft.common.items.vanity.ItemTopHat; import steamcraft.common.lib.BucketHandler; import steamcraft.common.lib.ModInfo; @@ -80,7 +146,7 @@ public class InitItems public static Item itemColdKettle, itemHotKettle, itemEmptyKettle, itemTeapot; - public static Item itemCopperParts, itemBrassParts, itemSteelParts, itemIronParts; + public static Item itemIronParts, itemSteelParts; public static Item itemCraftingChip; @@ -255,16 +321,12 @@ public class InitItems itemMachinePart = new ItemMachinePart().setUnlocalizedName("itemMachinePart"); itemGunPart = new ItemGunPart().setUnlocalizedName("itemGunPart"); - itemCopperParts = ((ItemParts) new ItemParts().setUnlocalizedName("itemPartsCopper")).setMaterial("Copper"); itemIronParts = ((ItemParts) new ItemParts().setUnlocalizedName("itemPartsIron")).setMaterial("Iron"); - itemBrassParts = ((ItemParts) new ItemParts().setUnlocalizedName("itemPartsBrass")).setMaterial("Brass"); itemSteelParts = ((ItemParts) new ItemParts().setUnlocalizedName("itemPartsSteel")).setMaterial("Steel"); registerItem(itemMachinePart, "ItemMachinePart"); registerItem(itemGunPart, "ItemGunPart"); - registerItem(itemCopperParts, "ItemCopperParts"); registerItem(itemIronParts, "ItemIronParts"); - registerItem(itemBrassParts, "ItemBrassParts"); registerItem(itemSteelParts, "ItemSteelParts"); } diff --git a/src/main/java/steamcraft/common/init/InitRecipes.java b/src/main/java/steamcraft/common/init/InitRecipes.java index dab18b3c..b3b32d52 100755 --- a/src/main/java/steamcraft/common/init/InitRecipes.java +++ b/src/main/java/steamcraft/common/init/InitRecipes.java @@ -393,18 +393,14 @@ public class InitRecipes GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemSteelParts, 1, 1), " P ", "P P", " P ", 'P', "plateSteel")); GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(InitItems.itemSteelParts, 1, 2), "PPP", " I ", "PPP", 'P', "plateSteel", 'I', "ingotSteel")); - GameRegistry.addRecipe( - new ShapedOreRecipe(new ItemStack(InitItems.itemCopperParts, 1, 0), " P ", "PIP", " P ", 'P', "plateCopper", 'I', "ingotCopper")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemCopperParts, 1, 1), " P ", "P P", " P ", 'P', "plateCopper")); GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(InitItems.itemIronParts, 1, 0), " P ", "PIP", " P ", 'I', "ingotIron", 'P', "plateIron")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemIronParts, 1, 1), " P ", "P P", " P ", 'P', "plateIron")); GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(InitItems.itemMachinePart, 1, 0), " X ", "X ", 'X', new ItemStack(InitItems.itemIngot, 1, 7))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMachinePart, 1, 1), "CPC", "S G", "CPC", 'P', - new ItemStack(InitItems.itemSheet, 1, 4), 'G', "gearIron", 'S', new ItemStack(InitItems.itemCopperParts, 1, 1), 'C', - new ItemStack(InitItems.itemMachinePart, 1, 0))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMachinePart, 1, 1), "CPC", "G G", "CPC", 'P', + new ItemStack(InitItems.itemSheet, 1, 4), 'G', "gearIron", 'C', new ItemStack(InitItems.itemMachinePart, 1, 0))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMachinePart, 1, 2), "P P", " P ", "P P", 'P', "plateIron")); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMachinePart, 1, 3), new ItemStack(Items.water_bucket), "ingotIron", "ingotCopper", "ingotZinc"));