F*CK I HATE JAVA

well its not that bad but WHY does Arraylist::add at index SHIFT THE WHOLE ARRAY AHHH. Anyway now the splash planes wont show D:
Goby56 · Aug 23, 2024 · 4169c8e · 4169c8e
1 parent 40db6c7
commit 4169c8e
Show file tree

Hide file tree

Showing 18 changed files with 118 additions and 177 deletions.
diff --git a/src/main/java/com/goby56/wakes/config/WakesConfig.java b/src/main/java/com/goby56/wakes/config/WakesConfig.java
@@ -26,7 +26,6 @@ public class WakesConfig {
             "mobs", EffectSpawningRule.ONLY_SIMULATION,
             "items", EffectSpawningRule.ONLY_SIMULATION
     ));
-    public boolean wakesInRunningWater = false;
 
     // Behaviour
     public float wavePropagationFactor = 0.95f;

diff --git a/src/main/java/com/goby56/wakes/config/YACLIntegration.java b/src/main/java/com/goby56/wakes/config/YACLIntegration.java
@@ -44,9 +44,6 @@ public static Screen createScreen(Screen parent) {
                                 .option(effectSpawningRuleOption("other_players", EffectSpawningRule.ONLY_SIMULATION))
                                 .option(effectSpawningRuleOption("mobs", EffectSpawningRule.ONLY_SIMULATION))
                                 .option(effectSpawningRuleOption("items", EffectSpawningRule.ONLY_SIMULATION))
-                                .option(booleanOption("wakes_in_running_water", false)
-                                        .binding(false, () -> config.wakesInRunningWater, val -> config.wakesInRunningWater = val)
-                                        .build())
                                 .option(booleanOption("spawn_particles", false)
                                         .binding(true, () -> config.spawnParticles, val -> config.spawnParticles = val)
                                         .build())

diff --git a/src/main/java/com/goby56/wakes/debug/DebugCommand.java b/src/main/java/com/goby56/wakes/debug/DebugCommand.java
@@ -42,6 +42,7 @@ public static int spawnWakeNode(CommandContext<FabricClientCommandSource> cmdCtx
         if (!cmdCtx.getSource().getWorld().getFluidState(new BlockPos((int) pos.x, (int) Math.floor(pos.y), (int) pos.z)).isIn(FluidTags.WATER)) return 0;
         WakeNode node = new WakeNode(result.getPos(), 100);
         node.floodLevel = cmdCtx.getArgument("flood_level", Integer.class);
+        node.spawner = "Command";
         WakeHandler.getInstance().insert(node);
         return 1;
     }

diff --git a/src/main/java/com/goby56/wakes/debug/WakeDebugRenderer.java b/src/main/java/com/goby56/wakes/debug/WakeDebugRenderer.java
@@ -21,20 +21,15 @@ public class WakeDebugRenderer implements WorldRenderEvents.DebugRender {
     @Override
     public void beforeDebugRender(WorldRenderContext context) {
         WakeHandler wakeHandler = WakeHandler.getInstance();
-        Map<Integer, Integer> nodeHeights = new HashMap<>();
-        Map<Integer, Integer> brickHeights = new HashMap<>();
         if (WakesClient.CONFIG_INSTANCE.drawDebugBoxes) {
             for (var node : wakeHandler.getVisible(context.frustum(), WakeNode.class)) {
-                nodeHeights.merge((int) node.height, 1, Integer::sum);
-                Box box = new Box(node.x, node.height - 0.1f, node.z, node.x + 1, node.height - 0.2f, node.z + 1);
                 DebugRenderer.drawBox(context.matrixStack(), context.consumers(),
-                        box.offset(context.camera().getPos().negate()),
+                        node.toBox().offset(context.camera().getPos().negate()),
                         1, 0, 1, 0.5f);
             }
             for (var brick : wakeHandler.getVisible(context.frustum(), Brick.class)) {
-                brickHeights.merge((int) brick.pos.y, 1, Integer::sum);
                 Vec3d pos = brick.pos;
-                Box box = new Box(pos.x, pos.y - 0.2f, pos.z, pos.x + brick.dim, pos.y - 0.3f, pos.z + brick.dim);
+                Box box = new Box(pos.x, pos.y - (1 - WakeNode.WATER_OFFSET), pos.z, pos.x + brick.dim, pos.y, pos.z + brick.dim);
                 var col = Color.getHSBColor(new Random(pos.hashCode()).nextFloat(), 1f, 1f).getRGBColorComponents(null);
                 DebugRenderer.drawBox(context.matrixStack(), context.consumers(),
                         box.offset(context.camera().getPos().negate()),

diff --git a/src/main/java/com/goby56/wakes/duck/ProducesWake.java b/src/main/java/com/goby56/wakes/duck/ProducesWake.java
@@ -5,8 +5,8 @@
 
 public interface ProducesWake {
     boolean onWaterSurface();
-    float producingHeight();
-    void setProducingHeight(float h);
+    Integer producingWaterLevel();
+    void setProducingHeight(int y);
     Vec3d getPrevPos();
     void setPrevPos(Vec3d pos);
     Vec3d getNumericalVelocity();

diff --git a/src/main/java/com/goby56/wakes/mixin/LilyPadFallMixin.java b/src/main/java/com/goby56/wakes/mixin/LilyPadFallMixin.java
@@ -27,7 +27,7 @@ public void onLandedUpon(World world, BlockState state, BlockPos pos, Entity ent
         EffectSpawningRule rule = WakesUtils.getEffectRuleFromSource(entity);
         ProducesWake wakeProducer = (ProducesWake) entity;
         if (rule.simulateWakes) {
-            wakeProducer.setProducingHeight(pos.getY() + world.getFluidState(pos).getHeight());
+            wakeProducer.setProducingHeight(pos.getY());
             WakesUtils.placeFallSplash(entity);
         }
     }

diff --git a/src/main/java/com/goby56/wakes/mixin/WakeSpawnerMixin.java b/src/main/java/com/goby56/wakes/mixin/WakeSpawnerMixin.java
@@ -34,7 +34,7 @@ public abstract class WakeSpawnerMixin implements ProducesWake {
 	@Unique private Vec3d numericalVelocity = Vec3d.ZERO;
 	@Unique private double horizontalNumericalVelocity = 0;
 	@Unique private double verticalNumericalVelocity = 0;
-	@Unique private Float producingWaterLevel = null;
+	@Unique private Integer producingWaterLevel = null;
 	@Unique private SplashPlaneParticle splashPlane;
 	@Unique private boolean hasRecentlyTeleported = false;
 
@@ -68,13 +68,13 @@ public void setPrevPos(Vec3d pos) {
 	}
 
 	@Override
-	public float producingHeight() {
+	public Integer producingWaterLevel() {
 		return this.producingWaterLevel;
 	}
 
 	@Override
-	public void setProducingHeight(float h) {
-		this.producingWaterLevel = h;
+	public void setProducingHeight(int y) {
+		this.producingWaterLevel = y;
 	}
 
 	@Override
@@ -114,7 +114,7 @@ private void tick(CallbackInfo info) {
 
 		if (this.onWaterSurface && !this.hasRecentlyTeleported) {
 			if (this.producingWaterLevel == null)
-				this.producingWaterLevel = WakesUtils.getWaterLevel(this.world, thisEntity);
+				this.producingWaterLevel = (int) Math.floor(WakesUtils.getWaterLevel(this.world, thisEntity));
 
 			Vec3d currPos = new Vec3d(thisEntity.getX(), this.producingWaterLevel, thisEntity.getZ());
 
@@ -138,7 +138,7 @@ private void onSwimmingStart(CallbackInfo ci) {
 		EffectSpawningRule rule = WakesUtils.getEffectRuleFromSource(thisEntity);
 		if (rule.simulateWakes) {
 			if (this.producingWaterLevel == null)
-				this.producingWaterLevel = WakesUtils.getWaterLevel(this.world, thisEntity);
+				this.producingWaterLevel = (int) Math.floor(WakesUtils.getWaterLevel(this.world, thisEntity));
 			WakesUtils.placeFallSplash(((Entity) (Object) this));
 		}
 		// TODO ADD WAKE WHEN GETTING OUT OF WATER

diff --git a/src/main/java/com/goby56/wakes/particle/custom/SplashCloudParticle.java b/src/main/java/com/goby56/wakes/particle/custom/SplashCloudParticle.java
@@ -1,6 +1,5 @@
 package com.goby56.wakes.particle.custom;
 
-import com.goby56.wakes.WakesClient;
 import com.goby56.wakes.duck.ProducesWake;
 import com.goby56.wakes.particle.WithOwnerParticleType;
 import com.goby56.wakes.simulation.WakeNode;
@@ -45,7 +44,7 @@ public void tick() {
 
         if (this.owner instanceof ProducesWake wake) {
             SplashPlaneParticle splashPlane = wake.getSplashPlane();
-            if (splashPlane == null) {
+            if (splashPlane == null || wake.producingWaterLevel() == null) {
                 this.markDead();
                 return;
             }
@@ -56,7 +55,7 @@ public void tick() {
 
             Vec3d particleOffset = new Vec3d(-splashPlane.direction.z, 0f, splashPlane.direction.x).multiply(this.offset * this.owner.getWidth() / 2f);
             Vec3d pos = splashPlane.getPos().add(particleOffset).add(splashPlane.direction.multiply(-0.2f));
-            this.setPos(pos.x, wake.producingHeight(), pos.z);
+            this.setPos(pos.x, wake.producingWaterLevel(), pos.z);
         }
     }
 

diff --git a/src/main/java/com/goby56/wakes/particle/custom/SplashPlaneParticle.java b/src/main/java/com/goby56/wakes/particle/custom/SplashPlaneParticle.java
@@ -24,9 +24,6 @@
 import net.minecraft.util.math.*;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Random;
-
 public class SplashPlaneParticle extends Particle {
     Entity owner;
     float yaw;
@@ -81,7 +78,7 @@ private void aliveTick(ProducesWake wakeProducer) {
         this.direction = Vec3d.fromPolar(0, -this.yaw);
         Vec3d planeOffset = direction.multiply(this.owner.getWidth() + WakesClient.CONFIG_INSTANCE.splashPlaneOffset);
         Vec3d planePos = this.owner.getPos().add(planeOffset);
-        this.setPos(planePos.x, wakeProducer.producingHeight(), planePos.z);
+        this.setPos(planePos.x, wakeProducer.producingWaterLevel(), planePos.z);
     }
 
     @Override

diff --git a/src/main/java/com/goby56/wakes/render/WakeTexture.java b/src/main/java/com/goby56/wakes/render/WakeTexture.java
@@ -3,6 +3,7 @@
 import com.goby56.wakes.render.enums.RenderType;
 import com.goby56.wakes.simulation.Brick;
 import com.goby56.wakes.simulation.QuadTree;
+import com.goby56.wakes.simulation.WakeNode;
 import com.mojang.blaze3d.platform.GlConst;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.TextureUtil;
@@ -48,7 +49,7 @@ public void render(Matrix4f matrix, Camera camera, Brick brick) {
 
         BufferBuilder buffer = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL);
 
-        Vector3f pos = brick.pos.add(camera.getPos().negate()).toVector3f();
+        Vector3f pos = brick.pos.add(camera.getPos().negate()).toVector3f().add(0, WakeNode.WATER_OFFSET, 0);
         int light = LightmapTextureManager.MAX_LIGHT_COORDINATE;
         buffer.vertex(matrix, pos.x, pos.y, pos.z)
                 .color(1f, 1f, 1f, 1f)

diff --git a/src/main/java/com/goby56/wakes/simulation/Age.java b/src/main/java/com/goby56/wakes/simulation/Age.java
diff --git a/src/main/java/com/goby56/wakes/simulation/Brick.java b/src/main/java/com/goby56/wakes/simulation/Brick.java
@@ -113,7 +113,6 @@ public WakeNode get(int x, int z) {
     }
 
     public void insert(WakeNode node) {
-        if (Math.abs(node.height - this.pos.y) > 1f) System.out.printf("INSERTING %s IN WRONG BRICK (%f)\n", node, this.pos.y);
         int x = Math.floorMod(node.x, dim), z = Math.floorMod(node.z, dim);
         if (nodes[z][x] != null) {
             nodes[z][x].revive(node);

diff --git a/src/main/java/com/goby56/wakes/simulation/Position.java b/src/main/java/com/goby56/wakes/simulation/Position.java
diff --git a/src/main/java/com/goby56/wakes/simulation/QuadTree.java b/src/main/java/com/goby56/wakes/simulation/QuadTree.java
@@ -19,7 +19,7 @@ public class QuadTree {
     private final DecentralizedBounds bounds;
     private final int depth;
     private Brick brick;
-    private final float yLevel;
+    public final float yLevel;
 
     public QuadTree(float y) {
         this(ROOT_X, y, ROOT_Z, ROOT_WIDTH, 0, null);
@@ -97,7 +97,6 @@ public <T> void query(Frustum frustum, ArrayList<T> output, Class<T> type) {
             return;
         }
         if (hasLeaf() && brick.occupied > 0) {
-            // TODO ADD VISIBLE NODES CHECK
             if (type.equals(Brick.class)) {
                 output.add(type.cast(brick));
             }

diff --git a/src/main/java/com/goby56/wakes/simulation/WakeHandler.java b/src/main/java/com/goby56/wakes/simulation/WakeHandler.java
@@ -15,8 +15,8 @@ public class WakeHandler {
     private static WakeHandler INSTANCE;
     public World world;
 
-    private final ArrayList<QuadTree> trees;
-    private final ArrayList<Queue<WakeNode>> toBeInserted;
+    private QuadTree[] trees;
+    private QueueSet<WakeNode>[] toBeInserted;
     public boolean resolutionResetScheduled = false;
     private final int minY;
     private final int maxY;
@@ -27,11 +27,10 @@ private WakeHandler(ClientWorld world) {
         this.minY = world.getBottomY();
         this.maxY = world.getTopY();
         int worldHeight = this.maxY - this.minY;
-        this.trees = new ArrayList<>(worldHeight);
-        this.toBeInserted = new ArrayList<>(worldHeight);
+        this.trees = new QuadTree[worldHeight];
+        this.toBeInserted = new QueueSet[worldHeight];
         for (int i = 0; i < worldHeight; i++) {
-            this.trees.add(null);
-            this.toBeInserted.add(new QueueSet<>());
+            toBeInserted[i] = new QueueSet<>();
         }
     }
 
@@ -47,16 +46,15 @@ public static WakeHandler getInstance() {
 
     public void tick() {
         for (int i = 0; i < this.maxY - this.minY; i++) {
+            Queue<WakeNode> pendingNodes = this.toBeInserted[i];
             if (this.resolutionResetScheduled) {
-                this.toBeInserted.get(i).clear();
+                if (pendingNodes != null) pendingNodes.clear();
                 continue;
             }
-            QuadTree tree = this.trees.get(i);
+            QuadTree tree = this.trees[i];
             if (tree != null) {
                 tree.tick();
-
                 long tInsertion = System.nanoTime();
-                Queue<WakeNode> pendingNodes = this.toBeInserted.get(i);
                 while (pendingNodes.peek() != null) {
                     tree.insert(pendingNodes.poll());
                 }
@@ -70,31 +68,40 @@ public void tick() {
 
     public void insert(WakeNode node) {
         if (this.resolutionResetScheduled) return;
-        int i = this.getArrayIndex((int) node.height);
+        int i = this.getArrayIndex(node.y);
         if (i < 0) return;
 
-        if (this.trees.get(i) == null) {
-            this.trees.add(i, new QuadTree(node.height));
+        if (this.trees[i] == null) {
+            this.trees[i] = new QuadTree(node.y);
         }
 
-        this.toBeInserted.get(i).add(node);
+        if (node.validPos()) {
+            this.toBeInserted[i].add(node);
+        }
     }
 
     public <T> ArrayList<T> getVisible(Frustum frustum, Class<T> type) {
         ArrayList<T> visibleQuads = new ArrayList<>();
         for (int i = 0; i < this.maxY - this.minY; i++) {
-            if (this.trees.get(i) != null) {
-                this.trees.get(i).query(frustum, visibleQuads, type);
+            if (this.trees[i] != null) {
+                this.trees[i].query(frustum, visibleQuads, type);
             }
         }
         return visibleQuads;
     }
 
-    private int getArrayIndex(int height) {
-        if (height < this.minY || height > this.maxY) {
+    private int getArrayIndex(int y) {
+        if (y < this.minY || y > this.maxY) {
             return -1;
         }
-        return height - this.minY;
+        return y - this.minY;
+    }
+
+    private int getYLevel(int i) {
+        if (i < 0 || i > this.maxY - this.minY) {
+            throw new IndexOutOfBoundsException();
+        }
+        return i + this.minY;
     }
 
     public static void scheduleResolutionChange(Resolution newRes) {
@@ -114,10 +121,11 @@ private void changeResolution() {
 
     private void reset() {
         for (int i = 0; i < this.maxY - this.minY; i++) {
-            QuadTree tree = this.trees.get(i);
+            QuadTree tree = this.trees[i];
             if (tree != null) {
                 tree.prune();
             }
+            toBeInserted[i].clear();
         }
     }