Merge remote-tracking branch 'upstream/1.20' into Functions

Author: XTerPL

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build
 on: 
   push:
     branches:  
-      - '1.19.4'
+      - '1.20'
 
 jobs: 
   build:

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.11-SNAPSHOT'
+    id 'fabric-loom' version '1.2-SNAPSHOT'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
 }
@@ -46,7 +46,7 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    // Cloth Config API
+    // Cloth Config API   ~ 10.0.95
     include "me.shedaniel.cloth:cloth-config-fabric:8.0.75"
     modImplementation "me.shedaniel.cloth:cloth-config-fabric:8.0.75"
 

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.1
-loader_version=0.14.19
+minecraft_version=1.20
+yarn_mappings=1.20.1+build.1
+loader_version=0.14.21
 # 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.77.0+1.19.4
+fabric_version=0.83.0+1.20.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/io/github/techstreet/dfscript/event/HudRenderEvent.java

@@ -1,8 +1,9 @@
 package io.github.techstreet.dfscript.event;
 
 import io.github.techstreet.dfscript.event.system.Event;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.util.math.MatrixStack;
 
-public record HudRenderEvent(MatrixStack stack) implements Event {
+public record HudRenderEvent(DrawContext context) implements Event {
 
 }

src/main/java/io/github/techstreet/dfscript/features/AuthHandler.java

@@ -18,6 +18,7 @@
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.UUID;
@@ -119,7 +120,10 @@ public static void regen() {
         }
 
         try {
-            InputStream is = new URL("https://dfscript-server.techstreetdev.repl.co/staff/").openStream();
+            URLConnection con2 = new URL("https://dfscript-server.techstreetdev.repl.co/staff/").openConnection();
+            con2.setReadTimeout(5000);
+            con2.setConnectTimeout(5000);
+            InputStream is = con2.getInputStream();
             BufferedReader rd = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
             obj = JsonParser.parseString(readAll(rd)).getAsJsonObject();
 

src/main/java/io/github/techstreet/dfscript/mixin/render/MInGameHUD.java

@@ -5,6 +5,7 @@
 import io.github.techstreet.dfscript.event.system.EventManager;
 import io.github.techstreet.dfscript.screen.overlay.OverlayManager;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
@@ -24,10 +25,10 @@ private void renderScoreboardSidebar(CallbackInfo info) {
     }
 
     @Inject(at = @At("HEAD"), method = "render")
-    private void render(MatrixStack matrices, float tickDelta, CallbackInfo ci) {
-        OverlayManager.getInstance().render(matrices);
+    private void render(DrawContext context, float tickDelta, CallbackInfo ci) {
+        OverlayManager.getInstance().render(context);
         EventManager em = EventManager.getInstance();
-        em.dispatch(new HudRenderEvent(matrices));
+        em.dispatch(new HudRenderEvent(context));
         em.resetEvents();
     }
 }

src/main/java/io/github/techstreet/dfscript/screen/CScreen.java

@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
@@ -24,11 +25,13 @@ protected CScreen(int width, int height) {
     }
 
     @Override
-    public void render(@NotNull MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
-        renderBackground(stack);
-        stack.push();
+    public void render(@NotNull DrawContext context, int mouseX, int mouseY, float tickDelta) {
+        renderBackground(context);
+        context.getMatrices().push();
         MinecraftClient mc = DFScript.MC;
 
+        MatrixStack stack = context.getMatrices();
+
         stack.translate(mc.currentScreen.width/2f, mc.currentScreen.height/2f, 0);
 
 //        float scaleFactor = (float) mc.getWindow().getScaleFactor();
@@ -37,7 +40,7 @@ public void render(@NotNull MatrixStack stack, int mouseX, int mouseY, float tic
 
         stack.translate(-width/2f, -height/2f, 0);
 
-        RenderUtil.renderGui(stack,0,0,width,height);
+        RenderUtil.renderGui(context,0,0,width,height);
 
         mouseX += -mc.currentScreen.width/2;
         mouseY += -mc.currentScreen.height/2;
@@ -49,13 +52,13 @@ public void render(@NotNull MatrixStack stack, int mouseX, int mouseY, float tic
         mouseY += height/2;
 
         for (CWidget cWidget : widgets) {
-            cWidget.render(stack, mouseX, mouseY, tickDelta);
+            cWidget.render(context, mouseX, mouseY, tickDelta);
         }
         for (CWidget cWidget : widgets) {
-            cWidget.renderOverlay(stack, mouseX, mouseY, tickDelta);
+            cWidget.renderOverlay(context, mouseX, mouseY, tickDelta);
         }
         stack.pop();
-        super.render(stack, mouseX, mouseY, tickDelta);
+        super.render(context, mouseX, mouseY, tickDelta);
     }
 
     @Override

src/main/java/io/github/techstreet/dfscript/screen/overlay/OverlayManager.java

@@ -2,6 +2,7 @@
 
 import io.github.techstreet.dfscript.DFScript;
 import io.github.techstreet.dfscript.loader.Loadable;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
@@ -42,7 +43,7 @@ public void add(Text text) {
         overlayText.add(new Overlay(text));
     }
 
-    public void render(MatrixStack stack) {
+    public void render(DrawContext context) {
         while (overlayText.size() > 10) {
             overlayText.remove(0);
         }
@@ -55,7 +56,7 @@ public void render(MatrixStack stack) {
             if(fadeout < now) {
                 opacity = (int) ((fadeout - now + 1000) * 255 / 1000);
             }
-            DFScript.MC.textRenderer.drawWithShadow(stack, text.text, 10, y, 0xFF5555 + ((opacity) << 24));
+            context.drawText(DFScript.MC.textRenderer, text.text, 10, y, 0xFF5555 + ((opacity) << 24), true);
             y += 9;
         }
     }

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddSettingSubtypeScreen.java

@@ -9,8 +9,7 @@
 import io.github.techstreet.dfscript.script.options.ScriptOption;
 import io.github.techstreet.dfscript.script.options.ScriptOptionEnum;
 import io.github.techstreet.dfscript.util.chat.ChatUtil;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -95,10 +94,10 @@ public void reloadMenu()
 
             if(optionPos == i) citem = new CItem(x, y, icon) {
                 @Override
-                public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
-                    super.render(stack, mouseX, mouseY, tickDelta);
+                public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
+                    super.render(context, mouseX, mouseY, tickDelta);
                     Rectangle b = getBounds();
-                    DrawableHelper.fill(stack, b.x, b.y, b.x + b.width, b.y + b.height, 0x3300ff00);
+                    context.fill(b.x, b.y, b.x + b.width, b.y + b.height, 0x3300ff00);
                 }
             };
             else citem = new CItem(x, y, icon);