We use a unique object, to use app-client

imesense · Oct 24, 2024 · 1f369e4 · 1f369e4
1 parent 6019df0
commit 1f369e4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 28 deletions.
diff --git a/...2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpEntity.java b/...2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/command/cmdAdminDumpEntity.java
@@ -9,6 +9,7 @@
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
+import org.imesense.dynamicspawncontrol.UniqueField;
 import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
@@ -61,7 +62,7 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
     {
         if (sender instanceof EntityPlayerMP)
         {
-            RayTraceResult result = Minecraft.getMinecraft().objectMouseOver;
+            RayTraceResult result = UniqueField.CLIENT.objectMouseOver;
 
             if (result != null && result.typeOfHit == RayTraceResult.Type.ENTITY)
             {

diff --git a/...g/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java b/...g/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java
@@ -9,6 +9,7 @@
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.imesense.dynamicspawncontrol.ProjectStructure;
+import org.imesense.dynamicspawncontrol.UniqueField;
 import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
@@ -52,11 +53,6 @@ public final class OnComplexityBiomes
      */
     private final long BIOMES_CHANGE_MIN_TIME = 3000;
 
-    /**
-     *
-     */
-    private final Minecraft mc = Minecraft.getMinecraft();
-
     /**
      *
      */
@@ -121,7 +117,7 @@ public synchronized void onRenderOverlay(RenderGameOverlayEvent.Text event)
             int boxWidth = 120;
             int boxHeight = 50;
 
-            int screenWidth = mc.displayWidth / mc.gameSettings.guiScale;
+            int screenWidth = UniqueField.CLIENT.displayWidth / UniqueField.CLIENT.gameSettings.guiScale;
 
             int xPos = (screenWidth - boxWidth) / 2;
             int yPos = 20;
@@ -130,11 +126,11 @@ public synchronized void onRenderOverlay(RenderGameOverlayEvent.Text event)
 
             drawRect(xPos, yPos, xPos + boxWidth, yPos + boxHeight, backgroundColor);
 
-            int textWidth = mc.fontRenderer.getStringWidth(biomeText);
+            int textWidth = UniqueField.CLIENT.fontRenderer.getStringWidth(biomeText);
             int textXPos = xPos + (boxWidth - textWidth) / 2;
             int textYPos = yPos + 10;
 
-            mc.fontRenderer.drawString(biomeText, textXPos, textYPos, 0xFFFFFF);
+            UniqueField.CLIENT.fontRenderer.drawString(biomeText, textXPos, textYPos, 0xFFFFFF);
 
             int[] skullCounts =
             {
@@ -171,7 +167,7 @@ public synchronized void onRenderOverlay(RenderGameOverlayEvent.Text event)
             {
                 for (int j = 0; j < skullCounts[i]; j++)
                 {
-                    mc.getTextureManager().bindTexture(skullTextures[i]);
+                    UniqueField.CLIENT.getTextureManager().bindTexture(skullTextures[i]);
                     drawModalRectWithCustomSizedTexture(skullXPos, skullYPos, 0, 0, skullWidth, skullWidth, skullWidth, skullWidth);
                     skullXPos += skullWidth + skullSpacing;
                 }

diff --git a/...src/main/java/org/imesense/dynamicspawncontrol/technical/handler/ObjectHandlerClient.java b/...src/main/java/org/imesense/dynamicspawncontrol/technical/handler/ObjectHandlerClient.java
@@ -18,6 +18,7 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.registries.IForgeRegistry;
 import org.imesense.dynamicspawncontrol.ProjectStructure;
+import org.imesense.dynamicspawncontrol.UniqueField;
 import org.imesense.dynamicspawncontrol.gameplay.throwingobject.DSCThrowItemWeb;
 import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.gameplay.item.DSCWeb;
@@ -90,7 +91,7 @@ public static void registerRenders(ModelRegistryEvent event)
             registerRender(ObjectHandlerClient.webbing);
 
             RenderingRegistry.registerEntityRenderingHandler(DSCThrowItemWeb.class, (manager) ->
-                    new RenderSnowball<>(manager, ObjectHandlerClient.webbing, Minecraft.getMinecraft().getRenderItem()));
+                    new RenderSnowball<>(manager, ObjectHandlerClient.webbing, UniqueField.CLIENT.getRenderItem()));
         }
 
         /**

diff --git a/...12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java b/...12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketGameRule.java
@@ -6,6 +6,7 @@
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import org.apache.logging.log4j.LogManager;
+import org.imesense.dynamicspawncontrol.UniqueField;
 import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.technical.config.gameworldtime.DataPluginWorldTime;
 
@@ -67,9 +68,9 @@ public static class Handler implements IMessageHandler<PacketGameRule, IMessage>
          */
         public IMessage onMessage(PacketGameRule message, MessageContext ctx)
         {
-            Minecraft.getMinecraft().addScheduledTask(() ->
+            UniqueField.CLIENT.addScheduledTask(() ->
             {
-                Minecraft.getMinecraft().world.getGameRules().setOrCreateGameRule("doDaylightCycle_tc", Boolean.toString(message.doDaylightCycle_tc));
+                UniqueField.CLIENT.world.getGameRules().setOrCreateGameRule("doDaylightCycle_tc", Boolean.toString(message.doDaylightCycle_tc));
 
                 if (DataPluginWorldTime.ConfigDataWorldTime.instance.getTimeControlDebug())
                 {

diff --git a/...l-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketTime.java b/...l-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/network/PacketTime.java
@@ -5,6 +5,7 @@
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import org.imesense.dynamicspawncontrol.UniqueField;
 import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnUpdateTimeWorld;
 
 /**
@@ -74,7 +75,7 @@ public static class Handler implements IMessageHandler<PacketTime, IMessage>
          */
         public IMessage onMessage(PacketTime message, MessageContext ctx)
         {
-            Minecraft.getMinecraft().addScheduledTask(() ->
+            UniqueField.CLIENT.addScheduledTask(() ->
             {
                 OnUpdateTimeWorld.INSTANCE.clientUpdate(message.customTime, message.multiplier);
             });

diff --git a/.../src/main/java/org/imesense/dynamicspawncontrol/technical/network/PlayerInWebMessage.java b/.../src/main/java/org/imesense/dynamicspawncontrol/technical/network/PlayerInWebMessage.java
@@ -9,6 +9,7 @@
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import net.minecraftforge.fml.relauncher.Side;
+import org.imesense.dynamicspawncontrol.UniqueField;
 import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 
 /**
@@ -84,20 +85,15 @@ public IMessage onMessage(final PlayerInWebMessage msg, MessageContext ctx)
             /**
              *
              */
-            Minecraft getMinecraft = Minecraft.getMinecraft();
-
-            /**
-             *
-             */
-            getMinecraft.addScheduledTask(new Runnable()
+            UniqueField.CLIENT.addScheduledTask(new Runnable()
             {
                 /**
                  *
                  */
                 public void run()
                 {
-                    getMinecraft.world.setBlockState(msg.pos, Blocks.WEB.getDefaultState());
-                    getMinecraft.player.setInWeb();
+                    UniqueField.CLIENT.world.setBlockState(msg.pos, Blocks.WEB.getDefaultState());
+                    UniqueField.CLIENT.player.setInWeb();
                 }
             });
 

diff --git a/...2.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheMonitor.java b/...2.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/CacheMonitor.java
@@ -4,6 +4,7 @@
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.client.gui.ScaledResolution;
+import org.imesense.dynamicspawncontrol.UniqueField;
 import org.imesense.dynamicspawncontrol.debug.CodeGenericUtil;
 import org.imesense.dynamicspawncontrol.technical.customlibrary.Log;
 
@@ -17,11 +18,6 @@ public final class CacheMonitor
      */
     private static boolean instanceExists = false;
 
-    /**
-     *
-     */
-    public final Minecraft GetMinecraft = Minecraft.getMinecraft();
-
     /**
      *
      */
@@ -44,7 +40,7 @@ public CacheMonitor()
      */
     public void renderDebugInfo(ScaledResolution resolution)
     {
-        final FontRenderer FONT_RENDER = GetMinecraft.fontRenderer;
+        final FontRenderer FONT_RENDER = UniqueField.CLIENT.fontRenderer;
 
         final String ACTUAL_ANIMALS = TextFormatting.GREEN + "Actual Animals: " + Cache.instance.getActualAnimalCount();
         final String ACTUAL_HOSTILE = TextFormatting.RED + "Actual Hostile Entities: " + Cache.instance.getActualHostileEntityCount();