diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod')
4 files changed, 2 insertions, 99 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 5eb536fa85..0d83b88b8c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -48,7 +48,6 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.core.util.reflect.AddGregtechRecipe; import gtPlusPlus.everglades.gen.gt.WorldGen_GT; -import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; @@ -162,13 +161,6 @@ public class HANDLER_GT { } } - public static void addNewOrePrefixes() { - for (CustomOrePrefix aPrefixTest : CustomOrePrefix.values()) { - Logger.INFO("Adding " + aPrefixTest.name() + " to OrePrefixes Enum."); - Logger.INFO("Injecting: " + aPrefixTest.addToEnum()); - } - } - private static void generateElementalDuplicatorRecipes() { for (GT_Recipe aRecipe : GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList) { Object aDataOrb = aRecipe.mSpecialItems; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java deleted file mode 100644 index fcbbd019a9..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java +++ /dev/null @@ -1,82 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.enums; - -import static gregtech.api.enums.GT_Values.B; - -import net.minecraftforge.common.util.EnumHelper; - -import gregtech.api.enums.OrePrefixes; - -public enum CustomOrePrefix { - - milled("Milled Ores", "Milled ", " Ore", true, true, false, false, false, false, false, false, false, true, B[3], - -1, 64, -1); - - private final String mRegularLocalName; - private final String mLocalizedMaterialPre; - private final String mLocalizedMaterialPost; - private final boolean mIsUnificatable; - private final boolean mIsMaterialBased; - private final boolean mIsSelfReferencing; - private final boolean mIsContainer; - private final boolean mDontUnificateActively; - private final boolean mIsUsedForBlocks; - private final boolean mAllowNormalRecycling; - private final boolean mGenerateDefaultItem; - private final boolean mIsEnchantable; - private final boolean mIsUsedForOreProcessing; - private final int mMaterialGenerationBits; - private final long mMaterialAmount; - private final int mDefaultStackSize; - private final int mTextureindex; - - private OrePrefixes mSelfReference; - - private CustomOrePrefix(String aRegularLocalName, String aLocalizedMaterialPre, String aLocalizedMaterialPost, - boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, boolean aIsContainer, - boolean aDontUnificateActively, boolean aIsUsedForBlocks, boolean aAllowNormalRecycling, - boolean aGenerateDefaultItem, boolean aIsEnchantable, boolean aIsUsedForOreProcessing, - int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, int aTextureindex) { - - mRegularLocalName = aRegularLocalName; - mLocalizedMaterialPre = aLocalizedMaterialPre; - mLocalizedMaterialPost = aLocalizedMaterialPost; - mIsUnificatable = aIsUnificatable; - mIsMaterialBased = aIsMaterialBased; - mIsSelfReferencing = aIsSelfReferencing; - mIsContainer = aIsContainer; - mDontUnificateActively = aDontUnificateActively; - mIsUsedForBlocks = aIsUsedForBlocks; - mAllowNormalRecycling = aAllowNormalRecycling; - mGenerateDefaultItem = aGenerateDefaultItem; - mIsEnchantable = aIsEnchantable; - mIsUsedForOreProcessing = aIsUsedForOreProcessing; - mMaterialGenerationBits = aMaterialGenerationBits; - mMaterialAmount = aMaterialAmount; - mDefaultStackSize = aDefaultStackSize; - mTextureindex = aTextureindex; - } - - public final boolean addToEnum() { - - mSelfReference = EnumHelper.addEnum( - OrePrefixes.class, - this.name(), - new Class[] { String.class, String.class, String.class, boolean.class, boolean.class, boolean.class, - boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, - boolean.class, int.class, long.class, int.class, int.class }, - new Object[] { mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost, mIsUnificatable, - mIsMaterialBased, mIsSelfReferencing, mIsContainer, mDontUnificateActively, mIsUsedForBlocks, - mAllowNormalRecycling, mGenerateDefaultItem, mIsEnchantable, mIsUsedForOreProcessing, - mMaterialGenerationBits, mMaterialAmount, mDefaultStackSize, mTextureindex }); - - return mSelfReference != null; - } - - public static final boolean checkEntryWasAdded(CustomOrePrefix aCustomPrefixObject) { - return aCustomPrefixObject.mSelfReference != null; - } - - public OrePrefixes get() { - return mSelfReference; - } -} 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; } } |