Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Recipes lost on respawn due to onCloneCapability #171

Open
wants to merge 3 commits into
base: 1.20.1
Choose a base branch
from
Open

[Fix] Recipes lost on respawn due to onCloneCapability #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d0b606
Bumped Gradle and dependencies to latest versions
ASchneider-GitHub Jan 7, 2025
c261919
Changed language to better-explain event
ASchneider-GitHub Jan 7, 2025
6894565
Fixed capability handling on respawn for onCloneCapability method
ASchneider-GitHub Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/me/towdium/jecalculation/data/structure/Recipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
4 changes: 3 additions & 1 deletion forge/src/main/java/me/towdium/jecalculation/forge/JecaCapability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ public static void onAttachCapability(AttachCapabilitiesEvent<Entity> 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 {
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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