[Port] Update to 1.3.2 (v2.4.0)

CDAGaming · Jun 9, 2024 · a16befc · a16befc
1 parent 6cc139e
commit a16befc
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 73 deletions.
diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/CraftPresence.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/CraftPresence.java
@@ -41,8 +41,8 @@
 import io.github.cdagaming.unicore.utils.ScheduleUtils;
 import io.github.cdagaming.unicore.utils.TimeUtils;
 import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.Session;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.Session;
 
 /**
  * The Primary Application Class and Utilities

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/config/gui/MainGui.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/config/gui/MainGui.java
@@ -32,7 +32,7 @@
 import com.gitlab.cdagaming.craftpresence.utils.gui.impl.ConfigurationGui;
 import com.gitlab.cdagaming.craftpresence.utils.gui.widgets.ScrollableTextWidget;
 import io.github.cdagaming.unicore.utils.StringUtils;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.src.GuiScreen;
 import org.lwjgl.input.Keyboard;
 
 public class MainGui extends ConfigurationGui<Config> {

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/impl/TranslationManager.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/impl/TranslationManager.java
@@ -27,7 +27,7 @@
 import com.gitlab.cdagaming.craftpresence.CraftPresence;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import io.github.cdagaming.unicore.utils.TranslationUtils;
-import net.minecraft.util.StringTranslate;
+import net.minecraft.src.StringTranslate;
 
 import java.util.Properties;
 

diff --git a/...c/main/java/com/gitlab/cdagaming/craftpresence/integrations/replaymod/ReplayModUtils.java b/...c/main/java/com/gitlab/cdagaming/craftpresence/integrations/replaymod/ReplayModUtils.java
@@ -32,7 +32,7 @@
 import io.github.cdagaming.unicore.utils.MappingUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import io.github.classgraph.ClassInfo;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.src.GuiScreen;
 
 import java.util.List;
 import java.util.function.Supplier;

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/KeyUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/KeyUtils.java
@@ -34,8 +34,8 @@
 import io.github.cdagaming.unicore.impl.Pair;
 import io.github.cdagaming.unicore.impl.Tuple;
 import io.github.cdagaming.unicore.utils.StringUtils;
-import net.minecraft.client.gui.GuiControls;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.src.GuiControls;
+import net.minecraft.src.KeyBinding;
 import org.lwjgl.input.Keyboard;
 
 import java.util.List;

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/NbtUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/NbtUtils.java
@@ -27,10 +27,7 @@
 import com.gitlab.cdagaming.craftpresence.core.Constants;
 import io.github.cdagaming.unicore.utils.FileUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityList;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.*;
+import net.minecraft.src.*;
 
 import java.util.List;
 

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/entity/EntityUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/entity/EntityUtils.java
@@ -29,11 +29,11 @@
 import com.gitlab.cdagaming.craftpresence.core.config.element.ModuleData;
 import com.gitlab.cdagaming.craftpresence.core.impl.ExtendedModule;
 import io.github.cdagaming.unicore.utils.StringUtils;
-import net.minecraft.client.gui.GuiPlayerInfo;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityList;
-import net.minecraft.world.World;
-import net.minecraft.world.storage.WorldInfo;
+import net.minecraft.src.GuiPlayerInfo;
+import net.minecraft.src.Entity;
+import net.minecraft.src.EntityList;
+import net.minecraft.src.World;
+import net.minecraft.src.WorldInfo;
 
 import java.util.List;
 import java.util.Map;

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/entity/TileEntityUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/entity/TileEntityUtils.java
@@ -28,9 +28,9 @@
 import com.gitlab.cdagaming.craftpresence.ModUtils;
 import com.gitlab.cdagaming.craftpresence.core.impl.Module;
 import io.github.cdagaming.unicore.utils.StringUtils;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
+import net.minecraft.src.Block;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
 
 import java.util.List;
 import java.util.Map;
@@ -235,7 +235,7 @@ public static String getName(final Object data, final boolean stripFormatting) {
         String result = "";
         if (!isEmpty(itemStack)) {
             result = StringUtils.getOrDefault(
-                    itemStack.getDisplayName()
+                    itemStack.getItem().getStatName()
             );
         }
 
@@ -308,7 +308,7 @@ public void clearAttributes() {
 
     @Override
     public void updateData() {
-        final ItemStack NEW_CURRENT_MAIN_HAND_ITEM = CraftPresence.player.getHeldItem();
+        final ItemStack NEW_CURRENT_MAIN_HAND_ITEM = CraftPresence.player.inventory.getCurrentItem();
         final ItemStack NEW_CURRENT_HELMET = CraftPresence.player.inventory.armorInventory[3];
         final ItemStack NEW_CURRENT_CHEST = CraftPresence.player.inventory.armorInventory[2];
         final ItemStack NEW_CURRENT_LEGS = CraftPresence.player.inventory.armorInventory[1];

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/GuiUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/GuiUtils.java
@@ -32,9 +32,9 @@
 import io.github.cdagaming.unicore.utils.MappingUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import io.github.classgraph.ClassInfo;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.src.FontRenderer;
+import net.minecraft.src.GuiScreen;
+import net.minecraft.src.GuiContainer;
 
 import java.util.List;
 import java.util.Map;

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/RenderUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/RenderUtils.java
@@ -42,12 +42,12 @@
 import io.github.cdagaming.unicore.utils.StringUtils;
 import io.github.cdagaming.unicore.utils.TimeUtils;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.item.ItemStack;
+import net.minecraft.src.FontRenderer;
+import net.minecraft.src.GuiScreen;
+import net.minecraft.src.RenderHelper;
+import net.minecraft.src.Tessellator;
+import net.minecraft.src.RenderItem;
+import net.minecraft.src.ItemStack;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
@@ -309,7 +309,7 @@ public static void drawItemStack(@Nonnull final Minecraft client, final FontRend
 
             final int xPos = Math.round(x / scale);
             final int yPos = Math.round(y / scale);
-            itemRender.renderItemAndEffectIntoGUI(fontRenderer, client.renderEngine, stack, xPos, yPos);
+            itemRender.renderItemIntoGUI(fontRenderer, client.renderEngine, stack, xPos, yPos);
             itemRender.renderItemOverlayIntoGUI(fontRenderer, client.renderEngine, stack, xPos, yPos);
 
             RenderHelper.disableStandardItemLighting();

diff --git a/...ain/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/ExtendedButtonControl.java b/...ain/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/ExtendedButtonControl.java
@@ -30,8 +30,8 @@
 import com.gitlab.cdagaming.craftpresence.utils.gui.integrations.ExtendedScreen;
 import com.gitlab.cdagaming.craftpresence.utils.gui.widgets.DynamicWidget;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
+import net.minecraft.src.FontRenderer;
+import net.minecraft.src.GuiButton;
 
 import javax.annotation.Nonnull;
 
@@ -62,6 +62,8 @@ public class ExtendedButtonControl extends GuiButton implements DynamicWidget {
      */
     private boolean isOverScreen = false;
 
