fixed bounding box bug

Author: Lightning323

src/main/java/dev/propulsionteam/propulsionsimulated/content/thruster/AbstractThrusterBlockEntity.java

@@ -90,9 +90,10 @@ public boolean isController() {
 
     //We need to cache the bounding box to avoid recalculating it every tick
     @OnlyIn(Dist.CLIENT)
+    //Used for tracking the state of the thruster so we dont have to recalculate the bounding box every time
     protected int boundingBoxHash;
     @OnlyIn(Dist.CLIENT)
-    public AABB boundingBox = MeshedThrusterFlameUtils.NULL_AABB;
+    public AABB boundingBox = getSingleRenderBox();
     @OnlyIn(Dist.CLIENT)
     protected AABB multiblockBoundingBox;
 
@@ -132,7 +133,6 @@ public AABB getRenderBoundingBox() {
         //Inflate and cache the bounding box
         AABB inflated = MeshedThrusterFlameUtils.inflateRenderBoundingBox(this, getSingleRenderBox());
         if (inflated != null) { //Update the bounding box
-//            System.out.println("Inflated bounding box: " + inflated);
             boundingBox = inflated;
             multiblockBoundingBox = null;
         }

src/main/java/dev/propulsionteam/propulsionsimulated/content/thruster/MeshedThrusterFlameUtils.java

@@ -169,26 +169,7 @@ private static float random01(int seed) {
         return (float) ((z >>> 40) * (1.0 / (1L << 24)));
     }
 
-    private static int hash(float x, float y, float z) {
-        // Start with a prime number
-        int result = 1;
-
-        // Combine each float
-        result = 31 * result + Float.floatToIntBits(x);
-        result = 31 * result + Float.floatToIntBits(y);
-        result = 31 * result + Float.floatToIntBits(z);
-        return result;
-    }
-
-    private static int hash(float x, float y) {
-        // Start with a prime number
-        int result = 1;
 
-        // Combine each float
-        result = 31 * result + Float.floatToIntBits(x);
-        result = 31 * result + Float.floatToIntBits(y);
-        return result;
-    }
 
     private static float getRenderBoxLength(AbstractThrusterBlockEntity be) {
         return (float) (Math.ceil(be.interpolatedPower.getValue() * 10) / 10 * RENDER_BOX_FLAME_LENGTH);
@@ -203,7 +184,12 @@ private static float getRenderBoxLength(AbstractThrusterBlockEntity be) {
      */
     public static AABB inflateRenderBoundingBox(AbstractThrusterBlockEntity be, AABB box) {
         float length = getRenderBoxLength(be);
-        int hash = Float.floatToRawIntBits(length);
+
+        //Hash the state of the thruster
+        int hash = 1;
+        hash = 31 * hash + Float.floatToRawIntBits(length);
+        hash = 31 * hash + box.hashCode();
+
 
         if (be.boundingBoxHash != hash) {
             be.boundingBoxHash = hash;
@@ -235,8 +221,15 @@ public static AABB inflateVectorRenderBoundingBox(VectorThrusterBlockEntity be,
         float xInflate = be.getInterpolatedVectorX(1) * 3.5f;
         float yInflate = be.getInterpolatedVectorY(1) * 3.5f;
         float length = Math.max(0, getRenderBoxLength(be) - Math.max(Math.abs(xInflate), Math.abs(yInflate)) * 0.8f);
-        int hash = hash(xInflate, yInflate, length);
 
+        //Hash the state of the thruster
+        int hash = 1;
+        hash = 31 * hash + Float.floatToRawIntBits(xInflate);
+        hash = 31 * hash + Float.floatToRawIntBits(yInflate);
+        hash = 31 * hash + Float.floatToRawIntBits(length);
+        hash = 31 * hash + box.hashCode();
+
+        //Compare the current vs previous state of the thruster
         if (be.boundingBoxHash != hash) {
             be.boundingBoxHash = hash;
             Vec3 center = box.getCenter();

src/main/java/dev/propulsionteam/propulsionsimulated/content/thruster/ion_thruster/IonThrusterBlockEntity.java

@@ -1,5 +1,6 @@
 package dev.propulsionteam.propulsionsimulated.content.thruster.ion_thruster;
 
+import dev.propulsionteam.propulsionsimulated.content.thruster.MeshedThrusterFlameUtils;
 import dev.propulsionteam.propulsionsimulated.content.thruster.ThrusterDamager;
 
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
@@ -25,6 +26,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.phys.AABB;
 import net.neoforged.neoforge.energy.IEnergyStorage;
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.fluids.capability.IFluidHandler;

src/main/java/dev/propulsionteam/propulsionsimulated/content/thruster/thruster/ThrusterRenderer.java

@@ -45,9 +45,10 @@ protected void renderSafe(ThrusterBlockEntity be, float partialTick, PoseStack m
                 ms.scale(w, w, w);
                 mb.light(light).overlay(overlay).renderInto(ms, vb);
                 ms.popPose();
-                MeshedThrusterFlameUtils.renderMultiblockFlame(be, partialTick, ms, buffer, w);
+                if (MeshedThrusterFlameUtils.isSpritePlume(be))
+                    MeshedThrusterFlameUtils.renderMultiblockFlame(be, partialTick, ms, buffer, w);
             }
-        } else {
+        } else if (MeshedThrusterFlameUtils.isSpritePlume(be)) {
             MeshedThrusterFlameUtils.renderMeshFlame(be, partialTick, ms, buffer);
         }
     }