support 1.18.x minecraft version and update to 1.4.2 [skip ci]

8 files changed, 32 insertions, 171 deletions

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
deleted file mode 100644
index 54292277..00000000
--- a/.github/workflows/beta.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Build Beta
-
-on:
-  push:
-    branches:
-      - '**'
-  pull_request:
-
-
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - uses: actions/github-script@v2
-        with:
-          result-encoding: string
-          script: |
-            const fs = require("fs");
-            let file = fs.readFileSync("./gradle.properties");
-            file = file.toString().split("\n").map(e => e.trim().startsWith("mod_version") ? `${e}-beta-${process.env.GITHUB_SHA.substring(0, 7)}` : e).join("\n");
-            fs.writeFileSync("./gradle.properties", file);
-
-      - name: Set up JDK 16
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '16'
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Build with Gradle
-        run: ./gradlew build
-
-      - uses: actions/github-script@v2
-        id: fname
-        with:
-          result-encoding: string
-          script: |
-            const fs = require("fs")
-            return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0].replace(".jar", "");
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: ${{ steps.fname.outputs.result }}
-          path: build/libs/
\ No newline at end of file
diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
deleted file mode 100644
index afc4bf68..00000000
--- a/.github/workflows/buildrelease.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Build Release
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
-on:
-  release:
-    types: [created]
-
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - name: Set up JDK 16
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '16'
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Build with Gradle
-        run: ./gradlew build
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: Artifacts
-          path: build/libs/
-
-      - name: Read Changelog
-        id: read_changelog
-        shell: bash
-        run: |
-          CHANGELOG=$(sed '/___/Q' CHANGELOG.md | grep -v '# ')
-          echo "Changelog:\n$CHANGELOG"
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-          echo "::set-output name=changelog::$CHANGELOG"
-
-      - uses: actions/github-script@v2
-        id: fname
-        with:
-          result-encoding: string
-          script: |
-            const fs = require("fs")
-            return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0]
-      - name: Release
-        id: uploadrelease
-        uses: softprops/action-gh-release@v1
-        with:
-          body: ${{ steps.read_changelog.outputs.changelog }}
-          files: build/libs/${{ steps.fname.outputs.result }}
-
-      - name: Publish to Modrinth
-        id: modrinth
-        env:
-          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN  }}
-          CHANGELOG: ${{ steps.read_changelog.outputs.changelog }}
-        run: ./gradlew publishModrinth
-
-      - name: Get version tag
-        id: version_tag
-        run: |
-          [[ ! "$GITHUB_REF" =~ refs/tags ]] && exit
-          echo "::set-output name=value::${GITHUB_REF#refs/tags/}"
-
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@master
-        with:
-          args: |
-            "@here"
-            "Skyblocker ${{ steps.version_tag.outputs.value }}"
-            ""
-            "Changelog"
-            "```md"
-            "${{ steps.read_changelog.outputs.changelog }}"
-            "```"
-            ":inbox_tray: Download latest version on Modrinth or Github:"
-            "<:modrinth:900697862206287882> <${{ steps.modrinth.outputs.url }}>"
-            "<:github:900697885706952725> <${{ steps.uploadrelease.outputs.url }}>"
-            ""
-            "<https://hysky.de/>"
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c5656d10..fc535314 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,8 @@ plugins {
 import com.modrinth.minotaur.TaskModrinthUpload
 import com.modrinth.minotaur.request.VersionType
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = "${project.mod_version}+${project.minecraft_version}"
@@ -67,8 +67,14 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 16
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+
+	// Minecraft 1.18 upwards uses Java 17.
+	it.options.release = 17
 }
 
 java {
diff --git a/gradle.properties b/gradle.properties
index 52e12079..e4b56d12 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,18 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties (https://fabricmc.net/versions.html)
-minecraft_version=1.17.1
-yarn_mappings=1.17.1+build.65
-loader_version=0.12.11
+minecraft_version=1.18
+yarn_mappings=1.18+build.1
+loader_version=0.12.8
 
 #Fabric api
-fabric_version=0.44.0+1.17
+fabric_version=0.43.1+1.18
 
 # Dependencies
 ## Cloth Api (https://www.curseforge.com/minecraft/mc-mods/cloth-config/files)
-clothconfig_version=5.2.47
+clothconfig_version=6.0.42
 ## Mod Menu (https://www.curseforge.com/minecraft/mc-mods/modmenu/files)
-mod_menu_version=2.0.14
+mod_menu_version=3.0.0
 
 # Mod Properties
 mod_version = 1.4.3
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java
index f6fb1bc1..962421b7 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java
@@ -67,17 +67,17 @@ public class RenderUtilsLiving {
 
         if (fill) {
             int opacity = (int) (MinecraftClient.getInstance().options.getTextBackgroundOpacity(0.25F) * 255.0F) << 24;
-            mc.textRenderer.draw(text, -halfWidth, 0f, 553648127, false, matrices.peek().getModel(), immediate, true, opacity, 0xf000f0);
+            mc.textRenderer.draw(text, -halfWidth, 0f, 553648127, false, matrices.peek().getPositionMatrix(), immediate, true, opacity, 0xf000f0);
             immediate.draw();
         } else {
             matrices.push();
             matrices.translate(1, 1, 0);
-            mc.textRenderer.draw(text.copy(), -halfWidth, 0f, 0x202020, false, matrices.peek().getModel(), immediate, true, 0, 0xf000f0);
+            mc.textRenderer.draw(text.copy(), -halfWidth, 0f, 0x202020, false, matrices.peek().getPositionMatrix(), immediate, true, 0, 0xf000f0);
             immediate.draw();
             matrices.pop();
         }
 
-        mc.textRenderer.draw(text, -halfWidth, 0f, -1, false, matrices.peek().getModel(), immediate, true, 0, 0xf000f0);
+        mc.textRenderer.draw(text, -halfWidth, 0f, -1, false, matrices.peek().getPositionMatrix(), immediate, true, 0, 0xf000f0);
         immediate.draw();
 
         RenderSystem.disableBlend();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Vertexer.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Vertexer.java
index f9ac629e..12f4b0fd 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Vertexer.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Vertexer.java
@@ -57,17 +57,17 @@ public class Vertexer {
         int[] color = quadColor.getAllColors();
 
         if (cullMode != CULL_FRONT) {
-            vertexConsumer.vertex(matrices.peek().getModel(), x1, y1, z1).color(color[0], color[1], color[2], color[3]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x2, y2, z2).color(color[4], color[5], color[6], color[7]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x3, y3, z3).color(color[8], color[9], color[10], color[11]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x4, y4, z4).color(color[12], color[13], color[14], color[15]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x1, y1, z1).color(color[0], color[1], color[2], color[3]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x2, y2, z2).color(color[4], color[5], color[6], color[7]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x3, y3, z3).color(color[8], color[9], color[10], color[11]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x4, y4, z4).color(color[12], color[13], color[14], color[15]).next();
         }
 
         if (cullMode != CULL_BACK) {
-            vertexConsumer.vertex(matrices.peek().getModel(), x4, y4, z4).color(color[0], color[1], color[2], color[3]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x3, y3, z3).color(color[4], color[5], color[6], color[7]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x2, y2, z2).color(color[8], color[9], color[10], color[11]).next();
-            vertexConsumer.vertex(matrices.peek().getModel(), x1, y1, z1).color(color[12], color[13], color[14], color[15]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x4, y4, z4).color(color[0], color[1], color[2], color[3]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x3, y3, z3).color(color[4], color[5], color[6], color[7]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x2, y2, z2).color(color[8], color[9], color[10], color[11]).next();
+            vertexConsumer.vertex(matrices.peek().getPositionMatrix(), x1, y1, z1).color(color[12], color[13], color[14], color[15]).next();
         }
     }
 
@@ -132,8 +132,8 @@ public class Vertexer {
     }
 
     public static void vertexLine(MatrixStack matrices, VertexConsumer vertexConsumer, float x1, float y1, float z1, float x2, float y2, float z2, LineColor lineColor) {
-        Matrix4f model = matrices.peek().getModel();
-        Matrix3f normal = matrices.peek().getNormal();
+        Matrix4f model = matrices.peek().getPositionMatrix();
+        Matrix3f normal = matrices.peek().getNormalMatrix();
 
         Vec3f normalVec = getNormal(normal, x1, y1, z1, x2, y2, z2);
 
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 250e5737..09320692 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -29,8 +29,8 @@
     "fabricloader": ">=0.12.11",
     "fabric": "*",
 	"cloth-config2": "*",
-    "minecraft": "1.17.x",
-    "java": ">=16"
+    "minecraft": "1.18.x",
+    "java": ">=17"
   },
   "custom": {
     "modmenu": {
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index bfc6b0f2..abc219fa 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -1,11 +1,10 @@
 {
   "required": true,
   "package": "me.xmrvizzy.skyblocker.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "client": [
     "ChatHudListenerMixin",
     "ClientPlayerEntityMixin",
-    "ClientPlayNetworkHandlerMixin",
     "InGameHudMixin",
     "ItemRendererMixin",
     "MinecraftClientMixin",