update for 1.20(.1)

.github/workflows/build-and-test.yml

@@ -12,14 +12,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 1.17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: 17
     - name: Cache Gradle packages
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
@@ -30,7 +30,7 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew build
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: jars
         path: build/libs

.github/workflows/minepkg-publish.yml

@@ -8,9 +8,9 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 1.17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17

.minepkg-lock.toml

@@ -4,30 +4,30 @@
 lockfileVersion = 1
 
 [fabric]
-  minecraft = "1.19.4"
-  fabricLoader = "0.14.18"
-  mapping = "1.19.4+build.1"
+  minecraft = "1.20"
+  fabricLoader = "0.16.10"
+  mapping = "1.20+build.1"
 
 [dependencies]
 
   [dependencies.fabric]
     name = "fabric"
-    version = "0.76.0+1.19.4.mpkg.1"
+    version = "0.92.3+1.20.1.mpkg.1"
     versionName = ""
     type = "mod"
-    ipfsHash = "QmPkXR4psTFUZXWTKFhcZsZtjE1BGpB99uS3yad1zHkLMq"
-    Sha256 = "63f4afaebc91dfaa40102294b24309397c18c4c2f824920613f435d23b3b04c0"
-    url = "https://api.preview.minepkg.io/v1/releases/fabric/fabric@0.76.0+1.19.4.mpkg.1/download"
+    ipfsHash = ""
+    Sha256 = "57e606b4afd5f8d6faefc78432fa0e813d3d2e59365cdb0e832ee2bbb6eef59a"
+    url = "https://api.preview.minepkg.io/v1/releases/fabric/fabric@0.92.3+1.20.1.mpkg.1/download"
     provider = "minepkg"
     dependent = ""
 
   [dependencies.minepkg-companion]
     name = "minepkg-companion"
-    version = "0.7.0"
+    version = "0.8.0"
     versionName = ""
     type = "mod"
-    ipfsHash = "QmeEMaQt17m6u1ynFMKqVxa6tBx7wyHtHPrQn3g8DQ2Yww"
-    Sha256 = "e81e923c709140cdfc6f4532c9574abfedc771ca8979e71f5fa90fafc0a4d1ee"
-    url = "https://api.preview.minepkg.io/v1/releases/fabric/minepkg-companion@0.7.0/download"
+    ipfsHash = ""
+    Sha256 = "f401f1c544db05482bfd9dcb87454cb9e815c9e819aa60391af8c9c355ac2d44"
+    url = "https://api.preview.minepkg.io/v1/releases/fabric/minepkg-companion@0.8.0/download"
     provider = "minepkg"
     dependent = ""

build.gradle

@@ -1,14 +1,15 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
-targetCompatibility = sourceCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+base {
+	archivesName = project.archives_base_name
+}
+
 repositories {
 	maven {
 		name = "CottonMC"
@@ -28,21 +29,25 @@ dependencies {
 }
 
 processResources {
-	inputs.property "version", project.version
+	def toExpand = [
+		"version": project.version,
+		"java_version": project.java_version,
+		"minecraft_version_range": project.minecraft_version_range,
+	]
+
+	inputs.properties toExpand
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand toExpand
 	}
 }
 
 tasks.withType(JavaCompile) {
-	options.release = 17
+	it.options.release = project.java_version as Integer
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
 java {
+	targetCompatibility = sourceCompatibility = JavaVersion.toVersion(project.java_version as Integer)
 	withSourcesJar()
 }
 

gradle.properties

@@ -3,15 +3,18 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.1
-loader_version=0.14.14
+minecraft_version=1.20
+yarn_mappings=1.20+build.1
+loader_version=0.16.10
 
 # Mod Properties
 mod_version=0.5.0
 maven_group=io.minepkg
 archives_base_name=test-utils
 
 # Dependencies
-fabric_version=0.73.2+1.19.3
-libgui_version=7.0.0-beta.2+1.19.4
+fabric_version=0.83.0+1.20
+libgui_version=8.0.1+1.20
+
+minecraft_version_range=>=1.20.0 <=1.20.1
+java_version=17

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

minepkg.toml

@@ -13,7 +13,7 @@ manifestVersion = 0
 
 # These are global requirements
 [requirements]
-  minecraft = "~1.19.4"
+  minecraft = ">=1.20.0 <=1.20.1"
   fabricLoader = "*"
 
 [dependencies]

src/main/java/io/minepkg/testutils/RuleBookGUI.java

@@ -224,7 +224,7 @@ private void setTime(long timeOfDay) {
     PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer());
     passedData.writeLong(timeOfDay);
     // Send packet to server to change the time
-    ClientPlayNetworking.send(TestUtils.SET_TIME_PACKET_ID, passedData);
+    ClientPlayNetworking.send(TestUtils.SET_TIME_C2S, passedData);
     timeSlider.setValue((int)timeOfDay, false);
     envBox.setTimeOfDay(timeOfDay);
     // TODO: wait for response instead
@@ -238,15 +238,15 @@ private void setRule(short id, boolean value) {
     passedData.writeShort(id);
     // enabling the button locks the weather
     passedData.writeBoolean(value);
-    ClientPlayNetworking.send(TestUtils.SET_RULE_PACKET_ID, passedData);
+    ClientPlayNetworking.send(TestUtils.SET_RULE_C2S, passedData);
     preventTickUpdates = 20;
   }
 
   private void setWeather(short weather) {
     preventTickUpdates += 1;
     PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer());
     passedData.writeShort(weather);
-    ClientPlayNetworking.send(TestUtils.SET_WEATHER_PACKET_ID, passedData);
+    ClientPlayNetworking.send(TestUtils.SET_WEATHER_C2S, passedData);
     preventTickUpdates = 30;
   }
 }