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/api | |
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/api')
16 files changed, 41 insertions, 31 deletions
diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java index 175081e0ce..98ed5fa3f7 100644 --- a/src/main/java/gregtech/api/enums/MaterialBuilder.java +++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java @@ -10,15 +10,15 @@ public class MaterialBuilder { public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5; - private int metaItemSubID; - private TextureSet iconSet; + private final int metaItemSubID; + private final TextureSet iconSet; private float toolSpeed = 1.0f; private int durability = 0; private int toolQuality = 0; private int types = 0; private int r = 255, g = 255, b = 255, a = 0; private String name; - private String defaultLocalName; + private final String defaultLocalName; private int fuelType = 0; private int fuelPower = 0; private int meltingPoint = 0; diff --git a/src/main/java/gregtech/api/gui/GT_GUIScreen.java b/src/main/java/gregtech/api/gui/GT_GUIScreen.java index 52ecbe8ab5..4f15e2e607 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIScreen.java +++ b/src/main/java/gregtech/api/gui/GT_GUIScreen.java @@ -35,7 +35,7 @@ public abstract class GT_GUIScreen extends GuiScreen implements GT_IToolTipRende protected ResourceLocation mGUIbackgroundLocation; private GuiButton selectedButton; - private GT_GUIColorOverride colorOverride; + private final GT_GUIColorOverride colorOverride; private final int textColor; private static final String guiTexturePath = "gregtech:textures/gui/GuiCover.png"; diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java index 890e6298c9..d52b09b9d5 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java @@ -30,10 +30,10 @@ public class GT_GuiCoverTabLine extends GT_GuiTabLine { "GT5U.interface.coverTabs.north", "GT5U.interface.coverTabs.south", "GT5U.interface.coverTabs.west", "GT5U.interface.coverTabs.east" }; - // Not sure there's a point in JIT translation but that's what this is - private String[] translatedSides; - private IGregTechTileEntity tile; - private int colorization; + // Not sure if there's a point in JIT translation but that's what this is + private final String[] translatedSides; + private final IGregTechTileEntity tile; + private final int colorization; /** * Let's you access an IGregTechTileEntity's covers as tabs on the GUI's sides diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java index 0f6a1c9f41..b534359cac 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java @@ -18,7 +18,7 @@ public class GT_GuiFakeItemButton implements IGuiScreen.IGuiElement { private GT_GuiIcon bgIcon; private ItemStack item; - private IGuiScreen gui; + private final IGuiScreen gui; private int xPosition, yPosition; private List<String> itemTooltips; private final GT_GuiTooltip tooltip = new GT_GuiTooltip(null) { diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java index 555d063a3b..62d6648e73 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java @@ -15,7 +15,8 @@ public class GT_GuiIconButton extends GuiButton implements IGuiScreen.IGuiElemen public static final int DEFAULT_HEIGHT = 16; protected GT_GuiIcon icon; - private int x0, y0; + private final int x0; + private final int y0; protected IGuiScreen gui; private GT_GuiTooltip tooltip; diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java index 556de34395..151eba2936 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java @@ -23,12 +23,12 @@ public class GT_GuiTab { public boolean visible = true, mousedOver, enabled = true; private Rectangle bounds; - private GT_GuiTabIconSet tabBackground; - private ItemStack item; - private GT_ITabRenderer gui; + private final GT_GuiTabIconSet tabBackground; + private final ItemStack item; + private final GT_ITabRenderer gui; private GT_GuiTooltip tooltip; - private IGuiIcon overlay; - private boolean flipHorizontally; + private final IGuiIcon overlay; + private final boolean flipHorizontally; /** * A tab to be attached to a tab line diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java index bc9f4437d7..74145463b3 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java @@ -40,7 +40,7 @@ public class GT_GuiTabLine { NORMAL((byte) 1), INVERSE((byte) -1); - private byte value; + private final byte value; DisplayStyle(byte value) { this.value = value; @@ -75,16 +75,21 @@ public class GT_GuiTabLine { // The tabs are arranged according to their index in this array protected final GT_GuiTab[] mTabs; - private int tabLineLeft, tabLineTop, tabHeight, tabWidth, tabSpacing; + private final int tabLineLeft; + private final int tabLineTop; + private final int tabHeight; + private final int tabWidth; + private final int tabSpacing; // In which direction to draw the tab line - private DisplayStyle xDir, yDir; + private final DisplayStyle xDir; + private final DisplayStyle yDir; // Whether to display on the right side of the GT_ITabRenderer instead of left protected boolean flipHorizontally, visible; - private GT_GuiTabIconSet tabBackground; - private GT_ITabRenderer gui; + private final GT_GuiTabIconSet tabBackground; + private final GT_ITabRenderer gui; /** * Draws clickable and configurable tabs on the left or right side of a GT_ITabRenderer diff --git a/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java b/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java index 91b6d5a117..7fb9bc4be6 100644 --- a/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java +++ b/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java @@ -15,7 +15,7 @@ import ic2.api.energy.tile.IEnergySink; public class TileIC2EnergySink extends TileEntity implements IEnergySink { - private IGregTechTileEntity myMeta; + private final IGregTechTileEntity myMeta; private GT_MetaPipeEntity_Cable cableMeta = null; public TileIC2EnergySink(IGregTechTileEntity meta) { diff --git a/src/main/java/gregtech/api/objects/GT_ChunkManager.java b/src/main/java/gregtech/api/objects/GT_ChunkManager.java index 6dbabe2535..dd87c8c72e 100644 --- a/src/main/java/gregtech/api/objects/GT_ChunkManager.java +++ b/src/main/java/gregtech/api/objects/GT_ChunkManager.java @@ -25,7 +25,7 @@ import gregtech.api.util.GT_Log; public class GT_ChunkManager implements ForgeChunkManager.OrderedLoadingCallback, ForgeChunkManager.PlayerOrderedLoadingCallback { - private Map<TileEntity, Ticket> registeredTickets = new HashMap<>(); + private final Map<TileEntity, Ticket> registeredTickets = new HashMap<>(); public static GT_ChunkManager instance = new GT_ChunkManager(); public static void init() { diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java index 779f3a732a..f0a6dae8e5 100644 --- a/src/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java @@ -21,7 +21,7 @@ public class GT_FluidStack extends FluidStack { private static final Collection<GT_FluidStack> sAllFluidStacks = Collections .newSetFromMap(new WeakHashMap<>(10000)); private static volatile boolean lock = false; - private Fluid mFluid; + private final Fluid mFluid; public GT_FluidStack(Fluid aFluid, int aAmount) { super(aFluid, aAmount); diff --git a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java index 8578f32228..af82c35dab 100644 --- a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java +++ b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java @@ -9,7 +9,7 @@ import com.google.common.collect.HashBiMap; public class GT_UO_Dimension { - private BiMap<String, GT_UO_Fluid> fFluids; + private final BiMap<String, GT_UO_Fluid> fFluids; private int maxChance; public String Dimension = "null"; diff --git a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java index 6beb8263e0..95d4246cb6 100644 --- a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java +++ b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java @@ -11,7 +11,7 @@ public class GT_UO_DimensionList { private Configuration fConfig; private String fCategory; - private BiMap<String, GT_UO_Dimension> fDimensionList; + private final BiMap<String, GT_UO_Dimension> fDimensionList; public int[] blackList = new int[0]; diff --git a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java index a1af512b82..077964cb69 100644 --- a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java +++ b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java @@ -28,11 +28,11 @@ public class GT_AssemblyLineUtils { /** * A cache of Recipes using the Output as Key. */ - private static HashMap<GT_ItemStack, GT_Recipe_AssemblyLine> sRecipeCacheByOutput = new HashMap<>(); + private static final HashMap<GT_ItemStack, GT_Recipe_AssemblyLine> sRecipeCacheByOutput = new HashMap<>(); /** * A cache of Recipes using the Recipe Hash String as Key. */ - private static HashMap<String, GT_Recipe_AssemblyLine> sRecipeCacheByRecipeHash = new HashMap<>(); + private static final HashMap<String, GT_Recipe_AssemblyLine> sRecipeCacheByRecipeHash = new HashMap<>(); /** * Checks the DataStick for deprecated/invalid recipes, updating them as required. diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GT_BaseCrop.java index 912a966e35..456ba50ff1 100644 --- a/src/main/java/gregtech/api/util/GT_BaseCrop.java +++ b/src/main/java/gregtech/api/util/GT_BaseCrop.java @@ -36,8 +36,8 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { private int mMaxSize = 0; private int mAfterHarvestSize = 0; private int mHarvestSize = 0; - private int[] mStats = new int[5]; - private int mGrowthSpeed = 0; + private final int[] mStats = new int[5]; + private final int mGrowthSpeed = 0; private ItemStack mDrop = null; private ItemStack[] mSpecialDrops = null; private Materials mBlock = null; diff --git a/src/main/java/gregtech/api/util/GT_ItsNotMyFaultException.java b/src/main/java/gregtech/api/util/GT_ItsNotMyFaultException.java index d6b41e69b0..f47a356d7b 100644 --- a/src/main/java/gregtech/api/util/GT_ItsNotMyFaultException.java +++ b/src/main/java/gregtech/api/util/GT_ItsNotMyFaultException.java @@ -4,7 +4,7 @@ public class GT_ItsNotMyFaultException extends RuntimeException { private static final long serialVersionUID = -8752778866486460495L; - private String mError; + private final String mError; public GT_ItsNotMyFaultException(String aError) { mError = aError; diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 4aa6d68a0a..2b7f0ec5b9 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -3160,7 +3160,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> { private int neiTextColorOverride = -1; private INEISpecialInfoFormatter neiSpecialInfoFormatter; - private boolean checkForCollision = true, allowNoInput, allowNoInputFluid, allowNoOutput, allowNoOutputFluid; + private final boolean checkForCollision = true; + private boolean allowNoInput; + private boolean allowNoInputFluid; + private boolean allowNoOutput; + private boolean allowNoOutputFluid; private boolean disableOptimize = false; private Function<? super GT_RecipeBuilder, ? extends Iterable<? extends GT_Recipe>> recipeEmitter = this::defaultBuildRecipe; private Function<? super GT_Recipe, ? extends GT_Recipe> specialHandler; |