aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/recipes
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-09-02 23:17:17 +0200
committerGitHub <noreply@github.com>2024-09-02 23:17:17 +0200
commit1b820de08a05070909a267e17f033fcf58ac8710 (patch)
tree02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gtPlusPlus/recipes
parentafd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff)
downloadGT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip
The Great Renaming (#3014)
* move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names
Diffstat (limited to 'src/main/java/gtPlusPlus/recipes')
-rw-r--r--src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java38
-rw-r--r--src/main/java/gtPlusPlus/recipes/RecipeRemovals.java22
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)