diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/recipe')
3 files changed, 36 insertions, 38 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java index d110124086..a481772961 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java @@ -474,54 +474,54 @@ public class RecipesGeneral { CI.component_Plate[9], ItemList.Hatch_Input_ZPM.get(1), CI.component_Plate[8], - GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0])); + GregtechItemList.Hatch_Input_Naquadah.get(1L)); if (GTMod.gregtechproxy.mPollution) { GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_LV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_LV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_LV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_MV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_MV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_MV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_HV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_HV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_HV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_HV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_EV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_EV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_EV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_EV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_IV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_IV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_IV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_IV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LuV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_LuV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_LuV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_ZPM.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_ZPM.get(1), 'P', + GregtechItemList.Pollution_Cleaner_ZPM.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_UV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_UV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_UV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_UV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MAX.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_MAX.get(1), 'P', + GregtechItemList.Pollution_Cleaner_MAX.get(1) }); } } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index f6091cda68..265cd60f97 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -172,7 +172,7 @@ public class RecipesMachines { // Misc public static ItemStack INPUT_RCCokeOvenBlock; - public static final void loadRecipes() { + public static void loadRecipes() { run(); Logger.INFO("Loading Recipes for the Various machine blocks."); } @@ -3299,7 +3299,7 @@ public class RecipesMachines { private static void fakeMachineCasingCovers() { int aMaxTier = GTValues.VOLTAGE_NAMES.length; - ItemStack aTier[] = new ItemStack[aMaxTier]; + ItemStack[] aTier = new ItemStack[aMaxTier]; for (int i = 0; i < aMaxTier; i++) { aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7); } diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index addc3df7e4..525c43883c 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -287,18 +287,17 @@ public class CI { public static String getTieredComponent(OrePrefixes type, int tier) { Object material = getMaterialFromTier(tier); if (material != null) { + String materialName; if (material instanceof Materials) { // return (ItemStack) type.get(material); - String materialName = ((Materials) material).mDefaultLocalName; - Logger.INFO("Searching for a component named " + type.name() + materialName); + materialName = ((Materials) material).mDefaultLocalName; // return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1); - return (type.name() + materialName); } else { - String materialName = (Utils.sanitizeString(((Material) material).getLocalizedName())); - Logger.INFO("Searching for a component named " + type.name() + materialName); + materialName = (Utils.sanitizeString(((Material) material).getLocalizedName())); // return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1); - return (type.name() + materialName); } + Logger.INFO("Searching for a component named " + type.name() + materialName); + return (type.name() + materialName); } Logger.INFO("[Components] Failed getting a tiered component. " + type.name() + " | " + tier); return null; @@ -517,8 +516,7 @@ public class CI { if (aPrefix == OrePrefixes.liquid) { int aMatID = (aTier == 0 || aTier == 2 || aTier == 5 || aTier == 8 ? 0 : (aTier == 1 || aTier == 3 || aTier == 6 || aTier == 9 ? 1 : 2)); - ItemStack aCell = aMaster[aMatID][aTier].getCell(aAmount); - return aCell; + return aMaster[aMatID][aTier].getCell(aAmount); } if (aPrefix == OrePrefixes.circuit) { |