feat: update java21

src/main/resources/assets/slsaddition/lang/en_us.json

@@ -6,9 +6,7 @@
 
   "carpet.rule.obtainableReinforcedDeepSlate.name": "Obtainable reinforced deep slate",
   "carpet.rule.skipTicksForJoblessVillager.name": "Skip ticks for jobless villager",
-  "carpet.rule.maxVillagersInABlock.name": "Max villagers in a block",
   "carpet.rule.creativeNoInfinitePickup.name": "Creative mode cannot infinite pickup",
-  "carpet.rule.autoUrl.name": "Auto add click event for url",
   "carpet.rule.noBatSpawning.name": "No bat spawning",
   "carpet.rule.offlineFakePlayers.name": "Use offline mode for fake players",
   "carpet.rule.pcaSyncProtocol.name": "Enable PCA Sync Protocol",
@@ -22,12 +20,13 @@
   "carpet.rule.maxUpdateQueueSize.name": "Maximum allowed capacity of update queue",
   "carpet.rule.oldRedstoneConnectionLogic.name": "Restore the previous redstone wire connection logic",
   "carpet.rule.optimizedOnDragonRespawn.name": "Optimize the dragon respawn",
+  "carpet.rule.enableCCESuppressor.name": "Enable CCE suppressor.",
+  "carpet.rule.fakePlayersNotOccupiedSleepQuota.name": "Fake players do not occupy sleep quotas.",
+  "carpet.rule.endermanCanPickUpMushroom.name": "Enderman can pick up mushroom",
 
   "carpet.rule.obtainableReinforcedDeepSlate.desc": "When an anvil falls on 64 dropped deepslates, they will be turned in a reinforced deepslate instead of disappearing.",
   "carpet.rule.skipTicksForJoblessVillager.desc": "For jobless/nitwit villagers, after performing a set number of tick operations, skip the 1 tick operation.",
-  "carpet.rule.maxVillagersInABlock.desc": "The maximum number of villagers that can be in a block, set to -1 to disable.",
   "carpet.rule.creativeNoInfinitePickup.desc": "If my inventory is full, don't pick up items in creative mode.",
-  "carpet.rule.autoUrl.desc": "Automatically add click event to URLs in chat.",
   "carpet.rule.noBatSpawning.desc": "Prevents bats from spawning.",
   "carpet.rule.offlineFakePlayers.desc": "Using offline uuid and skin so that fake players wont cause extra network traffic.",
   "carpet.rule.pcaSyncProtocol.desc": "Using PCA protocol to support sync entity and blockEntity from server",
@@ -41,8 +40,10 @@
   "carpet.rule.maxUpdateQueueSize.desc": "Set the maximum allowed length of the update queue",
   "carpet.rule.oldRedstoneConnectionLogic.desc": "Restore the interaction logic between the Redstone wire and the trap door to the performance of versions 1.19 and earlier",
   "carpet.rule.optimizedOnDragonRespawn.desc": "Optimize the dragon respawn process",
+  "carpet.rule.enableCCESuppressor.desc": "Make CCE suppressors from 1.20.1 and earlier versions available again.",
+  "carpet.rule.fakePlayersNotOccupiedSleepQuota.desc": "Make the fake player generated by Carpet no longer occupy sleep quotas",
+  "carpet.rule.endermanCanPickUpMushroom.desc": "Enderman can pick up the mushroom plant if enabled",
 
-  "carpet.rule.autoUrl.extra.0": "The URL sent by players to be directly clicked and redirected by other players",
   "carpet.rule.skipTicksForJoblessVillager.extra.0": "Set to 0 to maintain the vanilla behavior",
   "carpet.rule.skipTicksForJoblessVillager.extra.1": "Set to a number greater than 0, the value will be +1 based on the setting",
   "carpet.rule.skipTicksForJoblessVillager.extra.2": "To prevents villagers from getting completely stuck when set to 1",

src/main/resources/assets/slsaddition/lang/zh_cn.json

@@ -6,9 +6,7 @@
 
   "carpet.rule.obtainableReinforcedDeepSlate.name": "强化深板岩可获取",
   "carpet.rule.skipTicksForJoblessVillager.name": "无业村民跳刻",
-  "carpet.rule.maxVillagersInABlock.name": "单格最大村民数",
   "carpet.rule.creativeNoInfinitePickup.name": "创造模式满背包无法拾取",
-  "carpet.rule.autoUrl.name": "更便捷的URL",
   "carpet.rule.noBatSpawning.name": "禁止蝙蝠生成",
   "carpet.rule.offlineFakePlayers.name": "假人离线模式",
   "carpet.rule.pcaSyncProtocol.name": "启动兼容PCA的同步协议",
