From b74ead594f1e817e36818e3e0e69da91aeb4f5c9 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Sun, 23 Aug 2020 22:09:15 -0700 Subject: [PATCH] Add final keywords --- src/net/TheDgtl/Stargate/Blox.java | 8 ++++---- src/net/TheDgtl/Stargate/Gate.java | 14 +++++++------- src/net/TheDgtl/Stargate/LangLoader.java | 6 +++--- src/net/TheDgtl/Stargate/Portal.java | 16 ++++++++-------- src/net/TheDgtl/Stargate/Stargate.java | 4 ++-- .../Stargate/event/StargateAccessEvent.java | 2 +- .../Stargate/event/StargateActivateEvent.java | 2 +- .../Stargate/event/StargateCreateEvent.java | 4 ++-- .../Stargate/event/StargateDestroyEvent.java | 2 +- .../Stargate/event/StargateOpenEvent.java | 2 +- .../Stargate/event/StargatePortalEvent.java | 4 ++-- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/net/TheDgtl/Stargate/Blox.java b/src/net/TheDgtl/Stargate/Blox.java index d94486d..f45c023 100644 --- a/src/net/TheDgtl/Stargate/Blox.java +++ b/src/net/TheDgtl/Stargate/Blox.java @@ -30,10 +30,10 @@ import org.bukkit.block.data.type.WallSign; */ public class Blox { - private int x; - private int y; - private int z; - private World world; + private final int x; + private final int y; + private final int z; + private final World world; private Blox parent = null; public Blox (World world, int x, int y, int z) { diff --git a/src/net/TheDgtl/Stargate/Gate.java b/src/net/TheDgtl/Stargate/Gate.java index 9f2867f..088182e 100644 --- a/src/net/TheDgtl/Stargate/Gate.java +++ b/src/net/TheDgtl/Stargate/Gate.java @@ -39,18 +39,18 @@ public class Gate { private static final Character ANYTHING = ' '; private static final Character ENTRANCE = '.'; private static final Character EXIT = '*'; - private static HashMap gates = new HashMap<>(); - private static HashMap> controlBlocks = new HashMap<>(); - private static HashSet frameBlocks = new HashSet<>(); + private static final HashMap gates = new HashMap<>(); + private static final HashMap> controlBlocks = new HashMap<>(); + private static final HashSet frameBlocks = new HashSet<>(); - private String filename; - private Character[][] layout; - private HashMap types; + private final String filename; + private final Character[][] layout; + private final HashMap types; private RelativeBlockVector[] entrances = new RelativeBlockVector[0]; private RelativeBlockVector[] border = new RelativeBlockVector[0]; private RelativeBlockVector[] controls = new RelativeBlockVector[0]; private RelativeBlockVector exitBlock = null; - private HashMap exits = new HashMap<>(); + private final HashMap exits = new HashMap<>(); private Material portalBlockOpen = Material.NETHER_PORTAL; private Material portalBlockClosed = Material.AIR; diff --git a/src/net/TheDgtl/Stargate/LangLoader.java b/src/net/TheDgtl/Stargate/LangLoader.java index 625b56d..49cdf7f 100644 --- a/src/net/TheDgtl/Stargate/LangLoader.java +++ b/src/net/TheDgtl/Stargate/LangLoader.java @@ -31,12 +31,12 @@ import java.util.Set; */ public class LangLoader { - private String UTF8_BOM = "\uFEFF"; + private final String UTF8_BOM = "\uFEFF"; // Variables - private String datFolder; + private final String datFolder; private String lang; private HashMap strList; - private HashMap defList; + private final HashMap defList; public LangLoader(String datFolder, String lang) { this.lang = lang; diff --git a/src/net/TheDgtl/Stargate/Portal.java b/src/net/TheDgtl/Stargate/Portal.java index 90b28c9..cfff89c 100644 --- a/src/net/TheDgtl/Stargate/Portal.java +++ b/src/net/TheDgtl/Stargate/Portal.java @@ -70,14 +70,14 @@ public class Portal { private static final HashMap bungeePortals = new HashMap<>(); // Gate location block info - private Blox topLeft; - private int modX; - private int modZ; - private float rotX; - private Axis rot; + private final Blox topLeft; + private final int modX; + private final int modZ; + private final float rotX; + private final Axis rot; // Block references - private Blox id; + private final Blox id; private Blox button; private Blox[] frame; private Blox[] entrances; @@ -87,10 +87,10 @@ public class Portal { private String destination; private String lastDest = ""; private String network; - private Gate gate; + private final Gate gate; private String ownerName = ""; private UUID ownerUUID = null; - private World world; + private final World world; private boolean verified; private boolean fixed; diff --git a/src/net/TheDgtl/Stargate/Stargate.java b/src/net/TheDgtl/Stargate/Stargate.java index e103c6d..7409d4a 100644 --- a/src/net/TheDgtl/Stargate/Stargate.java +++ b/src/net/TheDgtl/Stargate/Stargate.java @@ -97,8 +97,8 @@ public class Stargate extends JavaPlugin { private static boolean destroyExplosion = false; public static int maxGates = 0; private static String langName = "en"; - private static int activeTime = 10; - private static int openTime = 10; + private static final int activeTime = 10; + private static final int openTime = 10; public static boolean destMemory = false; public static boolean handleVehicles = true; public static boolean sortLists = false; diff --git a/src/net/TheDgtl/Stargate/event/StargateAccessEvent.java b/src/net/TheDgtl/Stargate/event/StargateAccessEvent.java index 04362bb..6dc1585 100644 --- a/src/net/TheDgtl/Stargate/event/StargateAccessEvent.java +++ b/src/net/TheDgtl/Stargate/event/StargateAccessEvent.java @@ -24,7 +24,7 @@ import net.TheDgtl.Stargate.Portal; */ public class StargateAccessEvent extends StargateEvent { - private Player player; + private final Player player; private boolean deny; private static final HandlerList handlers = new HandlerList(); diff --git a/src/net/TheDgtl/Stargate/event/StargateActivateEvent.java b/src/net/TheDgtl/Stargate/event/StargateActivateEvent.java index ae82405..e254c3b 100644 --- a/src/net/TheDgtl/Stargate/event/StargateActivateEvent.java +++ b/src/net/TheDgtl/Stargate/event/StargateActivateEvent.java @@ -26,7 +26,7 @@ import net.TheDgtl.Stargate.Portal; */ public class StargateActivateEvent extends StargateEvent { - private Player player; + private final Player player; private ArrayList destinations; private String destination; diff --git a/src/net/TheDgtl/Stargate/event/StargateCreateEvent.java b/src/net/TheDgtl/Stargate/event/StargateCreateEvent.java index dab9ad1..05a46d0 100644 --- a/src/net/TheDgtl/Stargate/event/StargateCreateEvent.java +++ b/src/net/TheDgtl/Stargate/event/StargateCreateEvent.java @@ -23,10 +23,10 @@ import org.bukkit.event.HandlerList; */ public class StargateCreateEvent extends StargateEvent { - private Player player; + private final Player player; private boolean deny; private String denyReason; - private String[] lines; + private final String[] lines; private int cost; private static final HandlerList handlers = new HandlerList(); diff --git a/src/net/TheDgtl/Stargate/event/StargateDestroyEvent.java b/src/net/TheDgtl/Stargate/event/StargateDestroyEvent.java index d631c17..7ea06fe 100644 --- a/src/net/TheDgtl/Stargate/event/StargateDestroyEvent.java +++ b/src/net/TheDgtl/Stargate/event/StargateDestroyEvent.java @@ -23,7 +23,7 @@ import org.bukkit.event.HandlerList; */ public class StargateDestroyEvent extends StargateEvent { - private Player player; + private final Player player; private boolean deny; private String denyReason; private int cost; diff --git a/src/net/TheDgtl/Stargate/event/StargateOpenEvent.java b/src/net/TheDgtl/Stargate/event/StargateOpenEvent.java index d0da2ba..26ddc08 100644 --- a/src/net/TheDgtl/Stargate/event/StargateOpenEvent.java +++ b/src/net/TheDgtl/Stargate/event/StargateOpenEvent.java @@ -24,7 +24,7 @@ import org.bukkit.event.HandlerList; */ public class StargateOpenEvent extends StargateEvent { - private Player player; + private final Player player; private boolean force; private static final HandlerList handlers = new HandlerList(); diff --git a/src/net/TheDgtl/Stargate/event/StargatePortalEvent.java b/src/net/TheDgtl/Stargate/event/StargatePortalEvent.java index 4a10db9..d02eb63 100644 --- a/src/net/TheDgtl/Stargate/event/StargatePortalEvent.java +++ b/src/net/TheDgtl/Stargate/event/StargatePortalEvent.java @@ -25,8 +25,8 @@ import org.bukkit.event.HandlerList; */ public class StargatePortalEvent extends StargateEvent { - private Player player; - private Portal destination; + private final Player player; + private final Portal destination; private Location exit; private static final HandlerList handlers = new HandlerList();