diff options
Diffstat (limited to 'src')
5 files changed, 3 insertions, 48 deletions
diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index 836856c793..ad95e303b7 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -627,11 +627,6 @@ public enum MetaTileEntityIDs { GT_Dehydrator_MV(911), GT_Dehydrator_HV(912), Amazon_Warehouse_Controller(942), - Super_Chest_LV(946), - Super_Chest_MV(947), - Super_Chest_HV(948), - Super_Chest_EV(949), - Super_Chest_IV(950), Pollution_Creator(951), Thaumcraft_Researcher(956), Machine_Adv_BlastFurnace(963), diff --git a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java index f6fe748546..8566021256 100644 --- a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java @@ -97,7 +97,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSemiFluidgenerator import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSimpleWasher; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarTower; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamMultis; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperChests; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThaumcraftDevices; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThreadedBuffers; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredFluidTanks; @@ -172,7 +171,6 @@ public class CompatHandler { GregtechSemiFluidgenerators.run(); GregtechWirelessChargers.run(); GregtechIndustrialCuttingFactory.run(); - GregtechSuperChests.run(); GregtechIndustrialFishPond.run(); GregtechIndustrialExtruder.run(); GregtechIndustrialMultiMachine.run(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 4858b55583..73543efc5b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -677,13 +677,6 @@ public enum GregtechItemList implements IGregtechItemContainer { // Solar Tower Reflector Solar_Tower_Reflector, - // Super Tier Chests - Super_Chest_LV, - Super_Chest_MV, - Super_Chest_HV, - Super_Chest_EV, - Super_Chest_IV, - // Wireless Chargers Charger_LV, Charger_MV, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java index 51e5431da0..ba2d621a27 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java @@ -26,6 +26,9 @@ import gregtech.api.objects.GTRenderedTexture; import gregtech.api.util.GTUtility; import gtPlusPlus.core.lib.GTPPCore; +@Deprecated +// GT++ was adding super chests too for some reason when GT already has some +// this is deprecated but not deleted because it is used for the MTEInfiniteItemHolder public class MTETieredChest extends MTETieredMachineBlock implements IAddUIWidgets { public int mItemCount = 0; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java deleted file mode 100644 index 531eff4c1a..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java +++ /dev/null @@ -1,34 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import static gregtech.api.enums.MetaTileEntityIDs.Super_Chest_EV; -import static gregtech.api.enums.MetaTileEntityIDs.Super_Chest_HV; -import static gregtech.api.enums.MetaTileEntityIDs.Super_Chest_IV; -import static gregtech.api.enums.MetaTileEntityIDs.Super_Chest_LV; -import static gregtech.api.enums.MetaTileEntityIDs.Super_Chest_MV; - -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTETieredChest; - -public class GregtechSuperChests { - - public static void run() { - String aSuffix = " [Disabled]"; - - GregtechItemList.Super_Chest_LV.set( - (new MTETieredChest(Super_Chest_LV.ID, "super.chest.gtpp.tier.01", "Super Chest I" + aSuffix, 1)) - .getStackForm(1L)); - GregtechItemList.Super_Chest_MV.set( - (new MTETieredChest(Super_Chest_MV.ID, "super.chest.gtpp.tier.02", "Super Chest II" + aSuffix, 2)) - .getStackForm(1L)); - GregtechItemList.Super_Chest_HV.set( - (new MTETieredChest(Super_Chest_HV.ID, "super.chest.gtpp.tier.03", "Super Chest III" + aSuffix, 3)) - .getStackForm(1L)); - GregtechItemList.Super_Chest_EV.set( - (new MTETieredChest(Super_Chest_EV.ID, "super.chest.gtpp.tier.04", "Super Chest IV" + aSuffix, 4)) - .getStackForm(1L)); - GregtechItemList.Super_Chest_IV.set( - (new MTETieredChest(Super_Chest_IV.ID, "super.chest.gtpp.tier.05", "Super Chest V" + aSuffix, 5)) - .getStackForm(1L)); - - } -} |