Merge branch 'DFOnline:1.19.4' into Functions

XTerPL · web-flow · commit 8d7295def97e · 2023-04-28T22:12:20.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: Build
 on: 
   push:
     branches:  
-      - '1.19.2'
+      - '1.19.4'
 
 jobs: 
   build:
diff --git a/gradle.properties b/gradle.properties
@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19.2
-yarn_mappings=1.19.2+build.1
-loader_version=0.14.8
+minecraft_version=1.19.4
+yarn_mappings=1.19.4+build.1
+loader_version=0.14.19
 # Mod Properties
 mod_version=1.0-SNAPSHOT
 maven_group=io.github.techstreet.dfscript
 archives_base_name=DFScript
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.58.6+1.19.2
+fabric_version=0.77.0+1.19.4
diff --git a/src/main/java/io/github/techstreet/dfscript/event/RecieveSoundEvent.java b/src/main/java/io/github/techstreet/dfscript/event/RecieveSoundEvent.java
@@ -1,11 +1,6 @@
 package io.github.techstreet.dfscript.event;
 
 import io.github.techstreet.dfscript.event.system.CancellableEvent;
-import net.minecraft.client.sound.SoundInstance;
-import net.minecraft.network.packet.s2c.play.PlaySoundFromEntityS2CPacket;
-import net.minecraft.network.packet.s2c.play.PlaySoundIdS2CPacket;
-import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
-import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.Identifier;
 
 public class RecieveSoundEvent implements CancellableEvent {
diff --git a/src/main/java/io/github/techstreet/dfscript/mixin/game/MClientPlayNetworkHandler.java b/src/main/java/io/github/techstreet/dfscript/mixin/game/MClientPlayNetworkHandler.java
@@ -2,24 +2,20 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.techstreet.dfscript.DFScript;
-import io.github.techstreet.dfscript.event.BuildModeEvent;
-import io.github.techstreet.dfscript.event.DevModeEvent;
-import io.github.techstreet.dfscript.event.PlayModeEvent;
-import io.github.techstreet.dfscript.event.ReceiveChatEvent;
-import io.github.techstreet.dfscript.event.RecieveSoundEvent;
-import io.github.techstreet.dfscript.event.ServerJoinEvent;
-import io.github.techstreet.dfscript.event.ServerLeaveEvent;
+import io.github.techstreet.dfscript.event.*;
 import io.github.techstreet.dfscript.event.system.EventManager;
 import io.github.techstreet.dfscript.util.hypercube.HypercubeRank;
 import io.github.techstreet.dfscript.util.hypercube.HypercubeUtil;
 import java.net.InetSocketAddress;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.packet.s2c.play.*;
+import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ClientPlayNetworkHandler.class)
 public class MClientPlayNetworkHandler {
@@ -90,6 +86,25 @@ private void onDisconnect(DisconnectS2CPacket packet, CallbackInfo ci) {
         EventManager.getInstance().dispatch(event);
     }
 
+    @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
+    private void chat(String content, CallbackInfo ci) {
+        SendChatEvent event = new SendChatEvent(content);
+        EventManager.getInstance().dispatch(event);
+        if (event.isCancelled()) {
+            ci.cancel();
+        }
+    }
+
+    @Inject(method = "sendCommand(Ljava/lang/String;)Z", at = @At("HEAD"), cancellable = true)
+    private void command(String command, CallbackInfoReturnable<Boolean> ci) {
+        if(command.startsWith("scripts")) return;
+        SendChatEvent event = new SendChatEvent("/"+command);
+        EventManager.getInstance().dispatch(event);
+        if (event.isCancelled()) {
+            ci.cancel();
+        }
+    }
+
     /*@Inject(method = "onPlaySound", at = @At("HEAD"), cancellable = true)
     private void onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
         RecieveSoundEvent event = new RecieveSoundEvent(packet);
diff --git a/src/main/java/io/github/techstreet/dfscript/mixin/player/MLocalPlayer.java b/src/main/java/io/github/techstreet/dfscript/mixin/player/MLocalPlayer.java
@@ -13,36 +13,6 @@
 
 @Mixin(ClientPlayerEntity.class)
 public class MLocalPlayer {
-
-    @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
-    private void chat(String message, Text preview, CallbackInfo ci) {
-        SendChatEvent event = new SendChatEvent(message);
-        EventManager.getInstance().dispatch(event);
-        if (event.isCancelled()) {
-            ci.cancel();
-        }
-    }
-
-    @Inject(method = "sendCommand(Ljava/lang/String;)Z", at = @At("HEAD"), cancellable = true)
-    private void command(String command, CallbackInfoReturnable<Boolean> ci) {
-        if(command.startsWith("scripts")) return;
-        SendChatEvent event = new SendChatEvent("/"+command);
-        EventManager.getInstance().dispatch(event);
-        if (event.isCancelled()) {
-            ci.cancel();
-        }
-    }
-
-    @Inject(method = "sendCommand(Ljava/lang/String;Lnet/minecraft/text/Text;)V", at = @At("HEAD"), cancellable = true)
-    private void command2(String command, Text preview, CallbackInfo ci) {
-        if(command.startsWith("scripts")) return;
-        SendChatEvent event = new SendChatEvent("/"+command);
-        EventManager.getInstance().dispatch(event);
-        if (event.isCancelled()) {
-            ci.cancel();
-        }
-    }
-
     @Inject(method = "tick", at = @At("HEAD"))
     private void tick(CallbackInfo ci) {
         EventManager em = EventManager.getInstance();
diff --git a/src/main/java/io/github/techstreet/dfscript/mixin/sound/MSoundSystem.java b/src/main/java/io/github/techstreet/dfscript/mixin/sound/MSoundSystem.java
@@ -2,18 +2,14 @@
 
 import io.github.techstreet.dfscript.event.RecieveSoundEvent;
 import io.github.techstreet.dfscript.event.system.EventManager;
-import io.github.techstreet.dfscript.util.chat.ChatUtil;
 import net.minecraft.client.sound.Sound;
 import net.minecraft.client.sound.SoundInstance;
 import net.minecraft.client.sound.SoundSystem;
 import net.minecraft.client.sound.WeightedSoundSet;
-import net.minecraft.network.packet.s2c.play.PlaySoundIdS2CPacket;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/CScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/CScreen.java
@@ -20,7 +20,7 @@ protected CScreen(int width, int height) {
         super(Text.literal("DFScript Screen"));
         this.width = width;
         this.height = height;
-        DFScript.MC.keyboard.setRepeatEvents(true);
+//        DFScript.MC.keyboard.setRepeatEvents(true);
     }
 
     @Override
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditPartScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditPartScreen.java
@@ -117,7 +117,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
                 @Override
                 public boolean mouseClicked(double x, double y, int button) {
                     if (getBounds().contains(x, y)) {
-                        DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK, 1f,1f));
+                        DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK.value(), 1f,1f));
 
                         if (button == 0) {
                             ScriptArgument argument = action.getArguments().get(currentIndex);
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditScreen.java
@@ -308,7 +308,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
                 @Override
                 public boolean mouseClicked(double x, double y, int button) {
                     if (getBounds().contains(x, y)) {
-                        DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK, 1f,1f));
+                        DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK.value(), 1f,1f));
 
                         if (button != 0) {
                             CButton insertBefore = new CButton((int) x, (int) y, 40, 8, "Insert Before", () -> {
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptSettingsScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptSettingsScreen.java
@@ -92,7 +92,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
                 @Override
                 public boolean mouseClicked(double x, double y, int button) {
                     if (getBounds().contains(x, y)) {
-                        DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK, 1f,1f));
+                        DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK.value(), 1f,1f));
 
                         if (button != 0) {
                             CButton insertBefore = new CButton((int) x, (int) y, 40, 8, "Insert Before", () -> {
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/widget/CButton.java b/src/main/java/io/github/techstreet/dfscript/screen/widget/CButton.java
@@ -66,7 +66,7 @@ public boolean mouseClicked(double x, double y, int button) {
         Rectangle rect = new Rectangle(this.x, this.y, width, height);
 
         if (rect.contains(x, y)) {
-            DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK, 1f,1f));
+            DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK.value(), 1f,1f));
             onClick.run();
             return true;
         }
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/widget/CItem.java b/src/main/java/io/github/techstreet/dfscript/screen/widget/CItem.java
@@ -2,17 +2,17 @@
 
 import io.github.techstreet.dfscript.DFScript;
 import io.github.techstreet.dfscript.util.RenderUtil;
-import java.awt.Rectangle;
-import java.util.Optional;
-import java.util.function.Consumer;
-import net.minecraft.client.item.TooltipContext.Default;
+import net.minecraft.client.item.TooltipContext;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.util.math.Vec3f;
 import org.lwjgl.opengl.GL11;
 
+import java.awt.*;
+import java.util.Optional;
+import java.util.function.Consumer;
+
 public class CItem implements CWidget {
 
     private final int x;
@@ -43,9 +43,9 @@ public void renderOverlay(MatrixStack stack, int mouseX, int mouseY, float tickD
             stack.translate(mouseX, mouseY, 0);
             stack.scale(0.5f, 0.5f, 1f);
             GL11.glDisable(GL11.GL_DEPTH_TEST);
-            stack.peek().getPositionMatrix().addToLastColumn(new Vec3f(0, 0, 600));
+//            stack.peek().getPositionMatrix().addToLastColumn(new Vec3f(0, 0, 600));
             DFScript.MC.currentScreen.renderTooltip(stack, item.getTooltip(
-                DFScript.MC.player, Default.NORMAL
+                DFScript.MC.player, TooltipContext.BASIC
             ), Optional.empty(), 0, 0);
             stack.pop();
         }
@@ -62,7 +62,7 @@ public boolean mouseClicked(double x, double y, int button) {
 
         if (rect.contains(x, y)) {
             if (onClick != null) {
-                DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK, 1f, 1f));
+                DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK.value(), 1f, 1f));
                 onClick.accept(button);
                 return true;
             }
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/widget/CKeyField.java b/src/main/java/io/github/techstreet/dfscript/screen/widget/CKeyField.java
@@ -7,7 +7,7 @@
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.Vector4f;
+import org.joml.Vector4f;
 
 import java.awt.*;
 
@@ -53,15 +53,15 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
 
         Vector4f begin = new Vector4f(0, 0, 1, 1);
         Vector4f end = new Vector4f(width, height, 1, 1);
-        begin.transform(stack.peek().getPositionMatrix());
-        end.transform(stack.peek().getPositionMatrix());
+        begin.add(new Vector4f(2,2,0,501));
+        end.add(new Vector4f(2,2,0,501));
 
         int guiScale = (int) DFScript.MC.getWindow().getScaleFactor();
         RenderUtil.pushScissor(
-                (int) begin.getX()*guiScale,
-                (int) begin.getY()*guiScale,
-                (int) (end.getX() - begin.getX())*guiScale,
-                (int) (end.getY() - begin.getY())*guiScale
+                (int) begin.x()*guiScale,
+                (int) begin.y()*guiScale,
+                (int) (end.x() - begin.x())*guiScale,
+                (int) (end.y() - begin.y())*guiScale
         );
 
         stack.translate(2, 2, 0);
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/widget/CPlainPanel.java b/src/main/java/io/github/techstreet/dfscript/screen/widget/CPlainPanel.java
@@ -6,7 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.Vector4f;
+import org.joml.Vector4f;
 
 public class CPlainPanel implements CWidget {
 
@@ -25,17 +25,18 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
         stack.push();
         stack.translate(x, y, 0);
 
-        Vector4f begin = new Vector4f(0, 0, 1, 1);
-        Vector4f end = new Vector4f(width, height, 1, 1);
-        begin.transform(stack.peek().getPositionMatrix());
-        end.transform(stack.peek().getPositionMatrix());
+        float xpos = stack.peek().getPositionMatrix().m30() + x;
+        float ypos = stack.peek().getPositionMatrix().m31() - y;
+
+        Vector4f begin = new Vector4f(xpos, ypos, 1, 1);
+        Vector4f end = new Vector4f(xpos + (width * 2), ypos + (height * 2), 1, 1);
 
         int guiScale = (int) DFScript.MC.getWindow().getScaleFactor();
         RenderUtil.pushScissor(
-            (int) begin.getX()*guiScale,
-            (int) begin.getY()*guiScale,
-            (int) (end.getX() - begin.getX())*guiScale,
-            (int) (end.getY() - begin.getY())*guiScale
+                (int) begin.x()*guiScale,
+                (int) begin.y()*guiScale,
+                (int) (end.x() - begin.x())*guiScale,
+                (int) (end.y() - begin.y())*guiScale
         );
 
         for (CWidget child : children) {
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/widget/CScrollPanel.java b/src/main/java/io/github/techstreet/dfscript/screen/widget/CScrollPanel.java
@@ -6,7 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.Vector4f;
+import org.joml.Vector4f;
 
 public class CScrollPanel implements CWidget {
 
@@ -29,17 +29,18 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
         mouseX -= x;
         mouseY -= y;
 
-        Vector4f begin = new Vector4f(0, 0, 1, 1);
-        Vector4f end = new Vector4f(width, height, 1, 1);
-        begin.transform(stack.peek().getPositionMatrix());
-        end.transform(stack.peek().getPositionMatrix());
+        float xpos = stack.peek().getPositionMatrix().m30() + x;
+        float ypos = stack.peek().getPositionMatrix().m31() - y;
+
+        Vector4f begin = new Vector4f(xpos, ypos, 1, 1);
+        Vector4f end = new Vector4f(xpos + (width * 2), ypos + (height * 2), 1, 1);
 
         int guiScale = (int) DFScript.MC.getWindow().getScaleFactor();
         RenderUtil.pushScissor(
-            (int) begin.getX()*guiScale,
-            (int) begin.getY()*guiScale,
-            (int) (end.getX() - begin.getX())*guiScale,
-            (int) (end.getY() - begin.getY())*guiScale
+                (int) begin.x()*guiScale,
+                (int) begin.y()*guiScale,
+                (int) (end.x() - begin.x())*guiScale,
+                (int) (end.y() - begin.y())*guiScale
         );
 
         stack.translate(0, scroll, 0);
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/widget/CTextField.java b/src/main/java/io/github/techstreet/dfscript/screen/widget/CTextField.java
@@ -7,7 +7,7 @@
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.Vector4f;
+import org.joml.Vector4f;
 
 public class CTextField implements CWidget {
 
@@ -59,17 +59,18 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
         DrawableHelper.fill(stack, 0, 0, width, height, 0xFF888888);
         DrawableHelper.fill(stack, 1, 1, width - 1, height - 1, 0xFF000000);
 
-        Vector4f begin = new Vector4f(0, 0, 1, 1);
-        Vector4f end = new Vector4f(width, height, 1, 1);
-        begin.transform(stack.peek().getPositionMatrix());
-        end.transform(stack.peek().getPositionMatrix());
+        float xpos = stack.peek().getPositionMatrix().m30() + x;
+        float ypos = stack.peek().getPositionMatrix().m31();
+
+        Vector4f begin = new Vector4f(xpos - 2, ypos + 2, 1, 1);
+        Vector4f end = new Vector4f((xpos + (width * 2)) - 7, (ypos + (height * 2)), 1, 1);
 
         int guiScale = (int) DFScript.MC.getWindow().getScaleFactor();
         RenderUtil.pushScissor(
-            (int) begin.getX()*guiScale,
-            (int) begin.getY()*guiScale,
-            (int) (end.getX() - begin.getX())*guiScale,
-            (int) (end.getY() - begin.getY())*guiScale
+                (int) begin.x()*guiScale,
+                (int) begin.y()*guiScale,
+                (int) (end.x() - begin.x())*guiScale,
+                (int) (end.y() - begin.y())*guiScale
         );
 
         stack.translate(2 + xScroll, 2 + scroll, 0);
diff --git a/src/main/java/io/github/techstreet/dfscript/script/ScriptSnippet.java b/src/main/java/io/github/techstreet/dfscript/script/ScriptSnippet.java
@@ -126,7 +126,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
                     @Override
                     public boolean mouseClicked(double x, double y, int button) {
                         if (getBounds().contains(x, y)) {
-                            DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK, 1f, 1f));
+                            DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK.value(), 1f, 1f));
 
                             if (button == 0) {
                                 if(part instanceof ScriptParametrizedPart parametrizedPart)
diff --git a/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionType.java b/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionType.java
diff --git a/src/main/java/io/github/techstreet/dfscript/script/menu/ScriptMenuButton.java b/src/main/java/io/github/techstreet/dfscript/script/menu/ScriptMenuButton.java
diff --git a/src/main/java/io/github/techstreet/dfscript/script/options/ScriptDictionaryOption.java b/src/main/java/io/github/techstreet/dfscript/script/options/ScriptDictionaryOption.java
diff --git a/src/main/java/io/github/techstreet/dfscript/script/options/ScriptListOption.java b/src/main/java/io/github/techstreet/dfscript/script/options/ScriptListOption.java
diff --git a/src/main/java/io/github/techstreet/dfscript/util/RenderUtil.java b/src/main/java/io/github/techstreet/dfscript/util/RenderUtil.java
diff --git a/src/main/java/io/github/techstreet/dfscript/util/chat/ChatUtil.java b/src/main/java/io/github/techstreet/dfscript/util/chat/ChatUtil.java
diff --git a/src/main/java/io/github/techstreet/dfscript/util/render/BlendableTexturedButtonWidget.java b/src/main/java/io/github/techstreet/dfscript/util/render/BlendableTexturedButtonWidget.java

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ protected CScreen(int width, int height) {`
`20`	`20`	`super(Text.literal("DFScript Screen"));`
`21`	`21`	`this.width = width;`
`22`	`22`	`this.height = height;`
`23`		`- DFScript.MC.keyboard.setRepeatEvents(true);`
	`23`	`+// DFScript.MC.keyboard.setRepeatEvents(true);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`