Misc cleanups

Author: robotgryphon

src/main/java/dev/compactmods/machines/block/tiles/CompactMachineTile.java

@@ -36,7 +36,7 @@
 
 public class CompactMachineTile extends TileEntity implements ICapabilityProvider, ITickableTileEntity {
     public int machineId = -1;
-    private boolean initialized = false;
+    private final boolean initialized = false;
     public boolean alreadyNotifiedOnTick = false;
     public long nextSpawnTick = 0;
 

src/main/java/dev/compactmods/machines/client/gui/PersonalShrinkingDeviceScreen.java

@@ -22,7 +22,7 @@ public class PersonalShrinkingDeviceScreen extends Screen {
     private final ResourceLocation emptySection = new ResourceLocation(CompactMachines.MOD_ID, "empty");
 
     @Nullable
-    private GuideSection currentSection;
+    private final GuideSection currentSection;
 
     protected PersonalShrinkingDeviceScreen() {
         super(new TranslationTextComponent(CompactMachines.MOD_ID + ".gui.psd.title"));

src/main/java/dev/compactmods/machines/client/gui/guide/GuideSection.java

@@ -9,8 +9,8 @@
 
 public class GuideSection implements IRenderable, IGuiEventListener {
     private final List<GuidePage> pages;
-    private int currentPageIndex = 0;
-    private GuidePage currentPage;
+    private final int currentPageIndex = 0;
+    private final GuidePage currentPage;
 
     public GuideSection() {
         this.pages = new ArrayList<>();

src/main/java/dev/compactmods/machines/client/gui/widget/ScrollableWrappedTextWidget.java

@@ -12,9 +12,9 @@
 
 public class ScrollableWrappedTextWidget extends AbstractCMGuiWidget {
 
-    private String localeKey;
+    private final String localeKey;
     private double yScroll = 0;
-    private FontRenderer fontRenderer;
+    private final FontRenderer fontRenderer;
 
     private int maxLinesToShow;
     private int lineIndexStart;

src/main/java/dev/compactmods/machines/compat/theoneprobe/ProbeData.java

@@ -5,9 +5,9 @@
 import mcjty.theoneprobe.api.ProbeMode;
 
 public class ProbeData implements IProbeData {
-    private IProbeInfo info;
-    private ProbeMode mode;
-    private IProbeHitData hitData;
+    private final IProbeInfo info;
+    private final ProbeMode mode;
+    private final IProbeHitData hitData;
 
     public ProbeData(IProbeInfo info, ProbeMode mode, IProbeHitData hitData) {
         this.info = info;

src/main/java/dev/compactmods/machines/compat/theoneprobe/providers/CompactMachineProvider.java

@@ -77,7 +77,7 @@ private static void addProbeInfo(IProbeInfo info, World world, IProbeHitData hit
 
                 tile.getTunnelDefinition().ifPresent(tunnelDef -> {
                     vertical.text(
-                            new StringTextComponent(pos.toString() + ": " + tunnelDef.getRegistryName().toString())
+                            new StringTextComponent(pos + ": " + tunnelDef.getRegistryName().toString())
                     );
                 });
             });

src/main/java/dev/compactmods/machines/core/Registration.java

@@ -59,14 +59,14 @@ public class Registration {
     // ================================================================================================================
     //   PROPERTIES
     // ================================================================================================================
-    private static AbstractBlock.Properties MACHINE_BLOCK_PROPS = AbstractBlock.Properties
+    private static final AbstractBlock.Properties MACHINE_BLOCK_PROPS = AbstractBlock.Properties
             .of(Material.METAL)
             .strength(8.0F, 20.0F)
             .harvestLevel(1)
             .harvestTool(ToolType.PICKAXE)
             .requiresCorrectToolForDrops();
 
-    private static Supplier<Item.Properties> BASIC_ITEM_PROPS = () -> new Item.Properties()
+    private static final Supplier<Item.Properties> BASIC_ITEM_PROPS = () -> new Item.Properties()
             .tab(CompactMachines.COMPACT_MACHINES_ITEMS);
 
     // ================================================================================================================

src/main/java/dev/compactmods/machines/data/persistent/CompactRoomData.java

@@ -36,7 +36,7 @@
 public class CompactRoomData extends WorldSavedData {
     public static final String DATA_NAME = CompactMachines.MOD_ID + "_rooms";
 
-    private Map<ChunkPos, RoomData> machineData;
+    private final Map<ChunkPos, RoomData> machineData;
 
     public CompactRoomData() {
         super(DATA_NAME);

src/main/java/dev/compactmods/machines/datagen/BlockLootGenerator.java

@@ -63,7 +63,7 @@ private LootPool.Builder registerSelfDroppedBlock(RegistryObject<Block> block, R
             return builder;
         }
 
-        private ILootFunction.IBuilder CopyOwnerAndReferenceFunction = CopyNbt.copyData(CopyNbt.Source.BLOCK_ENTITY)
+        private final ILootFunction.IBuilder CopyOwnerAndReferenceFunction = CopyNbt.copyData(CopyNbt.Source.BLOCK_ENTITY)
                 .copy(Reference.CompactMachines.OWNER_NBT, Reference.CompactMachines.OWNER_NBT)
                 .copy("coords", "cm.coords");
 

src/main/java/dev/compactmods/machines/item/TunnelItem.java

@@ -111,7 +111,7 @@ public ActionResultType useOn(ItemUseContext context) {
             Item i = is.getItem();
 
             TunnelItem ti = ((TunnelItem) i);
-            Optional<TunnelDefinition> definition = ti.getDefinition(context.getItemInHand());
+            Optional<TunnelDefinition> definition = getDefinition(context.getItemInHand());
 
             definition.ifPresent(def -> {
                 BlockState tunnelState = Registration.BLOCK_TUNNEL_WALL.get()