diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api')
4 files changed, 1 insertions, 64 deletions
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 e341ee5a8c..e4939eda42 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -162,7 +162,6 @@ public enum GregtechItemList implements GregtechItemContainer { // Computer Cube Gregtech_Computer_Cube, - Gregtech_Computer_Cube_Machine, // Casings for batteries Battery_Casing_Gem_1, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 0b7e44ce14..96ff9f6aef 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -110,14 +110,7 @@ public enum GregtechOrePrefixes { // by // Calclavia chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced - // by - // Buildcraft - computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1),; // A - // whole - // Computer. - // "computerMaster" - // = - // ComputerCube + ; public static volatile int VERSION = 508; @@ -208,8 +201,6 @@ public enum GregtechOrePrefixes { getTcAspectStack(TC_Aspects.ITER.name(), 2).addToAspectList(this.mAspects); } else if (this.name().startsWith("circuit")) { getTcAspectStack("COGNITIO", 1); - } else if (this.name().startsWith("computer")) { - getTcAspectStack("COGNITIO", 4).addToAspectList(this.mAspects); } else if (this.name().startsWith("battery")) { getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java index 8cf0e88473..f7cd6cab23 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java @@ -29,8 +29,6 @@ public class GTPP_UITextures { public static final UITexture BUTTON_STANDARD_BRONZE = UITexture .fullImage(GTPlusPlus.ID, "gui/button/standard_bronze"); - public static final UITexture BUTTON_STANDARD_16x16 = UITexture - .fullImage(GTPlusPlus.ID, "gui/button/standard_16x16"); public static final UITexture OVERLAY_SLOT_WEED_EX = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/weed_ex"); public static final UITexture OVERLAY_SLOT_FERTILIZER = UITexture @@ -74,8 +72,6 @@ public class GTPP_UITextures { .fullImage(GTPlusPlus.ID, "gui/progressbar/boiler_empty"); public static final UITexture PROGRESSBAR_FUEL = UITexture.fullImage(GTPlusPlus.ID, "gui/progressbar/fuel"); public static final UITexture PROGRESSBAR_ARROW_2 = UITexture.fullImage(GTPlusPlus.ID, "gui/progressbar/arrow_2"); - public static final UITexture PROGRESSBAR_COMPUTER_ENERGY = UITexture - .fullImage(GTPlusPlus.ID, "gui/progressbar/computer_energy"); public static final UITexture PROGRESSBAR_PSS_ENERGY = UITexture .fullImage(GTPlusPlus.ID, "gui/progressbar/pss_energy"); @@ -100,16 +96,6 @@ public class GTPP_UITextures { public static final UITexture[] OVERLAY_BUTTON_MODE = IntStream.range(0, 10) // GT_MetaTileEntity_ElectricAutoWorkbench#MAX_MODES .mapToObj(i -> UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/mode_" + i)) .collect(Collectors.toList()).toArray(new UITexture[0]); - public static final UITexture OVERLAY_BUTTON_COMPUTER_MODE = UITexture - .fullImage(GTPlusPlus.ID, "gui/overlay_button/computer_mode"); - public static final UITexture OVERLAY_BUTTON_SAVE = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/save"); - public static final UITexture OVERLAY_BUTTON_LOAD = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/load"); - public static final UITexture OVERLAY_BUTTON_NUCLEAR_SWITCH = UITexture - .fullImage(GTPlusPlus.ID, "gui/overlay_button/nuclear_switch"); - public static final UITexture OVERLAY_BUTTON_ARROW_LEFT = UITexture - .fullImage(GTPlusPlus.ID, "gui/overlay_button/arrow_left"); - public static final UITexture OVERLAY_BUTTON_ARROW_RIGHT = UITexture - .fullImage(GTPlusPlus.ID, "gui/overlay_button/arrow_right"); public static final UITexture[] OVERLAY_BUTTON_DIRECTION = new UITexture[] { UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/bottom"), UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/top"), @@ -139,14 +125,6 @@ public class GTPP_UITextures { .fullImage(GTPlusPlus.ID, "gui/picture/workbench_circle"); public static final UITexture PICTURE_ARROW_WHITE_DOWN = UITexture .fullImage(GTPlusPlus.ID, "gui/picture/arrow_white_down"); - public static final UITexture PICTURE_V202 = UITexture.fullImage(GTPlusPlus.ID, "gui/picture/v202"); - public static final UITexture PICTURE_COMPUTER_TOP = UITexture.fullImage(GTPlusPlus.ID, "gui/picture/computer_top"); - public static final UITexture PICTURE_COMPUTER_GRID = UITexture - .fullImage(GTPlusPlus.ID, "gui/picture/computer_grid"); - public static final UITexture PICTURE_ARROWS_SEPARATE = UITexture - .fullImage(GTPlusPlus.ID, "gui/picture/arrows_separate"); - public static final UITexture PICTURE_ARROWS_FUSION = UITexture - .fullImage(GTPlusPlus.ID, "gui/picture/arrows_fusion"); public static final UITexture PICTURE_REDSTONE_CIRCUIT_SCREEN = UITexture .fullImage(GTPlusPlus.ID, "gui/picture/redstone_circuit_screen"); public static final UITexture PICTURE_ELECTRICITY_ERROR = UITexture diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/DataStickSlotWidget.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/DataStickSlotWidget.java deleted file mode 100644 index 7070fe5c8d..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/DataStickSlotWidget.java +++ /dev/null @@ -1,31 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.gui.widget; - -import com.gtnewhorizons.modularui.api.ModularUITextures; -import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable; -import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.api.enums.ItemList; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.util.GT_Utility; - -public class DataStickSlotWidget extends SlotWidget { - - public DataStickSlotWidget(IItemHandlerModifiable handler, int index) { - this(new BaseSlot(handler, index) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }); - } - - private DataStickSlotWidget(BaseSlot slot) { - super(slot); - setFilter( - stack -> GT_Utility.areStacksEqual(stack, ItemList.Tool_DataStick.get(1), true) - || GT_Utility.areStacksEqual(stack, ItemList.Tool_DataOrb.get(1), true)); - setBackground(ModularUITextures.ITEM_SLOT, GT_UITextures.OVERLAY_SLOT_DATA_ORB); - } -} |