diff --git a/build.gradle b/build.gradle index 3e88830d63..f3a7fa2788 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1698936026 +//version: 1699290261 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -1187,9 +1187,8 @@ publishing { version = System.getenv("RELEASE_VERSION") ?: identifiedVersion } } - repositories { - if (usesMavenPublishing.toBoolean()) { + if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) { maven { url = mavenPublishUrl allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java deleted file mode 100644 index a99cfcfea9..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java +++ /dev/null @@ -1,170 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; - -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT; - -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.enums.SoundResource; -import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.BlockIcons.CustomIcon; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GTPP_Recipe; -import gtPlusPlus.core.lib.CORE; - -@SuppressWarnings("deprecation") -public class GT_MetaTileEntity_Dehydrator extends GT_MetaTileEntity_BasicMachine_GT_Recipe { - - private static final CustomIcon[] sDehydratorOverlays = new CustomIcon[10]; - - static { - sDehydratorOverlays[0] = new CustomIcon("basicmachines/microwave/OVERLAY_FRONT"); - sDehydratorOverlays[2] = new CustomIcon("basicmachines/plasma_arc_furnace/OVERLAY_BOTTOM"); - sDehydratorOverlays[3] = new CustomIcon("basicmachines/fluid_heater/OVERLAY_SIDE"); - sDehydratorOverlays[4] = new CustomIcon("basicmachines/chemical_bath/OVERLAY_FRONT"); - sDehydratorOverlays[5] = new CustomIcon("basicmachines/microwave/OVERLAY_FRONT_ACTIVE"); - sDehydratorOverlays[7] = new CustomIcon("basicmachines/plasma_arc_furnace/OVERLAY_BOTTOM_ACTIVE"); - sDehydratorOverlays[8] = new CustomIcon("basicmachines/fluid_heater/OVERLAY_SIDE_ACTIVE"); - sDehydratorOverlays[9] = new CustomIcon("basicmachines/chemical_bath/OVERLAY_FRONT_ACTIVE"); - // 3 8 - } - - public GT_MetaTileEntity_Dehydrator(int aID, String aName, String aNameRegional, int aTier, String aDescription, - int aTankCapacity) { - super( - aID, - aName, - aNameRegional, - aTier, - aDescription, - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, - 2, - 9, - aTankCapacity, - SoundResource.NONE, - false, - false, - SpecialEffects.NONE, - "", - null); - } - - @Override - public String[] getDescription() { - String[] S = super.getDescription(); - final String[] desc = new String[S.length + 1]; - System.arraycopy(S, 0, desc, 0, S.length); - desc[S.length] = CORE.GT_Tooltip.get(); - return desc; - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[15][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = getSideFacingActive(i); - rTextures[1][i + 1] = getSideFacingInactive(i); - rTextures[2][i + 1] = getFrontFacingActive(i); - rTextures[3][i + 1] = getFrontFacingInactive(i); - rTextures[4][i + 1] = getTopFacingActive(i); - rTextures[5][i + 1] = getTopFacingInactive(i); - rTextures[6][i + 1] = getBottomFacingActive(i); - rTextures[7][i + 1] = getBottomFacingInactive(i); - rTextures[8][i + 1] = getBottomFacingPipeActive(i); - rTextures[9][i + 1] = getBottomFacingPipeInactive(i); - rTextures[10][i + 1] = getTopFacingPipeActive(i); - rTextures[11][i + 1] = getTopFacingPipeInactive(i); - rTextures[12][i + 1] = getSideFacingPipeActive(i); - rTextures[13][i + 1] = getSideFacingPipeInactive(i); - } - return rTextures; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return super.getTexture(aBaseMetaTileEntity, side, facing, aColorIndex, aActive, aRedstone); - } - - @Override - public ITexture[] getFrontFacingInactive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[0]) }; - } - - @Override - public ITexture[] getBottomFacingInactive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[2]) }; - } - - @Override - public ITexture[] getTopFacingInactive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[3]) }; - } - - @Override - public ITexture[] getSideFacingInactive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[4]) }; - } - - @Override - public ITexture[] getFrontFacingActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[5]) }; - } - - @Override - public ITexture[] getBottomFacingActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[7]) }; - } - - @Override - public ITexture[] getTopFacingActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[8]) }; - } - - @Override - public ITexture[] getSideFacingActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(sDehydratorOverlays[9]) }; - } - - @Override - public ITexture[] getBottomFacingPipeActive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getBottomFacingPipeInactive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getTopFacingPipeActive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getTopFacingPipeInactive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getSideFacingPipeActive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } - - @Override - public ITexture[] getSideFacingPipeInactive(byte aColor) { - return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) }; - } -} 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 static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR 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 static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR 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 static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR "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 static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR 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 static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR 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 static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR (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 static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR 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); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 54d94407db..1fd4e17b03 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -1,23 +1,27 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT; +import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL; +import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Dehydrator; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialDehydrator; public class GregtechDehydrator { @@ -30,169 +34,162 @@ public static void run() { } private static void run1() { + ItemStack coilT1 = new ItemStack(ModItems.itemDehydratorCoil, 1, 0); + ItemStack coilT2 = new ItemStack(ModItems.itemDehydratorCoil, 1, 1); + ItemStack coilT3 = new ItemStack(ModItems.itemDehydratorCoil, 1, 2); + ItemStack coilT4 = new ItemStack(ModItems.itemDehydratorCoil, 1, 3); - /* - * public GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String aName, String aNameRegional, int aTier, - * String aDescription, GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int - * aGUIParameterA, int aGUIParameterB, String aGUIName, String aSound, boolean aSharedTank, boolean - * aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays, Object[] aRecipe) { - */ + // Make some coils by wrapping wire around a spool. + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(ModItems.itemDehydratorCoilWire, 4, 0), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1)) + .itemOutputs(coilT1).duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(ModItems.itemDehydratorCoilWire, 4, 1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1)) + .itemOutputs(coilT2).duration(8 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(ModItems.itemDehydratorCoilWire, 4, 2), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1)) + .itemOutputs(coilT3).duration(8 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(ModItems.itemDehydratorCoilWire, 4, 3), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1)) + .itemOutputs(coilT4).duration(8 * SECONDS).eut(TierEU.RECIPE_EV / 2).addTo(sAssemblerRecipes); // Basic GregtechItemList.GT_Dehydrator_MV.set( - new GT_MetaTileEntity_Dehydrator( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 911, "machine.dehydrator.tier.00", "Basic Dehydrator I", 2, - "This dehydrates your Grapes into Raisins.", - 16000).getStackForm(1L)); + new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "DEHYDRATOR", + new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', + OrePrefixes.wireFine.get(Materials.RedAlloy), 'C', CIRCUIT, 'W', + OrePrefixes.cableGt04.get(Materials.Copper), 'G', + OrePrefixes.gearGt.get(Materials.Steel) }).getStackForm(1L)); GregtechItemList.GT_Dehydrator_HV.set( - new GT_MetaTileEntity_Dehydrator( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 912, "machine.dehydrator.tier.01", "Basic Dehydrator II", 3, - "This dehydrates your Grapes into Raisins.", - 32000).getStackForm(1L)); + new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "DEHYDRATOR", + new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', + OrePrefixes.wireFine.get(Materials.Electrum), 'C', CIRCUIT, 'W', + OrePrefixes.cableGt04.get(Materials.Silver), 'G', ALLOY.POTIN.getGear(1) }) + .getStackForm(1L)); // Chemical - GregtechItemList.GT_Dehydrator_EV.set( - new GT_MetaTileEntity_Dehydrator( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 813, "advancedmachine.dehydrator.tier.01", "Chemical Dehydrator I", 4, - "A hangover is the way your body reacts to dehydration.", - 48000).getStackForm(1L)); + new String[] { "A hangover is the way your body reacts to dehydration.", + CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "DEHYDRATOR", + new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT1, 'C', CIRCUIT, 'W', + OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', ALLOY.TUMBAGA.getGear(1) }) + .getStackForm(1L)); GregtechItemList.GT_Dehydrator_IV.set( - new GT_MetaTileEntity_Dehydrator( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 814, "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5, - "A hangover is the way your body reacts to dehydration.", - 48000).getStackForm(1L)); + new String[] { "A hangover is the way your body reacts to dehydration.", + CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "DEHYDRATOR", + new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT2, 'C', CIRCUIT, 'W', + OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', ALLOY.INCONEL_690.getGear(1) }) + .getStackForm(1L)); GregtechItemList.GT_Dehydrator_LuV.set( - new GT_MetaTileEntity_Dehydrator( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 815, "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6, - "You could probably make space icecream with this..", - 64000).getStackForm(1L)); + new String[] { "You could probably make space icecream with this..", CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "DEHYDRATOR", + new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT3, 'C', CIRCUIT, 'W', + OrePrefixes.cableGt04.get(Materials.Naquadah), 'G', ALLOY.HASTELLOY_N.getGear(1) }) + .getStackForm(1L)); GregtechItemList.GT_Dehydrator_ZPM.set( - new GT_MetaTileEntity_Dehydrator( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 816, "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7, - "You can definitely make space icecream with this..", - 64000).getStackForm(1L)); + new String[] { "You can definitely make space icecream with this..", CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "DEHYDRATOR", + new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT4, 'C', CIRCUIT, 'W', + OrePrefixes.cableGt04.get(Materials.Osmium), 'G', ALLOY.ZERON_100.getGear(1) }) + .getStackForm(1L)); // Advanced GregtechItemList.Controller_Vacuum_Furnace.set( new GregtechMetaTileEntity_IndustrialDehydrator(995, "multimachine.adv.vacuumfurnace", "Utupu-Tanuri") .getStackForm(1L)); - - ItemStack coilWire1 = ItemUtils - .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 4); - ItemStack coilWire2 = ItemUtils - .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 4); - ItemStack coilWire3 = ItemUtils - .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 4); - ItemStack coilWire4 = ItemUtils - .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 4); - ItemStack coilT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil", "coil1", 0, 1); - ItemStack coilT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:1", "coil2", 1, 1); - ItemStack coilT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:2", "coil3", 2, 1); - ItemStack coilT4 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:3", "coil4", 3, 1); - ItemStack spoolT1 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumBronze", 1); - ItemStack spoolT2 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumSteel", 1); - ItemStack spoolT3 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumStainlessSteel", 1); - ItemStack spoolT4 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumTitanium", 1); - - // Make some coils by wrapping wire around a spool. - GT_Values.RA.stdBuilder().itemInputs(coilWire1, spoolT1).itemOutputs(coilT1).duration(8 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(coilWire2, spoolT2).itemOutputs(coilT2).duration(8 * SECONDS) - .eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(coilWire3, spoolT3).itemOutputs(coilT3).duration(8 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(coilWire4, spoolT4).itemOutputs(coilT4).duration(8 * SECONDS) - .eut(TierEU.RECIPE_EV / 2).addTo(sAssemblerRecipes); - - // Add recipes for the Dehydrators. - - // Basic - GT_ModHandler.addCraftingRecipe( - GregtechItemList.GT_Dehydrator_MV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'), - ItemList.Robot_Arm_MV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.RedAlloy), - Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Copper), Character.valueOf('G'), - OrePrefixes.gearGt.get(Materials.Steel) }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.GT_Dehydrator_HV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'), - ItemList.Robot_Arm_HV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.Electrum), - Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Silver), Character.valueOf('G'), ALLOY.POTIN.getGear(1) }); - - // Chemical - GT_ModHandler.addCraftingRecipe( - GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'), - ItemList.Robot_Arm_EV, Character.valueOf('E'), coilT1, Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Data), Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Aluminium), Character.valueOf('G'), - ALLOY.TUMBAGA.getGear(1) }); - - GT_ModHandler.addCraftingRecipe( - GregtechItemList.GT_Dehydrator_IV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'), - ItemList.Robot_Arm_IV, Character.valueOf('E'), coilT2, Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Tungsten), Character.valueOf('G'), - ALLOY.INCONEL_690.getGear(1) }); - - GT_ModHandler.addCraftingRecipe( - GregtechItemList.GT_Dehydrator_LuV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'), - CI.robotArm_LuV, Character.valueOf('E'), coilT3, Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Naquadah), Character.valueOf('G'), - ALLOY.HASTELLOY_N.getGear(1) }); - - GT_ModHandler.addCraftingRecipe( - GregtechItemList.GT_Dehydrator_ZPM.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('P'), - CI.robotArm_ZPM, Character.valueOf('E'), coilT4, Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Osmium), Character.valueOf('G'), - ALLOY.ZERON_100.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java index df032a35a1..b16c4bcb34 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -1,10 +1,12 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import gregtech.api.enums.SoundResource; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ReactorColdTrap; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ReactorProcessingUnit; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_SpargeTower; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_NuclearReactor; @@ -24,18 +26,74 @@ private static void run1() { .getStackForm(1L)); // Reactor Processing Units GregtechItemList.ReactorProcessingUnit_IV.set( - new GregtechMetaTileEntity_ReactorProcessingUnit(31031, "rpu.tier.01", "Reactor Processing Unit I", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + 31031, + "rpu.tier.01", + "Reactor Processing Unit I", + 5, + new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "REACTOR_PROCESSING_UNIT", + null).getStackForm(1L)); GregtechItemList.ReactorProcessingUnit_ZPM.set( - new GregtechMetaTileEntity_ReactorProcessingUnit(31032, "rpu.tier.02", "Reactor Processing Unit II", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + 31032, + "rpu.tier.02", + "Reactor Processing Unit II", + 7, + new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "REACTOR_PROCESSING_UNIT", + null).getStackForm(1L)); // Cold Traps GregtechItemList.ColdTrap_IV.set( - new GregtechMetaTileEntity_ReactorColdTrap(31033, "coldtrap.tier.01", "Cold Trap I", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + 31033, + "coldtrap.tier.01", + "Cold Trap I", + 5, + new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "COLD_TRAP", + null).getStackForm(1L)); GregtechItemList.ColdTrap_ZPM.set( - new GregtechMetaTileEntity_ReactorColdTrap(31034, "coldtrap.tier.02", "Cold Trap II", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + 31034, + "coldtrap.tier.02", + "Cold Trap II", + 7, + new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes, + 2, + 9, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "COLD_TRAP", + null).getStackForm(1L)); // Sparge Tower GregtechItemList.Controller_Sparge_Tower.set( new GregtechMetaTileEntity_SpargeTower(31035, "sparge.controller.single", "Sparge Tower Controller") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index ee4de6ae0b..d366482812 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -7,12 +7,14 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SoundResource; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_BasicWasher; public class GregtechSimpleWasher { @@ -22,22 +24,97 @@ public static void run() { generateDirtyCrushedRecipes(); // Register the Simple Washer Entity. GregtechItemList.SimpleDustWasher_ULV.set( - new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.01", "Simple Washer I", 0) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + 767, + "simplewasher.01.tier.01", + "Simple Washer I", + 0, + new String[] { "It's like an automatic Cauldron for washing dusts.", + CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes, + 1, + 1, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "SIMPLE_WASHER", + null).getStackForm(1L)); // People want them in higher tiers apparently GregtechItemList.SimpleDustWasher_MV.set( - new GregtechMetaTileEntity_BasicWasher(31017, "simplewasher.01.tier.02", "Simple Washer II", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + 31017, + "simplewasher.01.tier.02", + "Simple Washer II", + 2, + new String[] { "It's like an automatic Cauldron for washing dusts.", + CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes, + 1, + 1, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "SIMPLE_WASHER", + null).getStackForm(1L)); GregtechItemList.SimpleDustWasher_EV.set( - new GregtechMetaTileEntity_BasicWasher(31018, "simplewasher.01.tier.03", "Simple Washer III", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + 31018, + "simplewasher.01.tier.03", + "Simple Washer III", + 4, + new String[] { "It's like an automatic Cauldron for washing dusts.", + CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes, + 1, + 1, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "SIMPLE_WASHER", + null).getStackForm(1L)); GregtechItemList.SimpleDustWasher_LuV.set( - new GregtechMetaTileEntity_BasicWasher(31019, "simplewasher.01.tier.04", "Simple Washer IV", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + 31019, + "simplewasher.01.tier.04", + "Simple Washer IV", + 6, + new String[] { "It's like an automatic Cauldron for washing dusts.", + CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes, + 1, + 1, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "SIMPLE_WASHER", + null).getStackForm(1L)); GregtechItemList.SimpleDustWasher_UV.set( - new GregtechMetaTileEntity_BasicWasher(31020, "simplewasher.01.tier.05", "Simple Washer V", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + 31020, + "simplewasher.01.tier.05", + "Simple Washer V", + 8, + new String[] { "It's like an automatic Cauldron for washing dusts.", + CORE.GT_Tooltip.get() }, + GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes, + 1, + 1, + true, + SoundResource.NONE, + false, + false, + SpecialEffects.NONE, + "SIMPLE_WASHER", + null).getStackForm(1L)); } } diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_ACTIVE.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_BOTTOM_GLOW.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_ACTIVE.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_FRONT_GLOW.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE.png.mcmeta similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_SIDE_GLOW.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_ACTIVE.png new file mode 100644 index 0000000000..4469a809e9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/cold_trap/OVERLAY_TOP_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_ACTIVE.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_BOTTOM_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT.png new file mode 100644 index 0000000000..f090fc04ac Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_ACTIVE.png new file mode 100644 index 0000000000..b18cca86b6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_ACTIVE_GLOW.png new file mode 100644 index 0000000000..590a0e1606 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_FRONT_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE.png new file mode 100644 index 0000000000..f9b78615ea Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_ACTIVE.png new file mode 100644 index 0000000000..a87d309908 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_ACTIVE_GLOW.png new file mode 100644 index 0000000000..11d8fffb7c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_SIDE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP.png new file mode 100644 index 0000000000..9afeaf4395 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_ACTIVE.png new file mode 100644 index 0000000000..d997a986df Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/dehydrator/OVERLAY_TOP_GLOW.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_ACTIVE.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_BOTTOM_GLOW.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE.png.mcmeta similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_FRONT_GLOW.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE.png.mcmeta similarity index 100% rename from src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta rename to src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_SIDE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP.png new file mode 100644 index 0000000000..a9ab34e963 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_ACTIVE.png new file mode 100644 index 0000000000..8a5c131623 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/reactor_processing_unit/OVERLAY_TOP_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_ACTIVE.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_BOTTOM_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT.png new file mode 100644 index 0000000000..72f22b8b00 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_ACTIVE.png new file mode 100644 index 0000000000..99039b2493 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_FRONT_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE.png new file mode 100644 index 0000000000..72f22b8b00 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_ACTIVE.png new file mode 100644 index 0000000000..99039b2493 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_SIDE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_ACTIVE.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_ACTIVE_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_GLOW.png new file mode 100644 index 0000000000..a2fcfb9a21 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/simple_washer/OVERLAY_TOP_GLOW.png differ diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index a9ff7d4707..dfd276c098 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -3074,16 +3074,6 @@ item.itemDustRareEarthIII.name=Rare Earth (III) Dust item.itemDustTinyRareEarthIII.name=Tiny Pile of Rare Earth (III) Dust item.itemDustSmallRareEarthIII.name=Small Pile of Rare Earth (III) Dust - - -//Added 13/10/19 -tile.blockRoundRobinator.0.name=Round Robinator I -tile.blockRoundRobinator.1.name=Round Robinator II -tile.blockRoundRobinator.2.name=Round Robinator III -tile.blockRoundRobinator.3.name=Round Robinator IV -tile.blockRoundRobinator.4.name=Round Robinator V - - //Added 16/10/19 item.BioRecipeSelector.name=Programmed Bio Circuit item.FermentationBase.name=Cell of Fermentation Base diff --git a/src/main/resources/assets/miscutils/lang/ru_RU.lang b/src/main/resources/assets/miscutils/lang/ru_RU.lang index 7a596f97ff..807de0ef72 100644 --- a/src/main/resources/assets/miscutils/lang/ru_RU.lang +++ b/src/main/resources/assets/miscutils/lang/ru_RU.lang @@ -3010,16 +3010,6 @@ item.itemDustRareEarthIII.name=Rare Earth (III) Dust item.itemDustTinyRareEarthIII.name=Tiny Pile of Rare Earth (III) Dust item.itemDustSmallRareEarthIII.name=Small Pile of Rare Earth (III) Dust - - -//Added 13/10/19 -tile.blockRoundRobinator.0.name=Round Robinator I -tile.blockRoundRobinator.1.name=Round Robinator II -tile.blockRoundRobinator.2.name=Round Robinator III -tile.blockRoundRobinator.3.name=Round Robinator IV -tile.blockRoundRobinator.4.name=Round Robinator V - - //Added 16/10/19 item.BioRecipeSelector.name=Programmed Bio Circuit item.FermentationBase.name=Cell of Fermentation Base diff --git a/src/main/resources/assets/miscutils/lang/zh_CN.lang b/src/main/resources/assets/miscutils/lang/zh_CN.lang index e6468fa983..83304b8697 100644 --- a/src/main/resources/assets/miscutils/lang/zh_CN.lang +++ b/src/main/resources/assets/miscutils/lang/zh_CN.lang @@ -3010,16 +3010,6 @@ item.itemDustRareEarthIII.name=稀土(III)粉 item.itemDustTinyRareEarthIII.name=小撮稀土(III)粉 item.itemDustSmallRareEarthIII.name=小堆稀土(III)粉 - - -//Added 13/10/19 -tile.blockRoundRobinator.0.name=自动输出机 I -tile.blockRoundRobinator.1.name=自动输出机 II -tile.blockRoundRobinator.2.name=自动输出机 III -tile.blockRoundRobinator.3.name=自动输出机 IV -tile.blockRoundRobinator.4.name=自动输出机 V - - //Added 16/10/19 item.BioRecipeSelector.name=编程生物电路 item.FermentationBase.name=发酵基单元 diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png deleted file mode 100644 index ff1a809196..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png deleted file mode 100644 index 4af5b49f1f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png deleted file mode 100644 index 0ea134fb93..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png deleted file mode 100644 index 52c1a02d54..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png deleted file mode 100644 index 0c791d1d7c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png deleted file mode 100644 index 51cefde2a7..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png deleted file mode 100644 index 6150873b54..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png deleted file mode 100644 index 4483072085..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png deleted file mode 100644 index 137b4231c6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png deleted file mode 100644 index 0dd1f2ae5f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png deleted file mode 100644 index fd7adea957..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png deleted file mode 100644 index a0b7d1544e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png deleted file mode 100644 index 1f395cc891..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png deleted file mode 100644 index 5f36f9e7b5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png deleted file mode 100644 index 191dd4f5ba..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png deleted file mode 100644 index 7df2cbec19..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png deleted file mode 100644 index 7185cd1be1..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png deleted file mode 100644 index 09ee5cd360..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png deleted file mode 100644 index 3e88422126..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png deleted file mode 100644 index 3d84925c61..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png deleted file mode 100644 index 6c4c1fb228..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png deleted file mode 100644 index f113ac0ab5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png deleted file mode 100644 index d896829cfb..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png deleted file mode 100644 index f1bfc1063d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png deleted file mode 100644 index bbc35cf318..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png deleted file mode 100644 index e7f0363217..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png deleted file mode 100644 index 2ec68c00ff..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png deleted file mode 100644 index 2ffeb029fb..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png deleted file mode 100644 index f2c5b72b0c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png deleted file mode 100644 index 63cbcf0851..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png deleted file mode 100644 index 69efbeb6de..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png deleted file mode 100644 index acd54acf07..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png deleted file mode 100644 index 7a3700a854..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png deleted file mode 100644 index 672a513513..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png deleted file mode 100644 index e0ec5ef95a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png deleted file mode 100644 index e92b9c9ff8..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png deleted file mode 100644 index b926eb1ef2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png deleted file mode 100644 index 25ea33ce3a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png deleted file mode 100644 index 8a47157d2b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta deleted file mode 100644 index 1367b80758..0000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":2, - "frames": [0, 0, 1, 1, 2, 2, 3, 3, 3, 2, 2, 1, 1, 0] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png deleted file mode 100644 index ae63da7746..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta deleted file mode 100644 index 8447c98f9a..0000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":2, - "frames": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png deleted file mode 100644 index 6d9fb32d7e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png deleted file mode 100644 index cbf604f2b3..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png deleted file mode 100644 index 3b7ac3d50e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png deleted file mode 100644 index a5a5e2c559..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png deleted file mode 100644 index b68c900ddd..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png deleted file mode 100644 index df182aeaa5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png deleted file mode 100644 index 85bc3f16cd..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png deleted file mode 100644 index f82185ebdb..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png deleted file mode 100644 index 345476e03c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png deleted file mode 100644 index 971164eb3e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png deleted file mode 100644 index 5b5bac3ad2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_ABYSSAL.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_ABYSSAL.png deleted file mode 100644 index d680025de6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_ABYSSAL.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL.png deleted file mode 100644 index d680025de6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956.png deleted file mode 100644 index d680025de6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_INCONEL_792.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_INCONEL_792.png deleted file mode 100644 index d680025de6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_INCONEL_792.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_NITINOL_60.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_NITINOL_60.png deleted file mode 100644 index d680025de6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_NITINOL_60.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM.png deleted file mode 100644 index d680025de6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL.png deleted file mode 100644 index d680025de6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_ZERON_100.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_ZERON_100.png deleted file mode 100644 index d680025de6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_ZERON_100.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_ABYSSAL.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_ABYSSAL.png deleted file mode 100644 index bb2f520e30..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_ABYSSAL.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY.png deleted file mode 100644 index bb2f520e30..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_CINOBITE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_CINOBITE.png deleted file mode 100644 index bb2f520e30..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_CINOBITE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_INCONEL_690.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_INCONEL_690.png deleted file mode 100644 index bb2f520e30..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_INCONEL_690.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_LAFIUM.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_LAFIUM.png deleted file mode 100644 index bb2f520e30..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_LAFIUM.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_NITINOL_60.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_NITINOL_60.png deleted file mode 100644 index bb2f520e30..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_NITINOL_60.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_STELLITE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_STELLITE.png deleted file mode 100644 index bb2f520e30..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_STELLITE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_TITANSTEEL.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_TITANSTEEL.png deleted file mode 100644 index bb2f520e30..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_PIPE_TITANSTEEL.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png deleted file mode 100644 index 8af98deabf..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/1.png b/src/main/resources/assets/miscutils/textures/blocks/number/1.png deleted file mode 100644 index 106e6e0d05..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/1.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/10.png b/src/main/resources/assets/miscutils/textures/blocks/number/10.png deleted file mode 100644 index 169ce8c5f8..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/10.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/11.png b/src/main/resources/assets/miscutils/textures/blocks/number/11.png deleted file mode 100644 index bf43b17391..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/11.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/12.png b/src/main/resources/assets/miscutils/textures/blocks/number/12.png deleted file mode 100644 index 9a0b758056..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/12.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/13.png b/src/main/resources/assets/miscutils/textures/blocks/number/13.png deleted file mode 100644 index 956d49540e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/13.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/14.png b/src/main/resources/assets/miscutils/textures/blocks/number/14.png deleted file mode 100644 index 23133d3134..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/14.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/15.png b/src/main/resources/assets/miscutils/textures/blocks/number/15.png deleted file mode 100644 index 07e60e9fee..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/15.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/16.png b/src/main/resources/assets/miscutils/textures/blocks/number/16.png deleted file mode 100644 index 4cf29a3598..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/16.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/2.png b/src/main/resources/assets/miscutils/textures/blocks/number/2.png deleted file mode 100644 index aa8f532163..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/2.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/3.png b/src/main/resources/assets/miscutils/textures/blocks/number/3.png deleted file mode 100644 index fdc79c3699..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/4.png b/src/main/resources/assets/miscutils/textures/blocks/number/4.png deleted file mode 100644 index bc77ccf7be..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/4.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/5.png b/src/main/resources/assets/miscutils/textures/blocks/number/5.png deleted file mode 100644 index d32b0d02e8..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/5.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/6.png b/src/main/resources/assets/miscutils/textures/blocks/number/6.png deleted file mode 100644 index a7fe7400a9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/6.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/7.png b/src/main/resources/assets/miscutils/textures/blocks/number/7.png deleted file mode 100644 index 8b6cec6694..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/7.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/8.png b/src/main/resources/assets/miscutils/textures/blocks/number/8.png deleted file mode 100644 index d2f992d6c5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/8.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/number/9.png b/src/main/resources/assets/miscutils/textures/blocks/number/9.png deleted file mode 100644 index 24151f645c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/number/9.png and /dev/null differ