refactor: invoke Minecraft.getInstance() directly

auioc · Jan 26, 2023 · 1b48b56 · 1b48b56
1 parent 1576dfe
commit 1b48b56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/input/KeyboardUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/game/input/KeyboardUtils.java
@@ -9,10 +9,8 @@
 @OnlyIn(Dist.CLIENT)
 public class KeyboardUtils {
 
-    private static final Minecraft MC = Minecraft.getInstance();
-
     public static boolean isKeyDown(int key) {
-        return InputConstants.isKeyDown(MC.getWindow().getWindow(), key);
+        return InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), key);
     }
 
     public static boolean isShiftKeyDown() {

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/language/LanguageUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/game/language/LanguageUtils.java
@@ -13,8 +13,6 @@
 @OnlyIn(Dist.CLIENT)
 public class LanguageUtils {
 
-    private static final Minecraft MC = Minecraft.getInstance();
-
     public static final LanguageInfo DEFAULT_LANGUAGE_INFO = new LanguageInfo("en_us", "US", "English", false);
 
     public static final String[] VANILLA_LANGUAGES = new String[] {
@@ -33,15 +31,15 @@ public class LanguageUtils {
 
 
     public static SortedSet<LanguageInfo> getInfo() {
-        return MC.getLanguageManager().getLanguages();
+        return Minecraft.getInstance().getLanguageManager().getLanguages();
     }
 
     public static Optional<LanguageInfo> getInfo(String code) {
-        return Optional.ofNullable(MC.getLanguageManager().getLanguage(code));
+        return Optional.ofNullable(Minecraft.getInstance().getLanguageManager().getLanguage(code));
     }
 
     public static LanguageInfo getCurrentInfo() {
-        return MC.getLanguageManager().getSelected();
+        return Minecraft.getInstance().getLanguageManager().getSelected();
     }
 
     public static String[] getInfoCodes() {
@@ -50,7 +48,7 @@ public static String[] getInfoCodes() {
 
 
     public static ClientLanguage get(LanguageInfo langInfo) {
-        return ClientLanguage.loadFrom(MC.getResourceManager(), List.of(langInfo));
+        return ClientLanguage.loadFrom(Minecraft.getInstance().getResourceManager(), List.of(langInfo));
     }
 
     public static ClientLanguage get(String langCode) {

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/resource/ResourceUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/game/resource/ResourceUtils.java
@@ -12,8 +12,6 @@
 @OnlyIn(Dist.CLIENT)
 public class ResourceUtils {
 
-    private static final Minecraft MC = Minecraft.getInstance();
-
     public static ResourceLocation modelIdOrElse(String modelId, ResourceLocation other) {
         try {
             return modelId.contains("#") ? new ModelResourceLocation(modelId) : new ResourceLocation(modelId);
@@ -26,6 +24,8 @@ public static ResourceLocation modelId(String modelId) {
         return modelIdOrElse(modelId, ModelBakery.MISSING_MODEL_LOCATION);
     }
 
+    // ====================================================================== //
+
     public static boolean isValidModelId(String modelId) {
         try {
             if (modelId.contains("#")) {
@@ -39,13 +39,14 @@ public static boolean isValidModelId(String modelId) {
         }
     }
 
+    // ====================================================================== //
+
     public static BakedModel getBakedModel(String modelId) {
-        return MC.getModelManager().getModel(modelId(modelId));
+        return Minecraft.getInstance().getModelManager().getModel(modelId(modelId));
     }
 
     public static BakedModel getBakedModel(ResourceLocation modelId) {
-        return MC.getModelManager().getModel(modelId);
+        return Minecraft.getInstance().getModelManager().getModel(modelId);
     }
 
-
 }