diff options
author | chill <chill.gtnh@outlook.com> | 2023-05-28 11:22:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-28 11:22:18 +0200 |
commit | fecc8533c5d52cf9bee137687fdda280dab2e39a (patch) | |
tree | f52544f5ef7196c4b4230d53ccd8eb7eac1b9597 /src/main/java/gregtech/common | |
parent | 0f97af86a57831c358089b361ce9fc9c6ece12f7 (diff) | |
download | GT5-Unofficial-fecc8533c5d52cf9bee137687fdda280dab2e39a.tar.gz GT5-Unofficial-fecc8533c5d52cf9bee137687fdda280dab2e39a.tar.bz2 GT5-Unofficial-fecc8533c5d52cf9bee137687fdda280dab2e39a.zip |
make private fields final where possible (#2028)
Diffstat (limited to 'src/main/java/gregtech/common')
13 files changed, 24 insertions, 22 deletions
diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java index dede2599e8..ff32ba956f 100644 --- a/src/main/java/gregtech/common/GT_Pollution.java +++ b/src/main/java/gregtech/common/GT_Pollution.java @@ -79,7 +79,7 @@ public class GT_Pollution { private boolean blank = true; public static int mPlayerPollution; - private static int POLLUTIONPACKET_MINVALUE = 1000; + private static final int POLLUTIONPACKET_MINVALUE = 1000; private static GT_PollutionEventHandler EVENT_HANDLER; diff --git a/src/main/java/gregtech/common/items/DropType.java b/src/main/java/gregtech/common/items/DropType.java index 3ed3169294..64d42b2eeb 100644 --- a/src/main/java/gregtech/common/items/DropType.java +++ b/src/main/java/gregtech/common/items/DropType.java @@ -15,13 +15,13 @@ public enum DropType { LAPIS("lapis coolant", true), ENDERGOO("ender goo", true); - private static int[][] colours = new int[][] { { 0x19191B, 0x303032 }, { 0xffc100, 0x00ff11 }, + private static final int[][] colours = new int[][] { { 0x19191B, 0x303032 }, { 0xffc100, 0x00ff11 }, { 0x144F5A, 0x2494A2 }, { 0xC11F1F, 0xEBB9B9 }, { 0x872836, 0xB8132C }, { 0xD02001, 0x9C0018 }, { 0x003366, 0x0066BB }, { 0x1727b1, 0x008ce3 }, { 0xA005E7, 0x161616 }, }; public boolean showInList; public Materials material; public int chance; - private String name; + private final String name; DropType(String pName, boolean show) { this.name = pName; diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java index aa7576911b..08d6f23164 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java @@ -49,7 +49,7 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item { * Assignment of metadata IDs: 0 - 999: Molten cells 10_000 - 15_999: Cracked fluid cells (# IDs used is * NUM_CRACKED_CELL_TYPES * 1_000; update this if you add any) */ - private BitSet enabled = new BitSet(); + private final BitSet enabled = new BitSet(); public GT_MetaGenerated_Item_99() { super("metaitem.99", (short) (10_000 + NUM_CRACKED_CELL_TYPES * 1_000), (short) 0); diff --git a/src/main/java/gregtech/common/items/PollenType.java b/src/main/java/gregtech/common/items/PollenType.java index 093a21187b..3cd9484b69 100644 --- a/src/main/java/gregtech/common/items/PollenType.java +++ b/src/main/java/gregtech/common/items/PollenType.java @@ -7,11 +7,11 @@ public enum PollenType { MATRIX("matrix", true); - private static int[][] colours = new int[][] { { 0x19191B, 0x303032 }, }; + private static final int[][] colours = new int[][] { { 0x19191B, 0x303032 }, }; public boolean showInList; public Materials material; public int chance; - private String name; + private final String name; PollenType(String pName, boolean show) { this.name = pName; diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java index 91f3f432b2..e6f08b0cfa 100644 --- a/src/main/java/gregtech/common/items/PropolisType.java +++ b/src/main/java/gregtech/common/items/PropolisType.java @@ -15,13 +15,13 @@ public enum PropolisType { Endium("Endium", true), Fireessence("Fireessence", true); - private static int[] colours = new int[] { 0xCC00FA, 0xDCB0E5, 0x9010AD, 0xFFFF00, 0x911ECE, 0x161616, 0xEE053D, - 0xa0ffff, 0xD41238 }; + private static final int[] colours = new int[] { 0xCC00FA, 0xDCB0E5, 0x9010AD, 0xFFFF00, 0x911ECE, 0x161616, + 0xEE053D, 0xa0ffff, 0xD41238 }; public boolean showInList; public Materials material; public int chance; - private String name; + private final String name; PropolisType(String pName, boolean show) { this.name = pName; diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java index 84c5626e69..c1d965fb22 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java @@ -19,8 +19,9 @@ import gregtech.common.misc.spaceprojects.SpaceProjectManager; */ public class SP_Command extends CommandBase { - private static Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections.newSetFromMap(new WeakHashMap<>()); - private static Set<EntityPlayerMP> confirm = Collections.newSetFromMap(new WeakHashMap<>()); + private static final Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections + .newSetFromMap(new WeakHashMap<>()); + private static final Set<EntityPlayerMP> confirm = Collections.newSetFromMap(new WeakHashMap<>()); private static final String INVITE = "invite"; private static final String ACCEPT = "accept"; diff --git a/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java b/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java index 34a71bfc84..5d94add40d 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java @@ -55,9 +55,9 @@ public enum SolarSystem implements ISpaceBody { KuiperBelt(AsteroidBelt), NONE(SpaceBodyType.NONE); - private SpaceBodyType spaceBody; - private StarType star; - private UITexture texture; + private final SpaceBodyType spaceBody; + private final StarType star; + private final UITexture texture; SolarSystem(SpaceBodyType aType) { this(aType, NotAStar); diff --git a/src/main/java/gregtech/common/misc/spaceprojects/enums/StarType.java b/src/main/java/gregtech/common/misc/spaceprojects/enums/StarType.java index a329c7c639..7585c95aa0 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/enums/StarType.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/enums/StarType.java @@ -14,8 +14,8 @@ public enum StarType { MClass(0.08, 0.1f), NotAStar(0, 0); - private double solarLuminosity; - private float costMultiplier; + private final double solarLuminosity; + private final float costMultiplier; StarType(double solarLuminosity, float costMultiplier) { this.solarLuminosity = solarLuminosity; diff --git a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java b/src/main/java/gregtech/common/render/GT_PollutionRenderer.java index d975ac7952..ee87b2b5d1 100644 --- a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java +++ b/src/main/java/gregtech/common/render/GT_PollutionRenderer.java @@ -31,7 +31,7 @@ public class GT_PollutionRenderer { private static GT_ClientPollutionMap pollutionMap; private static int playerPollution = 0; - private static boolean DEBUG = false; + private static final boolean DEBUG = false; // PARTICLES_POLLUTION_START + PARTICLES_POLLUTION_END -> Max Particles private static final int PARTICLES_MAX_NUM = 100; diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java index cc62de308c..e42f0bfb86 100644 --- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java +++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java @@ -22,7 +22,7 @@ public class Inventory extends UpgradeCasing { public static final int BOTH = 2; private String mInventoryName = "inventory"; private int mInventorySize; - private int mType = BOTH; + private final int mType = BOTH; public String getInventoryName() { return mInventoryName; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java index 66a11db3a3..46ebad2173 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java @@ -85,8 +85,9 @@ public class GT_MetaTileEntity_PCBFactory extends private float mRoughnessMultiplier = 1; private int mTier = 1, mSetTier = 1, mUpgradesInstalled = 0, mCurrentParallel = 0, mMaxParallel = 0; private boolean mBioUpgrade = false, mBioRotate = false, mOCTier1 = false, mOCTier2 = false; - private int[] mBioOffsets = new int[] { -5, -1 }, mOCTier1Offsets = new int[] { 2, -11 }, - mOCTier2Offsets = new int[] { 2, -11 }; + private final int[] mBioOffsets = new int[] { -5, -1 }; + private final int[] mOCTier1Offsets = new int[] { 2, -11 }; + private final int[] mOCTier2Offsets = new int[] { 2, -11 }; private GT_MetaTileEntity_Hatch_Input mCoolantInputHatch; private static final int mBioRotateBitMap = 0b1000000; private static final int mOCTier2BitMap = 0b100000; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java index 93db2f3627..341239c128 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java @@ -21,7 +21,7 @@ import gregtech.api.util.GT_ToolHarvestHelper; public class GT_Tool_Plow extends GT_Tool { - private ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>(); + private final ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>(); @Override public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java index ef699d4d15..f5d3f7147a 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java @@ -20,7 +20,7 @@ import gregtech.common.items.behaviors.Behaviour_Sense; public class GT_Tool_Sense extends GT_Tool { - private ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>(); + private final ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>(); @Override public float getBaseDamage() { |