diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')
4 files changed, 0 insertions, 432 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 3d71f00514..faeae0ba5a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -118,50 +118,9 @@ public class TexturesGtBlock { private static final CustomIcon Internal_PlaceHolder = new CustomIcon("TileEntities/_PlaceHolder"); public static final CustomIcon _PlaceHolder = Internal_PlaceHolder; - // Energy overlays - public static final CustomIcon OVERLAY_ENERGY_OUT_BUFFER = new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_BUFFER"); public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER = new CustomIcon( "iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER"); - // Wooden Shelf and Compartment Overlays - public static final CustomIcon OVERLAY_WOODEN_SHELF_FRONT = new CustomIcon("TileEntities/Compartment/wood_shelf"); - public static final CustomIcon OVERLAY_WOODEN_SHELF_CANS_FRONT = new CustomIcon( - "TileEntities/Compartment/wood_shelf_cans"); - public static final CustomIcon OVERLAY_WOODEN_SHELF_PAPER_FRONT = new CustomIcon( - "TileEntities/Compartment/wood_shelf_paper"); - public static final CustomIcon OVERLAY_CABINET_1 = new CustomIcon("TileEntities/Compartment/0"); - public static final CustomIcon OVERLAY_CABINET_2 = new CustomIcon("TileEntities/Compartment/1"); - public static final CustomIcon OVERLAY_CABINET_3 = new CustomIcon("TileEntities/Compartment/2"); - public static final CustomIcon OVERLAY_CABINET_4 = new CustomIcon("TileEntities/Compartment/3"); - public static final CustomIcon OVERLAY_CABINET_5 = new CustomIcon("TileEntities/Compartment/4"); - public static final CustomIcon OVERLAY_CABINET_6 = new CustomIcon("TileEntities/Compartment/5"); - public static final CustomIcon OVERLAY_CABINET_7 = new CustomIcon("TileEntities/Compartment/6"); - public static final CustomIcon OVERLAY_CABINET_8 = new CustomIcon("TileEntities/Compartment/7"); - public static final CustomIcon OVERLAY_CABINET_9 = new CustomIcon("TileEntities/Compartment/8"); - public static final CustomIcon OVERLAY_CABINET_10 = new CustomIcon("TileEntities/Compartment/9"); - public static final CustomIcon OVERLAY_CABINET_11 = new CustomIcon("TileEntities/Compartment/10"); - public static final CustomIcon OVERLAY_CABINET_12 = new CustomIcon("TileEntities/Compartment/11"); - public static final CustomIcon OVERLAY_CABINET_13 = new CustomIcon("TileEntities/Compartment/12"); - public static final CustomIcon OVERLAY_CABINET_14 = new CustomIcon("TileEntities/Compartment/13"); - public static final CustomIcon OVERLAY_CABINET_15 = new CustomIcon("TileEntities/Compartment/14"); - public static final CustomIcon OVERLAY_CABINET_16 = new CustomIcon("TileEntities/Compartment/15"); - public static final CustomIcon OVERLAY_COMPARTMENT_1 = new CustomIcon("TileEntities/Compartment/16"); - public static final CustomIcon OVERLAY_COMPARTMENT_2 = new CustomIcon("TileEntities/Compartment/17"); - public static final CustomIcon OVERLAY_COMPARTMENT_3 = new CustomIcon("TileEntities/Compartment/18"); - public static final CustomIcon OVERLAY_COMPARTMENT_4 = new CustomIcon("TileEntities/Compartment/19"); - public static final CustomIcon OVERLAY_COMPARTMENT_5 = new CustomIcon("TileEntities/Compartment/20"); - public static final CustomIcon OVERLAY_COMPARTMENT_6 = new CustomIcon("TileEntities/Compartment/21"); - public static final CustomIcon OVERLAY_COMPARTMENT_7 = new CustomIcon("TileEntities/Compartment/22"); - public static final CustomIcon OVERLAY_COMPARTMENT_8 = new CustomIcon("TileEntities/Compartment/23"); - public static final CustomIcon OVERLAY_COMPARTMENT_9 = new CustomIcon("TileEntities/Compartment/24"); - public static final CustomIcon OVERLAY_COMPARTMENT_10 = new CustomIcon("TileEntities/Compartment/25"); - public static final CustomIcon OVERLAY_COMPARTMENT_11 = new CustomIcon("TileEntities/Compartment/26"); - public static final CustomIcon OVERLAY_COMPARTMENT_12 = new CustomIcon("TileEntities/Compartment/27"); - public static final CustomIcon OVERLAY_COMPARTMENT_13 = new CustomIcon("TileEntities/Compartment/28"); - public static final CustomIcon OVERLAY_COMPARTMENT_14 = new CustomIcon("TileEntities/Compartment/29"); - public static final CustomIcon OVERLAY_COMPARTMENT_15 = new CustomIcon("TileEntities/Compartment/30"); - public static final CustomIcon OVERLAY_COMPARTMENT_16 = new CustomIcon("TileEntities/Compartment/31"); - // Controllers private static final CustomIcon Internal_Casing_Fusion_Simple_Front = new CustomIcon( "TileEntities/MACHINE_CASING_FUSION_FRONT"); @@ -375,41 +334,11 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_PIPE_GRINDING_MILL = new CustomIcon("TileEntities/MACHINE_CASING_PIPE_T1"); public static final CustomIcon TEXTURE_PIPE_GENERIC = new CustomIcon("iconsets/MACHINE_CASING_PIPE_GENERIC"); - public static final CustomIcon TEXTURE_PIPE_T1_BABBIT_ALLOY = new CustomIcon( - "iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY"); - public static final CustomIcon TEXTURE_PIPE_T2_INCONEL_690 = new CustomIcon( - "iconsets/MACHINE_CASING_PIPE_INCONEL_690"); - public static final CustomIcon TEXTURE_PIPE_T3_STELLITE = new CustomIcon("iconsets/MACHINE_CASING_PIPE_STELLITE"); - public static final CustomIcon TEXTURE_PIPE_T4_NITINOL_60 = new CustomIcon( - "iconsets/MACHINE_CASING_PIPE_NITINOL_60"); - public static final CustomIcon TEXTURE_PIPE_T5_LAFIUM = new CustomIcon("iconsets/MACHINE_CASING_PIPE_LAFIUM"); - public static final CustomIcon TEXTURE_PIPE_T6_CINOBITE = new CustomIcon("iconsets/MACHINE_CASING_PIPE_CINOBITE"); - public static final CustomIcon TEXTURE_PIPE_T7_TITANSTEEL = new CustomIcon( - "iconsets/MACHINE_CASING_PIPE_TITANSTEEL"); - public static final CustomIcon TEXTURE_PIPE_T8_ABYSSAL = new CustomIcon("iconsets/MACHINE_CASING_PIPE_ABYSSAL"); - // Custom Gearboxes public static final CustomIcon TEXTURE_GEARBOX_GRINDING_MILL = new CustomIcon( "TileEntities/MACHINE_CASING_GEARBOX_T1"); public static final CustomIcon TEXTURE_GEARBOX_GENERIC = new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_GENERIC"); - public static final CustomIcon TEXTURE_GEARBOX_T1_EGLIN_STEEL = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL"); - public static final CustomIcon TEXTURE_GEARBOX_T2_INCONEL_792 = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_INCONEL_792"); - public static final CustomIcon TEXTURE_GEARBOX_T3_INCOLOY_MA956 = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956"); - public static final CustomIcon TEXTURE_GEARBOX_T4_NITINOL_60 = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_NITINOL_60"); - public static final CustomIcon TEXTURE_GEARBOX_T5_ZERON_100 = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_ZERON_100"); - public static final CustomIcon TEXTURE_GEARBOX_T6_PIKYONIUM = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM"); - public static final CustomIcon TEXTURE_GEARBOX_T7_TITANSTEEL = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL"); - public static final CustomIcon TEXTURE_GEARBOX_T8_ABYSSAL = new CustomIcon( - "iconsets/MACHINE_CASING_GEARBOX_ABYSSAL"); - public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II = new CustomIcon("iconsets/MACHINE_CASING_FUSION_3"); public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_INNER = new CustomIcon( "iconsets/MACHINE_CASING_FUSION_COIL_II"); @@ -522,18 +451,6 @@ public class TexturesGtBlock { "iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE"); public static final CustomIcon Overlay_Machine_Controller_Advanced_Active = Internal_Overlay_Machine_Controller_Advanced_Active; - // Fluid Reactor Overlays - public static final CustomIcon Overlay_FluidReactor_Front = new CustomIcon( - "TileEntities/FluidReactor/OVERLAY_FRONT"); - public static final CustomIcon Overlay_FluidReactor_Side = new CustomIcon("TileEntities/FluidReactor/OVERLAY_SIDE"); - public static final CustomIcon Overlay_FluidReactor_Top = new CustomIcon("TileEntities/FluidReactor/OVERLAY_TOP"); - public static final CustomIcon Overlay_FluidReactor_Front_Active = new CustomIcon( - "TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE"); - public static final CustomIcon Overlay_FluidReactor_Side_Active = new CustomIcon( - "TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE"); - public static final CustomIcon Overlay_FluidReactor_Top_Active = new CustomIcon( - "TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE"); - // Crafting Overlays public static final CustomIcon Overlay_Crafting_Bronze = new CustomIcon("TileEntities/bronze_top_crafting"); public static final CustomIcon Overlay_Crafting_Steel = new CustomIcon("TileEntities/cover_crafting"); @@ -602,27 +519,6 @@ public class TexturesGtBlock { public static final CustomIcon Casing_InventoryManagaer_Blue_Redstone = new CustomIcon( "TileEntities/gt4/OVERLAY_BLUE_REDSTONE"); - private static final CustomIcon Casing_Test_1 = new CustomIcon("number/1"); - private static final CustomIcon Casing_Test_2 = new CustomIcon("number/2"); - private static final CustomIcon Casing_Test_3 = new CustomIcon("number/3"); - private static final CustomIcon Casing_Test_4 = new CustomIcon("number/4"); - private static final CustomIcon Casing_Test_5 = new CustomIcon("number/5"); - private static final CustomIcon Casing_Test_6 = new CustomIcon("number/6"); - private static final CustomIcon Casing_Test_7 = new CustomIcon("number/7"); - private static final CustomIcon Casing_Test_8 = new CustomIcon("number/8"); - private static final CustomIcon Casing_Test_9 = new CustomIcon("number/9"); - private static final CustomIcon Casing_Test_10 = new CustomIcon("number/10"); - private static final CustomIcon Casing_Test_11 = new CustomIcon("number/11"); - private static final CustomIcon Casing_Test_12 = new CustomIcon("number/12"); - private static final CustomIcon Casing_Test_13 = new CustomIcon("number/13"); - private static final CustomIcon Casing_Test_14 = new CustomIcon("number/14"); - private static final CustomIcon Casing_Test_15 = new CustomIcon("number/15"); - private static final CustomIcon Casing_Test_16 = new CustomIcon("number/16"); - - public static final CustomIcon[] TEST_NUMBER = new CustomIcon[] { Casing_Test_1, Casing_Test_2, Casing_Test_3, - Casing_Test_4, Casing_Test_5, Casing_Test_6, Casing_Test_7, Casing_Test_8, Casing_Test_9, Casing_Test_10, - Casing_Test_11, Casing_Test_12, Casing_Test_13, Casing_Test_14, Casing_Test_15, Casing_Test_16 }; - // Covers private static final CustomIcon Internal_Overlay_Overflow_Valve = new CustomIcon("iconsets/OVERLAY_OVERFLOW_VALVE"); public static final CustomIcon Overlay_Overflow_Valve = Internal_Overlay_Overflow_Valve; @@ -773,46 +669,6 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE_ALT = new CustomIcon( "TileEntities/DecayablesChest_top"); - // LFTR Single blocks - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_FRONT"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_SIDE"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_TOP"); - public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE = new CustomIcon( - "TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE"); - - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_FRONT"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_SIDE"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_TOP"); - public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE = new CustomIcon( - "TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE"); - - // Overlay Arrays - public static ITexture[] OVERLAYS_ENERGY_OUT_BUFFER = new ITexture[] { - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 220, 220, 220, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 220, 220, 220, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 255, 100, 0, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 255, 255, 30, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 128, 128, 128, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }) }; - public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[] { new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), @@ -827,42 +683,6 @@ public class TexturesGtBlock { (IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }) }; - public static ITexture[] OVERLAYS_CABINET_FRONT = new ITexture[] { - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16, new short[] { 255, 255, 255, 0 }), }; - - public static ITexture[] OVERLAYS_COMPARTMENT_FRONT = new ITexture[] { - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15, new short[] { 255, 255, 255, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16, new short[] { 255, 255, 255, 0 }), }; - public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[] { TEXTURE_CASING_FUSION_COIL_II_1, TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3, TEXTURE_CASING_FUSION_COIL_II_4, TEXTURE_CASING_FUSION_COIL_II_5, TEXTURE_CASING_FUSION_COIL_II_6, TEXTURE_CASING_FUSION_COIL_II_7, @@ -879,6 +699,4 @@ public class TexturesGtBlock { TEXTURE_CASING_TIERED_LV, TEXTURE_CASING_TIERED_MV, TEXTURE_CASING_TIERED_HV, TEXTURE_CASING_TIERED_EV, TEXTURE_CASING_TIERED_IV, TEXTURE_CASING_TIERED_LuV, TEXTURE_CASING_TIERED_ZPM, TEXTURE_CASING_TIERED_UV, TEXTURE_CASING_TIERED_MAX }; - - public static Object Casing_Material_Turbine; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java deleted file mode 100644 index f21752795c..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java +++ /dev/null @@ -1,78 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -import org.apache.commons.lang3.ArrayUtils; - -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.core.lib.CORE; - -public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicMachine { - - public GregtechMetaTileEntity_BasicWasher(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 1, - "It's like an automatic Cauldron for washing dusts.", - 1, - 1, - new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER) }); - } - - public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1); - } - - @Override - public String[] getDescription() { - return ArrayUtils - .addAll(this.mDescriptionArray, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip.get()); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_BasicWasher(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public GT_Recipe.GT_Recipe_Map getRecipeList() { - return GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes; - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return (super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack)) - && (getRecipeList().containsInput(aStack)); - } - - @Override - public boolean isFluidInputAllowed(FluidStack aFluid) { - return (aFluid.getFluid().getName().equals("water")) || (super.isFluidInputAllowed(aFluid)); - } - - @Override - public int getCapacity() { - return 8000 * Math.max(1, this.mTier); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java deleted file mode 100644 index 84bb17bf16..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java +++ /dev/null @@ -1,86 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -import org.apache.commons.lang3.ArrayUtils; - -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_BasicMachine { - - public GregtechMetaTileEntity_ReactorColdTrap(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 1, - "Just like the Arctic", - 2, - 9, - new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP) }); - } - - public GregtechMetaTileEntity_ReactorColdTrap(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, 1, aDescription, aTextures, 2, 9); - } - - @Override - public String[] getDescription() { - return ArrayUtils.addAll(this.mDescriptionArray, "Does not require ice cubes", CORE.GT_Tooltip.get()); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_ReactorColdTrap( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public boolean allowSelectCircuit() { - return true; - } - - @Override - public GT_Recipe.GT_Recipe_Map getRecipeList() { - return GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes; - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return (super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack)) - && (getRecipeList().containsInput(aStack)); - } - - @Override - public boolean isFluidInputAllowed(FluidStack aFluid) { - return super.isFluidInputAllowed(aFluid); - } - - @Override - public int getCapacity() { - return 16000 * Math.max(1, this.mTier); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java deleted file mode 100644 index fbf2ad9064..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java +++ /dev/null @@ -1,86 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -import org.apache.commons.lang3.ArrayUtils; - -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEntity_BasicMachine { - - public GregtechMetaTileEntity_ReactorProcessingUnit(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 1, - "Processes Nuclear things", - 2, - 9, - new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE), - new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP) }); - } - - public GregtechMetaTileEntity_ReactorProcessingUnit(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, 1, aDescription, aTextures, 2, 9); - } - - @Override - public String[] getDescription() { - return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_ReactorProcessingUnit( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public boolean allowSelectCircuit() { - return true; - } - - @Override - public GT_Recipe.GT_Recipe_Map getRecipeList() { - return GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes; - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return (super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack)) - && (getRecipeList().containsInput(aStack)); - } - - @Override - public boolean isFluidInputAllowed(FluidStack aFluid) { - return super.isFluidInputAllowed(aFluid); - } - - @Override - public int getCapacity() { - return 8000 * Math.max(1, this.mTier); - } -} |