Port to MC 1.20.2.

MightyPirates · Nov 15, 2023 · f9a0f82 · f9a0f82
1 parent 31ecadd
commit f9a0f82
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -57,7 +57,7 @@ subprojects {
         val loom = project.extensions.getByName<LoomGradleExtensionAPI>("loom")
         "mappings"(loom.layered {
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-$minecraftVersion:${rootProject.libs.versions.parchment.get()}@zip")
+            parchment("org.parchmentmc.data:parchment-${rootProject.libs.versions.parchment.minecraft.get()}:${rootProject.libs.versions.parchment.mappings.get()}@zip")
         })
         "compileOnly"("com.google.code.findbugs:jsr305:3.0.2")
     }

diff --git a/common/src/main/java/li/cil/manual/client/gui/ManualScreen.java b/common/src/main/java/li/cil/manual/client/gui/ManualScreen.java
@@ -74,7 +74,7 @@ public void init() {
 
     @Override
     public void render(final GuiGraphics graphics, final int mouseX, final int mouseY, final float partialTicks) {
-        renderBackground(graphics);
+        renderBackground(graphics, mouseX, mouseY, partialTicks);
 
         if (!Objects.equals(currentPath, model.peek())) {
             refreshPage();
@@ -124,12 +124,12 @@ public void render(final GuiGraphics graphics, final int mouseX, final int mouse
     }
 
     @Override
-    public boolean mouseScrolled(final double mouseX, final double mouseY, final double delta) {
-        if (super.mouseScrolled(mouseX, mouseY, delta)) {
+    public boolean mouseScrolled(final double mouseX, final double mouseY, final double deltaX, final double deltaY) {
+        if (super.mouseScrolled(mouseX, mouseY, deltaX, deltaY)) {
             return true;
         }
 
-        scrollBy(delta);
+        scrollBy(deltaY);
         return true;
     }
 

diff --git a/fabric/src/main/java/li/cil/manual/client/fabric/MarkdownManualFabric.java b/fabric/src/main/java/li/cil/manual/client/fabric/MarkdownManualFabric.java
@@ -3,13 +3,15 @@
 import li.cil.manual.api.platform.FabricManualInitializer;
 import li.cil.manual.client.ClientSetup;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.loader.impl.entrypoint.EntrypointUtils;
+import net.fabricmc.loader.api.FabricLoader;
 
 public final class MarkdownManualFabric implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         ClientSetup.initialize();
 
-        EntrypointUtils.invoke("markdown_manual:registration", FabricManualInitializer.class, FabricManualInitializer::registerManualObjects);
+        FabricLoader.getInstance()
+            .getEntrypoints("markdown_manual:registration", FabricManualInitializer.class)
+            .forEach(FabricManualInitializer::registerManualObjects);
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,20 @@
 [versions]
-minecraft = "1.20.1"
-parchment = "2023.08.13"
+minecraft = "1.20.2"
+parchment-minecraft = "1.20.1"
+parchment-mappings = "2023.09.03"
 
-architectury = "9.1.12"
+architectury = "10.0.9"
 
-fabric-loader = "0.14.22"
-fabric-api = "0.87.0+1.20.1"
+fabric-loader = "0.14.24"
+fabric-api = "0.90.7+1.20.2"
 
-forge-platform = "1.20.1-47.1.0"
+forge-platform = "1.20.2-48.0.39"
 
 [plugins]
 loom = { id = "dev.architectury.loom", version = "1.3-SNAPSHOT" }
 architectury = { id = "architectury-plugin", version = "3.4-SNAPSHOT" }
 shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
-spotless = { id = "com.diffplug.spotless", version = "6.20.0" }
+spotless = { id = "com.diffplug.spotless", version = "6.22.0" }
 
 [libraries]
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }