diff --git a/src/main/java/implementslegend/mod/vaultfaster/SectionedTemplate.kt b/src/main/java/implementslegend/mod/vaultfaster/SectionedTemplate.kt index b075618..2603366 100644 --- a/src/main/java/implementslegend/mod/vaultfaster/SectionedTemplate.kt +++ b/src/main/java/implementslegend/mod/vaultfaster/SectionedTemplate.kt @@ -14,18 +14,7 @@ import java.util.concurrent.ThreadPoolExecutor import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean import java.util.stream.Collector -/* -val GENERATOR_EXECUTOR = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()){ - Thread(it).apply { - name="Vault-Generator-$name" - } -}.apply { (this as? ThreadPoolExecutor)?.apply { corePoolSize=1;setKeepAliveTime(10,TimeUnit.SECONDS) } } -val ROOM_GENERATOR_EXECUTOR = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()){ - Thread(it).apply { - name="Vault-Room-Generator-$name" - } -}.apply { (this as? ThreadPoolExecutor)?.apply { corePoolSize=3;setKeepAliveTime(10,TimeUnit.SECONDS) } } -*/ + val GENERATOR_EXECUTOR = overflowExecutor(Runtime.getRuntime().availableProcessors(), overflowThreads = 1, poolTaskCapacity = 135){ Thread(it).apply { name="Vault-Generator-$name" diff --git a/src/main/java/implementslegend/mod/vaultfaster/TileMapper.kt b/src/main/java/implementslegend/mod/vaultfaster/TileMapper.kt index 684b7f9..ebaf0d5 100644 --- a/src/main/java/implementslegend/mod/vaultfaster/TileMapper.kt +++ b/src/main/java/implementslegend/mod/vaultfaster/TileMapper.kt @@ -37,7 +37,6 @@ import java.util.concurrent.atomic.AtomicReferenceArray typealias TileProcessors = ArrayList> -val AtomicReferenceArray<*>.indices get() = 0 until this.length() class TileMapper() { diff --git a/src/main/resources/vaultfaster.mixins.json b/src/main/resources/vaultfaster.mixins.json index b86a2c2..7796453 100644 --- a/src/main/resources/vaultfaster.mixins.json +++ b/src/main/resources/vaultfaster.mixins.json @@ -23,6 +23,7 @@ "MixinJigsawCorrectAddProcessors", "MixinLeveledProcessor", "MixinPartBlockProperties", + "MixinPartialBlock", "MixinPartialBlockState", "MixinPlacementSettings", "MixinReferenceTileProcessor", @@ -33,7 +34,6 @@ "NoBiomeDecorations", "OctahedralGroupFix", "PartialBlockIDAccessor", - "MixinPartialBlock", "PredicateIdAccessor", "ProcessorPredicateAccessor", "ProtoChunkAccessor",