From da86c6a4a1a9dc31e15a3d98c57d9d7162960177 Mon Sep 17 00:00:00 2001
From: Chloe Dawn <chloe@sapphic.dev>
Date: Fri, 4 Feb 2022 00:33:03 +0000
Subject: [PATCH] Port to 1.18

- Updated Gradle wrapper to 7.3.3
- Updated buildscript dependencies
- Updated required game version to 1.18.x
- Changed metadata links to use full URLs
- Migrate to new tick scheduling API
---
 build.gradle.kts                                     | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties             |  4 ++--
 .../plated/mixin/BasePressurePlateBlockMixin.java    |  2 +-
 src/main/resources/fabric.mod.json                   |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index fb309c2..ff1f6ce 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,14 +1,14 @@
 import java.time.Instant
 
 plugins {
-  id(/*net.fabricmc.*/ "fabric-loom") version "0.10.64"
+  id(/*net.fabricmc.*/ "fabric-loom") version "0.10.66"
   id("io.github.juuxel.loom-quiltflower-mini") version "1.2.1"
   id("net.nemerosa.versioning") version "2.15.1"
   id("org.gradle.signing")
 }
 
 group = "dev.sapphic"
-version = "2.1.1"
+version = "2.2.0"
 
 if ("CI" in System.getenv()) {
   version = "$version-${versioning.info.build}"
@@ -46,19 +46,19 @@ repositories {
 }
 
 dependencies {
-  minecraft("com.mojang:minecraft:1.17.1")
+  minecraft("com.mojang:minecraft:1.18.1")
   mappings(loom.officialMojangMappings())
 
-  modImplementation("net.fabricmc:fabric-loader:0.12.12")
+  modImplementation("net.fabricmc:fabric-loader:0.13.0")
   implementation("com.google.code.findbugs:jsr305:3.0.2")
   implementation("org.jetbrains:annotations:23.0.0")
-  implementation("org.checkerframework:checker-qual:3.20.0")
+  implementation("org.checkerframework:checker-qual:3.21.1")
 
   modCompileOnly("curse.maven:charm-318872:3393290") { // 1.17-3.3.2
     isTransitive = false
   }
 
-  modCompileOnly("curse.maven:red-bits-403914:3481458") { // 1.10.1
+  modCompileOnly("curse.maven:red-bits-403914:3612273") { // 1.12.0
     isTransitive = false
   }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fa58fc5..ee6ba9a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=dd54e87b4d7aa8ff3c6afb0f7805aa121d4b70bca55b8c9b1b896eb103184582
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
+distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/dev/sapphic/plated/mixin/BasePressurePlateBlockMixin.java b/src/main/java/dev/sapphic/plated/mixin/BasePressurePlateBlockMixin.java
index b9332d3..c1b754a 100644
--- a/src/main/java/dev/sapphic/plated/mixin/BasePressurePlateBlockMixin.java
+++ b/src/main/java/dev/sapphic/plated/mixin/BasePressurePlateBlockMixin.java
@@ -164,7 +164,7 @@ private void updateFluidState(
       final BlockPos offset,
       final CallbackInfoReturnable<BlockState> ci) {
     if (state.getValue(WATERLOGGED)) {
-      level.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(level));
+      level.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(level));
     }
   }
 
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 83566bd..2ca5ec1 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -6,7 +6,7 @@
   "description": "Allows placement of pressure plates on any solid face of a block.",
   "license": "Apache-2.0",
   "depends": {
-    "minecraft": ">=1.16 <=1.17.1",
+    "minecraft": "1.18.x",
     "fabricloader": ">=0.12.11",
     "java": ">=8"
   },
@@ -22,8 +22,8 @@
     "Chloe Dawn"
   ],
   "contact": {
-    "homepage": "https://bit.ly/3kEJS8j",
-    "sources": "https://git.io/JY81y",
-    "issues": "https://git.io/JWKa8"
+    "homepage": "https://www.curseforge.com/minecraft/mc-mods/plated",
+    "sources": "https://github.com/ChloeDawn/Plated",
+    "issues": "https://github.com/ChloeDawn/Plated/issues"
   }
 }