ASM long -> 3 int transformation for light engine

config/checkstyle/checkstyle.xml

@@ -160,8 +160,13 @@
 
         <!-- Metrics -->
 
-        <module name="CyclomaticComplexity"/>
+        <module name="CyclomaticComplexity">
+            <property name="switchBlockAsSingleDecisionPoint" value="true"/>
+            <property name="max" value="15"/>
+            <property name="tokens" value="LITERAL_WHILE , LITERAL_DO , LITERAL_FOR , LITERAL_IF , LITERAL_SWITCH , LITERAL_CASE , LITERAL_CATCH , QUESTION"/>
+        </module>
         <!-- <module name="JavaNCSS"/> TODO fix and enable -->
+
         <module name="NPathComplexity"/>
 
         <!-- Misc -->

config/checkstyle/suppressions.xml

@@ -6,9 +6,9 @@
 
 <suppressions>
     <!-- suppress for time measurement code -->
-    <suppress checks="InnerAssignment" files="DebugVisualization.java|Int3HashSet.java"/>
+    <suppress checks="InnerAssignment" files="DebugVisualization.java|Int3HashSet.java|LinkedInt3HashSet.java|Int3UByteLinkedHashMap.java|Int3List.java"/>
     <!-- class transformers will often repeat the same class name string literal -->
-    <suppress checks="MultipleStringLiterals" files=".*Transformer\.java"/>
+    <suppress checks="MultipleStringLiterals" files=".*Transformer\.java|ASMConfigPlugin\.java|TypeInferenceTest.java|ConfigTest.java"/>
     <!-- implementations of ChunkAccess, getHeight for heightmap and world height are semantically not overloads but have the same name -->
     <suppress checks="OverloadMethodsDeclarationOrder"
               files="SectionSizeCubeAccessWrapper.java|LevelCube.java|ProtoCube.java|ImposterProtoCube.java|NoiseAndSurfaceBuilderHelper.java|CubeWorldGenRegion.java"/>
@@ -35,8 +35,11 @@
     <!-- Mixins may have an underscore to separate target from functionality -->
     <suppress checks="TypeName" files=".*Mixin.*\.java"/>
     <suppress checks="DeclarationOrder" files="MixinNaturalSpawner.java|Int3HashSet.java"/>
-    <suppress checks="HiddenField" files="Int3HashSet.java"/>
-    <suppress checks="NoFinalizer" files="Int3HashSet.java"/>
+    <suppress checks="HiddenField" files="Int3HashSet.java|LinkedInt3HashSet.java|Int3UByteLinkedHashMap.java|Int3List.java"/>
+    <suppress checks="NoFinalizer" files="Int3HashSet.java|LinkedInt3HashSet.java|Int3UByteLinkedHashMap.java|Int3List.java"/>
     <suppress checks="EmptyForIteratorPad" files="Int3HashSet.java|Int3HashSetTest.java"/>
-    <suppress checks="ModifiedControlVariable" files="Int3HashSetTest.java"/>
+    <suppress checks="EmptyBlock" files="Int3UByteLinkedHashMapTest.java"/>
+    <suppress checks="ModifiedControlVariable" files="Int3HashSetTest.java|Int3UByteLinkedHashMapTest.java"/>
+    <!-- TODO These need refactoring -->
+    <suppress checks="CyclomaticComplexity" files="Int3UByteLinkedHashMap.java"/>
 </suppressions>

gradle.properties

@@ -5,7 +5,7 @@ modid=cubicchunks
 # Fabric Properties - https://fabricmc.net/versions.html
 minecraft_version=1.17.1
 yarn_version=1.17.1+build.37
-loader_version=0.11.6
+loader_version=0.11.7
 
 # Dependencies
 fabric_version=0.37.2+1.17

src/main/java/io/github/opencubicchunks/cubicchunks/debug/DebugVisualization.java

