From 3d6f87a1a5da2dc6e3f2777c797eec914f3162f0 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Fri, 19 Jan 2024 00:46:37 +0100 Subject: [PATCH] Not making instance final or private. Fix stuff --- .../java/dev/tr7zw/firstperson/FirstPersonModelCore.java | 2 +- src/main/java/dev/tr7zw/firstperson/LogicHandler.java | 6 +++--- .../tr7zw/firstperson/forge/RenderHandEventListener.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/tr7zw/firstperson/FirstPersonModelCore.java b/src/main/java/dev/tr7zw/firstperson/FirstPersonModelCore.java index 7ea779f7..9b96ccae 100644 --- a/src/main/java/dev/tr7zw/firstperson/FirstPersonModelCore.java +++ b/src/main/java/dev/tr7zw/firstperson/FirstPersonModelCore.java @@ -14,7 +14,7 @@ public abstract class FirstPersonModelCore extends FirstPersonBase { @Getter private LogicHandler logicHandler; - public static FirstPersonModelCore instance = new Fir; + public static FirstPersonModelCore instance; private boolean isHeld = false; private KeyMapping keyBinding = new KeyMapping("key.firstperson.toggle", 295, "Firstperson"); private boolean lateInit = true; diff --git a/src/main/java/dev/tr7zw/firstperson/LogicHandler.java b/src/main/java/dev/tr7zw/firstperson/LogicHandler.java index ef8239be..e21806a7 100644 --- a/src/main/java/dev/tr7zw/firstperson/LogicHandler.java +++ b/src/main/java/dev/tr7zw/firstperson/LogicHandler.java @@ -44,11 +44,11 @@ public boolean preventFirstperson() { if (client.player.getSwimAmount(1f) != 0 && !isCrawlingOrSwimming(client.player)) return true; // spotless:off - // #if MC >= 11700 + //#if MC >= 11700 if (client.player.isScoping()) return true; - // #endif - // spotless:on + //#endif + //spotless:on return false; } }); diff --git a/src/main/java/dev/tr7zw/firstperson/forge/RenderHandEventListener.java b/src/main/java/dev/tr7zw/firstperson/forge/RenderHandEventListener.java index 33258672..f4bd0232 100644 --- a/src/main/java/dev/tr7zw/firstperson/forge/RenderHandEventListener.java +++ b/src/main/java/dev/tr7zw/firstperson/forge/RenderHandEventListener.java @@ -14,7 +14,7 @@ //$$ //$$ @SubscribeEvent //$$ public void onRender(RenderHandEvent e) { -//$$ if(FirstPersonModelCore.enabled && !FirstPersonModelCore.instance.getLogicHandler().showVanillaHands()) { +//$$ if(FirstPersonModelCore.instance.isEnabled() && !FirstPersonModelCore.instance.getLogicHandler().showVanillaHands()) { //$$ e.setCanceled(true); //$$ } //$$ }