From 6a31adcdd87b01a00d16d78403a1077971a5d16c Mon Sep 17 00:00:00 2001
From: octarine-noise <octarine.noise@gmail.com>
Date: Wed, 12 May 2021 12:33:05 +0200
Subject: [PATCH] [WIP] move AbstractParticles

---
 .../render/{ => particle}/AbstractParticle.kt              | 4 +---
 .../mods/betterfoliage/render/particle/FallingLeaves.kt    | 7 -------
 .../mods/betterfoliage/render/particle/RisingSouls.kt      | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)
 rename src/main/kotlin/mods/betterfoliage/render/{ => particle}/AbstractParticle.kt (97%)

diff --git a/src/main/kotlin/mods/betterfoliage/render/AbstractParticle.kt b/src/main/kotlin/mods/betterfoliage/render/particle/AbstractParticle.kt
similarity index 97%
rename from src/main/kotlin/mods/betterfoliage/render/AbstractParticle.kt
rename to src/main/kotlin/mods/betterfoliage/render/particle/AbstractParticle.kt
index e301a72..8046446 100644
--- a/src/main/kotlin/mods/betterfoliage/render/AbstractParticle.kt
+++ b/src/main/kotlin/mods/betterfoliage/render/particle/AbstractParticle.kt
@@ -1,4 +1,4 @@
-package mods.betterfoliage.render
+package mods.betterfoliage.render.particle
 
 import mods.betterfoliage.util.Double3
 import net.minecraft.client.MinecraftClient
@@ -10,8 +10,6 @@ import net.minecraft.client.util.math.Vector3f
 import net.minecraft.util.math.MathHelper
 import net.minecraft.world.World
 
-fun VertexConsumer.vertex(v: Double3) = vertex(v.x, v.y, v.z)
-
 abstract class AbstractParticle(world: World, x: Double, y: Double, z: Double) : SpriteBillboardParticle(world, x, y, z) {
 
     companion object {
diff --git a/src/main/kotlin/mods/betterfoliage/render/particle/FallingLeaves.kt b/src/main/kotlin/mods/betterfoliage/render/particle/FallingLeaves.kt
index bbc5220..b730cd6 100644
--- a/src/main/kotlin/mods/betterfoliage/render/particle/FallingLeaves.kt
+++ b/src/main/kotlin/mods/betterfoliage/render/particle/FallingLeaves.kt
@@ -2,13 +2,11 @@ package mods.betterfoliage.render.particle
 
 import mods.betterfoliage.BetterFoliage
 import mods.betterfoliage.ClientWorldLoadCallback
-import mods.betterfoliage.render.AbstractParticle
 import mods.betterfoliage.render.block.vanilla.LeafKey
 import mods.betterfoliage.util.*
 import net.fabricmc.fabric.api.event.world.WorldTickCallback
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.particle.ParticleTextureSheet
-import net.minecraft.client.render.BufferBuilder
 import net.minecraft.client.world.ClientWorld
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.MathHelper
@@ -69,11 +67,6 @@ class FallingLeafParticle(
         }
     }
 
-//    override fun render(worldRenderer: BufferBuilder, partialTickTime: Float) {
-//        val tickAngle = angle + partialTickTime * (if (rotPositive) rotationSpeed else -rotationSpeed)
-//        renderParticleQuad(worldRenderer, partialTickTime, rotation = tickAngle.toDouble(), isMirrored = isMirrored)
-//    }
-
     fun setParticleColor(overrideColor: Int?, blockColor: Int) {
         val color =  overrideColor ?: blockColor
         setColor(color)
diff --git a/src/main/kotlin/mods/betterfoliage/render/particle/RisingSouls.kt b/src/main/kotlin/mods/betterfoliage/render/particle/RisingSouls.kt
index 9069766..14fd86b 100644
--- a/src/main/kotlin/mods/betterfoliage/render/particle/RisingSouls.kt
+++ b/src/main/kotlin/mods/betterfoliage/render/particle/RisingSouls.kt
@@ -1,7 +1,6 @@
 package mods.betterfoliage.render.particle
 
 import mods.betterfoliage.BetterFoliage
-import mods.betterfoliage.render.AbstractParticle
 import mods.betterfoliage.model.SpriteDelegate
 import mods.betterfoliage.model.SpriteSetDelegate
 import mods.betterfoliage.util.*