🎨 clean up code

PriestOfFerns · Mar 13, 2024 · 6121b38 · 6121b38
1 parent 27f00f2
commit 6121b38
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/items/ShipAssemblerItem.kt b/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/items/ShipAssemblerItem.kt
@@ -1,7 +1,6 @@
 package io.github.priestoffern.vs_ship_assembler.items
 
 import de.m_marvin.univec.impl.Vec3d
-import io.github.priestoffern.vs_ship_assembler.VsShipAssemblerTags
 import io.github.priestoffern.vs_ship_assembler.rendering.Renderer
 import io.github.priestoffern.vs_ship_assembler.rendering.RenderingData
 import io.github.priestoffern.vs_ship_assembler.rendering.SelectionZoneRenderer
@@ -105,18 +104,17 @@ class ShipAssemblerItem(properties: Properties): Item(properties) {
                         for (y in min(firstPosition!!.y, secondPosition!!.y)..max(firstPosition!!.y, secondPosition!!.y)) {
                             for (z in min(firstPosition!!.z, secondPosition!!.z)..max(firstPosition!!.z, secondPosition!!.z)) {
 
-                                if (!level.getBlockState(BlockPos(x,y,z)).tags.anyMatch { it==VsShipAssemblerTags.FORBIDDEN_ASSEMBLE })
+                                //if (!level.getBlockState(BlockPos(x,y,z)).tags.anyMatch { it==VsShipAssemblerTags.FORBIDDEN_ASSEMBLE })
                                 add(BlockPos(x,y,z))
                             }
                         }
                     }
                 }
 
-                if (set.size>0) {
-                    PhysicUtility.assembleToContraption(level,set,true,1.0)
+                if (PhysicUtility.assembleToContraption(level,set,true,1.0)) {
                     player.sendMessage(TextComponent("Assembled!").withStyle(ChatFormatting.BOLD), Util.NIL_UUID)
                 } else {
-                    player.sendMessage(TextComponent("Failed to Assemble: Empty ship").withStyle(ChatFormatting.RED), Util.NIL_UUID)
+                    player.sendMessage(TextComponent("Failed to Assemble").withStyle(ChatFormatting.RED), Util.NIL_UUID)
                 }
 
                 if (SelectionZone!=null) Renderer.removeRender(SelectionZone!!)

diff --git a/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/util/PhysicsUtility.kt b/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/util/PhysicsUtility.kt
@@ -3,6 +3,7 @@ package io.github.priestoffern.vs_ship_assembler.util
 
 import de.m_marvin.unimat.impl.Quaterniond
 import de.m_marvin.univec.impl.Vec3d
+import io.github.priestoffern.vs_ship_assembler.VsShipAssemblerTags
 import io.github.priestoffern.vs_ship_assembler.util.GeneralUtility.toBlockPos
 import net.minecraft.core.BlockPos
 import net.minecraft.server.level.ServerLevel
@@ -54,6 +55,9 @@ object PhysicUtility {
     }
 
     fun isSolidContraptionBlock(state: BlockState?): Boolean {
+        if (state != null) {
+            return !state.tags.anyMatch { it== VsShipAssemblerTags.FORBIDDEN_ASSEMBLE }
+        }
         return true
     }
 
@@ -117,10 +121,12 @@ object PhysicUtility {
         // Copy blocks and check if the center block got replaced (is default a stone block)
         var centerBlockReplaced = false
         for (itPos in blocks) {
-            val relative: BlockPos = itPos.subtract(toBlockPos(contraptionWorldPos))
-            val shipPos: BlockPos = contraptionBlockPos.offset(relative)
-            GeneralUtility.copyBlock(level, itPos, shipPos)
-            if (relative == BlockPos.ZERO) centerBlockReplaced = true
+            if (isSolidContraptionBlock(level.getBlockState(itPos))) {
+                val relative: BlockPos = itPos.subtract(toBlockPos(contraptionWorldPos))
+                val shipPos: BlockPos = contraptionBlockPos.offset(relative)
+                GeneralUtility.copyBlock(level, itPos, shipPos)
+                if (relative == BlockPos.ZERO) centerBlockReplaced = true
+            }
         }
 
         // If center block got not replaced, remove the stone block
@@ -131,7 +137,9 @@ object PhysicUtility {
         // Remove original blocks
         if (removeOriginal) {
             for (itPos in blocks) {
-                GeneralUtility.removeBlock(level, itPos)
+                if (isSolidContraptionBlock(level.getBlockState(itPos))) {
+                    GeneralUtility.removeBlock(level, itPos)
+                }
             }
         }