diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-01-23 05:58:46 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-23 05:58:46 +0000 |
commit | eeb0c7a34502325b62a9b6c6a5bf23a0d805ad5b (patch) | |
tree | 98c791b660cc9105d131b844b7451d56c8fdd9f1 | |
parent | 88bb81e85a79265949d3c7f36cea80c0e8d67325 (diff) | |
download | GT5-Unofficial-eeb0c7a34502325b62a9b6c6a5bf23a0d805ad5b.tar.gz GT5-Unofficial-eeb0c7a34502325b62a9b6c6a5bf23a0d805ad5b.tar.bz2 GT5-Unofficial-eeb0c7a34502325b62a9b6c6a5bf23a0d805ad5b.zip |
Removal (#512)
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
3 files changed, 0 insertions, 282 deletions
diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index da642e378e..94a0671a08 100644 --- a/src/main/java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -598,25 +598,6 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { true) .useModularUI(true); - // Advanced Mixer - public static final GT_Recipe_Map sAdvancedMixerRecipes = new GT_Recipe_Map( - new HashSet<>(1000), - "gtpp.recipe.advanced.mixer", - "Advanced Material Combiner", - null, - "gregtech:textures/gui/basicmachines/MixerAdvanced", - 4, - 4, - 1, - 0, - 2, - "", - 1, - "", - true, - true) - .useModularUI(true); - // Mini Fusion public static final GT_Recipe_Map sSlowFusionRecipes = new GT_Recipe_Map( new HashSet<>(50), diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index e0ba67e0b0..3cce9c4788 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -131,7 +131,6 @@ public class COMPAT_HANDLER { GregtechIndustrialThermalCentrifuge.run(); GregtechIndustrialWashPlant.run(); GregtechSemiFluidgenerators.run(); - GregtechAdvancedMixer.run(); GregtechWirelessChargers.run(); GregtechIndustrialGeneratorArray.run(); GregtechIndustrialCuttingFactory.run(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java deleted file mode 100644 index 731927f170..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java +++ /dev/null @@ -1,262 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import java.util.Collection; - -public class GregtechAdvancedMixer { - - private static int mID = 851; - - public static void run() { - // generateMixerRecipeMap(); - run1(); - } - - private static GT_Recipe_Map map = GT_Recipe.GT_Recipe_Map.sMixerRecipes; - - private static boolean generateMixerRecipeMap() { - if (GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() == 0) { - GT_Recipe_Map oldMap = GT_Recipe.GT_Recipe_Map.sMixerRecipes; - GT_Recipe_Map map = GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes; - final Collection<GT_Recipe> x = oldMap.mRecipeList; - // Logger.INFO("Generating " + map.mUnlocalizedName + " Recipes."); - for (final GT_Recipe g : x) { - GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.add(g); - } - - if (GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() > 0) { - return true; - } else { - Logger.INFO("Failed to generate " + map.mUnlocalizedName + " recipes."); - return false; - } - } - return true; - } - - private static void run1() { - GregtechItemList.Machine_Advanced_LV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - mID++, - "advancedmachine.mixer.tier.01", - "Basic Combiner", - 1, - "Indeed, It does blend!", - map, - 4, - 4, - 32000, - 0, - 1, - "MixerAdvanced.png", - "", - false, - false, - 0, - "MIXER", - null - /*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), - ItemList.Machine_LV_Mixer, Character.valueOf('E'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/ ) - .getStackForm(1L)); - GregtechItemList.Machine_Advanced_MV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - mID++, - "advancedmachine.mixer.tier.02", - "Advanced Combiner I", - 2, - "Indeed, It does blend!", - map, - 4, - 4, - 32000, - 0, - 1, - "MixerAdvanced.png", - "", - false, - false, - 0, - "MIXER", - null - /*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), - ItemList.Machine_MV_Mixer, Character.valueOf('E'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/ ) - .getStackForm(1L)); - GregtechItemList.Machine_Advanced_HV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - mID++, - "advancedmachine.mixer.tier.03", - "Advanced Combiner II", - 3, - "Indeed, It does blend!", - map, - 4, - 4, - 32000, - 0, - 1, - "MixerAdvanced.png", - "", - false, - false, - 0, - "MIXER", - null - /*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), - ItemList.Machine_HV_Mixer, Character.valueOf('E'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/ ) - .getStackForm(1L)); - GregtechItemList.Machine_Advanced_EV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - mID++, - "advancedmachine.mixer.tier.04", - "Super Combiner I", - 4, - "Indeed, It does blend!", - map, - 4, - 4, - 32000, - 0, - 1, - "MixerAdvanced.png", - "", - false, - false, - 0, - "MIXER", - null - /*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), - ItemList.Machine_EV_Mixer, Character.valueOf('E'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/ ) - .getStackForm(1L)); - GregtechItemList.Machine_Advanced_IV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - mID++, - "advancedmachine.mixer.tier.05", - "Super Combiner II", - 5, - "Indeed, It does blend!", - map, - 4, - 4, - 32000, - 0, - 1, - "MixerAdvanced.png", - "", - false, - false, - 0, - "MIXER", - null - /*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), - ItemList.Machine_IV_Mixer, Character.valueOf('E'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/ ) - .getStackForm(1L)); - - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - try { - GregtechItemList.Machine_Advanced_LuV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - mID++, - "advancedmachine.mixer.tier.06", - "Mega Combiner I", - 6, - "Indeed, It does blend!", - map, - 4, - 4, - 32000, - 0, - 1, - "MixerAdvanced.png", - "", - false, - false, - 0, - "MIXER", - null - /*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), - //ItemList.Machine_LuV_Mixer, Character.valueOf('E'), - ItemList.valueOf("Machine_LuV_Mixer"), Character.valueOf('E'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/ ) - .getStackForm(1L)); - GregtechItemList.Machine_Advanced_ZPM_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - mID++, - "advancedmachine.mixer.tier.07", - "Mega Combiner II", - 7, - "Indeed, It does blend!", - map, - 4, - 4, - 32000, - 0, - 1, - "MixerAdvanced.png", - "", - false, - false, - 0, - "MIXER", - null - /*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), - //ItemList.Machine_ZPM_Mixer, Character.valueOf('E'), - ItemList.valueOf("Machine_ZPM_Mixer"), Character.valueOf('E'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/ ) - .getStackForm(1L)); - GregtechItemList.Machine_Advanced_UV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - mID++, - "advancedmachine.mixer.tier.08", - "Ultra Combiner I", - 8, - "Indeed, It does blend!", - map, - 4, - 4, - 32000, - 0, - 1, - "MixerAdvanced.png", - "", - false, - false, - 0, - "MIXER", - null - /*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'), - //ItemList.Machine_UV_Mixer, Character.valueOf('E'), - ItemList.valueOf("Machine_UV_Mixer"), Character.valueOf('E'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'), - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/ ) - .getStackForm(1L)); - } catch (Throwable t) { - } - } - } -} |