aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common
diff options
context:
space:
mode:
authorGlease <4586901+Glease@users.noreply.github.com>2023-03-09 21:09:56 +0800
committerGitHub <noreply@github.com>2023-03-09 14:09:56 +0100
commit99441ebf43558b1fe19488100844d8291dcfd371 (patch)
tree21a374d3df8ae1dfe12c9904d105cb4db7a162c3 /src/main/java/gtPlusPlus/xmod/gregtech/common
parent6bd2231dd293fb0f23aa14bf55ed84bb1083e7fc (diff)
downloadGT5-Unofficial-99441ebf43558b1fe19488100844d8291dcfd371.tar.gz
GT5-Unofficial-99441ebf43558b1fe19488100844d8291dcfd371.tar.bz2
GT5-Unofficial-99441ebf43558b1fe19488100844d8291dcfd371.zip
remove EnumHelper usage towards OrePrefixes (#561)
* remove EnumHelper usage towards OrePrefixes * fix up dependency * spotless
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java4
2 files changed, 2 insertions, 9 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index ed3254921c..be77280550 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -187,11 +187,4 @@ public class GregtechFluidHandler {
return null;
}
- private static ItemStack generateIC2FluidCellNoOreDict(final String fluidNameWithCaps) {
- Logger.INFO("Adding a Cell for " + fluidNameWithCaps);
- if (!LoadedMods.IndustrialCraft2Classic) {
- return Utils.createInternalNameAndFluidCellNoOreDict(fluidNameWithCaps);
- }
- return null;
- }
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
index 58a4aba71c..616475b66b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
@@ -5,11 +5,11 @@ import java.util.HashMap;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
+import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.sys.Log;
-import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
public class FlotationRecipeHandler {
@@ -52,7 +52,7 @@ public class FlotationRecipeHandler {
for (ItemStack aStack : aInputs) {
for (int oredictID : OreDictionary.getOreIDs(aStack)) {
String oredict = OreDictionary.getOreName(oredictID);
- if (oredict.startsWith(CustomOrePrefix.milled.toString())) {
+ if (oredict.startsWith(OrePrefixes.milled.toString())) {
return aStack;
}
}