From f853498a9caeab2680c538367956773e0ef6f1b5 Mon Sep 17 00:00:00 2001 From: Boy Date: Fri, 1 Nov 2024 19:50:12 +0100 Subject: [PATCH 1/4] fix: bump geary --- build.gradle.kts | 22 +++++++++---------- common/build.gradle.kts | 2 +- .../hooks/items/HookGeary.java | 10 ++++++++- settings.gradle.kts | 10 ++++----- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9fa18aa..bdbc6d8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -75,7 +75,7 @@ allprojects { compileOnly("org.jetbrains:annotations:24.1.0") compileOnly("io.th0rgal:oraxen:1.182.0") compileOnly("com.github.LoneDev6:API-ItemsAdder:3.6.3-beta-14") - compileOnly("com.mineinabyss:geary-papermc:0.27.0") + compileOnly("com.mineinabyss:geary-papermc:0.31.0-dev.4") compileOnly("it.unimi.dsi:fastutil:8.5.13") compileOnly("com.denizenscript:denizen:1.2.7-SNAPSHOT") compileOnly("io.lumine:Mythic-Dist:5.2.1") @@ -110,11 +110,11 @@ allprojects { dependencies { implementation(project(path = ":common")) - implementation(project(path = ":v1_19_R3", configuration = "reobf")) - implementation(project(path = ":v1_20_R1", configuration = "reobf")) - implementation(project(path = ":v1_20_R2", configuration = "reobf")) - implementation(project(path = ":v1_20_R3", configuration = "reobf")) - implementation(project(path = ":v1_20_R4", configuration = "reobf")) + //implementation(project(path = ":v1_19_R3", configuration = "reobf")) + //implementation(project(path = ":v1_20_R1", configuration = "reobf")) + //implementation(project(path = ":v1_20_R2", configuration = "reobf")) + //implementation(project(path = ":v1_20_R3", configuration = "reobf")) + //implementation(project(path = ":v1_20_R4", configuration = "reobf")) implementation(project(path = ":v1_21_R1", configuration = "reobf")) } @@ -140,11 +140,11 @@ tasks { } shadowJar { - dependsOn(":v1_19_R3:reobfJar") - dependsOn(":v1_20_R1:reobfJar") - dependsOn(":v1_20_R2:reobfJar") - dependsOn(":v1_20_R3:reobfJar") - dependsOn(":v1_20_R4:reobfJar") + //dependsOn(":v1_19_R3:reobfJar") + //dependsOn(":v1_20_R1:reobfJar") + //dependsOn(":v1_20_R2:reobfJar") + //dependsOn(":v1_20_R3:reobfJar") + //dependsOn(":v1_20_R4:reobfJar") dependsOn(":v1_21_R1:reobfJar") mergeServiceFiles() diff --git a/common/build.gradle.kts b/common/build.gradle.kts index c126806..8b94ab3 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -4,7 +4,7 @@ tasks { compileJava { options.encoding = Charsets.UTF_8.name() - options.release.set(17) + options.release.set(21) } javadoc { diff --git a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/items/HookGeary.java b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/items/HookGeary.java index 4d2a3ef..a7ff5ba 100644 --- a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/items/HookGeary.java +++ b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/items/HookGeary.java @@ -1,6 +1,11 @@ package me.lojosho.hibiscuscommons.hooks.items; +import com.mineinabyss.geary.papermc.GearyPaper; +import com.mineinabyss.geary.papermc.GearyPaperKt; +import com.mineinabyss.geary.papermc.GearyPaperModule; +import com.mineinabyss.geary.papermc.GearyPaperModuleKt; import com.mineinabyss.geary.papermc.tracking.items.ItemTrackingKt; +import com.mineinabyss.geary.papermc.tracking.items.ItemTrackingModule; import com.mineinabyss.geary.prefabs.PrefabKey; import me.lojosho.hibiscuscommons.hooks.Hook; import me.lojosho.hibiscuscommons.hooks.HookFlag; @@ -12,6 +17,8 @@ import org.jetbrains.annotations.NotNull; */ public class HookGeary extends Hook { + private ItemTrackingModule itemTracking = null; + public HookGeary() { super("geary", HookFlag.ITEM_SUPPORT); } @@ -21,8 +28,9 @@ public class HookGeary extends Hook { */ @Override public ItemStack getItem(@NotNull String itemId) { + if (itemTracking == null) itemTracking = GearyPaperModuleKt.getGearyPaper().getWorldManager().getGlobal().getAddon(ItemTrackingKt.getItemTracking()); PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId); if (prefabKey == null) return null; - return ItemTrackingKt.getGearyItems().createItem(prefabKey, null); + return itemTracking.createItem(prefabKey, null); } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 46166c6..6cca7e8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,10 +8,10 @@ pluginManagement { rootProject.name = "HibiscusCommons" include( "common", - "v1_19_R3", - "v1_20_R1", - "v1_20_R2", - "v1_20_R3", - "v1_20_R4", + //"v1_19_R3", + //"v1_20_R1", + //"v1_20_R2", + //"v1_20_R3", + //"v1_20_R4", "v1_21_R1" ) \ No newline at end of file From df4662fe40c4d80fbf59fa2176ab3ed93d5af85d Mon Sep 17 00:00:00 2001 From: Boy Date: Fri, 1 Nov 2024 22:40:56 +0100 Subject: [PATCH 2/4] refactor: drop 1.19.4 --- build.gradle.kts | 4 +++- settings.gradle.kts | 8 ++++---- v1_20_R1/build.gradle.kts | 3 ++- v1_20_R2/build.gradle.kts | 2 +- v1_20_R3/build.gradle.kts | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bdbc6d8..c61c66f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -83,14 +83,16 @@ allprojects { compileOnly("net.Indyuce:MMOItems-API:6.9.4-SNAPSHOT") compileOnly("com.willfp:eco:6.67.2") compileOnly("me.clip:placeholderapi:2.11.6") - compileOnly("LibsDisguises:LibsDisguises:10.0.21") { + compileOnly("LibsDisguises:LibsDisguises:10.0.44") { exclude("org.spigotmc", "spigot") } compileOnly("com.github.Xiao-MoMi:Custom-Fishing:2.2.26") compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.2") + compileOnly("com.comphenix.protocol:ProtocolLib:5.3.0") // Lombok <3 annotationProcessor("org.projectlombok:lombok:1.18.34") + compileOnly("org.projectlombok:lombok:1.18.34") testCompileOnly("org.projectlombok:lombok:1.18.34") testAnnotationProcessor("org.projectlombok:lombok:1.18.34") diff --git a/settings.gradle.kts b/settings.gradle.kts index 6cca7e8..b6b4493 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,9 +9,9 @@ rootProject.name = "HibiscusCommons" include( "common", //"v1_19_R3", - //"v1_20_R1", - //"v1_20_R2", - //"v1_20_R3", - //"v1_20_R4", + "v1_20_R1", + "v1_20_R2", + "v1_20_R3", + "v1_20_R4", "v1_21_R1" ) \ No newline at end of file diff --git a/v1_20_R1/build.gradle.kts b/v1_20_R1/build.gradle.kts index 4c0a7bf..6a2f5d4 100644 --- a/v1_20_R1/build.gradle.kts +++ b/v1_20_R1/build.gradle.kts @@ -5,6 +5,7 @@ plugins { dependencies { paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT") + pluginRemapper("net.fabricmc:tiny-remapper:0.10.3:fat") implementation(project(":common")) } @@ -16,7 +17,7 @@ tasks { compileJava { options.encoding = Charsets.UTF_8.name() - options.release.set(17) + options.release.set(21) } javadoc { options.encoding = Charsets.UTF_8.name() diff --git a/v1_20_R2/build.gradle.kts b/v1_20_R2/build.gradle.kts index 7188f0a..73bbf60 100644 --- a/v1_20_R2/build.gradle.kts +++ b/v1_20_R2/build.gradle.kts @@ -16,7 +16,7 @@ tasks { compileJava { options.encoding = Charsets.UTF_8.name() - options.release.set(17) + options.release.set(21) } javadoc { options.encoding = Charsets.UTF_8.name() diff --git a/v1_20_R3/build.gradle.kts b/v1_20_R3/build.gradle.kts index c40fe21..6a5690d 100644 --- a/v1_20_R3/build.gradle.kts +++ b/v1_20_R3/build.gradle.kts @@ -16,7 +16,7 @@ tasks { compileJava { options.encoding = Charsets.UTF_8.name() - options.release.set(17) + options.release.set(21) } javadoc { options.encoding = Charsets.UTF_8.name() From a8870f7ae499f1d280bdaa57125a40ebf82e6aa2 Mon Sep 17 00:00:00 2001 From: Boy Date: Fri, 1 Nov 2024 22:45:35 +0100 Subject: [PATCH 3/4] feat: add 1.21.3 support --- build.gradle.kts | 24 +++++++++---------- .../hibiscuscommons/nms/NMSHandlers.java | 2 +- settings.gradle.kts | 4 ++-- v1_20_R1/build.gradle.kts | 4 ++-- v1_20_R2/build.gradle.kts | 2 +- v1_20_R3/build.gradle.kts | 2 +- v1_20_R4/build.gradle.kts | 2 +- v1_21_R1/build.gradle.kts | 2 +- {v1_19_R3 => v1_21_R2}/build.gradle.kts | 9 ++++--- .../nms/v1_21_R2}/NMSHandler.java | 12 +++++----- 10 files changed, 33 insertions(+), 30 deletions(-) rename {v1_19_R3 => v1_21_R2}/build.gradle.kts (64%) rename {v1_19_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_19_R3 => v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2}/NMSHandler.java (94%) diff --git a/build.gradle.kts b/build.gradle.kts index c61c66f..e805e2f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,10 +3,10 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription plugins { id("java") id("maven-publish") - id("com.gradleup.shadow") version "8.3.3" + id("com.gradleup.shadow") version "8.3.4" id("net.minecrell.plugin-yml.bukkit") version "0.6.0" id("xyz.jpenilla.run-paper") version "2.3.1" - id("io.papermc.paperweight.userdev") version "1.7.3" apply false + id("io.papermc.paperweight.userdev") version "1.7.4" apply false //id("io.papermc.hangar-publish-plugin") version "0.1.1" } @@ -112,12 +112,12 @@ allprojects { dependencies { implementation(project(path = ":common")) - //implementation(project(path = ":v1_19_R3", configuration = "reobf")) - //implementation(project(path = ":v1_20_R1", configuration = "reobf")) - //implementation(project(path = ":v1_20_R2", configuration = "reobf")) - //implementation(project(path = ":v1_20_R3", configuration = "reobf")) - //implementation(project(path = ":v1_20_R4", configuration = "reobf")) + implementation(project(path = ":v1_20_R1", configuration = "reobf")) + implementation(project(path = ":v1_20_R2", configuration = "reobf")) + implementation(project(path = ":v1_20_R3", configuration = "reobf")) + implementation(project(path = ":v1_20_R4", configuration = "reobf")) implementation(project(path = ":v1_21_R1", configuration = "reobf")) + implementation(project(path = ":v1_21_R2", configuration = "reobf")) } tasks { @@ -142,12 +142,12 @@ tasks { } shadowJar { - //dependsOn(":v1_19_R3:reobfJar") - //dependsOn(":v1_20_R1:reobfJar") - //dependsOn(":v1_20_R2:reobfJar") - //dependsOn(":v1_20_R3:reobfJar") - //dependsOn(":v1_20_R4:reobfJar") + dependsOn(":v1_20_R1:reobfJar") + dependsOn(":v1_20_R2:reobfJar") + dependsOn(":v1_20_R3:reobfJar") + dependsOn(":v1_20_R4:reobfJar") dependsOn(":v1_21_R1:reobfJar") + dependsOn(":v1_21_R2:reobfJar") mergeServiceFiles() relocate("org.bstats", "me.lojosho.shaded.bstats") diff --git a/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java b/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java index 60f05d4..14acecf 100644 --- a/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java +++ b/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java @@ -11,13 +11,13 @@ import java.util.LinkedHashMap; public class NMSHandlers { private static final LinkedHashMap VERSION_MAP = new LinkedHashMap <>() {{ - put("1.19.4", "v1_19_R3"); put("1.20.1", "v1_20_R1"); put("1.20.2", "v1_20_R2"); put("1.20.4", "v1_20_R3"); put("1.20.6", "v1_20_R4"); put("1.21", "v1_21_R1"); put("1.21.1", "v1_21_R1"); + put("1.21.3", "v1_21_R3"); }}; private static NMSHandler handler; @Getter diff --git a/settings.gradle.kts b/settings.gradle.kts index b6b4493..1cf9be1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,10 +8,10 @@ pluginManagement { rootProject.name = "HibiscusCommons" include( "common", - //"v1_19_R3", "v1_20_R1", "v1_20_R2", "v1_20_R3", "v1_20_R4", - "v1_21_R1" + "v1_21_R1", + "v1_21_R2", ) \ No newline at end of file diff --git a/v1_20_R1/build.gradle.kts b/v1_20_R1/build.gradle.kts index 6a2f5d4..7a04790 100644 --- a/v1_20_R1/build.gradle.kts +++ b/v1_20_R1/build.gradle.kts @@ -1,11 +1,11 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.7.3" + id("io.papermc.paperweight.userdev") version "1.7.4" } dependencies { paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT") - pluginRemapper("net.fabricmc:tiny-remapper:0.10.3:fat") + pluginRemapper("net.fabricmc:tiny-remapper:0.10.4:fat") implementation(project(":common")) } diff --git a/v1_20_R2/build.gradle.kts b/v1_20_R2/build.gradle.kts index 73bbf60..bb29b27 100644 --- a/v1_20_R2/build.gradle.kts +++ b/v1_20_R2/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.7.3" + id("io.papermc.paperweight.userdev") version "1.7.4" } dependencies { diff --git a/v1_20_R3/build.gradle.kts b/v1_20_R3/build.gradle.kts index 6a5690d..a6c616d 100644 --- a/v1_20_R3/build.gradle.kts +++ b/v1_20_R3/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.7.3" + id("io.papermc.paperweight.userdev") version "1.7.4" } dependencies { diff --git a/v1_20_R4/build.gradle.kts b/v1_20_R4/build.gradle.kts index 1f88c43..a6b4350 100644 --- a/v1_20_R4/build.gradle.kts +++ b/v1_20_R4/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.7.3" + id("io.papermc.paperweight.userdev") version "1.7.4" } dependencies { diff --git a/v1_21_R1/build.gradle.kts b/v1_21_R1/build.gradle.kts index 2966787..25d59d8 100644 --- a/v1_21_R1/build.gradle.kts +++ b/v1_21_R1/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.7.3" + id("io.papermc.paperweight.userdev") version "1.7.4" } dependencies { diff --git a/v1_19_R3/build.gradle.kts b/v1_21_R2/build.gradle.kts similarity index 64% rename from v1_19_R3/build.gradle.kts rename to v1_21_R2/build.gradle.kts index 180989f..25d59d8 100644 --- a/v1_19_R3/build.gradle.kts +++ b/v1_21_R2/build.gradle.kts @@ -1,10 +1,10 @@ plugins { id("java") - id("io.papermc.paperweight.userdev") version "1.7.3" + id("io.papermc.paperweight.userdev") version "1.7.4" } dependencies { - paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.21-R0.1-SNAPSHOT") implementation(project(":common")) } @@ -16,8 +16,11 @@ tasks { compileJava { options.encoding = Charsets.UTF_8.name() - options.release.set(17) } + java { + toolchain.languageVersion.set(JavaLanguageVersion.of(21)); + } + javadoc { options.encoding = Charsets.UTF_8.name() } diff --git a/v1_19_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_19_R3/NMSHandler.java b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSHandler.java similarity index 94% rename from v1_19_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_19_R3/NMSHandler.java rename to v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSHandler.java index d81da3e..f472439 100644 --- a/v1_19_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_19_R3/NMSHandler.java +++ b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSHandler.java @@ -1,4 +1,4 @@ -package me.lojosho.hibiscuscommons.nms.v1_19_R3; +package me.lojosho.hibiscuscommons.nms.v1_21_R2; import com.mojang.datafixers.util.Pair; import net.minecraft.network.protocol.Packet; @@ -13,11 +13,11 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Team; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R3.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_19_R3.CraftServer; -import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_19_R3.scoreboard.CraftScoreboard; +import org.bukkit.craftbukkit.CraftEquipmentSlot; +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.scoreboard.CraftScoreboard; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; From d15f79b50fc544ffbd419246e868a967f6fe9fb8 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Fri, 15 Nov 2024 16:42:09 -0600 Subject: [PATCH 4/4] fix: NMS handler proper NMS package --- .../main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java | 4 +++- v1_21_R2/build.gradle.kts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java b/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java index 14acecf..8b1ea42 100644 --- a/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java +++ b/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java @@ -14,10 +14,12 @@ public class NMSHandlers { put("1.20.1", "v1_20_R1"); put("1.20.2", "v1_20_R2"); put("1.20.4", "v1_20_R3"); + // 1.20.5 is not supported; was imminently bumped to 1.20.6 put("1.20.6", "v1_20_R4"); put("1.21", "v1_21_R1"); put("1.21.1", "v1_21_R1"); - put("1.21.3", "v1_21_R3"); + // 1.20.2 is not supported; was imminently bumped to 1.21.3 + put("1.21.3", "v1_21_R2"); }}; private static NMSHandler handler; @Getter diff --git a/v1_21_R2/build.gradle.kts b/v1_21_R2/build.gradle.kts index 25d59d8..550f577 100644 --- a/v1_21_R2/build.gradle.kts +++ b/v1_21_R2/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - paperweight.paperDevBundle("1.21-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT") implementation(project(":common")) }