diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-07-18 08:26:51 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-07-18 08:26:51 +1000 |
| commit | 522e07bfa57b0b045b1cdd633c4fda3eda11ae80 (patch) | |
| tree | 3f01dc9feaeabbc1953c9c2e7979e9b8f6c42387 /src/Java/gtPlusPlus/xmod | |
| parent | 11297bdd6dd4572b8e5a9cd588be0e8a279b945d (diff) | |
| download | GT5-Unofficial-522e07bfa57b0b045b1cdd633c4fda3eda11ae80.tar.gz GT5-Unofficial-522e07bfa57b0b045b1cdd633c4fda3eda11ae80.tar.bz2 GT5-Unofficial-522e07bfa57b0b045b1cdd633c4fda3eda11ae80.zip | |
+ Initial work refactoring items used by recipes.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 5c1c7bd174..63621c627e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -7,7 +7,7 @@ import gregtech.api.util.Recipe_GT; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.RECIPE_CONSTANTS; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; @@ -164,7 +164,7 @@ public class GregtechDehydrator GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LuV, - Character.valueOf('P'), RECIPE_CONSTANTS.robotArm_LuV, + Character.valueOf('P'), CI.robotArm_LuV, Character.valueOf('E'), coilT3, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Naquadah), @@ -175,7 +175,7 @@ public class GregtechDehydrator GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_ZPM, - Character.valueOf('P'), RECIPE_CONSTANTS.robotArm_ZPM, + Character.valueOf('P'), CI.robotArm_ZPM, Character.valueOf('E'), coilT4, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Osmium), diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index a5b36a0589..b7b89d4aba 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -5,7 +5,7 @@ import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.RECIPE_CONSTANTS; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator; @@ -50,8 +50,8 @@ public class GregtechGeothermalThermalGenerator { Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum), Character.valueOf('G'), ALLOY.STELLITE.getGear(1)}); - final ItemStack INGREDIENT_1 = RECIPE_CONSTANTS.electricPiston_LuV; - final ItemStack INGREDIENT_2 = RECIPE_CONSTANTS.electricMotor_LuV; + final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; + final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CEC", "GMG", "PWP", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 788618a660..3c80717c32 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java @@ -5,7 +5,7 @@ import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.RECIPE_CONSTANTS; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; @@ -50,8 +50,8 @@ public class GregtechRocketFuelGenerator { Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'), ALLOY.STELLITE.getGear(1)}); - final ItemStack INGREDIENT_1 = RECIPE_CONSTANTS.electricPiston_LuV; - final ItemStack INGREDIENT_2 = RECIPE_CONSTANTS.electricMotor_LuV; + final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; + final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", |