From 4ccae7abe0c8608abc648d1fd168b06576c65464 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 1 Jun 2021 19:53:35 -0300 Subject: [PATCH] 1.17-pre3 --- gradle.properties | 4 ++-- .../carpet/mixins/CrashReport_addScarpetAppsMixin.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index ea4700d6..ce343b58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.17-pre2 - yarn_mappings=1.17-pre2+build.1 + minecraft_version=1.17-pre3 + yarn_mappings=1.17-pre3+build.1 loader_version=0.11.3 fabric_version=0.34.8+1.17 diff --git a/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java b/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java index 676654a7..e2dcf2d7 100644 --- a/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java +++ b/src/main/java/carpet/mixins/CrashReport_addScarpetAppsMixin.java @@ -3,7 +3,7 @@ package carpet.mixins; import java.util.function.Supplier; import java.util.stream.Collectors; -import net.minecraft.class_6396; +import net.minecraft.util.SystemDetails; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -12,15 +12,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import carpet.CarpetServer; -@Mixin(class_6396.class) +@Mixin(SystemDetails.class) public abstract class CrashReport_addScarpetAppsMixin { - @Shadow public abstract void method_37123(String string, Supplier supplier); + @Shadow public abstract void addSection(String name, Supplier valueSupplier); @Inject(method = "", at = @At("RETURN")) private void fillSystemDetails(CallbackInfo info) { if (CarpetServer.scriptServer == null || CarpetServer.scriptServer.modules.isEmpty()) return; - method_37123("Loaded Scarpet Apps", () -> { + addSection("Loaded Scarpet Apps", () -> { return CarpetServer.scriptServer.modules.keySet().stream().collect(Collectors.joining("\n\t\t", "\n\t\t", "")); }); }