aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-01 20:06:12 +0100
committerGitHub <noreply@github.com>2023-04-01 19:06:12 +0000
commitb088958c9f6935d356b6c087c8e8106b400aa24f (patch)
treebe608fac08ba158f1226a4fb9f5b1ed459bac2a9 /src/main/java/gregtech/common
parente52cd9c3458584e58073df5cd9cde1302994f266 (diff)
downloadGT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.gz
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.bz2
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.zip
Jabel, Generic injection and mostly automatic code cleanup (#1829)
* Enable Jabel&Generic injection, fix type error caused by this * add missing <> * Infer generic types automatically * Parametrize cast types * Use enhanced for loops * Unnecessary boxing * Unnecessary unboxing * Use Objects.equals * Explicit type can be replaced with `<>` * Collapse identical catch blocks * Add SafeVarargs where applicable * Anonymous type can be replaced with lambda * Use List.sort directly * Lambda can be a method reference * Statement lambda can be an expression lambda * Use string switches * Instanceof pattern matching * Text block can be used * Migrate to enhanced switch * Java style array declarations * Unnecessary toString() * More unnecessary String conversions * Unnecessary modifiers * Unnecessary semicolons * Fix duplicate conditions * Extract common code from if branches * Replace switches with ifs for 1-2 cases * Inner class may be static * Minor performance issues * Replace string appending in loops with string builders * Fix IntelliJ using the wrong empty list method * Use Long.compare * Generic arguments: getSubItems * Generic arguments: getSubBlocks * Raw types warnings * Fix remaining missing generics * Too weak variable type leads to unnecessary cast * Redundant type casts * Redundant array length check * Redundant vararg arrays * Manual min/max implementations * A couple missed inspections * Goodbye explosion power ternary ladder * Apply spotless * Get rid of the other two big ternary ladders * Binary search explosion power * Don't overcomplicate things
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_Client.java107
-rw-r--r--src/main/java/gregtech/common/GT_Network.java3
-rw-r--r--src/main/java/gregtech/common/GT_PlayerActivityLogger.java6
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java173
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java22
-rw-r--r--src/main/java/gregtech/common/GT_ThaumcraftCompat.java22
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java2
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java2
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_Stone.java31
-rw-r--r--src/main/java/gregtech/common/GT_Worldgenerator.java56
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings1.java18
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings2.java54
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings3.java60
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings4.java143
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings5.java146
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings6.java49
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings8.java114
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings9.java12
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Machines.java18
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores.java41
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java33
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java41
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java10
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Storage.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java33
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings2.java7
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings5.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Concretes.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Machines.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Ores.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Storage.java2
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java5
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java101
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Crafting.java10
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java44
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Drain.java24
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java62
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java36
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java6
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java76
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java88
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java15
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Pump.java101
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java28
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java4
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java22
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java4
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java23
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Shutter.java16
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Vent.java27
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java3
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java19
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java20
-rw-r--r--src/main/java/gregtech/common/entities/GT_Entity_Arrow.java14
-rw-r--r--src/main/java/gregtech/common/fluid/GT_Fluid.java21
-rw-r--r--src/main/java/gregtech/common/gui/modularui/UIHelper.java52
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java15
-rw-r--r--src/main/java/gregtech/common/items/DropType.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_FluidDisplayItem.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java23
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_SensorCard_Item.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_VolumetricFlask.java8
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java55
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java2
-rw-r--r--src/main/java/gregtech/common/items/ItemPollen.java2
-rw-r--r--src/main/java/gregtech/common/items/ItemPropolis.java2
-rw-r--r--src/main/java/gregtech/common/items/PollenType.java2
-rw-r--r--src/main/java/gregtech/common/items/PropolisType.java2
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java4
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java6
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java9
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java6
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java22
-rw-r--r--src/main/java/gregtech/common/misc/GT_Command.java29
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java2
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java9
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java32
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java21
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/enums/SpaceBodyType.java2
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/enums/StarType.java2
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/enums/UpgradeStatus.java2
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java14
-rw-r--r--src/main/java/gregtech/common/net/MessageUpdateFluidDisplayItem.java3
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java42
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java12
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java16
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java15
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java22
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java21
-rw-r--r--src/main/java/gregtech/common/render/GT_RenderUtil.java21
-rw-r--r--src/main/java/gregtech/common/render/GT_RenderedTexture.java96
-rw-r--r--src/main/java/gregtech/common/render/GT_Renderer_Block.java25
-rw-r--r--src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java3
-rw-r--r--src/main/java/gregtech/common/render/GT_TextureBuilder.java29
-rw-r--r--src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java3
-rw-r--r--src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java6
-rw-r--r--src/main/java/gregtech/common/render/items/InfinityRenderer.java3
-rw-r--r--src/main/java/gregtech/common/render/items/UniversiumRenderer.java27
-rw-r--r--src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java19
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java14
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java18
<