aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2024-05-22 18:05:41 +0100
committerGitHub <noreply@github.com>2024-05-22 19:05:41 +0200
commit23494ade8145f1a70d4c533d74815b77b990314a (patch)
treeda447279d51a6bedafc1818bf22cd0e1808f0f72 /src/main
parent846c0839dc25298734aa50e66ba1a72f0025f560 (diff)
downloadGT5-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')
<
-rw-r--r--src/main/java/gtPlusPlus/GTplusplus.java3
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java4
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java1
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java18
-rw-r--r--src/main/java/gtPlusPlus/core/config/ConfigHandler.java81
-rw-r--r--src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java1
-rw-r--r--src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java9
-rw-r--r--src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java11
-rw-r--r--src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java2
-rw-r--r--src/main/java/gtPlusPlus/core/item/ModItems.java13
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java8
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java21
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java70
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java2
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java9
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java3
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java108
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java137
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java403
-rw-r--r--src/main/java/gtPlusPlus/core/lib/CORE.java65
-rw-r--r--src/main/java/gtPlusPlus/core/proxy/ClientProxy.java15
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java24
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java4
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java80
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java3
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java29
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java4
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java83
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java8
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java73
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java35
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java42
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java5
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java63
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java25
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java41
-rw-r--r--src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java327
-rw-r--r--src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java15
-rw-r--r--src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java5
-rw-r--r--src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java10
-rw-r--r--src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java2
-rw-r--r--src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java1
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java242
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java347
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java262
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java40
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java71
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java34
-rw-r--r--src/main/resources/assets/miscutils/textures/DevCape.pngbin1232 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/FancyCape.pngbin1191 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/TesterCape.pngbin1101 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/aspects/Sagrausten.pngbin2997 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/aspects/Slusium.pngbin697 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/aspects/Xablum.pngbin563 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/aspects/Xenil.pngbin1000 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/aspects/Zetralt.pngbin1461 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.pngbin612 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SwirlBlue.pngbin284 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SwirlCyan.pngbin286 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SwirlGray.pngbin270 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SwirlRed.pngbin286 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SwirlYellow.pngbin280 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.pngbin617 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.pngbin1777 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.pngbin504 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.pngbin654 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.pngbin515 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.pngbin502 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_QFT_COIL_STATIC.pngbin688 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.pngbin665 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.pngbin660 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.pngbin654 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.pngbin459 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.pngbin436 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.pngbin260 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.pngbin244 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.pngbin289 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.pngbin1505 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.pngbin1457 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.pngbin238 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.pngbin275 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.pngbin433 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.pngbin395 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.pngbin401 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.pngbin383 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE.pngbin221 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE_REDSTONE.pngbin243 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN.pngbin197 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN_REDSTONE.pngbin226 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN.pngbin204 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN_REDSTONE.pngbin229 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE.pngbin190 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE_REDSTONE.pngbin208 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED.pngbin209 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED_REDSTONE.pngbin219 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_SIDE_CABINET.pngbin416 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW.pngbin172 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW_REDSTONE.pngbin202 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_bottom.pngbin377 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_side.pngbin395 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top.pngbin359 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top_crafting.pngbin237 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.pngbin822 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.pngbin822 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_off.pngbin179 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_on.pngbin178 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_off.pngbin169 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_on.pngbin162 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_off.pngbin172 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_on.pngbin172 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_off.pngbin165 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_on.pngbin158 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_off.pngbin179 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_on.pngbin178 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_off.pngbin169 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_on.pngbin162 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.pngbin1713 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/blockAntiGrief.pngbin1086 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/blockBloodSteel.pngbin529 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/blockDefault.pngbin942 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.pngbin440 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/blockOre_Overlay.pngbin