aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/recipe/maps
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/gregtech/api/recipe/maps
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/gregtech/api/recipe/maps')
-rw-r--r--src/main/java/gregtech/api/recipe/maps/AssemblerBackend.java4
-rw-r--r--src/main/java/gregtech/api/recipe/maps/AssemblyLineFrontend.java8
-rw-r--r--src/main/java/gregtech/api/recipe/maps/FluidCannerBackend.java24
-rw-r--r--src/main/java/gregtech/api/recipe/maps/FormingPressBackend.java18
-rw-r--r--src/main/java/gregtech/api/recipe/maps/FuelBackend.java26
-rw-r--r--src/main/java/gregtech/api/recipe/maps/FurnaceBackend.java20
-rw-r--r--src/main/java/gregtech/api/recipe/maps/LargeBoilerFuelBackend.java22
-rw-r--r--src/main/java/gregtech/api/recipe/maps/MicrowaveBackend.java83
-rw-r--r--src/main/java/gregtech/api/recipe/maps/NonGTBackend.java8
-rw-r--r--src/main/java/gregtech/api/recipe/maps/OilCrackerBackend.java4
-rw-r--r--src/main/java/gregtech/api/recipe/maps/PrinterBackend.java32
-rw-r--r--src/main/java/gregtech/api/recipe/maps/PurificationUnitClarifierFrontend.java12
-rw-r--r--src/main/java/gregtech/api/recipe/maps/PurificationUnitFlocculatorFrontend.java27
-rw-r--r--src/main/java/gregtech/api/recipe/maps/PurificationUnitLaserFrontend.java10
-rw-r--r--src/main/java/gregtech/api/recipe/maps/PurificationUnitOzonationFrontend.java4
-rw-r--r--src/main/java/gregtech/api/recipe/maps/PurificationUnitParticleExtractorFrontend.java4
-rw-r--r--src/main/java/gregtech/api/recipe/maps/PurificationUnitPhAdjustmentFrontend.java23
-rw-r--r--src/main/java/gregtech/api/recipe/maps/PurificationUnitPlasmaHeaterFrontend.java14
-rw-r--r--src/main/java/gregtech/api/recipe/maps/RecyclerBackend.java22
-rw-r--r--src/main/java/gregtech/api/recipe/maps/ReplicatorBackend.java36
-rw-r--r--src/main/java/gregtech/api/recipe/maps/SpaceProjectFrontend.java18
-rw-r--r--src/main/java/gregtech/api/recipe/maps/TranscendentPlasmaMixerFrontend.java8
-rw-r--r--src/main/java/gregtech/api/recipe/maps/UnpackagerBackend.java12
23 files changed, 218 insertions, 221 deletions
diff --git a/src/main/java/gregtech/api/recipe/maps/AssemblerBackend.java b/src/main/java/gregtech/api/recipe/maps/AssemblerBackend.java
index cfa25e9fe2..8273c895b2 100644
--- a/src/main/java/gregtech/api/recipe/maps/AssemblerBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/AssemblerBackend.java
@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
import gregtech.api.enums.ItemList;
import gregtech.api.recipe.RecipeMapBackend;
import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
import gregtech.api.util.MethodsReturnNonnullByDefault;
@ParametersAreNonnullByDefault
@@ -21,7 +21,7 @@ public class AssemblerBackend extends RecipeMapBackend {
}
@Override
- protected GT_Recipe modifyFoundRecipe(GT_Recipe recipe, ItemStack[] items, FluidStack[] fluids,
+ protected GTRecipe modifyFoundRecipe(GTRecipe recipe, ItemStack[] items, FluidStack[] fluids,
@Nullable ItemStack specialSlot) {
for (ItemStack item : items) {
if (ItemList.Paper_Printed_Pages.isStackEqual(item, false, true)) {
diff --git a/src/main/java/gregtech/api/recipe/maps/AssemblyLineFrontend.java b/src/main/java/gregtech/api/recipe/maps/AssemblyLineFrontend.java
index 3d56c96b82..4bf3f7f56e 100644
--- a/src/main/java/gregtech/api/recipe/maps/AssemblyLineFrontend.java
+++ b/src/main/java/gregtech/api/recipe/maps/AssemblyLineFrontend.java
@@ -10,7 +10,7 @@ import com.gtnewhorizons.modularui.api.math.Pos2d;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
import gregtech.api.recipe.BasicUIPropertiesBuilder;
import gregtech.api.recipe.NEIRecipePropertiesBuilder;
import gregtech.api.recipe.RecipeMapFrontend;
@@ -52,21 +52,21 @@ public class AssemblyLineFrontend extends RecipeMapFrontend {
int bar2Width = 18;
List<Supplier<Float>> splitProgress = splitProgress(progressSupplier, bar1Width, bar2Width);
builder.widget(
- new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_1, bar1Width)
+ new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_1, bar1Width)
.setDirection(ProgressBar.Direction.RIGHT)
.setProgress(splitProgress.get(0))
.setSynced(false, false)
.setPos(new Pos2d(88, 8).add(windowOffset))
.setSize(bar1Width, 72));
builder.widget(
- new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_2, bar2Width)
+ new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_2, bar2Width)
.setDirection(ProgressBar.Direction.RIGHT)
.setProgress(splitProgress.get(1))
.setSynced(false, false)
.setPos(new Pos2d(124, 8).add(windowOffset))
.setSize(bar2Width, 72));
builder.widget(
- new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_3, 18)
+ new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_3, 18)
.setDirection(ProgressBar.Direction.UP)
.setProgress(progressSupplier)
.setSynced(false, false)
diff --git a/src/main/java/gregtech/api/recipe/maps/FluidCannerBackend.java b/src/main/java/gregtech/api/recipe/maps/FluidCannerBackend.java
index e5681f59aa..9bbe087e54 100644
--- a/src/main/java/gregtech/api/recipe/maps/FluidCannerBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/FluidCannerBackend.java
@@ -8,11 +8,11 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gregtech.api.recipe.RecipeMapBackend;
import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
@ParametersAreNonnullByDefault
@@ -24,17 +24,17 @@ public class FluidCannerBackend extends RecipeMapBackend {
}
@Override
- protected GT_Recipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
+ protected GTRecipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
if (items.length == 0 || items[0] == null) {
return null;
}
if (fluids.length > 0 && fluids[0] != null) {
- ItemStack filledItem = GT_Utility.fillFluidContainer(fluids[0], items[0], false, true);
- FluidStack fluidToTake = GT_Utility.getFluidForFilledItem(filledItem, true);
+ ItemStack filledItem = GTUtility.fillFluidContainer(fluids[0], items[0], false, true);
+ FluidStack fluidToTake = GTUtility.getFluidForFilledItem(filledItem, true);
if (fluidToTake != null) {
- return GT_Values.RA.stdBuilder()
- .itemInputs(GT_Utility.copyAmount(1, items[0]))
+ return GTValues.RA.stdBuilder()
+ .itemInputs(GTUtility.copyAmount(1, items[0]))
.itemOutputs(filledItem)
.fluidInputs(fluidToTake)
.duration(Math.max(fluidToTake.amount / 64, 16))
@@ -45,11 +45,11 @@ public class FluidCannerBackend extends RecipeMapBackend {
.orElse(null);
}
}
- FluidStack drainedFluid = GT_Utility.getFluidForFilledItem(items[0], true);
+ FluidStack drainedFluid = GTUtility.getFluidForFilledItem(items[0], true);
if (drainedFluid != null) {
- return GT_Values.RA.stdBuilder()
- .itemInputs(GT_Utility.copyAmount(1, items[0]))
- .itemOutputs(GT_Utility.getContainerItem(items[0], true))
+ return GTValues.RA.stdBuilder()
+ .itemInputs(GTUtility.copyAmount(1, items[0]))
+ .itemOutputs(GTUtility.getContainerItem(items[0], true))
.fluidOutputs(drainedFluid)
.duration(Math.max(drainedFluid.amount / 64, 16))
.eut(1)
diff --git a/src/main/java/gregtech/api/recipe/maps/FormingPressBackend.java b/src/main/java/gregtech/api/recipe/maps/FormingPressBackend.java
index ce3ea3e89c..ccf6e63c29 100644
--- a/src/main/java/gregtech/api/recipe/maps/FormingPressBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/FormingPressBackend.java
@@ -7,12 +7,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.recipe.RecipeMapBackend;
import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
/**
@@ -27,7 +27,7 @@ public class FormingPressBackend extends RecipeMapBackend {
}
@Override
- protected GT_Recipe modifyFoundRecipe(GT_Recipe recipe, ItemStack[] items, FluidStack[] fluids,
+ protected GTRecipe modifyFoundRecipe(GTRecipe recipe, ItemStack[] items, FluidStack[] fluids,
@Nullable ItemStack specialSlot) {
for (ItemStack mold : items) {
if (ItemList.Shape_Mold_Credit.isStackEqual(mold, false, true)) {
@@ -46,7 +46,7 @@ public class FormingPressBackend extends RecipeMapBackend {
}
@Override
- protected GT_Recipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
+ protected GTRecipe findFallback(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot) {
if (items.length < 2) {
return null;
}
@@ -54,16 +54,16 @@ public class FormingPressBackend extends RecipeMapBackend {
}
@Nullable
- private GT_Recipe findRenamingRecipe(ItemStack[] inputs) {
+ private GTRecipe findRenamingRecipe(ItemStack[] inputs) {
ItemStack mold = findNameMoldIndex(inputs);
if (mold == null) return null;
ItemStack input = findStackToRename(inputs, mold);
if (input == null) return null;
- ItemStack output = GT_Utility.copyAmount(1, input);
+ ItemStack output = GTUtility.copyAmount(1, input);
if (output == null) return null;
output.setStackDisplayName(mold.getDisplayName());
- return GT_Values.RA.stdBuilder()
- .itemInputs(GT_Utility.copyAmount(0, mold), GT_Utility.copyAmount(1, input))
+ return GTValues.RA.stdBuilder()
+ .itemInputs(GTUtility.copyAmount(0, mold), GTUtility.copyAmount(1, input))
.itemOutputs(output)
.duration(128)
.eut(8)
diff --git a/src/main/java/gregtech/api/recipe/maps/FuelBackend.java b/src/main/java/gregtech/api/recipe/maps/FuelBackend.java
index 49c989e174..e5f0ab40d1 100644
--- a/src/main/java/gregtech/api/recipe/maps/FuelBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/FuelBackend.java
@@ -12,23 +12,23 @@ import net.minecraftforge.fluids.FluidStack;
import gregtech.api.recipe.RecipeMapBackend;
import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
public class FuelBackend extends RecipeMapBackend {
- private final Map<String, GT_Recipe> recipesByFluidInput = new HashMap<>();
+ private final Map<String, GTRecipe> recipesByFluidInput = new HashMap<>();
public FuelBackend(RecipeMapBackendPropertiesBuilder propertiesBuilder) {
super(propertiesBuilder.disableOptimize());
}
@Override
- protected Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder) {
+ protected Collection<GTRecipe> doAdd(GTRecipeBuilder builder) {
if (builder.getDuration() == -1) {
builder.duration(0);
}
@@ -39,11 +39,11 @@ public class FuelBackend extends RecipeMapBackend {
}
@Override
- public GT_Recipe compileRecipe(GT_Recipe recipe) {
+ public GTRecipe compileRecipe(GTRecipe recipe) {
super.compileRecipe(recipe);
- if (recipe.mInputs != null && GT_Utility.getNonnullElementCount(recipe.mInputs) == 1
- && (recipe.mFluidInputs == null || GT_Utility.getNonnullElementCount(recipe.mFluidInputs) == 0)) {
- FluidStack fluidStack = GT_Utility.getFluidForFilledItem(recipe.mInputs[0], true);
+ if (recipe.mInputs != null && GTUtility.getNonnullElementCount(recipe.mInputs) == 1
+ && (recipe.mFluidInputs == null || GTUtility.getNonnullElementCount(recipe.mFluidInputs) == 0)) {
+ FluidStack fluidStack = GTUtility.getFluidForFilledItem(recipe.mInputs[0], true);
if (fluidStack != null) {
fluidStack.amount = 0;
recipesByFluidInput.put(
@@ -51,9 +51,9 @@ public class FuelBackend extends RecipeMapBackend {
.getName(),
recipe);
}
- } else if ((recipe.mInputs == null || GT_Utility.getNonnullElementCount(recipe.mInputs) == 0)
+ } else if ((recipe.mInputs == null || GTUtility.getNonnullElementCount(recipe.mInputs) == 0)
&& recipe.mFluidInputs != null
- && GT_Utility.getNonnullElementCount(recipe.mFluidInputs) >= 1
+ && GTUtility.getNonnullElementCount(recipe.mFluidInputs) >= 1
&& recipe.mFluidInputs[0] != null) {
recipesByFluidInput.put(
recipe.mFluidInputs[0].getFluid()
@@ -64,12 +64,12 @@ public class FuelBackend extends RecipeMapBackend {
}
@Nullable
- public GT_Recipe findFuel(FluidStack fluidStack) {
+ public GTRecipe findFuel(FluidStack fluidStack) {
return findFuel(fluidStack.getFluid());
}
@Nullable
- public GT_Recipe findFuel(Fluid fluid) {
+ public GTRecipe findFuel(Fluid fluid) {
return recipesByFluidInput.get(fluid.getName());
}
}
diff --git a/src/main/java/gregtech/api/recipe/maps/FurnaceBackend.java b/src/main/java/gregtech/api/recipe/maps/FurnaceBackend.java
index c4095eeb4e..e501db3c40 100644
--- a/src/main/java/gregtech/api/recipe/maps/FurnaceBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/FurnaceBackend.java
@@ -6,11 +6,11 @@ import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
/**
@@ -25,18 +25,18 @@ public class FurnaceBackend extends NonGTBackend {
}
@Override
- protected GT_Recipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
- @Nullable GT_Recipe cachedRecipe) {
+ protected GTRecipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
+ @Nullable GTRecipe cachedRecipe) {
if (items.length == 0 || items[0] == null) {
return null;
}
if (cachedRecipe != null && cachedRecipe.isRecipeInputEqual(false, true, fluids, items)) {
return cachedRecipe;
}
- ItemStack output = GT_ModHandler.getSmeltingOutput(items[0], false, null);
+ ItemStack output = GTModHandler.getSmeltingOutput(items[0], false, null);
return output == null ? null
- : GT_Values.RA.stdBuilder()
- .itemInputs(GT_Utility.copyAmount(1, items[0]))
+ : GTValues.RA.stdBuilder()
+ .itemInputs(GTUtility.copyAmount(1, items[0]))
.itemOutputs(output)
.duration(128)
.eut(4)
@@ -47,6 +47,6 @@ public class FurnaceBackend extends NonGTBackend {
@Override
public boolean containsInput(ItemStack item) {
- return GT_ModHandler.getSmeltingOutput(item, false, null) != null;
+ return GTModHandler.getSmeltingOutput(item, false, null) != null;
}
}
diff --git a/src/main/java/gregtech/api/recipe/maps/LargeBoilerFuelBackend.java b/src/main/java/gregtech/api/recipe/maps/LargeBoilerFuelBackend.java
index b38b66e41b..a27e425efb 100644
--- a/src/main/java/gregtech/api/recipe/maps/LargeBoilerFuelBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/LargeBoilerFuelBackend.java
@@ -9,11 +9,11 @@ import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gregtech.api.recipe.RecipeMapBackend;
import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTRecipe;
import gregtech.api.util.MethodsReturnNonnullByDefault;
@SuppressWarnings({ "unused", "UnusedReturnValue" })
@@ -46,11 +46,11 @@ public class LargeBoilerFuelBackend extends RecipeMapBackend {
return ALLOWED_SOLID_FUELS.add(itemregistryName + ":" + meta);
}
- public GT_Recipe addDenseLiquidRecipe(GT_Recipe recipe) {
+ public GTRecipe addDenseLiquidRecipe(GTRecipe recipe) {
return addRecipe(recipe, ((double) recipe.mSpecialValue) / 10, false);
}
- public GT_Recipe addDieselRecipe(GT_Recipe recipe) {
+ public GTRecipe addDieselRecipe(GTRecipe recipe) {
return addRecipe(recipe, ((double) recipe.mSpecialValue) / 40, false);
}
@@ -61,12 +61,12 @@ public class LargeBoilerFuelBackend extends RecipeMapBackend {
}
@Nullable
- public GT_Recipe addSolidRecipe(@Nullable ItemStack fuelItemStack) {
+ public GTRecipe addSolidRecipe(@Nullable ItemStack fuelItemStack) {
if (fuelItemStack == null) {
return null;
}
if (!addedGeneralDesc) {
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.duration(1)
.eut(1)
.specialValue(1)
@@ -82,17 +82,17 @@ public class LargeBoilerFuelBackend extends RecipeMapBackend {
String registryName = Item.itemRegistry.getNameForObject(fuelItemStack.getItem());
boolean isHighTierAllowed = ALLOWED_SOLID_FUELS.contains(registryName + ":" + fuelItemStack.getItemDamage());
- return GT_Values.RA.stdBuilder()
+ return GTValues.RA.stdBuilder()
.itemInputs(fuelItemStack)
.duration(1)
.eut(0)
- .specialValue(GT_ModHandler.getFuelValue(fuelItemStack) / 1600)
+ .specialValue(GTModHandler.getFuelValue(fuelItemStack) / 1600)
.build()
- .map(r -> addRecipe(r, ((double) GT_ModHandler.getFuelValue(fuelItemStack)) / 1600, isHighTierAllowed))
+ .map(r -> addRecipe(r, ((double) GTModHandler.getFuelValue(fuelItemStack)) / 1600, isHighTierAllowed))
.orElse(null);
}
- private GT_Recipe addRecipe(GT_Recipe recipe, double baseBurnTime, boolean isHighTierAllowed) {
+ private GTRecipe addRecipe(GTRecipe recipe, double baseBurnTime, boolean isHighTierAllowed) {
// Some recipes will have a burn time like 15.9999999 and % always rounds down
double floatErrorCorrection = 0.0001;
diff --git a/src/main/java/gregtech/api/recipe/maps/MicrowaveBackend.java b/src/main/java/gregtech/api/recipe/maps/MicrowaveBackend.java
index 53623cb0c7..ae4b5f5d35 100644
--- a/src/main/java/gregtech/api/recipe/maps/MicrowaveBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/MicrowaveBackend.java
@@ -1,8 +1,8 @@
package gregtech.api.recipe.maps;
-import static gregtech.api.enums.GT_Values.W;
-import static gregtech.api.util.GT_RecipeConstants.EXPLODE;
-import static gregtech.api.util.GT_RecipeConstants.ON_FIRE;
+import static gregtech.api.enums.GTValues.W;
+import static gregtech.api.util.GTRecipeConstants.EXPLODE;
+import static gregtech.api.util.GTRecipeConstants.ON_FIRE;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -13,18 +13,18 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraftforge.fluids.FluidStack;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.SubTag;
import gregtech.api.objects.ItemData;
import gregtech.api.objects.MaterialStack;
import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
/**
@@ -39,8 +39,8 @@ public class MicrowaveBackend extends NonGTBackend {
}
@Override
- protected GT_Recipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
- @Nullable GT_Recipe cachedRecipe) {
+ protected GTRecipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids, @Nullable ItemStack specialSlot,
+ @Nullable GTRecipe cachedRecipe) {
if (items.length == 0 || items[0] == null) {
return null;
}
@@ -48,12 +48,12 @@ public class MicrowaveBackend extends NonGTBackend {
return cachedRecipe;
}
- ItemStack output = GT_ModHandler.getSmeltingOutput(items[0], false, null);
+ ItemStack output = GTModHandler.getSmeltingOutput(items[0], false, null);
- if (GT_Utility.areStacksEqual(items[0], new ItemStack(Items.book, 1, W))) {
- return GT_Values.RA.stdBuilder()
- .itemInputs(GT_Utility.copyAmount(1, items[0]))
- .itemOutputs(GT_Utility.getWrittenBook("Manual_Microwave", ItemList.Book_Written_03.get(1)))
+ if (GTUtility.areStacksEqual(items[0], new ItemStack(Items.book, 1, W))) {
+ return GTValues.RA.stdBuilder()
+ .itemInputs(GTUtility.copyAmount(1, items[0]))
+ .itemOutputs(GTUtility.getWrittenBook("Manual_Microwave", ItemList.Book_Written_03.get(1)))
.duration(32)
.eut(4)
.noOptimize()
@@ -63,37 +63,36 @@ public class MicrowaveBackend extends NonGTBackend {
// Check Container Item of Input since it is around the Input, then the Input itself, then Container Item of
// Output and last check the Output itself
- for (ItemStack item : new ItemStack[] { GT_Utility.getContainerItem(items[0], true), items[0],
- GT_Utility.getContainerItem(output, true), output }) {
+ for (ItemStack item : new ItemStack[] { GTUtility.getContainerItem(items[0], true), items[0],
+ GTUtility.getContainerItem(output, true), output }) {
if (item == null) continue;
- if (GT_Utility.areStacksEqual(item, new ItemStack(Blocks.netherrack, 1, W), true)
- || GT_Utility.areStacksEqual(item, new ItemStack(Blocks.tnt, 1, W), true)
- || GT_Utility.areStacksEqual(item, new ItemStack(Items.egg, 1, W), true)
- || GT_Utility.areStacksEqual(item, new ItemStack(Items.firework_charge, 1, W), true)
- || GT_Utility.areStacksEqual(item, new ItemStack(Items.fireworks, 1, W), true)
- || GT_Utility.areStacksEqual(item, new ItemStack(Items.fire_charge, 1, W), true)) {
- GT_Log.exp
- .println("Microwave Explosion due to TNT || EGG || FIREWORKCHARGE || FIREWORK || FIRE CHARGE");
- return GT_RecipeBuilder.empty()
+ if (GTUtility.areStacksEqual(item, new ItemStack(Blocks.netherrack, 1, W), true)
+ || GTUtility.areStacksEqual(item, new ItemStack(Blocks.tnt, 1, W), true)
+ || GTUtility.areStacksEqual(item, new ItemStack(Items.egg, 1, W), true)
+ || GTUtility.areStacksEqual(item, new ItemStack(Items.firework_charge, 1, W), true)
+ || GTUtility.areStacksEqual(item, new ItemStack(Items.fireworks, 1, W), true)
+ || GTUtility.areStacksEqual(item, new ItemStack(Items.fire_charge, 1, W), true)) {
+ GTLog.exp.println("Microwave Explosion due to TNT || EGG || FIREWORKCHARGE || FIREWORK || FIRE CHARGE");
+ return GTRecipeBuilder.empty()
.metadata(EXPLODE, true)
.build()
.orElse(null);
}
- ItemData itemData = GT_OreDictUnificator.getItemData(item);
+ ItemData itemData = GTOreDictUnificator.getItemData(item);
if (itemData != null) {
if (itemData.mMaterial != null && itemData.mMaterial.mMaterial != null) {
if (itemData.mMaterial.mMaterial.contains(SubTag.METAL)
|| itemData.mMaterial.mMaterial.contains(SubTag.EXPLOSIVE)) {
- GT_Log.exp.println("Microwave Explosion due to METAL insertion");
- return GT_RecipeBuilder.empty()
+ GTLog.exp.println("Microwave Explosion due to METAL insertion");
+ return GTRecipeBuilder.empty()
.metadata(EXPLODE, true)
.build()
.orElse(null);
}
if (itemData.mMaterial.mMaterial.contains(SubTag.FLAMMABLE)) {
- GT_Log.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
- return GT_RecipeBuilder.empty()
+ GTLog.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
+ return GTRecipeBuilder.empty()
.metadata(ON_FIRE, true)
.build()
.orElse(null);
@@ -103,15 +102,15 @@ public class MicrowaveBackend extends NonGTBackend {
if (materialStack == null) continue;
if (materialStack.mMaterial.contains(SubTag.METAL)
|| materialStack.mMaterial.contains(SubTag.EXPLOSIVE)) {
- GT_Log.exp.println("Microwave Explosion due to METAL insertion");
- return GT_RecipeBuilder.empty()
+ GTLog.exp.println("Microwave Explosion due to METAL insertion");
+ return GTRecipeBuilder.empty()
.metadata(EXPLODE, true)
.build()
.orElse(null);
}
if (materialStack.mMaterial.contains(SubTag.FLAMMABLE)) {
- GT_Log.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
- return GT_RecipeBuilder.empty()
+ GTLog.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
+ return GTRecipeBuilder.empty()
.metadata(ON_FIRE, true)
.build()
.orElse(null);
@@ -119,8 +118,8 @@ public class MicrowaveBackend extends NonGTBackend {
}
}
if (TileEntityFurnace.getItemBurnTime(item) > 0) {
- GT_Log.exp.println("Microwave INFLAMMATION due to BURNABLE insertion");
- return GT_RecipeBuilder.empty()
+ GTLog.exp.println("Microwave INFLAMMATION due to BURNABLE insertion");
+ return GTRecipeBuilder.empty()
.metadata(ON_FIRE, true)
.build()
.orElse(null);
@@ -128,8 +127,8 @@ public class MicrowaveBackend extends NonGTBackend {
}
return output == null ? null
- : GT_Values.RA.stdBuilder()
- .itemInputs(GT_Utility.copyAmount(1, items[0]))
+ : GTValues.RA.stdBuilder()
+ .itemInputs(GTUtility.copyAmount(1, items[0]))
.itemOutputs(output)
.duration(32)
.eut(4)
@@ -140,6 +139,6 @@ public class MicrowaveBackend extends NonGTBackend {
@Override
public boolean containsInput(ItemStack item) {
- return GT_ModHandler.getSmeltingOutput(item, false, null) != null;
+ return GTModHandler.getSmeltingOutput(item, false, null) != null;
}
}
diff --git a/src/main/java/gregtech/api/recipe/maps/NonGTBackend.java b/src/main/java/gregtech/api/recipe/maps/NonGTBackend.java
index 1e871df372..3a66a1c980 100644
--- a/src/main/java/gregtech/api/recipe/maps/NonGTBackend.java
+++ b/src/main/java/gregtech/api/recipe/maps/NonGTBackend.java
@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
import gregtech.api.recipe.RecipeMapBackend;
import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
import gregtech.api.util.MethodsReturnNonnullByDefault;
/**
@@ -24,8 +24,8 @@ public abstract class NonGTBackend extends RecipeMapBackend {
}
@Override
- protected abstract GT_Recipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids,
- @Nullable ItemStack specialSlot, @Nullable GT_Recipe cachedRecipe);
+ protected abstract GTRecipe overwriteFindRecipe(ItemStack[] items, FluidStack[] fluids,
+ @Nullable ItemStack specialSlot, @Nullable GTRecipe cachedRecipe);
@Override
protected boolean doesOverwriteFindRecipe() {
@@ -46,7 +46,7 @@ public abstract class NonGTBackend extends RecipeMapBackend {
public void reInit() {}
@Override
- protected GT_Recipe addToItemMap(GT_Recipe recipe) {
+ protected GTRecipe addToItemMap(GTRecipe recipe) {
return recipe;
}
}
diff --git a/src/main/java/gregtech/api/recipe/maps/OilCrackerBackend.java b/src/main/java/gregtech/api/recipe/maps/OilCrackerBackend.java
index c2c312a48a..6417334d34 100644
--- a/src/main/java/gregtech/api/recipe/maps/OilCrackerB