Merge pull request #44 from HaHaWTH/perf/entity-tracker-include-y

Include y range for entity tracking

Author: KasumiNova

src/main/java/github/kasuminova/stellarcore/common/config/category/Performance.java

@@ -178,6 +178,11 @@ public static class Vanilla {
         @Config.Name("EntityTrackerImprovements")
         public boolean entitytracker = true;
 
+        @Config.Comment("(Server Performance) Include Y distance checks when tracking entities.")
+        @Config.RequiresMcRestart
+        @Config.Name("EntityTrackerIncludeY")
+        public boolean entitytrackerIncludeY = false;
+
         @Config.Comment("(Server Performance) Improving WorldServer#getPendingBlockUpdates Performance with Improved Data Structures.")
         @Config.RequiresMcRestart
         @Config.Name("WorldServerGetPendingBlockUpdatesImprovements")

src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreEarlyMixinLoader.java

@@ -31,6 +31,7 @@ public class StellarCoreEarlyMixinLoader implements IFMLLoadingPlugin {
         addMixinCFG("mixins.stellar_core_minecraft_chunktequeue.json",           () -> StellarCoreConfig.PERFORMANCE.vanilla.chunkTEQueue);
         addMixinCFG("mixins.stellar_core_minecraft_classmultimap.json",          () -> StellarCoreConfig.PERFORMANCE.vanilla.classMultiMap);
         addMixinCFG("mixins.stellar_core_minecraft_entitytracker.json",          () -> StellarCoreConfig.PERFORMANCE.vanilla.entitytracker);
+        addMixinCFG("mixins.stellar_core_minecraft_entitytracker_y_range.json",  () -> StellarCoreConfig.PERFORMANCE.vanilla.entitytrackerIncludeY);
         addMixinCFG("mixins.stellar_core_minecraft_itemstack_cap.json",          () -> StellarCoreConfig.PERFORMANCE.vanilla.asyncItemStackCapabilityInit && !(CensoredASMCompat.isPresent() && CensoredASMCompat.checkDelayItemStackCapInitEnabled()));
         addMixinCFG("mixins.stellar_core_minecraft_longnbtkiller.json",          () -> StellarCoreConfig.BUG_FIXES.vanilla.longNBTKiller);
         addMixinCFG("mixins.stellar_core_minecraft_modelblock.json",             () -> StellarCoreConfig.PERFORMANCE.vanilla.modelBlockStringCanonicalization && CensoredASMCompat.isPresent());

src/main/java/github/kasuminova/stellarcore/mixin/minecraft/entitytracker/y_range/MixinEntityTrackerEntry.java

@@ -0,0 +1,29 @@
+package github.kasuminova.stellarcore.mixin.minecraft.entitytracker.y_range;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.entity.EntityTrackerEntry;
+import net.minecraft.entity.player.EntityPlayerMP;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(EntityTrackerEntry.class)
+public class MixinEntityTrackerEntry {
+    @Shadow
+    private long encodedPosY;
+    @Unique
+    private static final int ENTITY_Y_TRACKING_RANGE = Integer.getInteger("stellarcore.entitytracker.y_range", -1);
+
+    @Inject(method = "isVisibleTo", at = @At("RETURN"), cancellable = true)
+    private void onIsVisibleTo(EntityPlayerMP playerMP, CallbackInfoReturnable<Boolean> cir, @Local(ordinal = 0) int range) {
+        if (cir.getReturnValue()) {
+            double yDistance = Math.abs(playerMP.posY - (double) this.encodedPosY / 4096.0D);
+            if ((ENTITY_Y_TRACKING_RANGE > 0 && yDistance > ENTITY_Y_TRACKING_RANGE) || yDistance > range) {
+                cir.setReturnValue(false);
+            }
+        }
+    }
+}

src/main/resources/mixins.stellar_core_minecraft_entitytracker_y_range.json

@@ -0,0 +1,10 @@
+{
+    "package": "github.kasuminova.stellarcore.mixin.minecraft.entitytracker.y_range",
+    "refmap": "mixins.stellar_core.refmap.json",
+    "target": "@env(DEFAULT)",
+    "minVersion": "0.8",
+    "compatibilityLevel": "JAVA_8",
+    "mixins": [
+        "MixinEntityTrackerEntry"
+    ]
+}