add rule: removeAllCurseOfBindingArmorWhenPlayerDeadInWall & fix: incorrect compatibilityLevel in opt-carpet-addition.mixins.json

Author: OptiJava

README.md

@@ -3,7 +3,7 @@
 Language: [English](https://github.com/OptiJava/OptCarpetAddition/blob/master/README-en.md) | 中文
 
 这是一个CarpetMod的扩展模组，目标是添加一些没有太大改变原版游戏机制但优化玩家体验/~~降低腐竹血压~~的一些功能。
-1
+
 使用[Preprocessor](https://github.com/ReplayMod/preprocessor)构建~~可供大家学习~~，目前支持`1.17.1` `1.18.2` `1.19.3` `1.20.1`四个版本，其他的大部分大版本相同小版本不同的版本也可直接安装使用
 
 **本模组需要前置：`Carpet` `fabric-api`**

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

@@ -179,4 +179,10 @@ public class OptCarpetSettings {
             category = {RuleCategory.BUGFIX, RuleCategory.EXPERIMENTAL}
     )
     public static boolean cceSuppressionCrashFix = false;
+
+    @Rule(
+            desc = "Remove every armour which has `curse of binding` enchantment when player dead in wall (keepInventory must be true).",
+            category = RuleCategory.FEATURE
+    )
+    public  static boolean removeAllCurseOfBindingArmorWhenPlayerDeadInWall = false;
 }

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeAllCurseOfBindingArmorWhenPlayerDeadInWall/ServerPlayerEntity_Mixin.java

@@ -0,0 +1,37 @@
+package io.github.optijava.opt_carpet_addition.mixins.rule.removeAllCurseOfBindingArmorWhenPlayerDeadInWall;
+
+import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.enchantment.Enchantments;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.world.GameRules;
+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 java.util.Objects;
+
+@Mixin(ServerPlayerEntity.class)
+public class ServerPlayerEntity_Mixin {
+
+    @Inject(
+            method = "onDeath",
+            at = @At("HEAD")
+    )
+    public void injectOnDeath(DamageSource source, CallbackInfo ci) {
+        //#if MC >= 12000
+        //$$ if (OptCarpetSettings.removeAllCurseOfBindingArmorWhenPlayerDeadInWall && ((ServerPlayerEntity) (Object)this).getWorld().getGameRules().getBoolean(GameRules.KEEP_INVENTORY) && Objects.equals(source.getName(), "inWall")) {
+        //#else
+        if (OptCarpetSettings.removeAllCurseOfBindingArmorWhenPlayerDeadInWall && ((ServerPlayerEntity) (Object)this).world.getGameRules().getBoolean(GameRules.KEEP_INVENTORY) && Objects.equals(source.getName(), "inWall")) {
+        //#endif
+            for (ItemStack armor : ((ServerPlayerEntity) (Object)this).getArmorItems()) {
+                if (EnchantmentHelper.getLevel(Enchantments.BINDING_CURSE, armor) > 0) {
+                    armor.setCount(0);
+                }
+            }
+        }
+    }
+}

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

@@ -2,9 +2,12 @@
   "required": true,
   "minVersion": "0.8",
   "package": "io.github.optijava.opt_carpet_addition.mixins",
+  //#if MC >= 11800
+  //$$ "compatibilityLevel": "JAVA_17",
+  //#else
   "compatibilityLevel": "JAVA_16",
+  //#endif
   "mixins": [
-    "logger.HUDController_Mixin",
     //#if MC < 11900
     "logger.updateSuppression.World_Mixin",
     "rule.async.MinecraftServer_Mixin",
@@ -22,6 +25,7 @@
     //$$ "rule.disabledUpdateSuppressionErrorStackTrace.NetworkThreadUtils_Mixin",
     //#endif
     //#endif
+    "logger.HUDController_Mixin",
     "rule.cceSuppressionCrashFix.MinecraftServer_Mixin",
     "rule.cceSuppressionCrashFix.ShulkerBoxBlock_Mixin",
     "rule.commandLogger.CommandManager_Mixin",
@@ -31,7 +35,8 @@
     "rule.disabledLayEggs.ChickenEntity_Mixin",
     "rule.disabledNetherPortalSpawn.NetherPortalBlock_Mixin",
     "rule.optimizeFakePlayerSpawn.EntityPlayerMPFake_Mixin",
-    "rule.optimizeFakePlayerSpawn.PlayerCommand_Mixin"
+    "rule.optimizeFakePlayerSpawn.PlayerCommand_Mixin",
+    "rule.removeAllCurseOfBindingArmorWhenPlayerDeadInWall.ServerPlayerEntity_Mixin"
   ],
   "client": [
     "rule.unescapeChatMessage.ChatMessageC2SPacket_Mixin",