diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2024-05-22 18:05:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 19:05:41 +0200 |
| commit | 23494ade8145f1a70d4c533d74815b77b990314a (patch) | |
| tree | da447279d51a6bedafc1818bf22cd0e1808f0f72 /src/main/java/gtPlusPlus/xmod | |
| parent | 846c0839dc25298734aa50e66ba1a72f0025f560 (diff) | |
| download | GT5-Unofficial-23494ade8145f1a70d4c533d74815b77b990314a.tar.gz GT5-Unofficial-23494ade8145f1a70d4c533d74815b77b990314a.tar.bz2 GT5-Unofficial-23494ade8145f1a70d4c533d74815b77b990314a.zip | |
Cleaning! (#881)
* Remove fluorite from sandstone references
* Remove some unused content, rogue useless configs
* Remove more junk
* Remove more
* Remove RF converter, I think this is disabled anyway? Or should be?
* Opps missed this
* Cleaning
* Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI?
* Delete unused Australia textures
* Unused texture loading
* Bulk remove seemingly unused textures.
* Remove xpjuice, seemingly no use? Change the localised name of mobessence to Mob Essence. Remove EnchantingUtils, no longer needed.
* Clean
* Unused tooltips
* Remove hydrogen blob
* Spotless apply for branch Cleaning! for #881 (#882)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* More cleaning
* Lots of unused code.
* Some reflection cleanup
* Revert "Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI?"
This reverts commit d244b7dba00a9aee42b4a0596e842956acb36c5a.
* Restore random conversion recipes
* Unused texture
* Unused stuff
* Restore some missing textures
* Spotless apply for branch Cleaning! for #881 (#883)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* Conditionally enable xpjuice recipe on OpenBlocks loaded
* Spotless apply for branch Cleaning! for #881 (#884)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod')
14 files changed, 18 insertions, 1072 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java index 94d936d477..4e769b7c95 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java @@ -9,13 +9,4 @@ public class LogRainforestTree extends LogBase { this.treeType = new String[] { "rainforest" }; } - /* - * @Override - * @SideOnly(Side.CLIENT) protected IIcon getSideIcon(int metaID){ return this.textureSide[metaID % - * this.textureSide.length]; } - * @Override - * @SideOnly(Side.CLIENT) protected IIcon getTopIcon(int metaID){ return this.textureTop[metaID % - * this.textureTop.length]; } - */ - } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 41ccecbbff..a9df5bf301 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -702,8 +702,6 @@ public enum GregtechItemList implements GregtechItemContainer { GT_Solar_MAX, // Variable voltage RF convertor - Energy_Buffer_RF_Convertor, - // Energy Buffers Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, Energy_Buffer_1by1_MV, 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 faeae0ba5a..47101dad12 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 @@ -1,7 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; @@ -21,10 +20,6 @@ public class TexturesGtBlock { private static AutoMap<Runnable> mCustomiconMap = new AutoMap<>(); - static {} - - // public static ITexture[] CASING_BLOCKS_GTPP = new ITexture[256]; - /* * Handles Custom Textures. */ @@ -69,51 +64,11 @@ public class TexturesGtBlock { } } - public static class VanillaIcon implements IIconContainer, Runnable { - - protected IIcon mIcon; - protected String mIconName; - - public VanillaIcon(final String aIconName) { - this.mIconName = aIconName; - mCustomiconMap.put(this); - Logger.WARNING("Constructing a Custom Texture. " + this.mIconName); - GregTech_API.sGTBlockIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return null; - } - - @Override - public void run() { - this.mIcon = GregTech_API.sBlockIcons.registerIcon(Minecraft.ID + ":" + this.mIconName); - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationBlocksTexture; - } - } - - public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aRGB) { - return new GT_RenderedTexture(aIcon, aRGB); - } - /* * Add Some Custom Textures below. I am not sure whether or not I need to declare them as such, but better to be * safe than sorry. Right? */ - // Vanilla Textures - public static final VanillaIcon VanillaIcon_OakPlanks = new VanillaIcon("planks_oak"); - // PlaceHolder Texture private static final CustomIcon Internal_PlaceHolder = new CustomIcon("TileEntities/_PlaceHolder"); public static final CustomIcon _PlaceHolder = Internal_PlaceHolder; @@ -121,14 +76,6 @@ public class TexturesGtBlock { public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER = new CustomIcon( "iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER"); - // Controllers - private static final CustomIcon Internal_Casing_Fusion_Simple_Front = new CustomIcon( - "TileEntities/MACHINE_CASING_FUSION_FRONT"); - public static final CustomIcon Casing_Fusion_Simple_Front = Internal_Casing_Fusion_Simple_Front; - private static final CustomIcon Internal_Casing_Fusion_Simple_Front_Active = new CustomIcon( - "TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE"); - public static final CustomIcon Casing_Fusion_Simple_Front_Active = Internal_Casing_Fusion_Simple_Front_Active; - // Machine Casings // Simple private static final CustomIcon Internal_Casing_Machine_Simple_Top = new CustomIcon("TileEntities/machine_top"); @@ -145,9 +92,6 @@ public class TexturesGtBlock { private static final CustomIcon Internal_Casing_Machine_Dimensional = new CustomIcon( "TileEntities/adv_machine_dimensional"); public static final CustomIcon Casing_Machine_Dimensional = Internal_Casing_Machine_Dimensional; - private static final CustomIcon Internal_Casing_Machine_Dimensional_Adv = new CustomIcon( - "TileEntities/high_adv_machine_dimensional"); - public static final CustomIcon Casing_Machine_Dimensional_Adv = Internal_Casing_Machine_Dimensional_Adv; // Material Casings private static final CustomIcon Internal_Casing_Tantalloy61 = new CustomIcon( @@ -179,15 +123,6 @@ public class TexturesGtBlock { private static final CustomIcon Internal_Casing_RedSteel = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_RED_STEEL"); public static final CustomIcon Casing_Material_RedSteel = Internal_Casing_RedSteel; - private static final CustomIcon Internal_Casing_Incoloy020 = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_INCOLOY_020"); - public static final CustomIcon Casing_Material_Incoloy020 = Internal_Casing_Incoloy020; - private static final CustomIcon Internal_Casing_IncoloyDS = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS"); - public static final CustomIcon Casing_Material_IncoloyDS = Internal_Casing_IncoloyDS; - private static final CustomIcon Internal_Casing_IncoloyMA956 = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956"); - public static final CustomIcon Casing_Material_IncoloyMA956 = Internal_Casing_IncoloyMA956; private static final CustomIcon Internal_Casing_ZirconiumCarbide = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE"); public static final CustomIcon Casing_Material_ZirconiumCarbide = Internal_Casing_ZirconiumCarbide; @@ -208,12 +143,8 @@ public class TexturesGtBlock { // Trinium Alloys public static final CustomIcon Casing_Trinium_Titanium = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM"); - public static final CustomIcon Casing_Trinium_Naquadah = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH"); public static final CustomIcon Casing_Trinium_Naquadah_Vent = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT"); - public static final CustomIcon Casing_Trinium_Naquadah_Carbon = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON"); // Material Machine/Firebox Casings private static final CustomIcon Internal_Casing_Staballoy_Firebox = new CustomIcon( @@ -253,7 +184,7 @@ public class TexturesGtBlock { // Quantum Force Transformer Casing // spotless:off - private static final CustomIcon Internal_Casing_QFT = mAnimated ? new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL") : new CustomIcon("TileEntites/MACHINE_CASING_QFT_COIL"); + private static final CustomIcon Internal_Casing_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL"); public static final CustomIcon Casing_Coil_QFT = Internal_Casing_QFT; public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon("NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic"); public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon("CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic"); @@ -284,41 +215,17 @@ public class TexturesGtBlock { // Structural Blocks private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A = new CustomIcon("chrono/MetalGrate"); public static final CustomIcon Casing_Machine_Metal_Grate_A = Internal_Casing_Machine_Metal_Grate_A; - private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A_Solid = new CustomIcon( - "chrono/MetalGrateA_Solid"); - public static final CustomIcon Casing_Machine_Metal_Grate_A_Solid = Internal_Casing_Machine_Metal_Grate_A_Solid; - private static final CustomIcon Internal_Casing_Machine_Metal_Grate_B = new CustomIcon("chrono/MetalGrate2"); - public static final CustomIcon Casing_Machine_Metal_Grate_B = Internal_Casing_Machine_Metal_Grate_B; + private static final CustomIcon Internal_Casing_Machine_Metal_Panel_A = new CustomIcon("chrono/MetalPanel"); public static final CustomIcon Casing_Machine_Metal_Panel_A = Internal_Casing_Machine_Metal_Panel_A; private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_A = new CustomIcon("chrono/MetalSheet"); public static final CustomIcon Casing_Machine_Metal_Sheet_A = Internal_Casing_Machine_Metal_Sheet_A; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_B = new CustomIcon("chrono/MetalSheet2"); - public static final CustomIcon Casing_Machine_Metal_Sheet_B = Internal_Casing_Machine_Metal_Sheet_B; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_C = new CustomIcon("chrono/MetalSheet3"); - public static final CustomIcon Casing_Machine_Metal_Sheet_C = Internal_Casing_Machine_Metal_Sheet_C; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_D = new CustomIcon("chrono/MetalSheet4"); - public static final CustomIcon Casing_Machine_Metal_Sheet_D = Internal_Casing_Machine_Metal_Sheet_D; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_E = new CustomIcon("chrono/MetalSheet5"); - public static final CustomIcon Casing_Machine_Metal_Sheet_E = Internal_Casing_Machine_Metal_Sheet_E; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_F = new CustomIcon("chrono/MetalSheet6"); - public static final CustomIcon Casing_Machine_Metal_Sheet_F = Internal_Casing_Machine_Metal_Sheet_F; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_G = new CustomIcon("chrono/MetalSheet7"); - public static final CustomIcon Casing_Machine_Metal_Sheet_G = Internal_Casing_Machine_Metal_Sheet_G; private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_H = new CustomIcon("chrono/MetalSheet8"); public static final CustomIcon Casing_Machine_Metal_Sheet_H = Internal_Casing_Machine_Metal_Sheet_H; private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_I = new CustomIcon("chrono/MetalSheet9"); public static final CustomIcon Casing_Machine_Metal_Sheet_I = Internal_Casing_Machine_Metal_Sheet_I; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_J = new CustomIcon("chrono/MetalSheet10"); - public static final CustomIcon Casing_Machine_Metal_Sheet_J = Internal_Casing_Machine_Metal_Sheet_J; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_K = new CustomIcon("chrono/MetalSheet11"); - public static final CustomIcon Casing_Machine_Metal_Sheet_K = Internal_Casing_Machine_Metal_Sheet_K; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_L = new CustomIcon("chrono/MetalSheet12"); - public static final CustomIcon Casing_Machine_Metal_Sheet_L = Internal_Casing_Machine_Metal_Sheet_L; private static final CustomIcon Internal_Overlay_Machine_Cyber_A = new CustomIcon("chrono/CyberPanel"); public static final CustomIcon Overlay_Machine_Cyber_A = Internal_Overlay_Machine_Cyber_A; - private static final CustomIcon Internal_Overlay_Machine_Cyber_B = new CustomIcon("chrono/CyberPanel2"); - public static final CustomIcon Overlay_Machine_Cyber_B = Internal_Overlay_Machine_Cyber_B; public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON"); public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon( @@ -388,18 +295,6 @@ public class TexturesGtBlock { public static final CustomIcon Overlay_Machine_Vent_Fast = Internal_Overlay_Machine_Vent_Fast; private static final CustomIcon Internal_Overlay_Machine_Vent_Adv = new CustomIcon( "TileEntities/adv_machine_vent_rotating"); - public static final CustomIcon Overlay_Machine_Vent_Adv = Internal_Overlay_Machine_Vent_Adv; - private static final CustomIcon Internal_Overlay_Machine_Turbine_Active = new CustomIcon( - "TileEntities/STEAM_TURBINE_SIDE_ACTIVE"); - public static final CustomIcon Overlay_Machine_Turbine_Active = Internal_Overlay_Machine_Turbine_Active; - // Grate Texture - public static final CustomIcon OVERLAY_GRATE_A = new CustomIcon("metro/OVERLAY_GRATE_A"); - // Speaker Texture - private static final CustomIcon Internal_Overlay_Machine_Sound = new CustomIcon("TileEntities/audio_out"); - public static final CustomIcon Overlay_Machine_Sound = Internal_Overlay_Machine_Sound; - private static final CustomIcon Internal_Overlay_Machine_Sound_Active = new CustomIcon( - "TileEntities/audio_out_active"); - public static final CustomIcon Overlay_Machine_Sound_Active = Internal_Overlay_Machine_Sound_Active; // Diesel Engines private static final CustomIcon Internal_Overlay_Machine_Diesel_Vertical = new CustomIcon( "TileEntities/machine_top_dieselmotor"); @@ -433,8 +328,6 @@ public class TexturesGtBlock { private static final CustomIcon Internal_Overlay_Machine_Screen_Logo = new CustomIcon( "TileEntities/adv_machine_screen_logo"); public static final CustomIcon Overlay_Machine_Screen_Logo = Internal_Overlay_Machine_Screen_Logo; - private static final CustomIcon Internal_Overlay_Machine_Cyber_Interface = new CustomIcon("chrono/Overlay_Cyber"); - public static final CustomIcon Overlay_Machine_Cyber_Interface = Internal_Overlay_Machine_Cyber_Interface; // Machine Controller Overlays private static final CustomIcon Internal_Overlay_Machine_Controller_Default = new CustomIcon( @@ -452,73 +345,12 @@ public class TexturesGtBlock { public static final CustomIcon Overlay_Machine_Controller_Advanced_Active = Internal_Overlay_Machine_Controller_Advanced_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"); - - public static final CustomIcon Casing_Workbench_Crafting_Overlay = new CustomIcon( - "TileEntities/gt4/bronze_top_crafting"); - public static final CustomIcon Casing_Workbench_Top = new CustomIcon("TileEntities/gt4/bronze_top"); - public static final CustomIcon Casing_Workbench_Side = new CustomIcon("TileEntities/gt4/bronze_side"); - public static final CustomIcon Casing_Workbench_Bottom = new CustomIcon("TileEntities/gt4/bronze_bottom"); public static final CustomIcon Casing_Adv_Workbench_Crafting_Overlay = new CustomIcon( "TileEntities/gt4/machine_top_crafting"); - public static final CustomIcon Casing_Adv_Workbench_Top = new CustomIcon("TileEntities/gt4/machine_top"); - public static final CustomIcon Casing_Adv_Workbench_Side = new CustomIcon("TileEntities/gt4/machine_side"); - public static final CustomIcon Casing_Adv_Workbench_Bottom = new CustomIcon("TileEntities/gt4/machine_bottom"); - - public static final CustomIcon Casing_Redstone_Top_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_top_redstone_off"); - public static final CustomIcon Casing_Redstone_Top_Main_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_top_redstone_main_off"); - public static final CustomIcon Casing_Redstone_Top_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_top_redstone_on"); - public static final CustomIcon Casing_Redstone_Top_Main_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_top_redstone_main_on"); - - public static final CustomIcon Casing_Redstone_Side_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_side_redstone_off"); - public static final CustomIcon Casing_Redstone_Side_Main_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_side_redstone_main_off"); - public static final CustomIcon Casing_Redstone_Side_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_side_redstone_on"); - public static final CustomIcon Casing_Redstone_Side_Main_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_side_redstone_main_on"); - - public static final CustomIcon Casing_Redstone_Bottom_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_bottom_redstone_off"); - public static final CustomIcon Casing_Redstone_Bottom_Main_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_bottom_redstone_main_off"); - public static final CustomIcon Casing_Redstone_Bottom_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_bottom_redstone_on"); - public static final CustomIcon Casing_Redstone_Bottom_Main_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_bottom_redstone_main_on"); - - public static final CustomIcon Casing_Electric_Auto_Workbench_Side = new CustomIcon( - "TileEntities/gt4/OVERLAY_SIDE_CABINET"); public static final CustomIcon Casing_CropHarvester_Cutter = new CustomIcon("TileEntities/gt4/OVERLAY_CROP"); public static final CustomIcon Casing_CropHarvester_Boxes = new CustomIcon("TileEntities/gt4/OVERLAY_BOXES"); - public static final CustomIcon Casing_InventoryManagaer_Cyan = new CustomIcon("TileEntities/gt4/OVERLAY_CYAN"); - public static final CustomIcon Casing_InventoryManagaer_Green = new CustomIcon("TileEntities/gt4/OVERLAY_GREEN"); - public static final CustomIcon Casing_InventoryManagaer_Purple = new CustomIcon("TileEntities/gt4/OVERLAY_PURPLE"); - public static final CustomIcon Casing_InventoryManagaer_Red = new CustomIcon("TileEntities/gt4/OVERLAY_RED"); - public static final CustomIcon Casing_InventoryManagaer_Yellow = new CustomIcon("TileEntities/gt4/OVERLAY_YELLOW"); - public static final CustomIcon Casing_InventoryManagaer_Blue = new CustomIcon("TileEntities/gt4/OVERLAY_BLUE"); - - public static final CustomIcon Casing_InventoryManagaer_Cyan_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_CYAN_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Green_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_GREEN_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Purple_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_PURPLE_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Red_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_RED_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Yellow_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_YELLOW_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Blue_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_BLUE_REDSTONE"); - // 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; @@ -533,10 +365,6 @@ public class TexturesGtBlock { // Advanced Muffler private static final CustomIcon Internal_Overlay_Hatch_Muffler_Adv = new CustomIcon("iconsets/OVERLAY_MUFFLER_ADV"); public static final CustomIcon Overlay_Hatch_Muffler_Adv = Internal_Overlay_Hatch_Muffler_Adv; - // Control Core Bus - private static final CustomIcon Internal_Overlay_Hatch_Control_Core = new CustomIcon( - "iconsets/OVERLAY_CONTROL_CORE_BUS"); - public static final CustomIcon Overlay_Hatch_Control_Core = Internal_Overlay_Hatch_Control_Core; // Milling Ball Bus private static final CustomIcon Internal_Overlay_Bus_Milling_Balls = new CustomIcon( "iconsets/OVERLAY_MILLING_BALL_BUS"); @@ -545,28 +373,10 @@ public class TexturesGtBlock { private static final CustomIcon Internal_Overlay_Bus_Catalyst = new CustomIcon("iconsets/OVERLAY_CATALYSTS"); public static final CustomIcon Overlay_Bus_Catalyst = Internal_Overlay_Bus_Catalyst; - public static final CustomIcon Overlay_Cobble = new CustomIcon("iconsets/OVERLAY_COBBLE"); - public static final CustomIcon Overlay_Connector = new CustomIcon("iconsets/OVERLAY_CONNECTOR"); - public static final CustomIcon Overlay_Fire = new CustomIcon("iconsets/OVERLAY_FIRE"); - public static final CustomIcon Overlay_Grinder = new CustomIcon("iconsets/OVERLAY_GRINDER"); - public static final CustomIcon Overlay_GT_Logo = new CustomIcon("iconsets/OVERLAY_GT"); - public static final CustomIcon Overlay_Ice = new CustomIcon("iconsets/OVERLAY_ICE"); - public static final CustomIcon Overlay_Implosion = new CustomIcon("iconsets/OVERLAY_IMPLOSION"); - // Lapo Orb Hatch - public static final CustomIcon Overlay_Hatch_Lapo_Orb = new CustomIcon("iconsets/OVERLAY_LAPO"); // Data Orb Hatch public static final CustomIcon Overlay_Hatch_Data_Orb = new CustomIcon("iconsets/OVERLAY_DATA_ORB"); - // RTG Hatch - private static final CustomIcon Internal_Overlay_Hatch_RTG_Off = new CustomIcon("iconsets/OVERLAY_ENERGY_RTG_OFF"); - public static final CustomIcon Overlay_Hatch_RTG_Off = Internal_Overlay_Hatch_RTG_Off; - private static final CustomIcon Internal_Overlay_Hatch_RTG_On = new CustomIcon("iconsets/OVERLAY_ENERGY_RTG_ON"); - public static final CustomIcon Overlay_Hatch_RTG_On = Internal_Overlay_Hatch_RTG_On; - // Dimensional - private static final CustomIcon Internal_Overlay_Machine_Dimensional_Blue = new CustomIcon( - "TileEntities/adv_machine_dimensional_cover_blue"); - public static final CustomIcon Overlay_Machine_Dimensional_Blue = Internal_Overlay_Machine_Dimensional_Blue; private static final CustomIcon Internal_Overlay_Machine_Dimensional_Orange = new CustomIcon( "TileEntities/adv_machine_dimensional_cover_orange"); public static final CustomIcon Overlay_Machine_Dimensional_Orange = Internal_Overlay_Machine_Dimensional_Orange; @@ -584,8 +394,6 @@ public class TexturesGtBlock { "TileEntities/adv_machine_matterfab_active_animated"); public static final CustomIcon Overlay_MatterFab_Active_Animated = Internal_Overlay_MatterFab_Active_Animated; - private static final CustomIcon Internal_Overlay_Oil = new CustomIcon("TileEntities/adv_machine_oil"); - public static final CustomIcon Overlay_Oil = Internal_Overlay_Oil; private static final CustomIcon Internal_Overlay_Water = new CustomIcon("TileEntities/adv_machine_water"); public static final CustomIcon Overlay_Water = Internal_Overlay_Water; private static final CustomIcon Internal_Overlay_UU_Matter = new CustomIcon("TileEntities/adv_machine_uum"); @@ -608,28 +416,16 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_METAL_PANEL_B = new CustomIcon("metro/TEXTURE_METAL_PANEL_B"); public static final CustomIcon TEXTURE_METAL_PANEL_C = new CustomIcon("metro/TEXTURE_METAL_PANEL_C"); public static final CustomIcon TEXTURE_METAL_PANEL_D = new CustomIcon("metro/TEXTURE_METAL_PANEL_D"); - public static final CustomIcon TEXTURE_METAL_PANEL_E = new CustomIcon("metro/TEXTURE_METAL_PANEL_E"); public static final CustomIcon TEXTURE_METAL_PANEL_F = new CustomIcon("metro/TEXTURE_METAL_PANEL_F"); - public static final CustomIcon TEXTURE_METAL_PANEL_G = new CustomIcon("metro/TEXTURE_METAL_PANEL_G"); - public static final CustomIcon TEXTURE_METAL_PANEL_H = new CustomIcon("metro/TEXTURE_METAL_PANEL_H"); - public static final CustomIcon TEXTURE_METAL_PANEL_I = new CustomIcon("metro/TEXTURE_METAL_PANEL_I"); public static final CustomIcon TEXTURE_MAGIC_PANEL_A = new CustomIcon("metro/TEXTURE_MAGIC_A"); public static final CustomIcon TEXTURE_MAGIC_PANEL_B = new CustomIcon("metro/TEXTURE_MAGIC_B"); - public static final CustomIcon TEXTURE_ORGANIC_PANEL_A = new CustomIcon("metro/TEXTURE_ORGANIC_PANEL_A"); public static final CustomIcon TEXTURE_ORGANIC_PANEL_A_GLOWING = new CustomIcon( "metro/TEXTURE_ORGANIC_PANEL_A_GLOWING"); - public static final CustomIcon TEXTURE_STONE_BIRD_A = new CustomIcon("metro/TEXTURE_STONE_BIRD_A"); - public static final CustomIcon TEXTURE_STONE_BIRD_A_LEFT = new CustomIcon("metro/TEXTURE_STONE_BIRD_A_LEFT"); - public static final CustomIcon TEXTURE_STONE_BIRD_A_RIGHT = new CustomIcon("metro/TEXTURE_STONE_BIRD_A_RIGHT"); public static final CustomIcon TEXTURE_STONE_RED_A = new CustomIcon("metro/TEXTURE_STONE_RED_A"); public static final CustomIcon TEXTURE_STONE_RED_B = new CustomIcon("metro/TEXTURE_STONE_RED_B"); - public static final CustomIcon TEXTURE_STONE_BLUE_A = new CustomIcon("metro/TEXTURE_STONE_BLUE_A"); - public static final CustomIcon TEXTURE_STONE_GREEN_A = new CustomIcon("metro/TEXTURE_STONE_GREEN_A"); - public static final CustomIcon TEXTURE_STONE_TABLET_A = new CustomIcon("metro/TEXTURE_STONE_TABLET_A"); - public static final CustomIcon TEXTURE_STONE_TABLET_B = new CustomIcon("metro/TEXTURE_STONE_TABLET_B"); public static final CustomIcon OVERLAY_SC_TURBINE1 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL1"); public static final CustomIcon OVERLAY_SC_TURBINE2 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL2"); @@ -654,34 +450,20 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_TECH_B = new CustomIcon("metro/TEXTURE_TECH_B"); public static final CustomIcon TEXTURE_TECH_C = new CustomIcon("metro/TEXTURE_TECH_C"); - public static final CustomIcon TEXTURE_TECH_PANEL_A = new CustomIcon("metro/TEXTURE_TECH_PANEL_A"); - public static final CustomIcon TEXTURE_TECH_PANEL_B = new CustomIcon("metro/TEXTURE_TECH_PANEL_B"); - public static final CustomIcon TEXTURE_TECH_PANEL_C = new CustomIcon("metro/TEXTURE_TECH_PANEL_C"); public static final CustomIcon TEXTURE_TECH_PANEL_D = new CustomIcon("metro/TEXTURE_TECH_PANEL_D"); - public static final CustomIcon TEXTURE_TECH_PANEL_E = new CustomIcon("metro/TEXTURE_TECH_PANEL_E"); - public static final CustomIcon TEXTURE_TECH_PANEL_F = new CustomIcon("metro/TEXTURE_TECH_PANEL_F"); - public static final CustomIcon TEXTURE_TECH_PANEL_G = new CustomIcon("metro/TEXTURE_TECH_PANEL_G"); public static final CustomIcon TEXTURE_TECH_PANEL_H = new CustomIcon("metro/TEXTURE_TECH_PANEL_H"); - public static final CustomIcon TEXTURE_TECH_PANEL_I = new CustomIcon("metro/TEXTURE_TECH_PANEL_I"); - - public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE = new CustomIcon( - "TileEntities/DecayablesChest_bottom"); - public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE_ALT = new CustomIcon( - "TileEntities/DecayablesChest_top"); 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 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 100, 0, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 255, 30, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 128, 128, 128, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture( - (IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, - new short[] { 240, 240, 245, 0 }) }; + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 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, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java index 7400bb987c..a9f74cd75d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java @@ -14,8 +14,6 @@ public final class TexturesGtTools { public static final CustomIcon ANGLE_GRINDER = new CustomIcon("iconsets/ANGLE_GRINDER"); public static final CustomIcon ELECTRIC_SNIPS = new CustomIcon("iconsets/ELECTRIC_SNIPS"); - public static final CustomIcon ELECTRIC_LIGHTER = new CustomIcon("iconsets/ELECTRIC_LIGHTER"); - public static final CustomIcon ELECTRIC_BUTCHER_KNIFE = new CustomIcon("iconsets/ELECTRIC_BUTCHER_KNIFE"); public static final class CustomIcon implements IIconContainer, Runnable { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index defa3d558b..204e05394d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -15,10 +15,7 @@ import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow; @@ -38,8 +35,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { public void generateMetaItems() { int tLastID = 0; - registerCustomCircuits(); - // Extruder Shape GregtechItemList.Shape_Extruder_WindmillShaft .set(this.addItem(40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts")); @@ -158,7 +153,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), getTcAspectStack(TC_Aspects.METALLUM, 8L), getTcAspectStack(TC_Aspects.POTENTIA, 8L))); - this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, true); + this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, false); GregtechItemList.Cover_Overflow_LV.set( this.addItem( @@ -297,50 +292,4 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { .set(this.addItem(152, "Maceration Upgrade Chip", "Used to upgrade Maceration Stack to Tier 2")); } - public void registerCustomCircuits() { - if (CORE.ConfigSwitches.enableCustomCircuits) { - GregtechItemList.Circuit_IV.set( - this.addItem( - 704, - "Symbiotic Circuit (IV)", - "A Symbiotic Data Processor", - GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic))); - GregtechItemList.Circuit_LuV.set( - this.addItem( - 705, - "Neutronic Circuit (LuV)", - "A Neutron Particle Processor", - GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic))); - GregtechItemList.Circuit_ZPM.set( - this.addItem( - 706, - "Quantum Circuit (ZPM)", - "A Singlularity Processor", - GregtechOrePrefixes.circuit.get(GT_Materials.Quantum))); - GregtechItemList.Circuit_Board_IV - .set(this.addItem(710, "IV Circuit Board", "An IV Voltage Rated Circuit Board")); - GregtechItemList.Circuit_Board_LuV - .set(this.addItem(711, "LuV Circuit Board", "An LuV Voltage Rated Circuit Board")); - GregtechItemList.Circuit_Board_ZPM - .set(this.addItem(712, "ZPM Processor Board", "A ZPM Voltage Rated Processor Board")); - GregtechItemList.Circuit_Parts_Crystal_Chip_IV - .set(this.addItem(713, "(IV) Energized Crystal Chip", "Needed for Circuits")); - GregtechItemList.Circuit_Parts_Crystal_Chip_LuV - .set(this.addItem(714, "(LuV) Neutron based Microchip", "Needed for Circuits")); - GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM - .set(this.addItem(715, "(ZPM) Quantum Chip", "Needed for Circuits")); - GregtechItemList.Circuit_Parts_IV.set(this.addItem(716, "(IV) Energized Circuit Parts", "Circuit Parts")); - GregtechItemList.Circuit_Parts_LuV - .set(this.addItem(717, "(LuV) Neutron-based Circuit Parts", "Circuit Parts")); - GregtechItemList.Circuit_Parts_ZPM.set(this.addItem(718, "(ZPM) Quantum Circuit Parts", "Circuit Parts")); - GregtechItemList.Circuit_Parts_Wiring_IV - .set(this.addItem(719, "Etched IV Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Circuit_Parts_Wiring_LuV - .set(this.addItem(720, "Etched LuV Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Circuit_Parts_Wiring_ZPM - .set(this.addItem(721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards")); - ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_IV.get(1), "circuitSuperconductor"); - ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_LuV.get(1), "circuitInfinite"); - } - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java deleted file mode 100644 index 7230008645..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java +++ /dev/null @@ -1,347 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.generators; - -import static gregtech.api.enums.GT_Values.V; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; - -import cofh.api.energy.IEnergyProvider; -import cofh.api.energy.IEnergyReceiver; -import cofh.api.energy.IEnergyStorage; -import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.enderio.machine.capbank.network.ICapBankNetwork; -import crazypants.enderio.power.IPowerContainer; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer; - -/** - * NEVER INCLUDE THIS FILE IN YOUR MOD!!! - * - * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple - * Machine - */ -public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer implements IEnergyReceiver { - - public GT_MetaTileEntity_RfConvertor(final String aName, final int aTier, final String aDescription, - final ITexture[][][] aTextures, final int aSlotCount) { - super(aName, aTier, aDescription, aTextures, aSlotCount); - } - - public GT_MetaTileEntity_RfConvertor(final int aID, final String aName, final String aNameRegional, final int aTier, - final String aDescription, final int aSlotCount) { - super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount); - } - - @Override - public String[] getDescription() { - return new String[] { "Use Screwdriver to change voltage", - "Hold Shift while using Screwdriver to change amperage", - EnumChatFormatting.DARK_AQUA + "Variable Output Voltage", CORE.GT_Tooltip.get() }; - } - - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[12][17][]; - GT_RenderedTexture aTex = new GT_RenderedTexture(TexturesGtBlock.Casing_Material_ZirconiumCarbide); - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; - rTextures[1][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; - rTextures[2][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; - rTextures[3][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; - rTextures[4][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; - rTextures[5][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; - rTextures[6][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] }; - rTextures[7][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] }; - rTextures[8][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] }; - rTextures[9][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; - rTextures[10][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; - rTextures[11][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; - } - return rTextures; - } - - @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { - return mTextures[Math.min(2, side.ordinal()) + (side == facing ? 3 : 0) + (aActive ? 0 : 6)][aColorIndex + 1]; - } - - @Override - public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RfConvertor( - this.mName, - this.mTier, - this.mDescription, - this.mTextures, - this.mInventory.length); - } - - @Override - public long getMinimumStoredEU() { - return 0; - } - - @Override - public long maxEUStore() { - return Integer.MAX_VALUE; - } - - @Override - public long maxEUInput() { - return 0; - } - - @Override - public long maxEUOutput() { - return V[this.mTier]; - } - - @Override - public long maxAmperesIn() { - return 0; - } - - @Override - public boolean isEnetInput() { - return false; - } - - @Override - public boolean isEnetOutput() { - return true; - } - - @Override - public boolean isInputFacing(ForgeDirection side) { - return !isOutputFacing(side); - } - - @Override - public boolean isOutputFacing(ForgeDirection side) { - return side == getBaseMetaTileEntity().getFrontFacing(); - } - - @Override - public boolean isAccessAllowed(final EntityPlayer aPlayer) { - return true; - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - if (aBaseMetaTileEntity.isServerSide()) { - if (!aBaseMetaTileEntity.isActive()) { - aBaseMetaTileEntity.setActive(true); - } - if (this.getEUVar() < this.maxEUStore()) { - for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - if (aBaseMetaTileEntity.getStoredEU() >= aBaseMetaTileEntity.getEUCapacity()) break; - if (isInputFacing(side)) { - receiveEnergy(side, Integer.MAX_VALUE, false); - } - } - } - return; - } - } - - @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public String[] getInfoData() { - String[] infoData = super.getInfoData(); - return new String[] { infoData[0], "Converts RF -> GTEU | Tier: " + this.mTier, infoData[1], infoData[2] }; - } - - @Override - public boolean isGivingInformation() { - return true; - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - aNBT.setByte("mTier", this.mTier); - super.saveNBTData(aNBT); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - this.mTier = aNBT.getByte("mTier"); - } - - @Override - public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (aPlayer.isSneaking()) { - byte aTest = (byte) (aCurrentOutputAmperage + 1); - if (aTest > 16 || aTest <= 0) { - aTest = 1; - } - aCurrentOutputAmperage = aTest; - PlayerUtils.messagePlayer(aPlayer, "Now handling " + maxAmperesOut() + " Amps."); - } else { - if (this.mTier < GT_Values.V.length) { - this.mTier++; - } else { - this.mTier = 0; - } - PlayerUtils.messagePlayer(aPlayer, "Now running at " + GT_Values.VOLTAGE_NAMES[this.mTier] + "."); - } - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - if (isOutputFacing(from)) { - return false; - } - return true; - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - - // Cannot accept power on the output face. - if (!canConnectEnergy(from) || isOutputFacing(from)) { - return 0; - } - - TileEntity tTileEntity = this.getBaseMetaTileEntity().getTileEntityAtSide(from); - if (tTileEntity == null) { - return 0; - } - - Logger.WARNING("Someone is trying to inject RF from " + from + ". Type:" + tTileEntity.getClass().getName()); - - // Calculate maximum RF we need to consume - int aInputRF = MathUtils.safeInt(this.maxEUOutput() * GregTech_API.mEUtoRF / 100); - - // Make sure we only consume the correct amount of RF that is pushed into this Tile. - if (aInputRF > maxReceive) { - aInputRF = maxReceive; - } - - int aInjectedRF = 0; - boolean aVal = false; - - long aStoredEU = this.getEUVar(); - long aMaxEU = this.maxEUStore(); - Logger.WARNING("Stored: " + aStoredEU + ", Capacity: " + aMaxEU + ""); - if (aStoredEU < aMaxEU) { - Logger.WARNING("StoredEU < MaxEU"); - long aRemainingSpace = aMaxEU - aStoredEU; - if (aRemainingSpace > 0) { - long tEU = 0; - final ForgeDirection toSide = from.getOpposite(); - byte aSide = (byte) from.ordinal(); - Logger.WARNING("Free: " + aRemainingSpace + "EU"); - if (tTileEntity instanceof IEnergyProvider - && ((IEnergyProvider) tTileEntity).extractEnergy(toSide, 1, true) == 1) { - tEU = (long) ((IEnergyProvider) tTileEntity) - .extractEnergy(toSide, (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU, false); - Logger.WARNING("Drained from IEnergyProvider Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + ""); - tEU = tEU * GregTech_API.mRFtoEU / 100; - } else if (tTileEntity instanceof IEnergyStorage - && ((IEnergyStorage) tTileEntity).extractEnergy(1, true) == 1) { - tEU = (long) ((IEnergyStorage) tTileEntity) - .extractEnergy((int) maxEUOutput() * 100 / GregTech_API.mRFtoEU, false); - Logger.WARNING( - "Drained from IEnergyStorage Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + ""); - tEU = tEU * GregTech_API.mRFtoEU / 100; - } else - if (GregTech_API.meIOLoaded && tTileEntity instanceof IPowerContainer - && ((IPowerContainer) tTileEntity).getEnergyStored() > 0) { - int storedRF = ((IPowerContainer) tTileEntity).getEnergyStored(); - int extractRF = (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU; - tEU = 0; - if (tTileEntity instanceof TileCapBank) { - ICapBankNetwork network = ((TileCapBank) tTileEntity).getNetwork(); - if (network != null && network.getEnergyStoredL() > 0) { - tEU = Math.min( - (Math.min( - Math.min(network.getEnergyStoredL(), storedRF - extractRF), - network.getMaxOutput())) * GregTech_API.mRFtoEU / 100, - maxEUOutput()); - Logger.WARNING( - "Drained from EIO CapBank Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) - + ""); - network.addEnergy((int) -(tEU * 100 / GregTech_API.mRFtoEU)); - } - } else { - if (storedRF > extractRF) { - ((IPowerContainer) tTileEntity).setEnergyStored(storedRF - extractRF); - tEU = maxEUOutput(); - Logger.WARNING( - "Drained from EIO Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + ""); - } else { - ((IPowerContainer) tTileEntity).setEnergyStored(0); - tEU = storedRF * GregTech_API.mRFtoEU / 100; - Logger.WARNING( - "Drained from EIO Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + ""); - } - } - } - Logger.WARNING("EU to inject: " + tEU + "EU"); - if (!simulate) { - aVal = this.getBaseMetaTileEntity().increaseStoredEnergyUnits(tEU, true); - } - if (tEU > 0) { - Logger.WARNING("Tried injecting " + tEU + " eu into self. Success? " + aVal); - } - } - } - return aInjectedRF; - } - - @Override - public int getEnergyStored(ForgeDirection from) { - long aStoredEU = this.getEUVar(); - long aMaxEU = this.maxEUStore(); - if (aStoredEU == 0) { - return 0; - } - if (aStoredEU < aMaxEU) { - long aRemainingSpace = aMaxEU - aStoredEU; - if (aRemainingSpace > 0) { - if (aRemainingSpace > (this.maxEUOutput() / (GregTech_API.mEUtoRF / 100))) { - int aCalculatedFreeSpace = 0; - int aRfPer10Eu = GregTech_API.mEUtoRF / 10; - // Calculate how many lots of '10 - aCalculatedFreeSpace = (int) Math.floor(aRemainingSpace / 10); - // Return value equal to how many lots of '10eu' packets we can fit in. - return Integer.MAX_VALUE - - MathUtils.balance(aCalculatedFreeSpace * aRfPer10Eu, 0, Integer.MAX_VALUE); - } - } - } - return Integer.MAX_VALUE; - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return Integer.MAX_VALUE; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java deleted file mode 100644 index 440fb72789..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java +++ /dev/null @@ -1,262 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.generators; - -import static gregtech.api.enums.GT_Values.V; - -import net.minecraftforge.common.util.ForgeDirection; - -import org.apache.commons.lang3.ArrayUtils; - -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.common.widget.ProgressBar; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.SteamVariant; -import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.gui.modularui.GUITextureSet; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaSolarGenerator; - -public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGenerator { - - public GregtechMetaTileEntitySolarGenerator(final int aID, final String aName, final String aNameRegional, - final int aTier) { - super(aID, aName, aNameRegional, aTier, "Feasts on the power of the Sun!", new ITexture[0]); - this.onConfigLoad(); - } - - public GregtechMetaTileEntitySolarGenerator(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - this.onConfigLoad(); - } - - @Override - public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", - CORE.GT_Tooltip.get()); - } - - @Override - public boolean isOutputFacing(final ForgeDirection side) { - return side == this.getBaseMetaTileEntity().getFrontFacing(); - } - - @Override - public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntitySolarGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get( - ConfigCategories.machineconfig, - "SunAbsorber.efficiency.tier." + this.mTier, - 100 - (this.mTier * 10)); - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() - && (aBaseMetaTileEntity.getUniversalEnergyStored() - < (this.maxEUOutput() + aBaseMetaTileEntity.getEUCapacity()))) { - - if (this.mSolarCharge <= 20) { - // Utils.LOG_WARNING("1."); - this.mSolarCharge = 20; - this.mLossTimer = 0; - } - if (++this.mLossTimer > 45) { - // Utils.LOG_WARNING("2."); - this.mSolarCharge -= 1; - this.mLossTimer = 0; - } - - if ((aTick % 10L) == 0L) { - - Logger.WARNING( - "getUniversalEnergyStored: " + aBaseMetaTileEntity.getUniversalEnergyStored() - + " maxEUOutput * 20 + getMinimumStoredEU: " - + ((this.maxEUOutput() * 20) + this.getMinimumStoredEU())); - - if ((this.mSolarCharge > 100) && (aBaseMetaTileEntity.isAllowedToWork()) - && (!aBaseMetaTileEntity.getWorld().isThundering()) - && (aBaseMetaTileEntity.getUniversalEnergyStored() - < (this.maxEUStore() - this.getMinimumStoredEU()))) { - this.getBaseMetaTileEntity().increaseStoredEnergyUnits(sEnergyPerTick * this.getEfficiency(), true); - } - } - - if ((this.mSolarCharge < 500) && (this.mProcessingEnergy != 0) && ((aTick % 32L) == 0L)) { - Logger.WARNING("Adding Solar Charge. Currently " + this.mSolarCharge); - this.mProcessingEnergy -= 1; - this.mSolarCharge += 1; - } - - if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) - && ((aTick % 64L) == 0L) - && (!aBaseMetaTileEntity.getWorld().isThundering())) { - Logger.WARNING("Adding Processing Energy. Currently " + this.mProcessingEnergy); - final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() - && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F); - this.mProcessingEnergy += (bRain && (aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4)) - || !aBaseMetaTileEntity.getSkyAtSide(ForgeDirection.UP) ? 0 - : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1; - } - - if (aBaseMetaTileEntity.isServerSide()) { - // Utils.LOG_WARNING("6."); - aBaseMetaTileEntity.setActive( - aBaseMetaTileEntity.isAllowedToWork() && (aBaseMetaTileEntity.getUniversalEnergyStored() - >= (this.maxEUOutput() + this.getMinimumStoredEU()))); - } - } - } - - @Override - public void inValidate() {} - - @Override - public int getEfficiency() { - return this.mEfficiency; - } - - @Override - public long maxEUStore() { - return Math.max(this.getEUVar(), (V[this.mTier] * 16000) + this.getMinimumStoredEU()); - } - - ITexture SolarArray[] = { new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_MV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_HV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_EV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) }; - - @Override - public ITexture[] getFront(final byte aColor) { - return new ITexture[] { super.getFront(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT), - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; - } - - @Override - public ITexture[] getBack(final byte aColor) { - return new ITexture[] { super.getBack(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) }; - } - - @Override - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { super.getBottom(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) }; - } - - @Override - public ITexture[] getTop(final byte aColor) { - return new ITexture[] { super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) }; - } - - @Override - public ITexture[] getSides(final byte aColor) { - return new ITexture[] { super.getSides(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) }; - } - - @Override - public ITexture[] getFrontActive(final byte aColor) { - return new ITexture[] { super.getFrontActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE), - Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; - } - - @Override - public ITexture[] getBackActive(final byte aColor) { - return new ITexture[] { super.getBackActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) }; - } - - @Override - public ITexture[] getBottomActive(final byte aColor) { - return new ITexture[] { super.getBottomActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) }; - } - - @Override - public ITexture[] getTopActive(final byte aColor) { - return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) }; - } - - @Override - public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { super.getSidesActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) }; - } - - @Override - public SteamVariant getSteamVariant() { - return SteamVariant.BRONZE; - } - - @Override - public boolean useModularUI() { - return true; - } - - @Override - public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget( - new ProgressBar().setProgress(() -> (float) mProcessingEnergy / 1000) - .setTexture( - GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()), - GT_UITextures.PROGRESSBAR_BOILER_STEAM, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) getBaseMetaTileEntity().getStoredEU()) - .setTexture( - GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()), - GT_UITextures.PROGRESSBAR_BOILER_WATER, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mSolarCharge / maxProgresstime()) - .setTexture( - GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()), - GT_UITextures.PROGRESSBAR_BOILER_HEAT, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mProcessingEnergy / 1000) - .setTexture(GT_UITextures.PROGRESSBAR_FUEL_STEAM.get(getSteamVariant()), 14) - .setDirection(ProgressBar.Direction.UP).setPos(116, 45).setSize(14, 14)); - } - - @Override - public GUITextureSet getGUITextureSet() { - return new GUITextureSet().setMainBackground(GT_UITextures.BACKGROUND_STEAM.get(getSteamVariant())) - .setItemSlot(GT_UITextures.SLOT_ITEM_STEAM.get(getSteamVariant())) - .setCoverTab( - GT_UITextures.TAB_COVER_STEAM_NORMAL.get(getSteamVariant()), - GT_UITextures.TAB_COVER_STEAM_HIGHLIGHT.get(getSteamVariant()), - GT_UITextures.TAB_COVER_STEAM_DISABLED.get(getSteamVariant())) - .setTitleTab( - GT_UITextures.TAB_TITLE_STEAM.getAdaptable(getSteamVariant()), - GT_UITextures.TAB_TITLE_DARK_STEAM.getAdaptable(getSteamVariant()), - GT_UITextures.TAB_TITLE_ANGULAR_STEAM.getAdaptable(getSteamVariant())) - .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM.get(getSteamVariant())); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java index 5447f71848..ae6304a0c8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java @@ -58,20 +58,6 @@ public class RecipeGen_FluidCanning implements Runnable { return isValid; } - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid) { - this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, null, null); - } - - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, - FluidStack aFluidOut) { - this(aExtracting, aEmpty, aFull, aFluidIn, aFluidOut, null, null); - } - - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid, - Integer aDuration, Integer aEUt) { - this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, aDuration, aEUt); - } - // Alternative Constructor public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, FluidStack aFluidOut, Integer aDuration, Integer aEUt) { @@ -163,7 +149,6 @@ public class RecipeGen_FluidCanning implements Runnable { private void generateRecipes() { if (isValid && recipe != null) { - // Logger.INFO("Processing "+(disableOptional ? "Extracting" : "Canning")+" Recipe."); if (this.disableOptional) { addFluidExtractionRecipe(recipe); } else { @@ -172,8 +157,7 @@ public class RecipeGen_FluidCanning implements Runnable { } } - private boolean addFluidExtractionRecipe(GT_Recipe aRecipe) { - boolean result = false; + private void addFluidExtractionRecipe(GT_Recipe aRecipe) { CORE.crash(); Logger.INFO( "[FE-Debug] " + aRecipe.mFluidOutputs[0].amount @@ -189,13 +173,7 @@ public class RecipeGen_FluidCanning implements Runnable { int aCount2 = aCount1; RecipeMaps.fluidExtractionRecipes.addRecipe(aRecipe); aCount1 = getMapSize(RecipeMaps.fluidExtractionRecipes); - result = aCount1 > aCount2; - if (result) { - // Logger.INFO("[FIND] Added Extraction recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); - } else { + if (aCount1 <= aCount2) { Logger.INFO( "[ERROR] Failed adding Extraction recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) + ", " @@ -206,22 +184,15 @@ public class RecipeGen_FluidCanning implements Runnable { + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); dumpStack(); } - return result; } - private boolean addFluidCannerRecipe(GT_Recipe aRecipe) { - boolean result = false; + private void addFluidCannerRecipe(GT_Recipe aRecipe) { + boolean result; int aCount1 = getMapSize(RecipeMaps.fluidCannerRecipes); int aCount2 = aCount1; RecipeMaps.fluidCannerRecipes.addRecipe(aRecipe); aCount1 = getMapSize(RecipeMaps.fluidCannerRecipes); - result = aCount1 > aCount2; - if (result) { - // Logger.INFO("[FIND] Added Canning recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); - } else { + if (aCount1 <= aCount2) { Logger.INFO( "[ERROR] Failed adding Canning recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) + ", " @@ -232,7 +203,6 @@ public class RecipeGen_FluidCanning implements Runnable { + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); dumpStack(); } - return result; } private void dumpStack() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index 08a0b6fcf5..742e9f9ece 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -1,16 +1,12 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gregtech.api.enums.Mods.COFHCore; - import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_RfConvertor; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer; public class GregtechEnergyBuffer { @@ -66,13 +62,6 @@ public class GregtechEnergyBuffer { new GregtechMetaEnergyBuffer(779, "energybuffer.tier.09", "MAX Voltage Energy Buffer", 9, "", 1) .getStackForm(1L)); - if (COFHCore.isModLoaded() && CORE.ConfigSwitches.enableMachine_RF_Convetor) { - // RF Convertor Buffer Has Special ID - GregtechItemList.Energy_Buffer_RF_Convertor.set( - new GT_MetaTileEntity_RfConvertor(31022, "energybuffer.rf.tier.01", "RF Energy Convertor", 3, "", 0) - .getStackForm(1L)); - } - GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java deleted file mode 100644 index 996462435c..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java +++ /dev/null @@ -1,71 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator; - -public class GregtechSolarGenerators { - - public static void run() { - if (ConfigSwitches.enableMachine_SolarGenerators) { - Logger.INFO("Gregtech5u Content | Registering Solar Generator Blocks."); - if (CORE.ConfigSwitches.enableMachine_SolarGenerators) { - run1(); - } - } - } - - private static void run1() { - - GregtechItemList.GT_Solar_ULV.set( - new GregtechMetaTileEntitySolarGenerator( - 800, - "sunabsorber.tier.00", - "Ultra Low Voltage Solar Generator", - 0).getStackForm(1L)); - GregtechItemList.GT_Solar_LV.set( - new GregtechMetaTileEntitySolarGenerator(801, "sunabsorber.tier.01", "Low Voltage Solar Generator", 1) - .getStackForm(1L)); - GregtechItemList.GT_Solar_MV.set( - new GregtechMetaTileEntitySolarGenerator( - 802, - "sunabsorber.tier.02", - "Medium Voltage Solar Generator", - 2).getStackForm(1L)); - GregtechItemList.GT_Solar_HV.set( - new GregtechMetaTileEntitySolarGenerator(803, "sunabsorber.tier.03", "High Voltage Solar Generator", 3) - .getStackForm(1L)); - GregtechItemList.GT_Solar_EV.set( - new GregtechMetaTileEntitySolarGenerator( - 804, - "sunabsorber.tier.04", - "Extreme Voltage Solar Generator", - 4).getStackForm(1L)); - GregtechItemList.GT_Solar_IV.set( - new GregtechMetaTileEntitySolarGenerator( - 805, - "sunabsorber.tier.05", - "Insane Voltage Solar Generator", - 5).getStackForm(1L)); - GregtechItemList.GT_Solar_LuV.set( - new GregtechMetaTileEntitySolarGenerator( - 806, - "sunabsorber.tier.06", - "Ludicrous Voltage Solar Generator", - 6).getStackForm(1L)); - GregtechItemList.GT_Solar_ZPM.set( - new GregtechMetaTileEntitySolarGenerator(807, "sunabsorber.tier.07", "ZPM Voltage Solar Generator", 7) - .getStackForm(1L)); - GregtechItemList.GT_Solar_UV.set( - new GregtechMetaTileEntitySolarGenerator( - 808, - "sunabsorber.tier.08", - "Ultimate Voltage Solar Generator", - 8).getStackForm(1L)); - GregtechItemList.GT_Solar_MAX.set( - new GregtechMetaTileEntitySolarGenerator(809, "sunabsorber.tier.09", "MAX Voltage Solar Generator", 9) - .getStackForm(1L)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java index d567d7bbc2..3b28aa67a8 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java @@ -30,8 +30,6 @@ import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { - Random random = new Random(); - public static final int LEVELS = 5; public static final Material materialFluidCryotheum = new MaterialLiquid(MapColor.iceColor); private static boolean enableSourceFall = true; private static boolean effect = true; @@ -62,13 +60,8 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { this.addInteraction(Blocks.leaves, Blocks.air); this.addInteraction(Blocks.tallgrass, Blocks.air); this.addInteraction(Blocks.fire, Blocks.air); - // addInteraction(TFBlocks.blockFluidGlowstone, 0, Blocks.glowstone); - final String str1 = "Fluid.Cryotheum"; - String str2 = "Enable this for Fluid Cryotheum to be worse than lava, except cold."; effect = true; - - str2 = "Enable this for Fluid Cryotheum Source blocks to gradually fall downwards."; enableSourceFall = true; return true; @@ -182,6 +175,4 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { } } - protected void triggerInteractionEffects(final World paramWorld, final int paramInt1, final int paramInt2, - final int paramInt3) {} } diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java index 5bbf0ea3ab..f43142a06e 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java @@ -16,7 +16,6 @@ import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { - public static final int LEVELS = 4; public static final Material materialFluidEnder = new MaterialLiquid(MapColor.greenColor); private static boolean effect = true; @@ -34,9 +33,6 @@ public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { public boolean preInit() { GameRegistry.registerBlock(this, "FluidEnder"); - String str1 = "Fluid.Ender"; - String str2 = "Enable this for Fluid Ender to randomly teleport entities on contact."; - return true; } diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java index af6b74c216..03bf3022f2 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java @@ -5,9 +5,7 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialLiquid; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; @@ -25,8 +23,6 @@ import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { Random random = new Random(); - public static final int LEVELS = 5; - public static final Material materialFluidPyrotheum = new MaterialLiquid(MapColor.tntColor); private static boolean effect = true; private static boolean enableSourceFall = true; diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java index fb89680e6c..b3e9482a92 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java @@ -2,7 +2,6 @@ package gtPlusPlus.xmod.tinkers.util; import static gregtech.api.enums.Mods.TinkerConstruct; -import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -261,39 +260,6 @@ public class TinkersUtils { return aData; } - public static Object generateToolMaterial(String name, String localizationString, int level, int durability, - int speed, int damage, float handle, int reinforced, float stonebound, String style, int primaryColor) { - try { - Constructor<?> constructor = mClass_ToolMaterial.getConstructor( - String.class, - String.class, - int.class, - int.class, - int.class, - int.class, - float.class, - int.class, - float.class, - String.class, - int.class); - return constructor.newInstance( - name, - localizationString, - level, - durability, - speed, - damage, - handle, - reinforced, - stonebound, - style, - primaryColor); - } catch (Throwable t) { - t.printStackTrace(); - return null; - } - } - public static List<?> getTableCastingRecipes() { Object aCastingTableHandlerInstance = getCastingInstance(0); List<?> aTemp; |