Update to minecraft 1.18.1

HashiCraft · Jan 3, 2022 · 08f41fa · 08f41fa
1 parent 5d76752
commit 08f41fa
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.9-SNAPSHOT'
+	id 'fabric-loom' version '0.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
-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
@@ -59,8 +59,8 @@ tasks.withType(JavaCompile).configureEach {
 	// If Javadoc is generated, this must be specified in that task too.
 	it.options.encoding = "UTF-8"
 
-	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 16
+  // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	it.options.release = 17
 }
 
 java {

diff --git a/gradle.properties b/gradle.properties
@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.17.1
-  yarn_mappings=1.17.1+build.52
-	loader_version=0.11.6
+	minecraft_version=1.18.1
+  yarn_mappings=1.18.1+build.14
+	loader_version=0.12.12
 
 # Mod Properties
 	mod_version = 1.0.2
 	maven_group = com.github.hashicraft
 	archives_base_name = projector
 
 # Dependencies
-	fabric_version=0.40.0+1.17
-	libgui_version=4.1.7+1.17.1
-  stateful_version=b9901a33ad
+	fabric_version=0.45.0+1.18
+	libgui_version=5.2.0+1.18
+  stateful_version=77079b065b
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/github/hashicraft/projector/blocks/DisplayEntityRenderer.java b/src/main/java/com/github/hashicraft/projector/blocks/DisplayEntityRenderer.java
@@ -44,7 +44,6 @@ public void render(DisplayEntity blockEntity, float tickDelta, MatrixStack matri
       return;
     }
 
-
     // get the texture or fallback to placeholder
     Identifier texture = ProjectorMod.PLACEHOLDER_TEXTURE;
     PictureData data = FileDownloader.getInstance().getPictureDataForURL(url, true);
@@ -113,7 +112,7 @@ public void render(DisplayEntity blockEntity, float tickDelta, MatrixStack matri
     // set the rotation
     matrices.multiply(yRotation);
 
-    Matrix4f matrix4f = matrices.peek().getModel();
+    Matrix4f matrix4f = matrices.peek().getPositionMatrix();
     bufferBuilder.begin(DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR);
 
     bufferBuilder.vertex(matrix4f, displayWidth + 0.125F, 0.125F, 1.0F).texture(1.0F, 1.0F).color(255, 255, 255, 255)

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -32,7 +32,7 @@
   "depends": {
     "fabricloader": ">=0.11.3",
     "fabric": "*",
-    "minecraft": "1.17.x",
+    "minecraft": "1.18.x",
     "java": ">=16"
   }
 }
diff --git a/src/main/resources/projector.mixins.json b/src/main/resources/projector.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "com.github.hashicraft.projector.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
   ],
   "client": [