From 23494ade8145f1a70d4c533d74815b77b990314a Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Wed, 22 May 2024 18:05:41 +0100 Subject: 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 --- src/main/java/gtPlusPlus/GTplusplus.java | 3 - .../core/block/base/BasicTileBlockWithTooltip.java | 4 +- .../block/general/antigrief/BlockWitherProof.java | 1 - .../core/common/compat/COMPAT_ExtraUtils.java | 18 - .../java/gtPlusPlus/core/config/ConfigHandler.java | 81 ----- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 1 - .../core/entity/monster/EntitySickBlaze.java | 9 +- .../entity/projectile/EntityToxinballSmall.java | 11 - .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 2 - src/main/java/gtPlusPlus/core/item/ModItems.java | 13 +- .../item/base/itemblock/ItemBlockBasicTile.java | 8 - .../core/item/base/itemblock/ItemBlockOre.java | 21 -- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 70 +--- .../core/item/bauble/ElectricBaseBauble.java | 2 +- .../core/item/bauble/FireProtectionBauble.java | 9 +- .../core/item/chemistry/NuclearChem.java | 3 +- .../core/item/tool/misc/DebugScanner.java | 108 ------ .../core/item/tool/staballoy/MultiSpadeBase.java | 137 ------- .../core/item/tool/staballoy/StaballoySpade.java | 403 --------------------- src/main/java/gtPlusPlus/core/lib/CORE.java | 65 +--- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 15 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 24 +- .../gtPlusPlus/core/recipe/RECIPES_General.java | 4 - .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 80 ---- .../gtPlusPlus/core/slots/SlotVolumetricFlask.java | 3 - .../core/util/minecraft/EnchantingUtils.java | 29 -- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 4 - .../gtPlusPlus/core/util/minecraft/LangUtils.java | 83 +---- .../core/util/minecraft/MaterialUtils.java | 8 +- .../core/util/minecraft/MiningUtils.java | 73 +--- .../core/util/minecraft/ModularArmourUtils.java | 35 -- .../gtPlusPlus/core/util/minecraft/NBTUtils.java | 42 --- .../core/util/minecraft/OreDictUtils.java | 5 +- .../core/util/minecraft/PlayerUtils.java | 63 +--- .../core/util/minecraft/RecipeUtils.java | 25 +- .../core/util/minecraft/ShapelessUtils.java | 41 --- .../core/util/reflect/ReflectionUtils.java | 327 +---------------- .../everglades/GTplusplus_Everglades.java | 15 - .../everglades/world/WorldChunkManagerCustom.java | 5 - .../everglades/world/WorldProviderMod.java | 10 - .../java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java | 2 +- .../gtPlusPlus/nei/handlers/NeiTextureHandler.java | 1 - .../plugin/agrichem/item/algae/ItemAlgaeBase.java | 2 +- .../bop/blocks/rainforest/LogRainforestTree.java | 9 - .../xmod/gregtech/api/enums/GregtechItemList.java | 2 - .../common/blocks/textures/TexturesGtBlock.java | 242 +------------ .../common/blocks/textures/TexturesGtTools.java | 2 - .../common/items/MetaGeneratedGregtechItems.java | 53 +-- .../generators/GT_MetaTileEntity_RfConvertor.java | 347 ------------------ .../GregtechMetaTileEntitySolarGenerator.java | 262 -------------- .../gregtech/loaders/RecipeGen_FluidCanning.java | 40 +- .../gregtech/GregtechEnergyBuffer.java | 11 - .../gregtech/GregtechSolarGenerators.java | 71 ---- .../block/TF_Block_Fluid_Cryotheum.java | 9 - .../block/TF_Block_Fluid_Ender.java | 4 - .../block/TF_Block_Fluid_Pyrotheum.java | 4 - .../gtPlusPlus/xmod/tinkers/util/TinkersUtils.java | 34 -- .../assets/miscutils/textures/DevCape.png | Bin 1232 -> 0 bytes .../assets/miscutils/textures/FancyCape.png | Bin 1191 -> 0 bytes .../assets/miscutils/textures/TesterCape.png | Bin 1101 -> 0 bytes .../miscutils/textures/aspects/Sagrausten.png | Bin 2997 -> 0 bytes .../assets/miscutils/textures/aspects/Slusium.png | Bin 697 -> 0 bytes .../assets/miscutils/textures/aspects/Xablum.png | Bin 563 -> 0 bytes .../assets/miscutils/textures/aspects/Xenil.png | Bin 1000 -> 0 bytes .../assets/miscutils/textures/aspects/Zetralt.png | Bin 1461 -> 0 bytes .../textures/blocks/FirePit/mossyFirepit.png | Bin 612 -> 0 bytes .../assets/miscutils/textures/blocks/SwirlBlue.png | Bin 284 -> 0 bytes .../assets/miscutils/textures/blocks/SwirlCyan.png | Bin 286 -> 0 bytes .../assets/miscutils/textures/blocks/SwirlGray.png | Bin 270 -> 0 bytes .../assets/miscutils/textures/blocks/SwirlRed.png | Bin 286 -> 0 bytes .../miscutils/textures/blocks/SwirlYellow.png | Bin 280 -> 0 bytes .../TileEntities/DecayablesChest_bottom_old.png | Bin 617 -> 0 bytes .../textures/blocks/TileEntities/EggBox_full.png | Bin 1777 -> 0 bytes .../textures/blocks/TileEntities/EggBox_side.png | Bin 504 -> 0 bytes .../textures/blocks/TileEntities/EggBox_top.png | Bin 654 -> 0 bytes .../TileEntities/MACHINE_CASING_FUSION_FRONT.png | Bin 515 -> 0 bytes .../MACHINE_CASING_FUSION_FRONT_ACTIVE.png | Bin 502 -> 0 bytes .../MACHINE_CASING_QFT_COIL_STATIC.png | Bin 688 -> 0 bytes .../MACHINE_CASING_STABLE_INCOLOY_020.png | Bin 665 -> 0 bytes .../MACHINE_CASING_STABLE_INCOLOY_DS.png | Bin 660 -> 0 bytes .../MACHINE_CASING_STABLE_INCOLOY_MA956.png | Bin 654 -> 0 bytes .../MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png | Bin 459 -> 0 bytes ...CHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png | Bin 436 -> 0 bytes .../blocks/TileEntities/ModularTable_output.png | Bin 260 -> 0 bytes .../blocks/TileEntities/ModularTable_side.png | Bin 244 -> 0 bytes .../blocks/TileEntities/ModularTable_top.png | Bin 289 -> 0 bytes .../TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png | Bin 1505 -> 0 bytes .../adv_machine_dimensional_cover_blue.png | Bin 1457 -> 0 bytes .../blocks/TileEntities/adv_machine_oil.png | Bin 238 -> 0 bytes .../textures/blocks/TileEntities/audio_out.png | Bin 275 -> 0 bytes .../blocks/TileEntities/audio_out_active.png | Bin 433 -> 0 bytes .../textures/blocks/TileEntities/bronze_side.png | Bin 395 -> 0 bytes .../blocks/TileEntities/bronze_side_cabinet.png | Bin 401 -> 0 bytes .../blocks/TileEntities/bronze_top_crafting.png | Bin 383 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_BLUE.png | Bin 221 -> 0 bytes .../TileEntities/gt4/OVERLAY_BLUE_REDSTONE.png | Bin 243 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_CYAN.png | Bin 197 -> 0 bytes .../TileEntities/gt4/OVERLAY_CYAN_REDSTONE.png | Bin 226 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_GREEN.png | Bin 204 -> 0 bytes .../TileEntities/gt4/OVERLAY_GREEN_REDSTONE.png | Bin 229 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_PURPLE.png | Bin 190 -> 0 bytes .../TileEntities/gt4/OVERLAY_PURPLE_REDSTONE.png | Bin 208 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_RED.png | Bin 209 -> 0 bytes .../TileEntities/gt4/OVERLAY_RED_REDSTONE.png | Bin 219 -> 0 bytes .../TileEntities/gt4/OVERLAY_SIDE_CABINET.png | Bin 416 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_YELLOW.png | Bin 172 -> 0 bytes .../TileEntities/gt4/OVERLAY_YELLOW_REDSTONE.png | Bin 202 -> 0 bytes .../blocks/TileEntities/gt4/bronze_bottom.png | Bin 377 -> 0 bytes .../blocks/TileEntities/gt4/bronze_side.png | Bin 395 -> 0 bytes .../blocks/TileEntities/gt4/bronze_top.png | Bin 359 -> 0 bytes .../TileEntities/gt4/bronze_top_crafting.png | Bin 237 -> 0 bytes .../blocks/TileEntities/gt4/machine_side.png | Bin 822 -> 0 bytes .../TileEntities/gt4/machine_side_cabinet.png | Bin 822 -> 0 bytes .../redstone/machine_bottom_redstone_main_off.png | Bin 179 -> 0 bytes .../redstone/machine_bottom_redstone_main_on.png | Bin 178 -> 0 bytes .../gt4/redstone/machine_bottom_redstone_off.png | Bin 169 -> 0 bytes .../gt4/redstone/machine_bottom_redstone_on.png | Bin 162 -> 0 bytes .../redstone/machine_side_redstone_main_off.png | Bin 172 -> 0 bytes .../gt4/redstone/machine_side_redstone_main_on.png | Bin 172 -> 0 bytes .../gt4/redstone/machine_side_redstone_off.png | Bin 165 -> 0 bytes .../gt4/redstone/machine_side_redstone_on.png | Bin 158 -> 0 bytes .../gt4/redstone/machine_top_redstone_main_off.png | Bin 179 -> 0 bytes .../gt4/redstone/machine_top_redstone_main_on.png | Bin 178 -> 0 bytes .../gt4/redstone/machine_top_redstone_off.png | Bin 169 -> 0 bytes .../gt4/redstone/machine_top_redstone_on.png | Bin 162 -> 0 bytes .../TileEntities/high_adv_machine_dimensional.png | Bin 1713 -> 0 bytes .../miscutils/textures/blocks/blockAntiGrief.png | Bin 1086 -> 0 bytes .../miscutils/textures/blocks/blockBloodSteel.png | Bin 529 -> 0 bytes .../miscutils/textures/blocks/blockDefault.png | Bin 942 -> 0 bytes .../blocks/blockNuclearFueledHeliumGenerator.png | Bin 440 -> 0 bytes .../miscutils/textures/blocks/blockOre_Overlay.png | Bin 231 -> 0 bytes .../textures/blocks/chrono/CyberPanel2.png | Bin 350 -> 0 bytes .../textures/blocks/chrono/MetalGrate2.png | Bin 269 -> 0 bytes .../textures/blocks/chrono/MetalGrate3.png | Bin 292 -> 0 bytes .../textures/blocks/chrono/MetalGrateA_Solid.png | Bin 304 -> 0 bytes .../textures/blocks/chrono/MetalSheet10.png | Bin 675 -> 0 bytes .../textures/blocks/chrono/MetalSheet11.png | Bin 574 -> 0 bytes .../textures/blocks/chrono/MetalSheet12.png | Bin 753 -> 0 bytes .../textures/blocks/chrono/MetalSheet3.png | Bin 863 -> 0 bytes .../textures/blocks/chrono/MetalSheet4.png | Bin 851 -> 0 bytes .../textures/blocks/chrono/MetalSheet5.png | Bin 877 -> 0 bytes .../textures/blocks/chrono/MetalSheet6.png | Bin 401 -> 0 bytes .../textures/blocks/chrono/MetalSheet7.png | Bin 543 -> 0 bytes .../textures/blocks/chrono/Overlay_Cyber.png | Bin 295 -> 0 bytes .../miscutils/textures/blocks/clear_flow.png | Bin 942 -> 0 bytes .../miscutils/textures/blocks/clear_still.png | Bin 942 -> 0 bytes .../textures/blocks/crop/blockCrop.Force.1.png | Bin 209 -> 0 bytes .../textures/blocks/crop/blockCrop.Force.2.png | Bin 547 -> 0 bytes .../textures/blocks/crop/blockCrop.Force.3.png | Bin 782 -> 0 bytes .../textures/blocks/crop/blockCrop.Force.4.png | Bin 701 -> 0 bytes .../textures/blocks/crop/blockCrop.Force.5.png | Bin 925 -> 0 bytes .../textures/blocks/door_cactus_lower.png | Bin 558 -> 0 bytes .../textures/blocks/door_cactus_upper.png | Bin 563 -> 0 bytes .../miscutils/textures/blocks/door_glass_lower.png | Bin 176 -> 0 bytes .../miscutils/textures/blocks/door_glass_upper.png | Bin 183 -> 0 bytes .../miscutils/textures/blocks/door_ice_lower.png | Bin 508 -> 0 bytes .../miscutils/textures/blocks/door_ice_upper.png | Bin 542 -> 0 bytes .../fluids/fluid.fluid.autogenerated.still.png | Bin 9586 -> 0 bytes .../blocks/fluids/fluid.hydrofluoricacid.png | Bin 3998 -> 0 bytes .../blocks/fluids/fluid.hydrogenchloride.png | Bin 2844 -> 0 bytes .../blocks/fluids/fluid.lithiumhydroxide.png | Bin 22548 -> 0 bytes .../fluids/fluid.molten.autogenerated.new.1.png | Bin 4175 -> 0 bytes .../fluids/fluid.molten.autogenerated.old.png | Bin 7019 -> 0 bytes .../textures/blocks/fluids/fluid.pyrotheum.png | Bin 3691 -> 0 bytes .../textures/blocks/fluids/fluid.sulfurdioxide.png | Bin 2844 -> 0 bytes .../blocks/fluids/fluid.sulfuricapatite.png | Bin 2844 -> 0 bytes .../blocks/fluids/fluid.sulfuriclithium.png | Bin 31006 -> 0 bytes .../textures/blocks/fluids/fluid.sulfurousacid.png | Bin 2844 -> 0 bytes .../blocks/fluids/fluid.thoriumhexafluoride.png | Bin 3011 -> 0 bytes .../blocks/fluids/fluid.thoriumtetrafluoride.png | Bin 3167 -> 0 bytes .../blocks/fluids/fluid.uraniumhexafluoride.png | Bin 3196 -> 0 bytes .../blocks/fluids/fluid.uraniumtetrafluoride.png | Bin 3196 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_HP_1.png | Bin 334 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_HP_2.png | Bin 448 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_HP_3.png | Bin 367 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_HP_4.png | Bin 461 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_HP_5.png | Bin 332 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_HP_6.png | Bin 505 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_HP_7.png | Bin 391 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_HP_8.png | Bin 446 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_HP_9.png | Bin 359 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png | Bin 546 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png | Bin 865 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png | Bin 608 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png | Bin 909 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png | Bin 880 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png | Bin 945 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png | Bin 656 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png | Bin 875 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png | Bin 644 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_LP_1.png | Bin 399 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_LP_2.png | Bin 445 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_LP_3.png | Bin 452 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_LP_4.png | Bin 479 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_LP_5.png | Bin 332 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_LP_6.png | Bin 494 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_LP_7.png | Bin 470 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_LP_8.png | Bin 466 -> 0 bytes .../iconsets/BigTurbine/LARGE_TURBINE_LP_9.png | Bin 447 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png | Bin 604 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png | Bin 851 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png | Bin 646 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png | Bin 897 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png | Bin 880 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png | Bin 939 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png | Bin 633 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png | Bin 894 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png | Bin 659 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_COBBLE.png | Bin 515 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_CONNECTOR.png | Bin 401 -> 0 bytes .../blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png | Bin 553 -> 0 bytes .../blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png | Bin 353 -> 0 bytes .../blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png | Bin 377 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_FIRE.png | Bin 500 -> 0 bytes .../OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png | Bin 363 -> 0 bytes ...OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png | Bin 350 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_GRINDER.png | Bin 237 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_GT.png | Bin 243 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_ICE.png | Bin 216 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_IMPLOSION.png | Bin 431 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_LAPO.png | Bin 450 -> 0 bytes .../assets/miscutils/textures/blocks/mash_flow.png | Bin 942 -> 0 bytes .../miscutils/textures/blocks/mash_still.png | Bin 942 -> 0 bytes .../textures/blocks/metro/OVERLAY_GRATE_A.png | Bin 423 -> 0 bytes .../blocks/metro/TEXTURE_METAL_GRATE_A.png | Bin 344 -> 0 bytes .../blocks/metro/TEXTURE_METAL_PANEL_E.png | Bin 537 -> 0 bytes .../blocks/metro/TEXTURE_ORGANIC_PANEL_A.png | Bin 598 -> 0 bytes .../textures/blocks/metro/TEXTURE_STONE_BIRD_A.png | Bin 647 -> 0 bytes .../blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png | Bin 630 -> 0 bytes .../blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png | Bin 627 -> 0 bytes .../textures/blocks/metro/TEXTURE_STONE_BLUE_A.png | Bin 410 -> 0 bytes .../blocks/metro/TEXTURE_STONE_GREEN_A.png | Bin 244 -> 0 bytes .../blocks/metro/TEXTURE_STONE_TABLET_A.png | Bin 572 -> 0 bytes .../blocks/metro/TEXTURE_STONE_TABLET_B.png | Bin 579 -> 0 bytes .../textures/blocks/metro/TEXTURE_TECH_PANEL_E.png | Bin 1488 -> 0 bytes .../textures/blocks/metro/TEXTURE_TECH_PANEL_F.png | Bin 837 -> 0 bytes .../textures/blocks/metro/TEXTURE_TECH_PANEL_G.png | Bin 671 -> 0 bytes .../textures/blocks/metro/TEXTURE_TECH_PANEL_I.png | Bin 749 -> 0 bytes .../miscutils/textures/blocks/rum_mature_flow.png | Bin 942 -> 0 bytes .../miscutils/textures/blocks/rum_mature_still.png | Bin 942 -> 0 bytes .../textures/blocks/rum_semi_mature_flow.png | Bin 942 -> 0 bytes .../textures/blocks/rum_semi_mature_still.png | Bin 942 -> 0 bytes .../miscutils/textures/blocks/workbench_top.png | Bin 550 -> 0 bytes .../miscutils/textures/entity/australia/boar.png | Bin 3022 -> 0 bytes .../textures/entity/australia/bush_spider.png | Bin 1445 -> 0 bytes .../textures/entity/australia/dingo/dingo.png | Bin 3643 -> 0 bytes .../entity/australia/dingo/dingo_angry.png | Bin 1712 -> 0 bytes .../entity/australia/dingo/dingo_collar.png | Bin 3576 -> 0 bytes .../textures/entity/australia/dingo/dingo_tame.png | Bin 3676 -> 0 bytes .../textures/entity/australia/octopus.png | Bin 720 -> 0 bytes .../assets/miscutils/textures/entity/batKing.png | Bin 1994 -> 0 bytes .../textures/entity/villager/aboriginal.png | Bin 1154 -> 0 bytes .../miscutils/textures/entity/villager/banker.png | Bin 937 -> 0 bytes .../textures/entity/villager/technician.png | Bin 996 -> 0 bytes .../miscutils/textures/entity/villager/trader.png | Bin 955 -> 0 bytes .../miscutils/textures/enviroment/moon_phases.png | Bin 1029 -> 0 bytes .../assets/miscutils/textures/enviroment/sun.png | Bin 694 -> 0 bytes .../miscutils/textures/gui/ModularityTable.png | Bin 1014 -> 0 bytes .../miscutils/textures/gui/RoundRobinator.png | Bin 1648 -> 0 bytes .../textures/gui/helium_collector_gui.png | Bin 2682 -> 0 bytes .../assets/miscutils/textures/gui/itemBackpack.png | Bin 888 -> 0 bytes .../assets/miscutils/textures/gui/itemGrindle.png | Bin 1254 -> 0 bytes .../textures/gui/overlay_button/mode_0.png | Bin 177 -> 0 bytes .../textures/gui/overlay_button/mode_1.png | Bin 143 -> 0 bytes .../textures/gui/overlay_button/mode_2.png | Bin 140 -> 0 bytes .../textures/gui/overlay_button/mode_3.png | Bin 141 -> 0 bytes .../textures/gui/overlay_button/mode_4.png | Bin 132 -> 0 bytes .../textures/gui/overlay_button/mode_5.png | Bin 209 -> 0 bytes .../textures/gui/overlay_button/mode_6.png | Bin 180 -> 0 bytes .../textures/gui/overlay_button/mode_7.png | Bin 178 -> 0 bytes .../textures/gui/overlay_button/mode_8.png | Bin 188 -> 0 bytes .../textures/gui/overlay_button/mode_9.png | Bin 211 -> 0 bytes .../textures/gui/overlay_button/throughput_0.png | Bin 205 -> 0 bytes .../textures/gui/overlay_button/throughput_1.png | Bin 194 -> 0 bytes .../textures/gui/overlay_button/throughput_2.png | Bin 188 -> 0 bytes .../textures/gui/overlay_button/throughput_3.png | Bin 177 -> 0 bytes .../textures/items/MU-metaitem.01/162.png | Bin 455 -> 0 bytes .../textures/items/MU-metaitem.01/212.png | Bin 252 -> 0 bytes .../textures/items/MU-metaitem.01/701.png | Bin 361 -> 0 bytes .../textures/items/MU-metaitem.01/702.png | Bin 369 -> 0 bytes .../textures/items/MU-metaitem.01/703.png | Bin 366 -> 0 bytes .../textures/items/MU-metaitem.01/704.png | Bin 368 -> 0 bytes .../textures/items/MU-metaitem.01/705.png | Bin 375 -> 0 bytes .../textures/items/MU-metaitem.01/706.png | Bin 375 -> 0 bytes .../textures/items/MU-metaitem.01/707.png | Bin 386 -> 0 bytes .../textures/items/MU-metaitem.01/708.png | Bin 362 -> 0 bytes .../textures/items/MU-metaitem.01/710.png | Bin 326 -> 0 bytes .../textures/items/MU-metaitem.01/711.png | Bin 326 -> 0 bytes .../textures/items/MU-metaitem.01/712.png | Bin 343 -> 0 bytes .../textures/items/MU-metaitem.01/713.png | Bin 352 -> 0 bytes .../textures/items/MU-metaitem.01/714.png | Bin 363 -> 0 bytes .../textures/items/MU-metaitem.01/715.png | Bin 363 -> 0 bytes .../textures/items/MU-metaitem.01/716.png | Bin 343 -> 0 bytes .../textures/items/MU-metaitem.01/717.png | Bin 343 -> 0 bytes .../textures/items/MU-metaitem.01/718.png | Bin 343 -> 0 bytes .../textures/items/MU-metaitem.01/719.png | Bin 464 -> 0 bytes .../textures/items/MU-metaitem.01/721.png | Bin 465 -> 0 bytes .../textures/items/MU-metaitem.01/757.png | Bin 464 -> 0 bytes .../assets/miscutils/textures/items/bomb.png | Bin 311 -> 0 bytes .../miscutils/textures/items/bomb_casing.png | Bin 280 -> 0 bytes .../assets/miscutils/textures/items/bomb_lit.png | Bin 328 -> 0 bytes .../textures/items/bucket/OverlayIcon.png | Bin 195 -> 0 bytes .../miscutils/textures/items/frameChocolate.png | Bin 339 -> 0 bytes .../miscutils/textures/items/frameHealing.png | Bin 354 -> 0 bytes .../assets/miscutils/textures/items/frameNova.png | Bin 636 -> 0 bytes .../miscutils/textures/items/frameRestraint.png | Bin 355 -> 0 bytes .../assets/miscutils/textures/items/frameSoul.png | Bin 584 -> 0 bytes .../assets/miscutils/textures/items/frameVoid.png | Bin 663 -> 0 bytes .../iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png | Bin 143 -> 0 bytes .../items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png | Bin 257 -> 0 bytes .../textures/items/iconsets/PUMP_OVERLAY.png | Bin 143 -> 0 bytes .../items/iconsets/RENDERING_ERROR_OVERLAY.png | Bin 161 -> 0 bytes .../textures/items/iconsets/SKOOKUMCHOOCHER.png | Bin 382 -> 0 bytes .../items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png | Bin 143 -> 0 bytes .../textures/items/iconsets/VOID_OVERLAY.png | Bin 143 -> 0 bytes .../assets/miscutils/textures/items/itemBolt.png | Bin 161 -> 0 bytes .../assets/miscutils/textures/items/itemBottle.png | Bin 262 -> 0 bytes .../miscutils/textures/items/itemCentidust.png | Bin 326 -> 0 bytes .../miscutils/textures/items/itemDecidust.png | Bin 341 -> 0 bytes .../miscutils/textures/items/itemDefault.png | Bin 376 -> 0 bytes .../miscutils/textures/items/itemDroplet.png | Bin 218 -> 0 bytes .../assets/miscutils/textures/items/itemFiber.png | Bin 455 -> 0 bytes .../miscutils/textures/items/itemFineWire.png | Bin 514 -> 0 bytes .../assets/miscutils/textures/items/itemGem.png | Bin 420 -> 0 bytes .../miscutils/textures/items/itemHeavyPlate.png | Bin 397 -> 0 bytes .../textures/items/itemHeavyPlate_Overlay.png | Bin 471 -> 0 bytes .../miscutils/textures/items/itemHeliumBlob.png | Bin 350 -> 0 bytes .../assets/miscutils/textures/items/itemHelmet.png | Bin 396 -> 0 bytes .../miscutils/textures/items/itemHydrogenBlob.png | Bin 241 -> 0 bytes .../assets/miscutils/textures/items/itemKey.png | Bin 258 -> 0 bytes .../textures/items/itemPlateBatteryAlloy.png | Bin 491 -> 0 bytes .../miscutils/textures/items/itemPlateDouble.png | Bin 297 -> 0 bytes .../assets/miscutils/textures/items/itemPotion.png | Bin 271 -> 0 bytes .../miscutils/textures/items/itemPotionBlack.png | Bin 284 -> 0 bytes .../miscutils/textures/items/itemPotionRed.png | Bin 284 -> 0 bytes .../assets/miscutils/textures/items/itemRing.png | Bin 311 -> 0 bytes .../assets/miscutils/textures/items/itemRod.png | Bin 250 -> 0 bytes .../miscutils/textures/items/itemRodLong.png | Bin 246 -> 0 bytes .../assets/miscutils/textures/items/itemRotor.png | Bin 443 -> 0 bytes .../assets/miscutils/textures/items/itemScrew.png | Bin 199 -> 0 bytes .../textures/items/itemSlowBuildersRing.png | Bin 427 -> 0 bytes .../miscutils/textures/items/itemSmallSpring.png | Bin 317 -> 0 bytes .../assets/miscutils/textures/items/itemSpring.png | Bin 276 -> 0 bytes .../textures/items/itemSulfuricAcidPotion.png | Bin 416 -> 0 bytes .../miscutils/textures/items/itemSunnariumBit.png | Bin 276 -> 0 bytes .../assets/miscutils/textures/items/itemSword.png | Bin 363 -> 0 bytes .../assets/miscutils/textures/items/itemTablet.png | Bin 372 -> 0 bytes .../miscutils/textures/items/itemWaterBottle.png | Bin 262 -> 0 bytes .../assets/miscutils/textures/space/RocketGui.png | Bin 490 -> 0 bytes 349 files changed, 73 insertions(+), 2882 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java delete mode 100644 src/main/resources/assets/miscutils/textures/DevCape.png delete mode 100644 src/main/resources/assets/miscutils/textures/FancyCape.png delete mode 100644 src/main/resources/assets/miscutils/textures/TesterCape.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Sagrausten.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Slusium.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Xablum.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Xenil.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Zetralt.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlBlue.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlCyan.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlGray.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlRed.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlYellow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_QFT_COIL_STATIC.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_SIDE_CABINET.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_bottom.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top_crafting.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockAntiGrief.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockBloodSteel.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockDefault.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet10.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet11.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet12.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/clear_flow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/clear_still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_cactus_lower.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_cactus_upper.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_glass_lower.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_glass_upper.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_ice_lower.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_ice_upper.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_COBBLE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONNECTOR.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FIRE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GRINDER.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ICE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_IMPLOSION.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_LAPO.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/mash_flow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/mash_still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_E.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_F.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_G.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_I.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/rum_mature_flow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/rum_mature_still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/workbench_top.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/boar.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/bush_spider.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/octopus.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/batKing.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/villager/aboriginal.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/villager/banker.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/villager/technician.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/villager/trader.png delete mode 100644 src/main/resources/assets/miscutils/textures/enviroment/moon_phases.png delete mode 100644 src/main/resources/assets/miscutils/textures/enviroment/sun.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/ModularityTable.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/RoundRobinator.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/helium_collector_gui.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/itemBackpack.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/itemGrindle.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_0.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_0.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/bomb.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/bomb_casing.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/bomb_lit.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameChocolate.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameHealing.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameNova.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameRestraint.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameSoul.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameVoid.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemBolt.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemBottle.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemCentidust.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemDecidust.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemDefault.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemDroplet.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemFiber.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemFineWire.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemGem.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHeavyPlate.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHeliumBlob.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHelmet.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHydrogenBlob.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemKey.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPlateDouble.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPotion.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPotionBlack.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPotionRed.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRing.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRod.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRodLong.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRotor.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemScrew.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSmallSpring.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSpring.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSunnariumBit.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSword.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemTablet.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemWaterBottle.png delete mode 100644 src/main/resources/assets/miscutils/textures/space/RocketGui.png (limited to 'src/main') diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index 69078ee499..73b9cc9aea 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -125,9 +125,6 @@ public class GTplusplus implements ActionListener { // Tools Logger.WARNING("Processing texture: " + TexturesGtTools.ANGLE_GRINDER.getTextureFile().getResourcePath()); Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_SNIPS.getTextureFile().getResourcePath()); - Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_LIGHTER.getTextureFile().getResourcePath()); - Logger.WARNING( - "Processing texture: " + TexturesGtTools.ELECTRIC_BUTCHER_KNIFE.getTextureFile().getResourcePath()); // Blocks Logger.WARNING( diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index c4e8b191d0..d6119e5608 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -260,9 +260,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override @SideOnly(Side.CLIENT) - public final void registerBlockIcons(final IIconRegister aRegisterer) { - this.blockIcon = aRegisterer.registerIcon(GTPlusPlus.ID + ":" + "net"); - } + public final void registerBlockIcons(final IIconRegister aRegisterer) {} @Override public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_); diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index fa7372090c..c24ef46f5c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -33,7 +33,6 @@ public class BlockWitherProof extends Block { this.setResistance(5000.0F); this.setHarvestLevel("pickaxe", 3); this.setStepSound(soundTypeMetal); - // LanguageRegistry.addName(this, "Wither Cage"); GameRegistry.registerBlock(this, Utils.sanitizeString("blockBlackGate")); } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java index 907e6a0c42..f61c70ab5b 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java @@ -2,10 +2,8 @@ package gtPlusPlus.core.common.compat; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.recipe.RECIPES_Tools; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; public class COMPAT_ExtraUtils { @@ -16,21 +14,5 @@ public class COMPAT_ExtraUtils { private static void run() { ItemUtils.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0); - // GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium)); - - if (ConfigSwitches.enableAlternativeDivisionSigilRecipe) { - // Division Sigil - RecipeUtils.addShapedRecipe( - "plateNetherStar", - "gemIridium", - "plateNetherStar", - "plateIridium", - RECIPES_Tools.craftingToolHardHammer, - "plateIridium", - "plateNetherStar", - "gemIridium", - "plateNetherStar", - RECIPES_Tools.RECIPE_DivisionSigil); - } } } diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index b922bb0116..c498164cf9 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -8,30 +8,20 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondBoil import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondGeothermalGenerator; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.boilerSteamPerSecond; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropFluoriteOre; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIntegration; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableIC2Recipes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.dumpItemAndBlockData; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeBatteryAlloy; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeDivisionSigilRecipe; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAnimatedTextures; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCircuits; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Cables; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Pipes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Dehydrators; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_FluidTanks; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_GeothermalEngines; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Pollution; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RF_Convetor; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RocketEngines; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SimpleWasher; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SolarGenerators; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SteamConverter; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Tesseracts; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiSizeTools; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_Cyclotron; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge; @@ -55,8 +45,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_NuclearFu import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_PowerSubstation; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_ThermalBoiler; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableOldGTcircuits; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableSulfuricAcidFix; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableThaumcraftShardUnification; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableWatchdogBGM; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.hideUniversalCells; @@ -129,13 +117,6 @@ public class ConfigHandler { * DEBUG = config.getBoolean("debugMode", "debug", false, * "Enables