diff options
| -rw-r--r-- | build.gradle | 6 | ||||
| -rw-r--r-- | gradle.properties | 14 | ||||
| -rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java | 2 | ||||
| -rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java | 2 | ||||
| -rw-r--r-- | src/main/resources/fabric.mod.json | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/build.gradle b/build.gradle index 54e7628..700f589 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'fabric-loom' version '0.9-SNAPSHOT' - id 'io.github.juuxel.loom-quiltflower' version '1.3.0' + id 'fabric-loom' version '0.10-SNAPSHOT' + id 'io.github.juuxel.loom-quiltflower-mini' version '1.0.0' id 'maven-publish' id 'checkstyle' } @@ -30,7 +30,7 @@ repositories { }*/ maven { name = "TerraformersMC archive" - url = "https://raw.githubusercontent.com/TerraformersMC/Archive/main/releases/" + url = "https://maven.terraformersmc.com/releases/" content { includeGroup "com.terraformersmc" } diff --git a/gradle.properties b/gradle.properties index 4d860e1..0f14d52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.17.1 - yarn_mappings=1.17.1+build.59 - loader_version=0.11.6 + minecraft_version=1.18-pre1 + yarn_mappings=1.18-pre1+build.7 + loader_version=0.12.5 # Mod Properties - mod_version = 4.2.1 + mod_version = 4.3.0 maven_group = io.github.cottonmc archives_base_name = LibGui # Dependencies - fabric_version=0.40.1+1.17 - jankson_version=3.0.1+j1.2.0 - modmenu_version=2.0.2 + fabric_version=0.42.2+1.18 + jankson_version=4.0.0+j1.2.0 + modmenu_version=3.0.0 libninepatch_version=1.1.0 diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java index 99a6d00..33d8b43 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java @@ -136,7 +136,7 @@ public class ScreenDrawing { float b = (color & 255) / 255.0F; Tessellator tessellator = Tessellator.getInstance(); BufferBuilder buffer = tessellator.getBuffer(); - Matrix4f model = matrices.peek().getModel(); + Matrix4f model = matrices.peek().getPositionMatrix(); RenderSystem.enableBlend(); RenderSystem.setShaderTexture(0, texture); RenderSystem.setShaderColor(r, g, b, opacity); diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java index e9e2692..39bd13d 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java @@ -216,7 +216,7 @@ public class WTextField extends WWidget { private void invertedRect(MatrixStack matrices, int x, int y, int width, int height) { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder buffer = tessellator.getBuffer(); - Matrix4f model = matrices.peek().getModel(); + Matrix4f model = matrices.peek().getPositionMatrix(); RenderSystem.setShaderColor(0.0F, 0.0F, 1.0F, 1.0F); RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.disableTexture(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 87ab98b..291aee8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,10 +23,10 @@ "modmenu": ["io.github.cottonmc.cotton.gui.impl.modmenu.ModMenuSupport"] }, "depends": { - "fabricloader": ">=0.11.0", + "fabricloader": ">=0.12.5", "fabric": "*", - "minecraft": ">=1.17.1", - "jankson": "^3.0.0", + "minecraft": "~1.18-beta.1", + "jankson": "^4.0.0", "fabric-networking-api-v1": "^1.0.0", "libninepatch": "^1.1.0" }, |