add rule: cceSuppressionCrashFix

Author: OptiJava

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java

@@ -158,5 +158,11 @@ public class OptCarpetSettings {
             category = RuleCategory.OPTIMIZATION
     )
     public static boolean optimizeFakePlayerSpawn = false;
+
+    @Rule(
+            desc = "Fix CCE Suppression crashes",
+            category = {RuleCategory.BUGFIX, RuleCategory.EXPERIMENTAL}
+    )
+    public static boolean cceSuppressionCrashFix = false;
 }
 

src/main/java/io/github/optijava/opt_carpet_addition/logger/LoggerRegister.java

@@ -1,6 +1,7 @@
 package io.github.optijava.opt_carpet_addition.logger;
 
 import carpet.logging.LoggerRegistry;
+import io.github.optijava.opt_carpet_addition.logger.cceSuppressionCrashLogger.CCESuppressionCrashLogger;
 import io.github.optijava.opt_carpet_addition.logger.disk.DiskHUDLogger;
 import io.github.optijava.opt_carpet_addition.logger.updateSuppression.UpdateSuppressionLogger;
 
@@ -12,8 +13,11 @@ private LoggerRegister() {
 
     public static boolean __updateSuppression = false;
 
+    public static boolean __cceSuppressionCrash = false;
+
     public static void registry() {
         LoggerRegistry.registerLogger("disk", DiskHUDLogger.INSTANCE);
         LoggerRegistry.registerLogger("updateSuppression", UpdateSuppressionLogger.INSTANCE);
+        LoggerRegistry.registerLogger("cceSuppressionCrash", CCESuppressionCrashLogger.INSTANCE);
     }
 }

src/main/java/io/github/optijava/opt_carpet_addition/logger/cceSuppressionCrashLogger/CCESuppressionCrashLogger.java

@@ -0,0 +1,34 @@
+package io.github.optijava.opt_carpet_addition.logger.cceSuppressionCrashLogger;
+
+import carpet.utils.Messenger;
+import io.github.optijava.opt_carpet_addition.logger.AbstractLogger;
+import io.github.optijava.opt_carpet_addition.logger.LoggerRegister;
+import net.minecraft.text.BaseText;
+import net.minecraft.util.math.BlockPos;
+
+import java.lang.reflect.Field;
+
+public class CCESuppressionCrashLogger extends AbstractLogger {
+
+    public static final CCESuppressionCrashLogger INSTANCE;
+
+    static {
+        try {
+            INSTANCE = new CCESuppressionCrashLogger(LoggerRegister.class.getField("__cceSuppressionCrash"), "cceSuppressionCrash", null, null, false);
+        } catch (NoSuchFieldException e) {
+            throw new Error("Failed to init UpdateSuppressionLogger", e);
+        }
+    }
+
+    protected CCESuppressionCrashLogger(Field acceleratorField, String logName, String def, String[] options, boolean strictOptions) {
+        super(acceleratorField, logName, def, options, strictOptions);
+    }
+
+    public void logUpdateSuppression(BlockPos pos) {
+        if (LoggerRegister.__cceSuppressionCrash) {
+            super.log(() -> new BaseText[]{
+                    Messenger.c("w CCE suppression crash prevented in: ", "m world tick ", "w - at: ", "g [ " + pos.toShortString() + " ]")
+            });
+        }
+    }
+}

src/main/java/io/github/optijava/opt_carpet_addition/logger/cceSuppressionCrashLogger/ThrowableCCESuppression.java

@@ -0,0 +1,12 @@
+package io.github.optijava.opt_carpet_addition.logger.cceSuppressionCrashLogger;
+
+import net.minecraft.util.math.BlockPos;
+
+public class ThrowableCCESuppression extends RuntimeException{
+    public final BlockPos pos;
+
+    public ThrowableCCESuppression(String message, BlockPos pos) {
+        super(message);
+        this.pos = pos;
+    }
+}

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/cceSuppressionCrashFix/MinecraftServer_Mixin.java

