From badcd5a38ced120b7805f28d73f1ce6be22df6f4 Mon Sep 17 00:00:00 2001 From: miozune Date: Tue, 14 Nov 2023 09:32:39 +0900 Subject: [PATCH] Fix crash count not being read (#14) * Fix crash count not being read * move mixins accessor interfaces under mixins\interfaces package --------- Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> --- build.gradle | 4 +- .../mixins/early/CrashReportMixin.java | 4 +- .../mixins/early/MinecraftMixin.java | 13 ++++- .../interfaces/CrashReportExt.java} | 4 +- .../mixins/interfaces/MinecraftExt.java | 8 +++ .../bettercrashes/utils/GuiProblemScreen.java | 50 ++++--------------- .../utils/IPatchedMinecraft.java | 12 ----- 7 files changed, 37 insertions(+), 58 deletions(-) rename src/main/java/vfyjxf/bettercrashes/{utils/IPatchedCrashReport.java => mixins/interfaces/CrashReportExt.java} (82%) create mode 100644 src/main/java/vfyjxf/bettercrashes/mixins/interfaces/MinecraftExt.java delete mode 100644 src/main/java/vfyjxf/bettercrashes/utils/IPatchedMinecraft.java diff --git a/build.gradle b/build.gradle index e59189c..3e88830 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1697697256 +//version: 1698936026 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -646,7 +646,7 @@ repositories { def mixinProviderGroup = "io.github.legacymoddingmc" def mixinProviderModule = "unimixins" -def mixinProviderVersion = "0.1.7.1" +def mixinProviderVersion = "0.1.13" def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" ext.mixinProviderSpec = mixinProviderSpec diff --git a/src/main/java/vfyjxf/bettercrashes/mixins/early/CrashReportMixin.java b/src/main/java/vfyjxf/bettercrashes/mixins/early/CrashReportMixin.java index 123ace4..899a3ce 100644 --- a/src/main/java/vfyjxf/bettercrashes/mixins/early/CrashReportMixin.java +++ b/src/main/java/vfyjxf/bettercrashes/mixins/early/CrashReportMixin.java @@ -33,12 +33,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import cpw.mods.fml.common.ModContainer; import vfyjxf.bettercrashes.BetterCrashesConfig; -import vfyjxf.bettercrashes.utils.IPatchedCrashReport; +import vfyjxf.bettercrashes.mixins.interfaces.CrashReportExt; import vfyjxf.bettercrashes.utils.ModIdentifier; import vfyjxf.bettercrashes.utils.StacktraceDeobfuscator; @Mixin(value = CrashReport.class, priority = 500) -public class CrashReportMixin implements IPatchedCrashReport { +public class CrashReportMixin implements CrashReportExt { @Shadow @Final diff --git a/src/main/java/vfyjxf/bettercrashes/mixins/early/MinecraftMixin.java b/src/main/java/vfyjxf/bettercrashes/mixins/early/MinecraftMixin.java index fbcce01..e782756 100644 --- a/src/main/java/vfyjxf/bettercrashes/mixins/early/MinecraftMixin.java +++ b/src/main/java/vfyjxf/bettercrashes/mixins/early/MinecraftMixin.java @@ -45,6 +45,7 @@ import org.spongepowered.asm.mixin.Unique; import cpw.mods.fml.client.SplashProgress; import cpw.mods.fml.common.Loader; import vfyjxf.bettercrashes.BetterCrashesConfig; +import vfyjxf.bettercrashes.mixins.interfaces.MinecraftExt; import vfyjxf.bettercrashes.utils.CrashUtils; import vfyjxf.bettercrashes.utils.GuiCrashScreen; import vfyjxf.bettercrashes.utils.GuiInitErrorScreen; @@ -54,7 +55,7 @@ import vfyjxf.bettercrashes.utils.StateManager; * @author Runemoro */ @Mixin(Minecraft.class) -public abstract class MinecraftMixin { +public abstract class MinecraftMixin implements MinecraftExt { @Shadow @Final @@ -222,6 +223,16 @@ public abstract class MinecraftMixin { } } + @Override + public int betterCrashes$getClientCrashCount() { + return betterCrashes$clientCrashCount; + } + + @Override + public int betterCrashes$getServerCrashCount() { + return betterCrashes$serverCrashCount; + } + @Unique private void betterCrashes$displayCrashScreen(CrashReport report) { try { diff --git a/src/main/java/vfyjxf/bettercrashes/utils/IPatchedCrashReport.java b/src/main/java/vfyjxf/bettercrashes/mixins/interfaces/CrashReportExt.java similarity index 82% rename from src/main/java/vfyjxf/bettercrashes/utils/IPatchedCrashReport.java rename to src/main/java/vfyjxf/bettercrashes/mixins/interfaces/CrashReportExt.java index 6b94512..af461ab 100644 --- a/src/main/java/vfyjxf/bettercrashes/utils/IPatchedCrashReport.java +++ b/src/main/java/vfyjxf/bettercrashes/mixins/interfaces/CrashReportExt.java @@ -4,7 +4,7 @@ * dimdev/vanillafix/crashes/IPatchedCrashReport.java The source file uses the MIT License. */ -package vfyjxf.bettercrashes.utils; +package vfyjxf.bettercrashes.mixins.interfaces; import java.util.Set; @@ -13,7 +13,7 @@ import cpw.mods.fml.common.ModContainer; /** * @author Runemoro */ -public interface IPatchedCrashReport { +public interface CrashReportExt { Set betterCrashes$getSuspectedMods(); } diff --git a/src/main/java/vfyjxf/bettercrashes/mixins/interfaces/MinecraftExt.java b/src/main/java/vfyjxf/bettercrashes/mixins/interfaces/MinecraftExt.java new file mode 100644 index 0000000..ecf4e0b --- /dev/null +++ b/src/main/java/vfyjxf/bettercrashes/mixins/interfaces/MinecraftExt.java @@ -0,0 +1,8 @@ +package vfyjxf.bettercrashes.mixins.interfaces; + +public interface MinecraftExt { + + int betterCrashes$getClientCrashCount(); + + int betterCrashes$getServerCrashCount(); +} diff --git a/src/main/java/vfyjxf/bettercrashes/utils/GuiProblemScreen.java b/src/main/java/vfyjxf/bettercrashes/utils/GuiProblemScreen.java index 68ee26d..f8d4b3c 100644 --- a/src/main/java/vfyjxf/bettercrashes/utils/GuiProblemScreen.java +++ b/src/main/java/vfyjxf/bettercrashes/utils/GuiProblemScreen.java @@ -7,7 +7,6 @@ package vfyjxf.bettercrashes.utils; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -28,26 +27,13 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import vfyjxf.bettercrashes.BetterCrashesConfig; +import vfyjxf.bettercrashes.mixins.interfaces.CrashReportExt; +import vfyjxf.bettercrashes.mixins.interfaces.MinecraftExt; import vfyjxf.bettercrashes.upload.CrashReportUpload; @SideOnly(Side.CLIENT) public abstract class GuiProblemScreen extends GuiScreen { - private static Field fieldClientCrashCount = null; - private static Field fieldServerCrashCount = null; - - static { - try { - // these are actually reachable, see MinecraftMixin - fieldClientCrashCount = Minecraft.class.getDeclaredField("clientCrashCount"); - fieldClientCrashCount.setAccessible(true); - fieldServerCrashCount = Minecraft.class.getDeclaredField("serverCrashCount"); - fieldServerCrashCount.setAccessible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - protected final CrashReport report; private volatile URL pasteLink = null; private String modListString; @@ -205,7 +191,7 @@ public abstract class GuiProblemScreen extends GuiScreen { protected String getModListString() { if (modListString == null) { - final Set suspectedMods = ((IPatchedCrashReport) report).betterCrashes$getSuspectedMods(); + final Set suspectedMods = ((CrashReportExt) report).betterCrashes$getSuspectedMods(); if (suspectedMods == null) { return modListString = I18n.format("bettercrashes.gui.common.identificationErrored"); } @@ -248,30 +234,16 @@ public abstract class GuiProblemScreen extends GuiScreen { return installedUnsupportedMods; } - private int getClientCrashCount() { - if (fieldClientCrashCount != null) { - try { - return (int) fieldClientCrashCount.get(Minecraft.getMinecraft()); - } catch (Exception e) { - e.printStackTrace(); - } - } - return 0; - } - - private int getServerCrashCount() { - if (fieldServerCrashCount != null) { - try { - return (int) fieldServerCrashCount.get(Minecraft.getMinecraft()); - } catch (Exception e) { - e.printStackTrace(); - } - } - return 0; - } - protected boolean isCrashLogExpectedToBeGenerated() { return getClientCrashCount() <= BetterCrashesConfig.crashLogLimitClient && getServerCrashCount() <= BetterCrashesConfig.crashLogLimitServer; } + + private int getClientCrashCount() { + return ((MinecraftExt) Minecraft.getMinecraft()).betterCrashes$getClientCrashCount(); + } + + private int getServerCrashCount() { + return ((MinecraftExt) Minecraft.getMinecraft()).betterCrashes$getServerCrashCount(); + } } diff --git a/src/main/java/vfyjxf/bettercrashes/utils/IPatchedMinecraft.java b/src/main/java/vfyjxf/bettercrashes/utils/IPatchedMinecraft.java deleted file mode 100644 index 082effa..0000000 --- a/src/main/java/vfyjxf/bettercrashes/utils/IPatchedMinecraft.java +++ /dev/null @@ -1,12 +0,0 @@ -package vfyjxf.bettercrashes.utils; - -import net.minecraft.crash.CrashReport; - -public interface IPatchedMinecraft { - - boolean shouldCrashIntegratedServerNextTick(); - - void showWarningScreen(CrashReport report); - - void makeErrorNotification(CrashReport report); -}