1.20 (#92)

Author: zml2008

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "org.enginehub.worldeditcui"
-version = "${libs.versions.minecraft.get()}+02-SNAPSHOT"
+version = "${libs.versions.minecraft.get()}+01-SNAPSHOT"
 
 repositories {
     // mirrors:
@@ -136,13 +136,13 @@ dependencies {
     }
 
     // for development
-    modLocalRuntime(libs.worldedit) {
+    /*modLocalRuntime(libs.worldedit) {
         exclude("com.google.guava", "guava")
         exclude("com.google.code.gson", "gson")
         exclude("com.google.code.gson", "gson")
         exclude("it.unimi.dsi", "fastutil")
         exclude("org.apache.logging.log4j", "log4j-api")
-    }
+    }*/
 }
 
 configurations.modLocalRuntime {

gradle/libs.versions.toml

@@ -2,10 +2,10 @@
 version = "1.0"
 
 [versions]
-minecraft = "1.19.4"
-fabricLoader = "0.14.17"
-fabricApi = "0.77.0+1.19.4"
-modmenu = "6.1.0-rc.4"
+minecraft = "1.20"
+fabricLoader = "0.14.21"
+fabricApi = "0.83.0+1.20"
+modmenu = "7.0.1"
 multiconnect = "1.5.10"
 quiltflower = "1.9.0"
 
@@ -16,10 +16,10 @@ fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabricLo
 fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabricApi" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
 multiconnect-api = { module = "net.earthcomputer.multiconnect:multiconnect-api", version.ref = "multiconnect" }
-worldedit = { module = "com.sk89q.worldedit:worldedit-fabric-mc1.19.4", version = "7.2.14" }
+worldedit = { module = "com.sk89q.worldedit:worldedit-fabric-mc1.20", version = "7.2.15" }
 
 [plugins]
 loom = { id = "fabric-loom", version = "1.2.7" }
-loomQuiltflower = { id = "io.github.juuxel.loom-quiltflower", version = "1.8.0" }
+loomQuiltflower = { id = "io.github.juuxel.loom-quiltflower", version = "1.10.0" }
 versions = { id = "com.github.ben-manes.versions", version = "0.44.0" }
-javaEcosystemCapabilities = { id = "org.gradlex.java-ecosystem-capabilities", version = "1.1" }
+javaEcosystemCapabilities = { id = "org.gradlex.java-ecosystem-capabilities", version = "1.2" }

src/main/java/org/enginehub/worldeditcui/gui/CUIConfigList.java

@@ -1,10 +1,10 @@
 package org.enginehub.worldeditcui.gui;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.logging.LogUtils;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
 import net.minecraft.client.gui.components.CycleButton;
@@ -78,12 +78,12 @@ public OnOffEntry(String tag) {
         }
 
         @Override
-        public void render(PoseStack poseStack, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean isMouseOver, float partialTick) {
-            super.render(poseStack, index, top, left, width, height, mouseX, mouseY, isMouseOver, partialTick);
+        public void render(GuiGraphics gfx, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean isMouseOver, float partialTick) {
+            super.render(gfx, index, top, left, width, height, mouseX, mouseY, isMouseOver, partialTick);
 
             this.toggleBotton.setX(left + 105);
             this.toggleBotton.setY(top);
-            this.toggleBotton.render(poseStack, mouseX, mouseY, partialTick);
+            this.toggleBotton.render(gfx, mouseX, mouseY, partialTick);
         }
 
         @Override
@@ -147,11 +147,11 @@ public ColorConfigEntry(String tag) {
         }
 
         @Override
-        public void render(PoseStack poseStack, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean isMouseOver, float partialTick) {
-            super.render(poseStack, index, top, left, width, height, mouseX, mouseY, isMouseOver, partialTick);
+        public void render(GuiGraphics gfx, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean isMouseOver, float partialTick) {
+            super.render(gfx, index, top, left, width, height, mouseX, mouseY, isMouseOver, partialTick);
             this.textField.setX(left + 105);
             this.textField.setY(top);
-            this.textField.render(poseStack, mouseX, mouseY, partialTick);
+            this.textField.render(gfx, mouseX, mouseY, partialTick);
         }
 
         @Override
@@ -192,16 +192,16 @@ public ConfigEntry(String tag) {
 
         }
         @Override
-        public void render(PoseStack poseStack, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean isMouseOver, float partialTick) {
+        public void render(GuiGraphics gfx, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean isMouseOver, float partialTick) {
             int textLeft = left + 90 - maxNameWidth;
 
             this.textField.setX(textLeft);
             this.textField.setY(top);
-            this.textField.render(poseStack, mouseX, mouseY, partialTick);
+            this.textField.render(gfx, mouseX, mouseY, partialTick);
 
             this.resetButton.setX(left + 190);
             this.resetButton.setY(top);
-            this.resetButton.render(poseStack, mouseX, mouseY, partialTick);
+            this.resetButton.render(gfx, mouseX, mouseY, partialTick);
         }
 
         protected abstract void updateFromConfig();

src/main/java/org/enginehub/worldeditcui/gui/CUIConfigPanel.java

@@ -1,14 +1,12 @@
 package org.enginehub.worldeditcui.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.logging.LogUtils;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import org.enginehub.worldeditcui.config.CUIConfiguration;
-import org.slf4j.Logger;
 
 /**
  * @author Mark Vainomaa
@@ -46,13 +44,13 @@ protected void init() {
     }
 
     @Override
-    public void render(PoseStack poseStack, int mouseX, int mouseY, float delta) {
-        this.renderBackground(poseStack);
+    public void render(GuiGraphics gfx, int mouseX, int mouseY, float delta) {
+        this.renderBackground(gfx);
 
-        this.configList.render(poseStack, mouseX, mouseY, delta);
-        drawCenteredString(poseStack, this.font, screenTitle, this.width / 2, 8, 0xFFFFFF);
+        this.configList.render(gfx, mouseX, mouseY, delta);
+        gfx.drawCenteredString(this.font, screenTitle, this.width / 2, 8, 0xFFFFFF);
 
-        this.done.render(poseStack, mouseX, mouseY, delta);
-        super.render(poseStack, mouseX, mouseY, delta);
+        this.done.render(gfx, mouseX, mouseY, delta);
+        super.render(gfx, mouseX, mouseY, delta);
     }
 }