From 0d0b606c185f378f38bbaaaafdd9178649aab5b3 Mon Sep 17 00:00:00 2001 From: ASchneider-GitHub Date: Mon, 6 Jan 2025 22:36:42 -0800 Subject: [PATCH 1/3] Bumped Gradle and dependencies to latest versions --- build.gradle | 2 +- gradle.properties | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index a1fa9866..3a02b7b0 100755 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false } architectury { diff --git a/gradle.properties b/gradle.properties index dadb5140..61736930 100755 --- a/gradle.properties +++ b/gradle.properties @@ -4,18 +4,18 @@ minecraft_version=1.20.1 enabled_platforms=quilt,fabric,forge archives_base_name=jecalculation -mod_version=4.0.4 +mod_version=4.0.5 maven_group=me.towdium.jecalculation -architectury_version=9.1.12 +architectury_version=9.2.14 -fabric_loader_version=0.14.23 -fabric_api_version=0.90.4+1.20.1 +fabric_loader_version=0.16.9 +fabric_api_version=0.92.2+1.20.1 -forge_version=1.20.1-47.2.1 +forge_version=1.20.1-47.3.12 -quilt_loader_version=0.21.2-beta.2 -quilt_fabric_api_version=7.4.0+0.90.0-1.20.1 +quilt_loader_version=0.28.0-beta.3 +quilt_fabric_api_version=7.7.0+0.92.2-1.20.1 jei_version=15.2.0.27 rei_version=12.0.684 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e411586a..0d184210 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From c261919cf53467b7ca6b0f856a511de4e37450ad Mon Sep 17 00:00:00 2001 From: ASchneider-GitHub Date: Mon, 6 Jan 2025 22:38:06 -0800 Subject: [PATCH 2/3] Changed language to better-explain event --- .../java/me/towdium/jecalculation/data/structure/Recipes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/me/towdium/jecalculation/data/structure/Recipes.java b/common/src/main/java/me/towdium/jecalculation/data/structure/Recipes.java index 396b6798..5d401c3c 100644 --- a/common/src/main/java/me/towdium/jecalculation/data/structure/Recipes.java +++ b/common/src/main/java/me/towdium/jecalculation/data/structure/Recipes.java @@ -30,9 +30,9 @@ public class Recipes { public Recipes() { File file = new File(Utilities.config(), "records.json"); CompoundTag nbt = Utilities.Json.read(file); - if (nbt == null) JustEnoughCalculation.logger.info("Failed to load default records at " + file + "."); + if (nbt == null) JustEnoughCalculation.logger.info("No (optional) default records file found at: '" + file + "'"); else { - JustEnoughCalculation.logger.info("Loading default records at " + file + "."); + JustEnoughCalculation.logger.info("Loading default records from " + file + "."); deserialize(nbt); } } From 6894565a52fc96853a292bc2356a142d7e88f351 Mon Sep 17 00:00:00 2001 From: ASchneider-GitHub Date: Mon, 6 Jan 2025 22:41:37 -0800 Subject: [PATCH 3/3] Fixed capability handling on respawn for onCloneCapability method --- .../java/me/towdium/jecalculation/forge/JecaCapability.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/forge/src/main/java/me/towdium/jecalculation/forge/JecaCapability.java b/forge/src/main/java/me/towdium/jecalculation/forge/JecaCapability.java index 00ef9637..55599466 100644 --- a/forge/src/main/java/me/towdium/jecalculation/forge/JecaCapability.java +++ b/forge/src/main/java/me/towdium/jecalculation/forge/JecaCapability.java @@ -54,8 +54,10 @@ public static void onAttachCapability(AttachCapabilitiesEvent e) { @SubscribeEvent public static void onCloneCapability(PlayerEvent.Clone e) { + e.getOriginal().reviveCaps(); RecordPlayer r = JecaCapability.getRecord(e.getOriginal()); - e.getOriginal().getCapability(JecaCapability.CAPABILITY_RECORD, Direction.UP).orElseGet(Container::new).setRecord(r); + e.getEntity().getCapability(JecaCapability.CAPABILITY_RECORD, Direction.UP).orElseGet(Container::new).setRecord(r); + e.getOriginal().invalidateCaps(); } public static class Container {