feat: forceLoadPets

Author: OptiJava

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

@@ -9,6 +9,7 @@
 import io.github.optijava.opt_carpet_addition.commands.*;
 import io.github.optijava.opt_carpet_addition.events.fixExperienceBug.FixExperienceBug;
 import io.github.optijava.opt_carpet_addition.logger.LoggerRegister;
+import io.github.optijava.opt_carpet_addition.mixins.rule.forceLoadPets.FollowOwnerGoal_Mixin;
 import io.github.optijava.opt_carpet_addition.utils.CommandLogger;
 import io.github.optijava.opt_carpet_addition.utils.ConfigUtil;
 import io.github.optijava.opt_carpet_addition.utils.TpLimit;
@@ -98,6 +99,10 @@ public void onGameStarted() {
                     rateLimiter.setRate(time);
                 }
             }
+
+            if (rule.name().equals("forceLoadPets") && OptCarpetSettings.forceLoadPets) {
+                FollowOwnerGoal_Mixin.ShouldTriggerImmediateLoadPets.triggerImmediateLoadPets = true;
+            }
         }));
 
         // config

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

@@ -196,4 +196,9 @@ public class OptCarpetSettings {
             categories = {RuleCategory.FEATURE, OCA}
     )
     public static boolean allowSpectatorToModifyContainer = false;
+
+    @Rule(
+            categories = {RuleCategory.FEATURE, RuleCategory.EXPERIMENTAL, OCA}
+    )
+    public static boolean forceLoadPets = false;
 }

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/forceLoadPets/FollowOwnerGoal_Mixin.java

@@ -0,0 +1,39 @@
+package io.github.optijava.opt_carpet_addition.mixins.rule.forceLoadPets;
+
+import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
+import io.github.optijava.opt_carpet_addition.utils.McUtils;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.TicketType;
+import net.minecraft.world.entity.TamableAnimal;
+import net.minecraft.world.entity.ai.goal.FollowOwnerGoal;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(FollowOwnerGoal.class)
+public class FollowOwnerGoal_Mixin {
+
+    @Final
+    @Shadow
+    private TamableAnimal tamable;
+
+    @Inject(
+            method = "tick",
+            at = @At("TAIL")
+    )
+    public void tick(CallbackInfo ci) {
+        if (OptCarpetSettings.forceLoadPets && this.tamable.level() instanceof ServerLevel serverLevel) {
+            if (ShouldTriggerImmediateLoadPets.triggerImmediateLoadPets || (McUtils.MINECRAFT_SERVER.getTickCount() % 35 == 0)) {
+                serverLevel.getChunkSource().addTicketWithRadius(TicketType.ENDER_PEARL, this.tamable.chunkPosition(), 2);
+            }
+            ShouldTriggerImmediateLoadPets.triggerImmediateLoadPets = false;
+        }
+    }
+
+    public static class ShouldTriggerImmediateLoadPets {
+        public static boolean triggerImmediateLoadPets = false;
+    }
+}

src/main/resources/assets/opt-carpet-addition/lang/en_us.json

@@ -62,5 +62,9 @@
   "carpet.rule.enableListAdvanceCommand.name": "Enable Advanced List Command",
   "carpet.rule.enableListAdvanceCommand.desc": "Enable advanced list feature commands",
   "carpet.rule.enableTpmanagerCommand.name": "Enable Teleport Manager Command",
-  "carpet.rule.enableTpmanagerCommand.desc": "Enable teleport management related commands"
+  "carpet.rule.enableTpmanagerCommand.desc": "Enable teleport management related commands",
+  "carpet.rule.allowSpectatorToModifyContainer.name": "Allow spectators to modify containers",
+  "carpet.rule.allowSpectatorToModifyContainer.desc": "Allow spectators to modify containers",
+  "carpet.rule.forceLoadPets.name": "Force load pet chunks",
+  "carpet.rule.forceLoadPets.desc": "Create a ticket every 35 ticks in pet chunks to prevent pets from not teleporting to the player."
 }

src/main/resources/assets/opt-carpet-addition/lang/zh_cn.json

@@ -62,6 +62,10 @@
   "carpet.rule.enableListAdvanceCommand.name": "启用高级列表命令",
   "carpet.rule.enableListAdvanceCommand.desc": "启用高级列表功能命令",
   "carpet.rule.enableTpmanagerCommand.name": "启用传送管理命令",
-  "carpet.rule.enableTpmanagerCommand.desc": "启用传送管理相关命令"
+  "carpet.rule.enableTpmanagerCommand.desc": "启用传送管理相关命令",
+  "carpet.rule.allowSpectatorToModifyContainer.name": "允许旁观者操作容器",
+  "carpet.rule.allowSpectatorToModifyContainer.desc": "允许旁观者在GUI操作容器",
+  "carpet.rule.forceLoadPets.name": "强制加载宠物所在的区块",
+  "carpet.rule.forceLoadPets.desc": "向宠物所在区块每隔35tick投1个类型为ENDER_PEARL的加载票，强加载宠物区块防止宠物不传送到玩家"
 }
 

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

@@ -22,7 +22,8 @@
     //"rule.optimizeFakePlayerSpawn.EntityPlayerMPFake_Mixin",
     //"rule.optimizeFakePlayerSpawn.PlayerCommand_Mixin",
     //? }
-    "logger.blockUpdate.LogCommand_Mixin"
+    "logger.blockUpdate.LogCommand_Mixin",
+    "rule.forceLoadPets.FollowOwnerGoal_Mixin"
   ],
   "client": [
     "rule.unescapeChatMessage.ChatMessageC2SPacket_Mixin",