From 38b2e83d055bb471d7fa134825c6137f65d950ba Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 31 May 2021 16:14:10 -0300 Subject: [PATCH] fixed crash report for 1.17 --- gradle.properties | 4 ++-- .../mixins/CrashReport_addScarpetAppsMixin.java | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1ac9e902..8d7be438 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=1.17-pre1 - yarn_mappings=1.17-pre1+build.1 + yarn_mappings=1.17-pre1+build.14 loader_version=0.11.3 - fabric_version=0.34.7+1.17 + fabric_version=0.34.8+1.17 # Mod Properties mod_version = 1.4.38 diff --git a/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java b/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java index dd156441..676654a7 100644 --- a/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java +++ b/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java @@ -1,7 +1,9 @@ package carpet.mixins; +import java.util.function.Supplier; import java.util.stream.Collectors; +import net.minecraft.class_6396; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -9,19 +11,16 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import carpet.CarpetServer; -import net.minecraft.util.crash.CrashReport; -import net.minecraft.util.crash.CrashReportSection; -@Mixin(CrashReport.class) +@Mixin(class_6396.class) public abstract class CrashReport_addScarpetAppsMixin { - @Shadow - public abstract CrashReportSection getSystemDetailsSection(); - - @Inject(at = @At("RETURN"), method = "fillSystemDetails") + @Shadow public abstract void method_37123(String string, Supplier supplier); + + @Inject(method = "", at = @At("RETURN")) private void fillSystemDetails(CallbackInfo info) { if (CarpetServer.scriptServer == null || CarpetServer.scriptServer.modules.isEmpty()) return; - getSystemDetailsSection().add("Loaded Scarpet Apps", () -> { + method_37123("Loaded Scarpet Apps", () -> { return CarpetServer.scriptServer.modules.keySet().stream().collect(Collectors.joining("\n\t\t", "\n\t\t", "")); }); }