resolved merge conflicts

Goby56 · Aug 18, 2024 · 1b5e8bd · 1b5e8bd
1 parent f6c28bd
commit 1b5e8bd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/main/java/com/goby56/wakes/WakesClient.java b/src/main/java/com/goby56/wakes/WakesClient.java
@@ -2,12 +2,12 @@
 
 import com.goby56.wakes.debug.DebugCommand;
 import com.goby56.wakes.config.WakesConfig;
+import com.goby56.wakes.debug.WakeDebugRenderer;
 import com.goby56.wakes.event.PickBoat;
 import com.goby56.wakes.event.WakeTicker;
 import com.goby56.wakes.particle.ModParticles;
 import com.goby56.wakes.render.SplashPlaneRenderer;
 import com.goby56.wakes.render.WakeRenderer;
-import com.goby56.wakes.debug.WakeDebugRenderer;
 import ladysnake.satin.api.managed.ManagedCoreShader;
 import ladysnake.satin.api.managed.ShaderEffectManager;
 import net.fabricmc.api.ClientModInitializer;

diff --git a/src/main/java/com/goby56/wakes/config/YACLIntegration.java b/src/main/java/com/goby56/wakes/config/YACLIntegration.java
@@ -133,6 +133,9 @@ public static Screen createScreen(Screen parent) {
                         .option(booleanOption("show_debug_info", false)
                                 .binding(false, () -> config.showDebugInfo, val -> config.showDebugInfo = val)
                                 .build())
+                        .option(booleanOption("show_debug_info", false)
+                                .binding(false, () -> config.showDebugInfo, val -> config.showDebugInfo = val)
+                                .build())
                         .option(booleanOption("disable_mod", false)
                                 .binding(false, () -> config.disableMod, val -> config.disableMod = val)
                                 .build())

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,12 +1,8 @@
 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;
-import com.goby56.wakes.utils.WakesUtils;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
 import net.minecraft.client.particle.*;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;

diff --git a/src/main/java/com/goby56/wakes/particle/custom/SplashPlaneParticle.java b/src/main/java/com/goby56/wakes/particle/custom/SplashPlaneParticle.java
@@ -6,7 +6,6 @@
 import com.goby56.wakes.particle.WithOwnerParticleType;
 import com.goby56.wakes.render.SplashPlaneRenderer;
 import com.goby56.wakes.utils.WakesUtils;
-import com.terraformersmc.modmenu.util.mod.Mod;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
@@ -25,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;
@@ -141,6 +137,7 @@ public Factory(SpriteProvider spriteSet) {
         @Nullable
         @Override
         public Particle createParticle(DefaultParticleType parameters, ClientWorld world, double x, double y, double z, double velX, double velY, double velZ) {
+            SplashPlaneParticle wake = new SplashPlaneParticle(world, x, y, z);
             SplashPlaneParticle splashPlane = new SplashPlaneParticle(world, x, y, z);
             if (parameters instanceof WithOwnerParticleType type) {
                 splashPlane.owner = type.owner;