+    protected boolean hovered = false;
+
     /**
      * Initialization Event for this Control, assigning defined arguments
      *
@@ -450,7 +452,7 @@ public void setControlVisible(final boolean isVisible) {
      * @return the current hover state
      */
     public boolean isHoveringOver() {
-        return this.field_5056;
+        return this.hovered;
     }
 
     /**
@@ -459,7 +461,7 @@ public boolean isHoveringOver() {
      * @param isHovered the new hover state
      */
     public void setHoveringOver(final boolean isHovered) {
-        this.field_5056 = isHovered;
+        this.hovered = isHovered;
     }
 
     /**

diff --git a/.../main/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/ExtendedTextControl.java b/.../main/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/ExtendedTextControl.java
@@ -27,8 +27,8 @@
 import com.gitlab.cdagaming.craftpresence.utils.gui.integrations.ExtendedScreen;
 import com.gitlab.cdagaming.craftpresence.utils.gui.widgets.DynamicWidget;
 import io.github.cdagaming.unicore.utils.StringUtils;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.src.FontRenderer;
+import net.minecraft.src.GuiTextField;
 
 /**
  * Extended Gui Widget for a Text Field

diff --git a/...ain/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/ScrollableListControl.java b/...ain/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/ScrollableListControl.java
@@ -38,10 +38,10 @@
 import io.github.cdagaming.unicore.utils.StringUtils;
 import io.github.classgraph.ClassInfo;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiSlot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.src.FontRenderer;
+import net.minecraft.src.GuiSlot;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.Tessellator;
 
 import javax.annotation.Nonnull;
 import java.awt.*;

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/impl/CommandsGui.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/impl/CommandsGui.java
@@ -39,6 +39,7 @@
 import com.jagrosh.discordipc.IPCClient;
 import io.github.cdagaming.unicore.utils.FileUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
+import net.minecraft.src.GuiTextField;
 import org.lwjgl.input.Keyboard;
 
 import java.io.BufferedWriter;
@@ -160,7 +161,10 @@ public void initializeUi() {
     public void preRender() {
         proceedButton.setControlEnabled(!blockInteractions);
         copyButton.setControlEnabled(!blockInteractions);
-        commandInput.method_4243(!blockInteractions);
+        StringUtils.updateField(GuiTextField.class, commandInput,
+                !blockInteractions,
+                "isEnabled", "field_73819_m", "field_1127", "m"
+        );
 
         if (!blockInteractions) {
             checkCommands();

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/impl/ControlsGui.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/impl/ControlsGui.java
@@ -34,7 +34,7 @@
 import com.gitlab.cdagaming.craftpresence.utils.gui.widgets.ScrollableTextWidget;
 import io.github.cdagaming.unicore.impl.Tuple;
 import io.github.cdagaming.unicore.utils.StringUtils;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.src.KeyBinding;
 import org.lwjgl.input.Keyboard;
 
 import java.util.List;

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/impl/SelectorGui.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/impl/SelectorGui.java
@@ -30,7 +30,7 @@
 import com.gitlab.cdagaming.craftpresence.utils.gui.controls.ScrollableListControl;
 import com.gitlab.cdagaming.craftpresence.utils.gui.integrations.ExtendedScreen;
 import io.github.cdagaming.unicore.utils.StringUtils;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.src.GuiScreen;
 
 import java.util.List;
 import java.util.Set;

diff --git a/...c/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/integrations/ExtendedScreen.java b/...c/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/integrations/ExtendedScreen.java
@@ -37,10 +37,10 @@
 import io.github.cdagaming.unicore.utils.MathUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.src.FontRenderer;
+import net.minecraft.src.Gui;
+import net.minecraft.src.GuiButton;
+import net.minecraft.src.GuiScreen;
 import org.lwjgl.Sys;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
@@ -136,7 +136,6 @@ public class ExtendedScreen extends GuiScreen {
 
     private int prevEventButton = 0;
     private long prevMouseEvent = 0L;
-    private int touchValue = 0;
 
     /**
      * Initialization Event for this Control, assigning defined arguments
@@ -643,18 +642,10 @@ public void handleMouseInput() {
             final int mouseY = height - Mouse.getEventY() * height / mc.displayHeight - 1;
             final int eventButton = Mouse.getEventButton();
             if (Mouse.getEventButtonState()) {
-                if (mc.gameSettings.touchscreen && touchValue++ > 0) {
-                    return;
-                }
-
                 prevEventButton = eventButton;
                 prevMouseEvent = getSystemTime();
                 mouseClicked(mouseX, mouseY, prevEventButton);
             } else if (eventButton != -1) {
-                if (mc.gameSettings.touchscreen && --touchValue > 0) {
-                    return;
-                }
-
                 prevEventButton = -1;
                 mouseMovedOrUp(mouseX, mouseY, eventButton);
             } else if (prevEventButton != -1 && prevMouseEvent > 0L) {
@@ -743,15 +734,13 @@ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) {
         }
     }
 
-    @Override
     protected void method_4259(int mouseX, int mouseY, int mouseButton, long timeSinceLastClick) {
         if (isLoaded()) {
             for (Gui extendedControl : getControls()) {
                 if (extendedControl instanceof ExtendedScreen extendedScreen) {
                     extendedScreen.method_4259(mouseX, mouseY, mouseButton, timeSinceLastClick);
                 }
             }
-            super.method_4259(mouseX, mouseY, mouseButton, timeSinceLastClick);
         }
     }
 

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/widgets/TextWidget.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/widgets/TextWidget.java
@@ -29,7 +29,7 @@
 import com.gitlab.cdagaming.craftpresence.utils.gui.controls.ExtendedTextControl;
 import com.gitlab.cdagaming.craftpresence.utils.gui.integrations.ExtendedScreen;
 import io.github.cdagaming.unicore.utils.StringUtils;
-import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.src.FontRenderer;
 
 /**
  * Implementation for a Row-Style {@link ExtendedTextControl} Widget

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java
@@ -37,11 +37,11 @@
 import io.github.cdagaming.unicore.utils.StringUtils;
 import io.github.cdagaming.unicore.utils.TimeUtils;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiPlayerInfo;
-import net.minecraft.client.multiplayer.GuiConnecting;
-import net.minecraft.client.multiplayer.NetClientHandler;
-import net.minecraft.client.multiplayer.ServerData;
-import net.minecraft.client.multiplayer.ServerList;
+import net.minecraft.src.GuiPlayerInfo;
+import net.minecraft.src.GuiConnecting;
+import net.minecraft.src.NetClientHandler;
+import net.minecraft.src.ServerData;
+import net.minecraft.src.ServerList;
 
 import java.util.List;
 import java.util.Map;
@@ -216,7 +216,7 @@ public void updateData() {
         final NetClientHandler newConnection = CraftPresence.instance.getSendQueue();
 
         try {
-            newServerData = (ServerData) StringUtils.getField(Minecraft.class, CraftPresence.instance, "currentServerData", "field_71422_O", "field_3773", "M");
+            newServerData = (ServerData) StringUtils.getField(Minecraft.class, CraftPresence.instance, "currentServerData", "field_71422_O", "field_3773", "O");
         } catch (Exception ex) {
             newServerData = null;
         }

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/BiomeUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/BiomeUtils.java
@@ -32,7 +32,7 @@
 import io.github.cdagaming.unicore.utils.MappingUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import io.github.classgraph.ClassInfo;
-import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.src.BiomeGenBase;
 
 import java.util.List;
 import java.util.function.Supplier;

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/DimensionUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/DimensionUtils.java
@@ -32,7 +32,7 @@
 import io.github.cdagaming.unicore.utils.MappingUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import io.github.classgraph.ClassInfo;
-import net.minecraft.world.WorldProvider;
+import net.minecraft.src.WorldProvider;
 
 import java.util.List;
 import java.util.Map;

diff --git a/gradle.properties b/gradle.properties
@@ -15,18 +15,18 @@ isVerboseState=false
 # Mapping Info
 mc_mappings=
 mc_mappings_type=forgeMCP
-mc_version=1.4.7
-mc_protocol=51
+mc_version=1.3.2
+mc_protocol=39
 display_version=
 # Fabric Info
 fabric_loader_version=0.15.11
 fabric_api_version=
-fabric_game_version_range=1.4.7
+fabric_game_version_range=1.3.2
 fabric_loader_version_range=>=0.13.0
 # Forge Info
-forge_version=6.6.2.534
+forge_version=4.3.5.318
 fml_version_range=
-forge_game_version_range=1.4.7
+forge_game_version_range=1.3.2
 forge_loader_version_range=
 # Deployment Info
 versionId=2.4.0