Merge pull request #42 from HaHaWTH/master

Optimize AABB intersect

Author: KasumiNova

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

@@ -193,6 +193,11 @@ public static class Vanilla {
         @Config.Name("PropertyEnumHashCodeCache")
         public boolean propertyEnumHashCodeCache = true;
 
+        @Config.Comment("(Client/Server Performance) Optimize BoundingBox intersect check.")
+        @Config.RequiresMcRestart
+        @Config.Name("BoundingBoxIntersectCheck")
+        public boolean boundingBoxIntersectCheck = true;
+
         @Config.Comment("(Server Performance) Improving BlockStateContainer$BlockStateImplementation#hashCode Performance with hashCode cache.")
         @Config.RequiresMcRestart
         @Config.Name("BlockStateImplementationHashCodeCache")

src/main/java/github/kasuminova/stellarcore/common/util/RuntimeEnv.java

@@ -0,0 +1,27 @@
+package github.kasuminova.stellarcore.common.util;
+
+@SuppressWarnings("unused")
+public class RuntimeEnv {
+    private RuntimeEnv() {
+    }
+
+    public static final boolean IS_CLEANROOM_LOADER = isClassInPath("com.cleanroommc.common.CleanroomContainer");
+
+    public static boolean isClassInPath(String className) {
+        String classPath = className.replace('.', '/') + ".class";
+        try {
+            return Thread.currentThread().getContextClassLoader().getResource(classPath) != null;
+        } catch (Throwable e) {
+            return false;
+        }
+    }
+
+    public static boolean isClassLoaded(String className) {
+        try {
+            Class.forName(className);
+            return true;
+        } catch (Throwable e) {
+            return false;
+        }
+    }
+}

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

@@ -3,6 +3,7 @@
 import github.kasuminova.stellarcore.common.config.StellarCoreConfig;
 import github.kasuminova.stellarcore.common.integration.censoredasm.CensoredASMCompat;
 import github.kasuminova.stellarcore.common.mod.Mods;
+import github.kasuminova.stellarcore.common.util.RuntimeEnv;
 import github.kasuminova.stellarcore.common.util.StellarEnvironment;
 import github.kasuminova.stellarcore.common.util.StellarLog;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
@@ -41,6 +42,7 @@ public class StellarCoreEarlyMixinLoader implements IFMLLoadingPlugin {
         addMixinCFG("mixins.stellar_core_minecraft_nnlist.json",                 () -> StellarCoreConfig.PERFORMANCE.vanilla.nonNullList);
         addMixinCFG("mixins.stellar_core_minecraft_noglerror.json",              () -> StellarCoreConfig.PERFORMANCE.vanilla.noGlError);
         addMixinCFG("mixins.stellar_core_minecraft_property.json",               () -> StellarCoreConfig.PERFORMANCE.vanilla.propertyEnumHashCodeCache);
+        addMixinCFG("mixins.stellar_core_minecraft_phys.json",                   () -> StellarCoreConfig.PERFORMANCE.vanilla.boundingBoxIntersectCheck && !RuntimeEnv.IS_CLEANROOM_LOADER);
         addMixinCFG("mixins.stellar_core_minecraft_randomtick.json",             () -> StellarCoreConfig.PERFORMANCE.vanilla.parallelRandomBlockTicker);
         addMixinCFG("mixins.stellar_core_minecraft_renderglobal.json",           () -> StellarCoreConfig.PERFORMANCE.vanilla.alwaysDeferChunkUpdates);
         addMixinCFG("mixins.stellar_core_minecraft_resourcelocation.json",       () -> StellarCoreConfig.PERFORMANCE.vanilla.resourceLocationCanonicalization && !StellarCoreConfig.PERFORMANCE.vanilla.resourceLocationCanonicalizationAsync);

src/main/java/github/kasuminova/stellarcore/mixin/minecraft/phys/MixinAxisAlignedBB.java

@@ -0,0 +1,52 @@
+package github.kasuminova.stellarcore.mixin.minecraft.phys;
+
+import net.minecraft.util.math.AxisAlignedBB;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(value = AxisAlignedBB.class, priority = 999)
+public abstract class MixinAxisAlignedBB {
+    @Shadow @Final public double minX;
+
+    @Shadow @Final public double minY;
+
+    @Shadow @Final public double minZ;
+
+    @Shadow @Final public double maxX;
+
+    @Shadow @Final public double maxY;
+
+    @Shadow @Final public double maxZ;
+
+    /**
+     * @author Creeam
+     * @reason Optimize AABB
+     */
+    @Overwrite
+    public AxisAlignedBB intersect(AxisAlignedBB other) {
+        return new AxisAlignedBB(
+                this.minX > other.minX ? this.minX : other.minX,
+                this.minY > other.minY ? this.minY : other.minY,
+                this.minZ > other.minZ ? this.minZ : other.minZ,
+                this.maxX < other.maxX ? this.maxX : other.maxX,
+                this.maxY < other.maxY ? this.maxY : other.maxY,
+                this.maxZ < other.maxZ ? this.maxZ : other.maxZ
+        );
+    }
+
+    /**
+     * @author Creeam
+     * @reason Direct comparison, avoid method call
+     */
+    @Overwrite
+    public boolean intersects(AxisAlignedBB other) {
+        return this.minX < other.maxX &&
+                this.maxX > other.minX &&
+                this.minY < other.maxY &&
+                this.maxY > other.minY &&
+                this.minZ < other.maxZ &&
+                this.maxZ > other.minZ;
+    }
+}

src/main/resources/mixins.stellar_core_minecraft_phys.json

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