diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/recipes')
| -rw-r--r-- | src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java | 38 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/recipes/RecipeRemovals.java | 22 |
2 files changed, 30 insertions, 30 deletions
diff --git a/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java b/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java index 32d4ab55cf..8dd97eb4be 100644 --- a/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java +++ b/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java @@ -1,8 +1,8 @@ package gtPlusPlus.recipes; import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes; import java.util.ArrayList; @@ -10,15 +10,15 @@ import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -36,10 +36,10 @@ public class CokeAndPyrolyseOven { // Try use all woods found ArrayList<ItemStack> aLogData = OreDictionary.getOres("logWood"); for (ItemStack stack : aLogData) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(20), ItemUtils.getSimpleStack(stack, 20)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L)) - .fluidInputs(GT_ModHandler.getSteam(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(20), ItemUtils.getSimpleStack(stack, 20)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L)) + .fluidInputs(GTModHandler.getSteam(1000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coalgas", 1440)) .duration(72 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -47,24 +47,24 @@ public class CokeAndPyrolyseOven { } // Coal to Coke - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(22), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L)) + GTUtility.getIntegratedCircuit(22), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10)) - .fluidInputs(GT_ModHandler.getSteam(1000)) + .fluidInputs(GTModHandler.getSteam(1000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coalgas", 2880)) .duration(36 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(pyrolyseRecipes); // Coke & Coal - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 6)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 14)) - .fluidInputs(GT_ModHandler.getSteam(2000)) + .fluidInputs(GTModHandler.getSteam(2000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coalgas", 5040)) .eut(240) .duration(1 * MINUTES) @@ -73,7 +73,7 @@ public class CokeAndPyrolyseOven { private static void convertPyroToCokeOven() { int aCount = 0; - for (GT_Recipe g : RecipeMaps.pyrolyseRecipes.getAllRecipes()) { + for (GTRecipe g : RecipeMaps.pyrolyseRecipes.getAllRecipes()) { if (AddGregtechRecipe.importPyroRecipe(g.copy())) { aCount++; } diff --git a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java index 4462f81fc7..4ccde441b3 100644 --- a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java +++ b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java @@ -12,12 +12,12 @@ import org.apache.commons.lang3.ArrayUtils; import advsolar.common.AdvancedSolarPanel; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Recipe; -import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.api.util.GTRecipe; +import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -36,12 +36,12 @@ public class RecipeRemovals { // Doesn't actually remove recipes, just hide them private static void removeCrudeTurbineRotors() { int aRemoved = 0; - int CUT = CORE.turbineCutoffBase; + int CUT = GTPPCore.turbineCutoffBase; Item aU; - Collection<GT_Recipe> aAssRecipes = RecipeMaps.assemblerRecipes.getAllRecipes(); + Collection<GTRecipe> aAssRecipes = RecipeMaps.assemblerRecipes.getAllRecipes(); // 170, 172, 174, 176 if (aAssRecipes.size() > 0) { - for (GT_Recipe aG : aAssRecipes) { + for (GTRecipe aG : aAssRecipes) { if (ArrayUtils.isNotEmpty(aG.mOutputs)) { for (ItemStack aI : aG.mOutputs) { if (aI == null) { @@ -51,7 +51,7 @@ public class RecipeRemovals { if (aU == null) { continue; } - if (aU instanceof GT_MetaGenerated_Tool_01) { + if (aU instanceof MetaGeneratedTool01) { int aMeta = aI.getItemDamage(); // Found a Turbine if (aMeta >= 170 && aMeta <= 176) { @@ -75,9 +75,9 @@ public class RecipeRemovals { aType = "Huge "; } } - Materials aMainMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(aI); - Materials aSecondaryMaterial = GT_MetaGenerated_Tool.getSecondaryMaterial(aI); - long rotorDurabilityMax = GT_MetaGenerated_Tool.getToolMaxDamage(aI); + Materials aMainMaterial = MetaGeneratedTool.getPrimaryMaterial(aI); + Materials aSecondaryMaterial = MetaGeneratedTool.getSecondaryMaterial(aI); + long rotorDurabilityMax = MetaGeneratedTool.getToolMaxDamage(aI); if (rotorDurabilityMax < aCutoff) { Logger.WARNING( "[Turbine Cleanup] " + getMaterialName(aMainMaterial) |