- 新增 IC2 能量网络计算优化（并行计算）。

- 新增 EIO 导管能量网络计算优化（并行计算）。 - 新增 FluxNetworks 计算优化（并行计算）。 - 新增 FluxNetworks 随机 UID 功能。 - 新增 ImmersiveEngineering 的杂项优化。 - 修复某些整合包使用并行模型加载器会出现奇怪的 NoSuchMethodError 问题。 - LazyAE2 -> TheEng - 更新配置文件。
NovaEngineering-Source · Sep 22, 2024 · 3107132 · 3107132
1 parent 7e56658
commit 3107132
Show file tree

Hide file tree

Showing 44 changed files with 1,832 additions and 102 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 // Project properties
 group = "github.kasuminova.stellarcore"
-version = "1.4.5"
+version = "1.4.9"
 
 // Set the toolchain version to decouple the Java we run Gradle with from the Java used to compile and run the mod
 java {
@@ -148,6 +148,9 @@ repositories {
     maven {
         url = uri("https://maven.blamejared.com/")
     }
+    maven {
+        url = uri("https://maven.tterrag.com") // AutoSave, AutoConfig
+    }
     maven {
         url = uri("https://repo.spongepowered.org/maven")
     }
@@ -206,7 +209,7 @@ dependencies {
     implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:5147702"))
     compileOnly(rfg.deobf("curse.maven:CodeChickenLib-242818:2779848"))
     compileOnly(rfg.deobf("curse.maven:nuclearcraft-overhauled-336895:3862197"))
-    compileOnly(rfg.deobf("curse.maven:industrialcraft-2-242638:3838713"))
+    implementation(rfg.deobf("curse.maven:industrialcraft-2-242638:3838713"))
     compileOnly(rfg.deobf("curse.maven:mekanism-ce-unofficial-840735:5130458"))
 //    compileOnly(rfg.deobf("curse.maven:mekanism-unofficial-edition-v10-edition-840735:4464199"))
     compileOnly(rfg.deobf("curse.maven:RedstoneFlux-270789:2920436"))
@@ -231,6 +234,8 @@ dependencies {
     compileOnly(rfg.deobf("curse.maven:rgb-chat-702720:4092100"))
     compileOnly(rfg.deobf("curse.maven:endercore-231868:4671384"))
     compileOnly(rfg.deobf("curse.maven:ender-io-64578:4674244"))
+    compileOnly("info.loenwind.autosave:AutoSave:1.12.2:1.0.11") // EnderIO Dependency
+    compileOnly("info.loenwind.autoconfig:AutoConfig:1.12.2:1.0.2") // EnderIO Dependency
     compileOnly(rfg.deobf("curse.maven:tinkers-evolution-384589:4941753"))
     compileOnly(rfg.deobf("curse.maven:ore-excavation-250898:2897369"))
     compileOnly(rfg.deobf("curse.maven:techguns-244201:2958103"))

diff --git a/src/main/java/github/kasuminova/stellarcore/common/config/StellarCoreConfig.java b/src/main/java/github/kasuminova/stellarcore/common/config/StellarCoreConfig.java
@@ -578,6 +578,9 @@ public static class Performance {
         @Config.Name("InGameInfoXML")
         public final InGameInfoXML inGameInfoXML = new InGameInfoXML();
 
+        @Config.Name("ImmersiveEngineering")
+        public final ImmersiveEngineering immersiveEngineering = new ImmersiveEngineering();
+
         @Config.Name("Mekanism")
         public final Mekanism mekanism = new Mekanism();
 
@@ -677,6 +680,11 @@ public static class Vanilla {
             @Config.Name("PropertyEnumHashCodeCache")
             public boolean propertyEnumHashCodeCache = true;
 
+            @Config.Comment("(Server Performance) Improving BlockStateContainer$BlockStateImplementation#hashCode Performance with hashCode cache.")
+            @Config.RequiresMcRestart
+            @Config.Name("BlockStateImplementationHashCodeCache")
+            public boolean blockStateImplementationHashCodeCache = true;
+
             @Config.Comment("(Client/Server Performance | Experimental) Replaces the internal default ArrayList of NonNullList with an ObjectArrayList (may not work).")
             @Config.RequiresMcRestart
             @Config.Name("NonNullListImprovements")
@@ -742,10 +750,11 @@ public static class Vanilla {
             @Config.RequiresMcRestart
             @Config.Comment({
                     "(Client Performance) Modify the data structure of ModelBlock's textures map to improve performance and reduce memory usage.",
-                    "This feature requires CensoredASM mod."
+                    "This feature requires CensoredASM mod.",
+                    "Known to be incompatible with DynamicTrees."
             })
             @Config.Name("ModelBlockStringCanonicalization")
-            public boolean modelBlockStringCanonicalization = true;
+            public boolean modelBlockStringCanonicalization = false;
 
             @Config.Comment({
                     "(Client Performance | Experimental) Deduplicate vertexData array to optimise memory usage.",
@@ -1006,6 +1015,10 @@ public static class EnderIOConduits {
             @Config.Name("EnderLiquidConduitNetworkTankMap")
             public boolean enderLiquidConduitNetworkTankMap = true;
 
+            @Config.Comment("(Server Performance | Experimental) Rewriting the eio conduit energy network computation logic to improve performance using multithreading.")
+            @Config.Name("NetworkPowerManagerImprovements")
+            public boolean networkPowerManager = true;
+
         }
 
         public static class FTBLib {
@@ -1026,6 +1039,11 @@ public static class FTBQuests {
 
         public static class IndustrialCraft2 {
 
+            @Config.RequiresMcRestart
+            @Config.Comment("(Server Performance | Experimental) Rewriting the ic2 energy network computation logic to improve performance using multithreading.")
+            @Config.Name("EnergyCalculatorLegImprovements")
+            public boolean energyCalculatorLeg = true;
+
             @Config.Comment("(Server Performance) Improved some data structures, slight performance improvements.")
             @Config.Name("GridDataImprovements")
             public boolean energyCalculatorLegGridData = true;
@@ -1034,6 +1052,10 @@ public static class IndustrialCraft2 {
             @Config.Name("EnergyNetLocalImprovements")
             public boolean energyNetLocal = true;
 
+            @Config.Comment("(Server Performance) Improve EnergyNetLocal#getIoTile and EnergyNetLocal#getSubTile fetching speed to optimise performance to some extent.")
+            @Config.Name("GetIoAndSubTileEnergyNetLocalImprovements")
+            public boolean getIoAndSubTile = true;
+
             @Config.Comment("(Server Performance) Improved some data structures, slight performance improvements.")
             @Config.Name("GridImprovements")
             public boolean grid = true;
@@ -1067,6 +1089,17 @@ public static class InGameInfoXML {
 
         }
 
+        public static class ImmersiveEngineering {
+
+            @Config.Comment({
+                    "(Server Performance) 阻止 IE 机械方块传输能量时触发完整的方块更新，这可能会改进性能。",
+                    "但如果出现奇怪的方块状态请尝试关闭此选项."
+            })
+            @Config.Name("EnergyTransferNoUpdate")
+            public boolean energyTransferNoUpdate = true;
+
+        }
+
         public static class Mekanism {
 
             @Config.Comment({
@@ -1166,6 +1199,9 @@ public static class Features {
         @Config.Name("EnderIOConduits")
         public final EnderIOConduits enderIOConduits = new EnderIOConduits();
 
+        @Config.Name("FluxNetworks")
+        public final FluxNetworks fluxNetworks = new FluxNetworks();
+
         @Config.Name("IC2")
         public final IC2 ic2 = new IC2();
 
@@ -1257,6 +1293,14 @@ public static class EnderIOConduits {
             public boolean prevEnderLiquidConduitLogSpam = true;
 
         }
+
+        public static class FluxNetworks {
+
+            @Config.Comment("(Server) Make FluxNetworks to generate a random int uid for each network, instead of using the self-incrementing ID.")
+            @Config.Name("RandomNetworkUniqueID")
+            public boolean randomNetworkUniqueID = false;
+
+        }
 
         public static class IC2 {