@@ -22,12 +20,13 @@
   "carpet.rule.maxUpdateQueueSize.name": "最大更新队列容量",
   "carpet.rule.oldRedstoneConnectionLogic.name": "恢复红石线连接逻辑",
   "carpet.rule.optimizedOnDragonRespawn.name": "龙战优化",
+  "carpet.rule.enableCCESuppressor.name": "恢复CCE抑制器",
+  "carpet.rule.fakePlayersNotOccupiedSleepQuota.name": "假人不占用睡眠名额",
+  "carpet.rule.endermanCanPickUpMushroom.name": "末影人可拿起蘑菇",
 
-  "carpet.rule.maxVillagersInABlock.desc": "每个方块中最大村民数量，设置-1为无限制",
   "carpet.rule.obtainableReinforcedDeepSlate.desc": "当铁砧在64个深板岩的掉落物上时，可以获得强化深板岩",
   "carpet.rule.skipTicksForJoblessVillager.desc": "对于无业/傻子村民，执行设定数量的tick运算后，跳过1tick的运算",
   "carpet.rule.creativeNoInfinitePickup.desc": "创造模式下，玩家不能无限制地拾取物品",
-  "carpet.rule.autoUrl.desc": "自动识别URL并为其添加点击事件",
   "carpet.rule.noBatSpawning.desc": "禁止任何区域蝙蝠生成",
   "carpet.rule.offlineFakePlayers.desc": "由Carpet生成的假玩家，将使用离线皮肤和UUID",
   "carpet.rule.pcaSyncProtocol.desc": "借助PCA同步协议，支持同步 BlockEntity 和 Entity 到客户端",
@@ -41,8 +40,10 @@
   "carpet.rule.maxUpdateQueueSize.desc": "设定最大允许的更新队列长度",
   "carpet.rule.oldRedstoneConnectionLogic.desc": "使活板门上的红石线与其他红石线连接的逻辑恢复到1.19及之前版本的表现",
   "carpet.rule.optimizedOnDragonRespawn.desc": "对重生末影龙的过程进行优化",
+  "carpet.rule.enableCCESuppressor.desc": "让1.20.1及更早的CCE抑制器变得再次可用",
+  "carpet.rule.fakePlayersNotOccupiedSleepQuota.desc": "让假人不再占用睡眠名额，这样即使假人不睡觉也能跳过夜晚",
+  "carpet.rule.endermanCanPickUpMushroom.desc": "如果该选项打开，则末影人可以捡起地上的蘑菇",
 
-  "carpet.rule.autoUrl.extra.0": "使玩家发出的URL可以被其他玩家直接点击跳转",
   "carpet.rule.skipTicksForJoblessVillager.extra.0": "设置为0则保持原版行为",
   "carpet.rule.skipTicksForJoblessVillager.extra.1": "设置为大于0的数，将在设置的基础上将该值+1",
   "carpet.rule.skipTicksForJoblessVillager.extra.2": "以此避免在设置为1的时候，村民完全卡死",

src/main/resources/fabric.mod.json

@@ -6,7 +6,8 @@
   "name": "Carpet SLS Addition",
   "description": "",
   "authors": [
-    "zly2006"
+    "zly2006",
+    "Disy920"
   ],
   "contact": {
   },
@@ -25,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.13",
+    "fabricloader": ">=0.15.1",
     "fabric-api": "*",
     "minecraft": ">=1.20",
     "java": ">=17",

src/main/resources/slsa.accesswidener

@@ -1,2 +1,3 @@
 accessWidener v1 named
 accessible class net/minecraft/world/block/ChainRestrictedNeighborUpdater$Entry
+accessible class net/minecraft/entity/mob/EndermanEntity$PickUpBlockGoal

src/main/resources/slsaddition.mixins.json

@@ -16,6 +16,7 @@
     "carpet.MixinSettingsManager",
     "entity.MixinArmorStandEntity",
     "entity.MixinEnderDragonFight",
+    "entity.MixinEndermanGoal",
     "entity.MixinFallingBlockEntity",
     "entity.MixinItemEntity",
     "entity.MixinPlayerEntity",
@@ -41,6 +42,7 @@
     "screen.MixinSlot",
     "server.MixinMinecraftServer",
     "server.MixinPlayerManager",
+    "world.MixinSleepManager",
     "world.MixinSpawnHelper",
     "world.MixinWorld"
   ],