Add rule mobSpawnWithArmorDiamondOverrideChance

Author: Fallen-Breath

patches/net/minecraft/entity/EntityLiving.java.patch

@@ -103,8 +103,16 @@
          {
              ItemStack itemstack = this.getItemStackFromSlot(entityequipmentslot);
              float f = this.getDropChance(entityequipmentslot);
-@@ -973,7 +1005,8 @@
+@@ -971,9 +1003,16 @@
+                 ++i;
+             }
 
++            // TISCM mobSpawnWithArmorDiamondOverrideChance
++            if (CarpetSettings.mobSpawnWithArmorDiamondOverrideChance > 0 && this.rand.nextFloat() < CarpetSettings.mobSpawnWithArmorDiamondOverrideChance)
++            {
++                i = 4;
++            }
++
              boolean flag = true;
 
 -            for (EntityEquipmentSlot entityequipmentslot : EntityEquipmentSlot.values())
@@ -113,7 +121,7 @@
              {
                  if (entityequipmentslot.getSlotType() == EntityEquipmentSlot.Type.ARMOR)
                  {
-@@ -1136,7 +1169,8 @@
+@@ -1136,7 +1175,8 @@
              this.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, EnchantmentHelper.addRandomEnchantment(this.rand, this.getHeldItemMainhand(), (int)(5.0F + f * (float)this.rand.nextInt(18)), false));
          }
 
@@ -123,7 +131,7 @@
          {
              if (entityequipmentslot.getSlotType() == EntityEquipmentSlot.Type.ARMOR)
              {
-@@ -1174,6 +1208,9 @@
+@@ -1174,6 +1214,9 @@
 
      public void enablePersistence()
      {
@@ -133,7 +141,7 @@
          this.persistenceRequired = true;
      }
 
-@@ -1447,10 +1484,16 @@
+@@ -1447,10 +1490,16 @@
          float f = (float)this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getValue();
          int i = 0;
 

src/main/java/carpet/settings/CarpetSettings.java

@@ -961,6 +961,16 @@ public String validate(CommandSource source, ParsedRule<String> currentRule, Str
     )
     public static boolean blockStateParserFutureVersionInputCompact;
 
+    @Rule(
+            desc = "If enabled, if a mob spawns with armor, there's the given chance to override the armor type to diamond",
+            extra = {
+                    "If set to 1, the mob will always spawn with diamond armor if it spawns with armor",
+                    "Set it to <=0 to disable this rule",
+            },
+            category = {CREATIVE},
+            options = {"-1", "0.5", "1"}
+    )
+    public static double mobSpawnWithArmorDiamondOverrideChance = -1;
 
     // /$$$$$$$$ /$$$$$$  /$$$$$$   /$$$$$$  /$$      /$$
     //|__  $$__/|_  $$_/ /$$__  $$ /$$__  $$| $$$    /$$$

src/main/resources/assets/carpet/lang/zh_cn.yml

@@ -217,6 +217,12 @@ rule:
     extra:
       '0': 将其设为0以让矿车忽略速度，像船一样总能将附件实体载上车
       '1': 将其设为NaN以让矿车永远不能把实体载上车
+  mobSpawnWithArmorDiamondOverrideChance:
+    name: 怪物装备钻石化几率
+    desc: 启用时，若怪物刷新上带有盔甲，那么会有给定概率把其盔甲材质覆盖为钻石
+    extra:
+      '0': 若其值为1，则怪物若刷新时带有盔甲，则盔甲一定是钻石材质
+      '1': 将其值设置为<=0以禁用该规则
   opPlayerNoCheat:
     name: op玩家不准作弊
     desc: 禁用部分指令以避免op玩家意外地作弊