Release 1.13.7 & Fix HorizontalScrolling & Remove useless annotation

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 
 # Mod Properties
 mod_id = Pangu
-mod_version = 1.13.4
+mod_version = 1.13.7
 mod_group = cn.mccraft.pangu
 mod_core_plugin = cn.mccraft.pangu.core.asm.PanguPlugin
 

src/main/java/cn/mccraft/pangu/core/PanguCore.java

@@ -19,7 +19,7 @@
 @Mod(
         modid = PanguCore.ID,
         name = "Pangu Core",
-        version = "1.13.4",
+        version = "1.13.7",
         useMetadata = true,
         acceptedMinecraftVersions = "[1.12.2,1.13)"
 )

src/main/java/cn/mccraft/pangu/core/client/ui/Button.java

@@ -1,9 +1,6 @@
 package cn.mccraft.pangu.core.client.ui;
 
-import lombok.Data;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.util.function.Consumer;
@@ -32,17 +29,17 @@ public abstract class Button extends Component {
     @Getter
     protected Consumer<ButtonClickEvent> buttonClickEvent;
 
-    @Deprecated
-    public Button(int width, int height) {
-        super();
-        setSize(width, height);
-    }
 
     public Button(float width, float height) {
         super();
         setSize(width, height);
     }
 
+    @Deprecated
+    public Button(int width, int height) {
+        this((float) width, height);
+    }
+
     public void onClick(int mouseButton, int mouseX, int mouseY) {
         if (isDisabled()) return;
         if (isPlayPressSound()) playPressSound();
@@ -91,10 +88,7 @@ public Button onButtonClick(Consumer<ButtonClickEvent> consumer) {
 
     @Data
     public static class ButtonClickEvent {
-        @NonNull
-        private Button button;
-
-        @NonNull
-        private int mouseButton, mouseX, mouseY;
+        private final Button button;
+        private final int mouseButton, mouseX, mouseY;
     }
 }

src/main/java/cn/mccraft/pangu/core/client/ui/Container.java

@@ -245,4 +245,11 @@ public void drawBackground() {
 
     public void drawForeground() {
     }
+
+    @Override
+    public Container setScreen(Screen screen) {
+        for (Component component : components) component.setScreen(screen);
+        super.setScreen(screen);
+        return this;
+    }
 }

src/main/java/cn/mccraft/pangu/core/client/ui/TextField.java

@@ -44,7 +44,6 @@ public class TextField extends Component implements Focusable {
     protected int lineScrollOffset;
 
     @Getter
-    @Setter
     protected int cursorPosition;
 
     @Getter

src/main/java/cn/mccraft/pangu/core/client/ui/builtin/HorizontalScrolling.java

@@ -197,7 +197,7 @@ private void applyScrollLimits() {
     }
 
     public float getMaxScroll() {
-        return this.getContentHeight() - getHeight();
+        return this.getContentWidth() - getWidth();
     }
 
     @Override