@@ -171,7 +171,7 @@ void main() {
     private static float screenWidth = 854.0f;
     private static float screenHeight = 480f;
     private static GLCapabilities debugGlCapabilities;
-    private static boolean enabled;
+    private static boolean enabled = false;
 
     private static VisualizationMode mode = VisualizationMode.AVAILABLE_MODES[0];
 

src/main/java/io/github/opencubicchunks/cubicchunks/levelgen/aquifer/CubicAquifer.java

@@ -91,7 +91,16 @@ private int getIndex(int x, int y, int z) {
         int localX = x - this.minGridX;
         int localY = y - this.minGridY;
         int localZ = z - this.minGridZ;
-        return (localY * this.gridSizeZ + localZ) * this.gridSizeX + localX;
+
+        int index = (localY * this.gridSizeZ + localZ) * this.gridSizeX + localX;
+
+        //FIXME: Because of the way the cache is implemented, this can cause an ArrayIndexOutOfBoundsException.
+        //The coordinates are unpacked from longs so when outside the proper range, they wrap around and this returns nonsense values.
+        if (index < 0 || index >= this.aquiferCache.length) {
+            return 0;
+        }
+
+        return index;
     }
 
     @Override
@@ -117,6 +126,7 @@ public BlockState computeState(BaseStoneSource stoneSource, int x, int y, int z,
         int firstDistance2 = Integer.MAX_VALUE;
         int secondDistance2 = Integer.MAX_VALUE;
         int thirdDistance2 = Integer.MAX_VALUE;
+
         long firstSource = 0;
         long secondSource = 0;
         long thirdSource = 0;

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java

@@ -1,16 +1,20 @@
 package io.github.opencubicchunks.cubicchunks.mixin;
 
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
 import io.github.opencubicchunks.cubicchunks.mixin.transform.MainTransformer;
-import net.fabricmc.loader.api.FabricLoader;
+import io.github.opencubicchunks.cubicchunks.utils.Utils;
 import net.fabricmc.loader.api.MappingResolver;
+import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
@@ -41,21 +45,28 @@ public class ASMConfigPlugin implements IMixinConfigPlugin {
     }
 
     @Override public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-        MappingResolver map = FabricLoader.getInstance().getMappingResolver();
+        MappingResolver map = Utils.getMappingResolver();
+        boolean modified = false;
         String chunkMapDistanceManager = map.mapClassName("intermediary", "net.minecraft.class_3898$class_3216");
         String chunkMap = map.mapClassName("intermediary", "net.minecraft.class_3898");
         String chunkHolder = map.mapClassName("intermediary", "net.minecraft.class_3193");
         String naturalSpawner = map.mapClassName("intermediary", "net.minecraft.class_1948");
 
         if (targetClassName.equals(chunkMapDistanceManager)) {
+            modified = true;
             MainTransformer.transformProxyTicketManager(targetClass);
         } else if (targetClassName.equals(chunkMap)) {
+            modified = true;
             MainTransformer.transformChunkManager(targetClass);
         } else if (targetClassName.equals(chunkHolder)) {
+            modified = true;
             MainTransformer.transformChunkHolder(targetClass);
         } else if (targetClassName.equals(naturalSpawner)) {
+            modified = true;
             MainTransformer.transformNaturalSpawner(targetClass);
-        } else {
+        }
+
+        if (!modified) {
             return;
         }
 
@@ -67,20 +78,74 @@ public class ASMConfigPlugin implements IMixinConfigPlugin {
             addMethod.setAccessible(true);
 
             ClassInfo ci = ClassInfo.forName(targetClassName);
+
+            //Field fieldField = ClassInfo.class.getDeclaredField("fields");
+            //fieldField.setAccessible(true);
+            //Set<ClassInfo.Field> fields = (Set<ClassInfo.Field>) fieldField.get(ci);
+
             Set<String> existingMethods = ci.getMethods().stream().map(x -> x.getName() + x.getDesc()).collect(Collectors.toSet());
             for (MethodNode method : targetClass.methods) {
                 if (!existingMethods.contains(method.name + method.desc)) {
                     addMethod.invoke(ci, method, false);
                 }
             }
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+
+            /*//Modify descriptors of modified fields
+            for(FieldNode field: targetClass.fields){
+                //Should only remove one
+                fields.removeIf(fieldInfo -> fieldInfo.getName().equals(field.name) && !fieldInfo.getDesc().equals(field.desc));
+                fields.add(ci.new Field(field, false));
+            }*/
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException /*| NoSuchFieldException*/ e) {
             throw new IllegalStateException(e);
         }
 
 
     }
 
     @Override public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+        MappingResolver map = Utils.getMappingResolver();
+        String dynamicGraphMinFixedPoint = map.mapClassName("intermediary", "net.minecraft.class_3554");
+        String layerLightEngine = map.mapClassName("intermediary", "net.minecraft.class_3558");
+        String layerLightSectionStorage = map.mapClassName("intermediary", "net.minecraft.class_3560");
+        String blockLightSectionStorage = map.mapClassName("intermediary", "net.minecraft.class_3547");
+        String skyLightSectionStorage = map.mapClassName("intermediary", "net.minecraft.class_3569");
+        String sectionPos = map.mapClassName("intermediary", "net.minecraft.class_4076");
+        String blockLightEngine = map.mapClassName("intermediary", "net.minecraft.class_3552");
+        String skyLightEngine = map.mapClassName("intermediary", "net.minecraft.class_3572");
+
+        Set<String> defaulted = Set.of(
+            blockLightSectionStorage,
+            skyLightSectionStorage,
+            blockLightEngine,
+            skyLightEngine
+        );
+
+        if (targetClassName.equals(dynamicGraphMinFixedPoint)) {
+            MainTransformer.transformDynamicGraphMinFixedPoint(targetClass);
+        } else if (targetClassName.equals(layerLightEngine)) {
+            MainTransformer.transformLayerLightEngine(targetClass);
+        } else if (targetClassName.equals(layerLightSectionStorage)) {
+            MainTransformer.transformLayerLightSectionStorage(targetClass);
+        } else if (targetClassName.equals(sectionPos)) {
+            MainTransformer.transformSectionPos(targetClass);
+        } else if (defaulted.contains(targetClassName)) {
+            MainTransformer.defaultTransform(targetClass);
+        } else {
+            return;
+        }
+
+        //Save it without computing extra stuff (like maxs) which means that if the frames are wrong and mixin fails to save it, it will be saved elsewhere
+        Path savePath = Utils.getGameDir().resolve("longpos-out").resolve(targetClassName.replace('.', '/') + ".class");
+        try {
+            Files.createDirectories(savePath.getParent());
 
+            ClassWriter writer = new ClassWriter(0);
+            targetClass.accept(writer);
+            Files.write(savePath, writer.toByteArray());
+            System.out.println("Saved " + targetClassName + " to " + savePath);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
     }
 }

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/asm/common/MixinAsmTarget.java

@@ -1,15 +1,33 @@
 package io.github.opencubicchunks.cubicchunks.mixin.asm.common;
 
+import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.world.level.NaturalSpawner;
+import net.minecraft.world.level.lighting.BlockLightEngine;
+import net.minecraft.world.level.lighting.BlockLightSectionStorage;
+import net.minecraft.world.level.lighting.DynamicGraphMinFixedPoint;
+import net.minecraft.world.level.lighting.LayerLightEngine;
+import net.minecraft.world.level.lighting.LayerLightSectionStorage;
+import net.minecraft.world.level.lighting.SkyLightEngine;
+import net.minecraft.world.level.lighting.SkyLightSectionStorage;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin({
     ChunkMap.DistanceManager.class,
     ChunkMap.class,
     ChunkHolder.class,
-    NaturalSpawner.class
+    DynamicGraphMinFixedPoint.class,
+    NaturalSpawner.class,
+
+    //Long Pos Transforms
+    BlockLightEngine.class,
+    SkyLightEngine.class,
+    LayerLightEngine.class,
+    SectionPos.class,
+    LayerLightSectionStorage.class,
+    SkyLightSectionStorage.class,
+    BlockLightSectionStorage.class
 })
 public class MixinAsmTarget {
     // intentionally empty