From 0299801c03be944556637603e09153749b48c276 Mon Sep 17 00:00:00 2001
From: lukflug <lukflug@googlemail.com>
Date: Wed, 9 Mar 2022 14:48:35 +0100
Subject: [PATCH] Fixed issues with example mods for 1.17 and 1.18

---
 README.md                                                  | 2 +-
 example-mod17/build.gradle                                 | 5 ++++-
 example-mod18/build.gradle                                 | 7 +++++--
 example-mod18/gradle.properties                            | 2 +-
 .../java/com/lukflug/panelstudio/mc17/package-info.java    | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8e063bf..0e57713 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ In addition to the core PanelStudio library, there are the PanelStudio-MC suppor
 | panelstudio-mc16-forge  | example-mod16-forge  | Minecraft Forge 1.16.5 |
 | panelstudio-mc8-fabric  | example-mod8-fabric  | Legacy Fabric 1.8.9    |
 | panelstudio-mc8-forge   | example-mod8-forge   | Minecraft Forge 1.8.9  |
-| panelstudio-mc17        | example-mod17 & example-mod18 | FabricMC 1.17.x & 1.18.2 |
+| panelstudio-mc17        | example-mod17 & example-mod18 | FabricMC 1.17.1 & 1.18.2 |
 
 Minecraft versions or APIs not in this table can also be used with PanelStudio, but the small PanelStudio-MC library has to be ported, which shouldn't be hard in most cases.
 
diff --git a/example-mod17/build.gradle b/example-mod17/build.gradle
index c02039b..4975722 100644
--- a/example-mod17/build.gradle
+++ b/example-mod17/build.gradle
@@ -54,4 +54,7 @@ shadowJar {
 	relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_2"
 }
 
-remapJar.dependsOn(shadowJar)
+remapJar {
+	dependsOn shadowJar
+	inputFile = shadowJar.archiveFile
+}
diff --git a/example-mod18/build.gradle b/example-mod18/build.gradle
index 033beae..55fa5e8 100644
--- a/example-mod18/build.gradle
+++ b/example-mod18/build.gradle
@@ -38,7 +38,7 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${loader18}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${api18}"
 	shadow "com.lukflug:panelstudio:${version}"
-	shadow("com.lukflug:panelstudio-mc17:${versionmc}") {changing = true}
+	shadow "com.lukflug:panelstudio-mc17:${versionmc}"
 }
 
 processResources {
@@ -54,4 +54,7 @@ shadowJar {
 	relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_2"
 }
 
-remapJar.dependsOn(shadowJar)
+remapJar {
+	dependsOn shadowJar
+	inputFile = shadowJar.archiveFile
+}
diff --git a/example-mod18/gradle.properties b/example-mod18/gradle.properties
index a2cd8ab..5d62380 100644
--- a/example-mod18/gradle.properties
+++ b/example-mod18/gradle.properties
@@ -6,4 +6,4 @@ loomVersion = 0.12.1
 minecraft18 = 1.18.2
 mappings18 = 1.18.2+build.2
 loader18 = 0.13.3
-api18 = 0.47.9+1.18.2
+api18 = 0.47.10+1.18.2
diff --git a/panelstudio-mc17/src/main/java/com/lukflug/panelstudio/mc17/package-info.java b/panelstudio-mc17/src/main/java/com/lukflug/panelstudio/mc17/package-info.java
index 9f9606e..4d9adef 100644
--- a/panelstudio-mc17/src/main/java/com/lukflug/panelstudio/mc17/package-info.java
+++ b/panelstudio-mc17/src/main/java/com/lukflug/panelstudio/mc17/package-info.java
@@ -1,5 +1,5 @@
 /**
- * PanelStudio-MC utility functions designed for FabricMC 1.17.x.
+ * PanelStudio-MC utility functions designed for FabricMC 1.17.x and 1.18.x.
  * This library only depends on the Fabric Yarn mappings and not on the Fabric Mod Loader or the Fabric API.
  * @author lukflug
  */