@@ -0,0 +1,42 @@
+package io.github.optijava.opt_carpet_addition.mixins.rule.cceSuppressionCrashFix;
+
+import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
+import io.github.optijava.opt_carpet_addition.logger.cceSuppressionCrashLogger.CCESuppressionCrashLogger;
+import io.github.optijava.opt_carpet_addition.logger.cceSuppressionCrashLogger.ThrowableCCESuppression;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.world.ServerWorld;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+import java.util.Iterator;
+import java.util.function.BooleanSupplier;
+
+@Mixin(MinecraftServer.class)
+public class MinecraftServer_Mixin {
+
+    @Inject(
+            method = {"tickWorlds"},
+            at = {@At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/util/crash/CrashReport;create(Ljava/lang/Throwable;Ljava/lang/String;)Lnet/minecraft/util/crash/CrashReport;"
+            )},
+            locals = LocalCapture.CAPTURE_FAILHARD,
+            cancellable = true
+    )
+    public void injectTickWorlds(BooleanSupplier shouldKeepTicking, CallbackInfo ci, @SuppressWarnings("all") Iterator var2, ServerWorld serverWorld, Throwable throwable) {
+        if (OptCarpetSettings.cceSuppressionCrashFix && (throwable instanceof ThrowableCCESuppression || throwable.getCause() instanceof ThrowableCCESuppression)) {
+            try {
+                if (throwable instanceof ThrowableCCESuppression) {
+                    CCESuppressionCrashLogger.INSTANCE.logUpdateSuppression(((ThrowableCCESuppression) throwable).pos);
+                } else {
+                    CCESuppressionCrashLogger.INSTANCE.logUpdateSuppression(((ThrowableCCESuppression) throwable.getCause()).pos);
+                }
+            } catch (Exception ignored){}
+
+            ci.cancel();
+        }
+    }
+}

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/cceSuppressionCrashFix/ShulkerBoxBlock_Mixin.java

@@ -0,0 +1,37 @@
+package io.github.optijava.opt_carpet_addition.mixins.rule.cceSuppressionCrashFix;
+
+import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
+import io.github.optijava.opt_carpet_addition.logger.cceSuppressionCrashLogger.ThrowableCCESuppression;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ShulkerBoxBlock;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.screen.ScreenHandler;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ShulkerBoxBlock.class)
+public class ShulkerBoxBlock_Mixin {
+
+    @Inject(
+            method = "getComparatorOutput",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    public void injectGetComparatorOutput(BlockState state, World world, BlockPos pos, CallbackInfoReturnable<Integer> cir) {
+        if (OptCarpetSettings.cceSuppressionCrashFix) {
+            int var1 = 0;
+            try {
+                var1 = ScreenHandler.calculateComparatorOutput((Inventory)((Object)world.getBlockEntity(pos)));
+            } catch (ClassCastException e) {
+                throw new ThrowableCCESuppression(e.getMessage(), pos);
+            }
+            cir.setReturnValue(var1);
+        } else {
+            cir.setReturnValue(ScreenHandler.calculateComparatorOutput((Inventory)((Object)world.getBlockEntity(pos))));
+        }
+    }
+}

src/main/resources/opt-carpet-addition.mixins.json

@@ -14,6 +14,8 @@
     "rule.async.optimizePlayerConnect.World_Mixin",
     "rule.async.optimizeTeleport.ServerPlayerEntity_Mixin",
     "rule.async.optimizeTeleport.ServerPlayNetworkHandler_Mixin",
+    "rule.cceSuppressionCrashFix.MinecraftServer_Mixin",
+    "rule.cceSuppressionCrashFix.ShulkerBoxBlock_Mixin",
     "rule.commandLogger.CommandManager_Mixin",
     "rule.disabledEnderManPickupGoal.EnderManEntity_Mixin",
     "rule.disabledEnderManPlaceBlockGoal.EndermanEntity_Mixin",