Repo-Mirror/HibiscusCommons
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HibiscusCommons.git synced 2025-12-19 15:09:26 +00:00
Code Issues Releases Activity

fix: bump geary

Browse Source
This commit is contained in:
Boy
2024-11-01 19:50:12 +01:00
parent 03d46b973e
commit f853498a9c
4 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build.gradle.kts
View File

@@ -75,7 +75,7 @@ allprojects {
compileOnly("org.jetbrains:annotations:24.1.0") compileOnly("org.jetbrains:annotations:24.1.0")
compileOnly("io.th0rgal:oraxen:1.182.0") compileOnly("io.th0rgal:oraxen:1.182.0")
compileOnly("com.github.LoneDev6:API-ItemsAdder:3.6.3-beta-14") 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("it.unimi.dsi:fastutil:8.5.13")
compileOnly("com.denizenscript:denizen:1.2.7-SNAPSHOT") compileOnly("com.denizenscript:denizen:1.2.7-SNAPSHOT")
compileOnly("io.lumine:Mythic-Dist:5.2.1") compileOnly("io.lumine:Mythic-Dist:5.2.1")
@@ -110,11 +110,11 @@ allprojects {
dependencies { dependencies {
implementation(project(path = ":common")) implementation(project(path = ":common"))
implementation(project(path = ":v1_19_R3", configuration = "reobf")) //implementation(project(path = ":v1_19_R3", configuration = "reobf"))
implementation(project(path = ":v1_20_R1", configuration = "reobf")) //implementation(project(path = ":v1_20_R1", configuration = "reobf"))
implementation(project(path = ":v1_20_R2", configuration = "reobf")) //implementation(project(path = ":v1_20_R2", configuration = "reobf"))
implementation(project(path = ":v1_20_R3", configuration = "reobf")) //implementation(project(path = ":v1_20_R3", configuration = "reobf"))
implementation(project(path = ":v1_20_R4", configuration = "reobf")) //implementation(project(path = ":v1_20_R4", configuration = "reobf"))
implementation(project(path = ":v1_21_R1", configuration = "reobf")) implementation(project(path = ":v1_21_R1", configuration = "reobf"))
} }
@@ -140,11 +140,11 @@ tasks {
} }
shadowJar { shadowJar {
dependsOn(":v1_19_R3:reobfJar") //dependsOn(":v1_19_R3:reobfJar")
dependsOn(":v1_20_R1:reobfJar") //dependsOn(":v1_20_R1:reobfJar")
dependsOn(":v1_20_R2:reobfJar") //dependsOn(":v1_20_R2:reobfJar")
dependsOn(":v1_20_R3:reobfJar") //dependsOn(":v1_20_R3:reobfJar")
dependsOn(":v1_20_R4:reobfJar") //dependsOn(":v1_20_R4:reobfJar")
dependsOn(":v1_21_R1:reobfJar") dependsOn(":v1_21_R1:reobfJar")
mergeServiceFiles() mergeServiceFiles()

2
common/build.gradle.kts
View File

@@ -4,7 +4,7 @@
tasks { tasks {
compileJava { compileJava {
options.encoding = Charsets.UTF_8.name() options.encoding = Charsets.UTF_8.name()
options.release.set(17) options.release.set(21)
} }
javadoc { javadoc {

10
common/src/main/java/me/lojosho/hibiscuscommons/hooks/items/HookGeary.java
View File

@@ -1,6 +1,11 @@
package me.lojosho.hibiscuscommons.hooks.items; 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.ItemTrackingKt;
import com.mineinabyss.geary.papermc.tracking.items.ItemTrackingModule;
import com.mineinabyss.geary.prefabs.PrefabKey; import com.mineinabyss.geary.prefabs.PrefabKey;
import me.lojosho.hibiscuscommons.hooks.Hook; import me.lojosho.hibiscuscommons.hooks.Hook;
import me.lojosho.hibiscuscommons.hooks.HookFlag; import me.lojosho.hibiscuscommons.hooks.HookFlag;
@@ -12,6 +17,8 @@ import org.jetbrains.annotations.NotNull;
*/ */
public class HookGeary extends Hook { public class HookGeary extends Hook {
private ItemTrackingModule itemTracking = null;
public HookGeary() { public HookGeary() {
super("geary", HookFlag.ITEM_SUPPORT); super("geary", HookFlag.ITEM_SUPPORT);
} }
@@ -21,8 +28,9 @@ public class HookGeary extends Hook {
*/ */
@Override @Override
public ItemStack getItem(@NotNull String itemId) { public ItemStack getItem(@NotNull String itemId) {
if (itemTracking == null) itemTracking = GearyPaperModuleKt.getGearyPaper().getWorldManager().getGlobal().getAddon(ItemTrackingKt.getItemTracking());
PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId); PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId);
if (prefabKey == null) return null; if (prefabKey == null) return null;
return ItemTrackingKt.getGearyItems().createItem(prefabKey, null); return itemTracking.createItem(prefabKey, null);
} }
} }

10
settings.gradle.kts
View File

@@ -8,10 +8,10 @@ pluginManagement {
rootProject.name = "HibiscusCommons" rootProject.name = "HibiscusCommons"
include( include(
"common", "common",
"v1_19_R3", //"v1_19_R3",
"v1_20_R1", //"v1_20_R1",
"v1_20_R2", //"v1_20_R2",
"v1_20_R3", //"v1_20_R3",
"v1_20_R4", //"v1_20_R4",
"v1_21_R1" "v1_21_R1"
) )