diff options
author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2023-08-29 01:46:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-29 01:46:40 +0200 |
commit | d1f7d54620be77d4e9c413978a6c9497401fc9c2 (patch) | |
tree | c9b2e08b09988106c7023c8abaf6c5026abb064a | |
parent | 8aa519a116879298195bfe4206451ee24c855d2a (diff) | |
download | GT5-Unofficial-d1f7d54620be77d4e9c413978a6c9497401fc9c2.tar.gz GT5-Unofficial-d1f7d54620be77d4e9c413978a6c9497401fc9c2.tar.bz2 GT5-Unofficial-d1f7d54620be77d4e9c413978a6c9497401fc9c2.zip |
Fix massive lags when EEC is running at high voltage (#94)
* Don't split stacks when using ME bus
* Update build.gradle
* Update dependencies.gradle
* Update KubaTechGTMultiBlockBase.java
* Update KubaTechGTMultiBlockBase.java
-rw-r--r-- | build.gradle | 5 | ||||
-rw-r--r-- | dependencies.gradle | 24 | ||||
-rw-r--r-- | src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java | 11 |
3 files changed, 14 insertions, 26 deletions
diff --git a/build.gradle b/build.gradle index c5af340745..b894d64772 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1691351470 +//version: 1692122114 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -562,9 +562,6 @@ repositories { maven { name 'Overmind forge repo mirror' url 'https://gregtech.overminddl1.com/' - mavenContent { - excludeGroup("net.minecraftforge") // missing the `universal` artefact - } } maven { name = "GTNH Maven" diff --git a/dependencies.gradle b/dependencies.gradle index aae4742a5b..ec810fc475 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,17 +35,17 @@ */ dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.171:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.187:dev') api("com.github.GTNewHorizons:EnderCore:0.2.17:dev") api("com.github.GTNewHorizons:EnderIO:2.4.24:dev") api("com.github.GTNewHorizons:ForestryMC:4.6.14:dev") api("com.github.GTNewHorizons:ModularUI:1.1.16:dev") - api("com.github.GTNewHorizons:Mobs-Info:0.1.4-GTNH:dev") + api("com.github.GTNewHorizons:Mobs-Info:0.1.6-GTNH:dev") devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.7.9-GTNH:dev") //compileOnly("curse.maven:extrautilities-225561:2264384") { // transitive = false //} - compileOnly("com.github.GTNewHorizons:GTplusplus:1.9.76:dev") + compileOnly("com.github.GTNewHorizons:GTplusplus:1.9.83:dev") { transitive = false } @@ -61,15 +61,15 @@ dependencies { { transitive = false } - compileOnly("com.github.GTNewHorizons:bartworks:0.7.38:dev") + compileOnly("com.github.GTNewHorizons:bartworks:0.7.39:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.99:dev") + compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.109:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.4.3-GTNH:dev") + compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.4.4-GTNH:dev") { transitive = false } @@ -83,15 +83,15 @@ dependencies { */ // For testing - //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.4.3-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.9.76:dev") - //runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.1.0-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.99:dev") + //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.4.4-GTNH:dev") + //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.9.83:dev") + //runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.1.1-GTNH:dev") + //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.109:dev") //runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.7.0-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:bartworks:0.7.38:dev") + //runtimeOnly("com.github.GTNewHorizons:bartworks:0.7.39:dev") //runtimeOnly("com.github.GTNewHorizons:CraftTweaker:3.2.13:dev") //api("com.github.GTNewHorizons:SpecialMobs:3.4.3:dev") - //api("com.github.GTNewHorizons:twilightforest:2.4.4:dev") + //api("com.github.GTNewHorizons:twilightforest:2.4.5:dev") //api("com.github.GTNewHorizons:EnderZoo:1.0.23:dev") //runtimeOnly("com.github.GTNewHorizons:Draconic-Evolution:1.1.19-GTNH:dev") //runtimeOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") diff --git a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java index 2a14d96d57..e561e712fe 100644 --- a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java +++ b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java @@ -23,8 +23,6 @@ package kubatech.api.implementations; import static kubatech.api.Variables.ln2; import static kubatech.api.Variables.ln4; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.function.Function; @@ -165,14 +163,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_Exten if (dMulti > 0) { dMulti = 1 << (isPerfect ? (dMulti << 1) : dMulti); // TODO: Use more inputs??? - final ArrayList<ItemStack> stacks = new ArrayList<>(Arrays.asList(this.mOutputItems)); - for (ItemStack mOutputItem : this.mOutputItems) { - mOutputItem.stackSize *= dMulti; - int maxSize = mOutputItem.getMaxStackSize(); - while (mOutputItem.stackSize > maxSize) - stacks.add(mOutputItem.splitStack(Math.min(mOutputItem.stackSize - maxSize, maxSize))); - } - if (stacks.size() != this.mOutputItems.length) this.mOutputItems = stacks.toArray(new ItemStack[0]); + for (ItemStack mOutputItem : this.mOutputItems) mOutputItem.stackSize *= dMulti; for (FluidStack mOutputFluid : this.mOutputFluids) mOutputFluid.amount *= dMulti; } if (aDuration < minDuration) aDuration = minDuration; |