修复一些问题

Author: Circulate233

src/main/java/github/kasuminova/novaeng/client/util/NEWBlockArrayPreviewRenderHelper.kt

@@ -10,14 +10,13 @@ import net.minecraft.client.Minecraft
 import net.minecraft.util.EnumFacing
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.text.TextComponentTranslation
-import java.util.stream.IntStream
 
 @Suppress("CAST_NEVER_SUCCEEDS")
 object NEWBlockArrayPreviewRenderHelper : BlockArrayPreviewRenderHelper() {
 
     val utils = this as BlockArrayPreviewRenderUtils
     var renderHelperUtils: BlockArrayRenderUtils? = null
-    private var status: IntArray? = null
+    private var status: Int = 0
     var work = false
     var key = 0L
 
@@ -41,21 +40,19 @@ object NEWBlockArrayPreviewRenderHelper : BlockArrayPreviewRenderHelper() {
 
     private fun initLayers() {
         val matchingArray = renderHelperUtils!!.`n$getBlocks`()
-        val lowestSlice = matchingArray.min.y
         val maxSlice = matchingArray.max.y
-        val status = IntStream.range(lowestSlice, maxSlice + 2).toArray()
-        utils.renderedLayer = status[status.size - 1]
-        this.status = status
+        utils.renderedLayer = maxSlice + 1
+        this.status = maxSlice + 2
     }
 
     fun setLayers(newValue: Int) {
         if (renderHelperUtils != null) {
-            val size = status!!.size
+            val size = status
             val mod = newValue % size
 
             val value = if (mod < 0) mod + size else mod
 
-            utils.renderedLayer = status!![value]
+            utils.renderedLayer = value
         }
     }
 
@@ -69,7 +66,7 @@ object NEWBlockArrayPreviewRenderHelper : BlockArrayPreviewRenderHelper() {
 
     fun clear() {
         renderHelperUtils = null
-        status = null
+        status = 0
         work = false
         key = 0
 

src/main/java/github/kasuminova/novaeng/common/handler/MachineAssemblyHandler.kt

@@ -33,8 +33,10 @@ object MachineAssemblyHandler {
         if (!player.isSneaking && stack.item is ItemMachineAssemblyTool) {
             val pos = event.pos
             val tile = world.getTileEntity(pos)
-            val state = world.getBlockState(pos)
+            var state = world.getBlockState(pos)
             val block = state.block
+            @Suppress("DEPRECATION")
+            state = block.getActualState(state, world, pos)
             var facing: EnumFacing? = null
             val machine: DynamicMachine = if (tile is TileMultiblockMachineController) {
                 tile.blueprintMachine ?: if (block is BlockController)
@@ -43,19 +45,19 @@ object MachineAssemblyHandler {
             } else {
                 val meta = block.getMetaFromState(state)
                 var m: DynamicMachine? = null
-                val eventFacing = if (event.face == EnumFacing.UP || event.face == EnumFacing.DOWN) {
-                    EnumFacing.NORTH
-                } else event.face
                 for (entry in NEWMachineAssemblyManager.getConstructorsIterator()) {
-                    if (entry.key.block == block && entry.key.meta == meta) {
-                        m = entry.value
-                        val pf = block.blockState.getProperty("facting")
+                    if (entry.key == block && entry.value.containsKey(meta)) {
+                        m = entry.value[meta]
+                        val pf = block.blockState.getProperty("facing")
                         facing = if (pf != null) {
-                            state.getValue(pf) as? EnumFacing ?: eventFacing
-                        } else eventFacing
+                            state.getValue(pf) as? EnumFacing ?: event.face
+                        } else event.face
                         break
                     }
                 }
+                facing = if (facing == EnumFacing.UP || facing == EnumFacing.DOWN) {
+                    EnumFacing.NORTH
+                } else facing
                 m ?: return
             }
 

src/main/java/github/kasuminova/novaeng/common/item/ItemMachineAssemblyTool.kt

@@ -47,9 +47,10 @@ object ItemMachineAssemblyTool : ItemBasic("machine_assembly_tool") {
             return EnumActionResult.PASS
         } else if (player.isSneaking) {
             if (!NEWMachineAssemblyManager.checkMachineAssembly(player)) {
-                val state = world.getBlockState(pos)
+                var state = world.getBlockState(pos)
                 val block = state.block
-
+                @Suppress("DEPRECATION")
+                state = block.getActualState(state, world, pos)
                 val machine: DynamicMachine
                 val controllerFacing: EnumFacing
                 if (tile is TileMultiblockMachineController) {
@@ -61,19 +62,19 @@ object ItemMachineAssemblyTool : ItemBasic("machine_assembly_tool") {
                     val meta = block.getMetaFromState(state)
                     var m: DynamicMachine? = null
                     var e: EnumFacing? = null
-                    val eventFacing = if (facing == EnumFacing.UP || facing == EnumFacing.DOWN) {
-                        EnumFacing.NORTH
-                    } else facing
                     for (entry in NEWMachineAssemblyManager.getConstructorsIterator()) {
-                        if (entry.key.block == block && entry.key.meta == meta) {
-                            m = entry.value
-                            val pf = block.blockState.getProperty("facting")
+                        if (entry.key == block && entry.value.containsKey(meta)) {
+                            m = entry.value[meta]
+                            val pf = block.blockState.getProperty("facing")
                             e = if (pf != null) {
-                                state.getValue(pf) as? EnumFacing ?: eventFacing
-                            } else eventFacing
+                                state.getValue(pf) as? EnumFacing ?: facing
+                            } else facing
                             break
                         }
                     }
+                    e = if (e == EnumFacing.UP || e == EnumFacing.DOWN) {
+                        EnumFacing.NORTH
+                    } else e
                     machine = m ?: return EnumActionResult.FAIL
                     controllerFacing = e ?: return EnumActionResult.FAIL
                 }

src/main/java/github/kasuminova/novaeng/common/util/NEWMachineAssemblyManager.kt

@@ -23,6 +23,7 @@ import hellfirepvp.modularmachinery.common.util.BlockArray
 import hellfirepvp.modularmachinery.common.util.ItemUtils
 import ink.ikx.mmce.common.assembly.MachineAssembly
 import ink.ikx.mmce.common.utils.StructureIngredient
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
 import it.unimi.dsi.fastutil.objects.ObjectArrayList
 import it.unimi.dsi.fastutil.objects.ObjectIterator
@@ -50,7 +51,7 @@ class NEWMachineAssemblyManager {
 
     companion object {
         private val ADDITIONAL_CONSTRUCTORS =
-            Reference2ObjectOpenHashMap<BlockPair, DynamicMachine>()
+            Reference2ObjectOpenHashMap<Block, Int2ObjectOpenHashMap<DynamicMachine>>()
         private val MACHINE_ASSEMBLY_CACHE =
             Object2ObjectOpenHashMap<EntityPlayer, AssemblyBlockArray>()
         private val CheckAllItemComplete = ObjectLists.singleton(
@@ -59,15 +60,25 @@ class NEWMachineAssemblyManager {
         private val emptyMiss2ListPair = Miss2ListPair(0, ObjectLists.emptyList())
 
         fun getAllConstructors(): Collection<DynamicMachine> {
-            return ADDITIONAL_CONSTRUCTORS.values
+            val i = ObjectArrayList<DynamicMachine>()
+            for (map in ADDITIONAL_CONSTRUCTORS.values) {
+                i.addAll(map.values)
+            }
+            return i
+        }
+
+        fun getDynamicMachine(state: IBlockState): DynamicMachine? {
+            return ADDITIONAL_CONSTRUCTORS[state.block]?.let {
+                it[state.block.getMetaFromState(state)]
+            }
         }
 
-        fun getConstructorsIterator(): ObjectIterator<Map.Entry<BlockPair, DynamicMachine>> {
+        fun getConstructorsIterator(): ObjectIterator<Map.Entry<Block, Int2ObjectOpenHashMap<DynamicMachine>>> {
             return ADDITIONAL_CONSTRUCTORS.entries.iterator()
         }
 
         fun setConstructors(block: BlockPair, machine: NEWDynamicMachine) {
-            ADDITIONAL_CONSTRUCTORS[block] = machine
+            ADDITIONAL_CONSTRUCTORS.computeIfAbsent(block.block) { Int2ObjectOpenHashMap() }[block.meta] = machine
             ModIntegrationJEI.PREVIEW_WRAPPERS.add(StructurePreviewWrapper(machine))
         }