一些修改

Author: Circulate233

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorController.kt

@@ -50,7 +50,7 @@ import kotlin.math.roundToInt
 import kotlin.math.roundToLong
 
 @Suppress("unused")
-open class EFabricatorController() : EPartController<EFabricatorPart>() {
+class EFabricatorController() : EPartController<EFabricatorPart>() {
 
     companion object {
         const val MAX_COOLANT_CACHE: Int = 100000

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorMEChannel.kt

@@ -33,7 +33,7 @@ import net.minecraftforge.fluids.FluidStack
 import javax.annotation.Nonnull
 import kotlin.math.min
 
-open class EFabricatorMEChannel : EFabricatorPart(), ICraftingProvider, IActionHost, IGridProxyable {
+class EFabricatorMEChannel : EFabricatorPart(), ICraftingProvider, IActionHost, IGridProxyable {
 
     companion object {
         private fun getContainerItem(stackInSlot: ItemStack?): ItemStack {
@@ -88,7 +88,7 @@ open class EFabricatorMEChannel : EFabricatorPart(), ICraftingProvider, IActionH
     }
 
     // Crafting Provider
-    protected fun postPatternChangeEvent() {
+    private fun postPatternChangeEvent() {
         val currentActive = this.aEProxy.isActive
         if (this.wasActive != currentActive) {
             this.wasActive = currentActive
@@ -147,7 +147,7 @@ open class EFabricatorMEChannel : EFabricatorPart(), ICraftingProvider, IActionH
         return partController.offerWork(CraftWork(remaining, output, size))
     }
 
-    protected fun pushFluidPattern(pattern: FluidCraftingPatternDetails, table: InventoryCrafting): Boolean {
+    private fun pushFluidPattern(pattern: FluidCraftingPatternDetails, table: InventoryCrafting): Boolean {
         val outputs = pattern.outputs
         val output =
             if (outputs[0] != null) outputs[0]!!.getCachedItemStack(outputs[0]!!.stackSize) else ItemStack.EMPTY

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorParallelProc.kt

@@ -14,7 +14,7 @@ import net.minecraftforge.fml.relauncher.SideOnly
 import java.util.function.Consumer
 import kotlin.math.abs
 
-open class EFabricatorParallelProc : EFabricatorPart {
+class EFabricatorParallelProc : EFabricatorPart {
     val modifiers: MutableList<Modifier> = ObjectArrayList<Modifier>()
     val overclockModifiers: MutableList<Modifier> = ObjectArrayList<Modifier>()
 

…ecotech/efabricator/EFabricatorPart.java …e/ecotech/efabricator/EFabricatorPart.ktsrc/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorPart.java renamed to src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorPart.kt src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorPart.java renamed to src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorPart.kt

@@ -1,7 +1,5 @@
-package github.kasuminova.novaeng.common.tile.ecotech.efabricator;
+package github.kasuminova.novaeng.common.tile.ecotech.efabricator
 
-import github.kasuminova.novaeng.common.tile.ecotech.AbstractEPart;
+import github.kasuminova.novaeng.common.tile.ecotech.AbstractEPart
 
-public abstract class EFabricatorPart extends AbstractEPart<EFabricatorController> {
-
-}
+abstract class EFabricatorPart : AbstractEPart<EFabricatorController>()

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorPatternBus.kt

@@ -35,30 +35,30 @@ import java.util.stream.Collectors
 import java.util.stream.IntStream
 import javax.annotation.Nonnull
 
-open class EFabricatorPatternBus : EFabricatorPart(), IAEAppEngInventory {
+class EFabricatorPatternBus : EFabricatorPart(), IAEAppEngInventory {
 
     companion object {
         val PATTERN_SLOTS = 12 * 6
     }
 
     val aePatterns = ObjectOpenHashSet<IAEItemStack>()
     val patterns = AppEngInternalInventory(this, PATTERN_SLOTS, 1, PatternItemFilter.INSTANCE)
-    protected val details = ObjectArrayList<ICraftingPatternDetails?>(PATTERN_SLOTS)
+    private val details = ObjectArrayList<ICraftingPatternDetails?>(PATTERN_SLOTS)
 
     init {
         // Initialize details...
         IntStream.range(0, PATTERN_SLOTS).mapToObj<ICraftingPatternDetails?>(IntFunction { i: Int -> null })
             .forEach { e: ICraftingPatternDetails? -> details.add(e) }
     }
 
-    protected fun refreshPatterns() {
+    private fun refreshPatterns() {
         for (i in 0..<PATTERN_SLOTS) {
             refreshPattern(i)
         }
         notifyPatternChanged()
     }
 
-    protected fun refreshPattern(slot: Int) {
+    private fun refreshPattern(slot: Int) {
         details[slot] = null
 
         val pattern = patterns.getStackInSlot(slot)

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorTail.java

@@ -0,0 +1,38 @@
+package github.kasuminova.novaeng.common.tile.ecotech.efabricator
+
+import net.minecraft.nbt.NBTTagCompound
+
+class EFabricatorTail : EFabricatorPart() {
+
+    private var formed: Boolean = false
+
+    fun isFormed(): Boolean {
+        return formed
+    }
+
+    override fun onAssembled() {
+        if (!formed) {
+            formed = true
+            markForUpdateSync()
+        }
+        super.onAssembled()
+    }
+
+    override fun onDisassembled() {
+        if (formed) {
+            formed = false
+            markForUpdateSync()
+        }
+        super.onDisassembled()
+    }
+
+    override fun readCustomNBT(compound: NBTTagCompound) {
+        formed = compound.getBoolean("formed")
+        super.readCustomNBT(compound)
+    }
+
+    override fun writeCustomNBT(compound: NBTTagCompound) {
+        compound.setBoolean("formed", formed)
+        super.writeCustomNBT(compound)
+    }
+}

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorTail.kt

@@ -23,7 +23,7 @@ import java.util.Deque
 import kotlin.math.max
 import kotlin.math.min
 
-open class EFabricatorWorker : EFabricatorPart() {
+class EFabricatorWorker : EFabricatorPart() {
 
     companion object {
         const val MAX_ENERGY_CACHE: Int = 500000