Multiblock validator performance improvements

Author: igentuman

build.gradle

@@ -112,7 +112,7 @@ dependencies {
     implementation 'org.spongepowered:mixin:0.8.5'
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
 
-    compileOnly fg.deobf("com.gregtechceu.gtceu:gtceu-${mc_version}:${gtm_version}"){
+    implementation fg.deobf("com.gregtechceu.gtceu:gtceu-${mc_version}:${gtm_version}"){
         transitive = false
     }
 
@@ -128,7 +128,7 @@ dependencies {
     implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}") {
         transitive = false
     }*/
-    implementation fg.deobf("curse.maven:multi-builder-tool-827020:6877370")
+    implementation fg.deobf("curse.maven:multi-builder-tool-827020:7041820")
     runtimeOnly fg.deobf("curse.maven:ctm-267602:5983309")
     compileOnly fg.deobf("curse.maven:immersive-engineering-231951:5224387")
     implementation fg.deobf("curse.maven:thermal-foundation-222880:5443583")

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.caching=true
 
-mod_version=1.2.9
+mod_version=1.2.10
 
 mc_version=1.20.1
 mappings_version=2023.09.03
@@ -25,4 +25,4 @@ ctm_version=1.1.6+8
 kubejs_version=2001.6.5-build.16
 rhino_version=2001.2.3-build.6
 architectury_version=9.2.14
-gtm_version=1.6.4
+gtm_version=7.2.0

src/generated/resources/assets/nuclearcraft/lang/en_us.json

@@ -2564,14 +2564,17 @@
   "report.nc.1.accelerator.valid_coolers": "Valid Coolers: %s",
   "report.nc.1.fusion_size": "Fusion Reactor Size: %s",
   "report.nc.1.reactor_all_moderators": "All Moderators: %s",
+  "report.nc.1.stabilizers": "Stabilizers: %s",
   "report.nc.1.target_chamber.all_detectors": "All Detectors: %s",
   "report.nc.1.target_chamber.valid_detectors": "Valid Detectors: %s",
   "report.nc.10.reactor_fuel_cells": "Fuel Cells: %s",
   "report.nc.11.has_recipe": "Has Recipe: %s",
+  "report.nc.2.flux_regulators": "Flux Regulators: %s",
   "report.nc.2.magnets": "Magnets: %s",
   "report.nc.2.reactor_moderators": "Valid Moderators: %s",
   "report.nc.3.amplifiers": "RF Amplifiers: %s",
   "report.nc.3.reactor_moderator_attachments": "Moderator Attachments: %s",
+  "report.nc.3.transformers": "Transformers: %s",
   "report.nc.4.fusion_rf_amplification": "RF Amplification: %s",
   "report.nc.4.reactor_all_heat_sinks": "All Heat Sinks: %s",
   "report.nc.5.casing_blocks": "Casing Blocks: %s",
@@ -2713,7 +2716,7 @@
   "tooltip.nc.reactor.plasma_optimal": "Optimal: %s K",
   "tooltip.nc.reactor.ready": "Ready",
   "tooltip.nc.reactor.running": "Activation: %s",
-  "tooltip.nc.report_issue": "Report a Bug",
+  "tooltip.nc.report_issue": "Copy link to post a bug",
   "tooltip.nc.rf_amplifier.efficiency": "Efficiency: %s%%",
   "tooltip.nc.rf_amplifier.heat": "Heat: %s H/t",
   "tooltip.nc.rf_amplifier.max_temp": "Max Temperature: %s K",

src/main/java/igentuman/nc/block/entity/MultiblockBuilderBE.java

@@ -50,12 +50,6 @@ public void tickClient() {
         BlockOverlayHandler.addBoxToOutline(boundingBox,  0.5f, 0.9f, 0.9f, 0.8f, getBlockPos().relative(getFacing().getOpposite(), offset));
     }
 
-    public void tickServer() {
-        if (currentTick % 2 == 0) {
-            return;
-        }
-    }
-
     public void setBlockMap(HashMap<BlockPos, Block> blockMap) {
         if (getLevel().isClientSide()) {
             removeOverlayBox();

src/main/java/igentuman/nc/block/entity/processor/NCProcessorBE.java

@@ -392,6 +392,10 @@ public void tickServer() {
         }
         boolean updated = forceUpdate();
         boolean wasActive = isActive;
+        //if no recipe - tick only 5 times per second
+        if(!hasRecipe() && level.getGameTime() % 5 == 0) {
+           return;
+        }
         processRecipe();
         handleRecipeOutput();
         updated = updated || contentHandler().tick();

src/main/java/igentuman/nc/block/fission/entity/FissionPortBE.java

@@ -93,6 +93,10 @@ public void tickServer() {
         if(getMultiblock() != null && controller() != null) {
             sendOutPower();
         }
+        //if no recipe - tick only 5 times per second
+        if(currentTick % 5 == 0 && controller() != null && !controller().hasRecipe()) {
+            return;
+        }
         boolean updated = updateController();
         if(currentTick % 20 == 0 && controller() != null) {
             pushPull();
@@ -155,7 +159,7 @@ protected void transferEnergyToSide(Direction direction) {
         }
         int wasEnergy = getEnergyStored();
         BlockEntity be = level.getExistingBlockEntity(worldPosition.relative(direction));
-        if (be == null || be instanceof FissionPortBE) {
+        if (be == null || be instanceof FissionPortBE || be instanceof FissionControllerBE) {
             return;
         }
         if((isGtLoaded() && isGTEUCapEnabled())) {

src/main/java/igentuman/nc/block/fusion/entity/FusionCoreBE.java

@@ -400,6 +400,10 @@ public void tickServer() {
     }
 
     private void tickProxyBlocks() {
+        //if no recipe - tick only 5 times per second
+        if(!hasRecipe() && currentTick % 5 == 0) {
+            return;
+        }
         for(FusionCoreProxyBE proxy: getProxies()) {
             if(proxy == null) continue;
             proxy.forceTickServer(this);

src/main/java/igentuman/nc/block/fusion/entity/FusionCoreProxyBE.java

@@ -87,7 +87,10 @@ public void tickServer()
             level.removeBlock(worldPosition, false);
             return;
         }
-
+        //if no recipe - tick only 5 times per second
+        if(currentTick % 5 == 0 && !core.hasRecipe()) {
+            return;
+        }
         if(wasSignal != core.analogSignal) {
             wasSignal = core.analogSignal;
             MultiblockHandler.get(level.dimension()).addIgnoreToUpdate(getBlockPos());
@@ -127,6 +130,7 @@ public void setCore(FusionCoreBE core) {
         if(wasCore != core) {
             MultiblockHandler.get(getLevel().dimension()).addIgnoreToUpdate(getBlockPos());
             setChanged();
+            level.updateNeighborsAt(worldPosition, getBlockState().getBlock());
             level.sendBlockUpdated(worldPosition, getBlockState(), getBlockState(), Block.UPDATE_ALL);
         }
     }

src/main/java/igentuman/nc/block/kugelblitz/entity/ChamberPortBE.java

@@ -23,6 +23,7 @@
 import javax.annotation.Nullable;
 import java.util.Objects;
 
+import static igentuman.nc.NuclearCraft.currentTick;
 import static igentuman.nc.compat.gregtech.GTUtils.*;
 import static igentuman.nc.compat.oc2.FusionReactorDevice.DEVICE_CAPABILITY;
 import static igentuman.nc.multiblock.kugelblitz.KugelblitzRegistration.KUGELBLITZ_BE;
@@ -83,6 +84,10 @@ public boolean canInvalidateCache() {
     public void tickServer() {
         if(NuclearCraft.instance.isNcBeStopped || isRemoved()) return;
         super.tickServer();
+        //if no blackhole - tick only 5 times per second
+        if(currentTick % 5 == 0 && controller() != null && !controller().hasBlackhole()) {
+            return;
+        }
         int wasSignal = analogSignal;
         if(getMultiblock() != null || controller() != null) {
             sendOutPower();
@@ -136,7 +141,7 @@ protected void transferEnergyToSide(Direction direction) {
         }
         int wasEnergy = getEnergyStored();
         BlockEntity be = level.getExistingBlockEntity(worldPosition.relative(direction));
-        if (be == null || be instanceof ChamberPortBE) {
+        if (be == null || be instanceof ChamberPortBE || be instanceof ChamberTerminalBE) {
             return;
         }
         if((isGtLoaded() && isGTEUCapEnabled())) {

src/main/java/igentuman/nc/block/kugelblitz/entity/ChamberTerminalBE.java

@@ -93,7 +93,7 @@ public class ChamberTerminalBE extends MultiblockControllerBE {
     @NBTField
     public int stabilizers = 0;
     public HashMap<Direction, Long> pulseEnergy = new HashMap<>();
-    public int collectingEnergy = 2;
+    public int collectingEnergy = 10;
 
     protected Direction facing;
     public Recipe recipe;
@@ -262,7 +262,7 @@ public void tickServer() {
         if(isCasingValid && isInternalValid) {
             collectingEnergy--;
             if(collectingEnergy < 0) {
-                collectingEnergy = 2;
+                collectingEnergy = 10;
                 if(pulseEnergy.size() == 6) {
                     gotLaserBurst = true;
                 }
@@ -301,6 +301,15 @@ public void tickServer() {
         }
     }
 
+    @Override
+    public HashMap<String, String> getAnalyzeReport() {
+        HashMap<String, String> report = new HashMap<>();
+        report.put("report.nc.1.stabilizers", String.valueOf(stabilizers));
+        report.put("report.nc.2.flux_regulators", String.valueOf(fluxRegulators));
+        report.put("report.nc.3.transformers", String.valueOf(transformers));
+        return report;
+    }
+
     private boolean isBlackHoleStable() {
         return blackholeStability > 39;
     }
@@ -658,7 +667,7 @@ private void handleBlackHole() {
                 getMultiblock().blackHole = (BlackHoleBE) be;
             }
         }
-        if(!(getMultiblock().isFormed() || isCasingValid) && getMultiblock().blackHole != null) {
+        if(!getMultiblock().isValidating() && !(getMultiblock().isFormed() || isCasingValid) && getMultiblock().blackHole != null) {
             BlockPos pos = getMultiblock().blackHole.getBlockPos();
             getMultiblock().blackHole = null;
             getLevel().setBlockAndUpdate(pos, AIR.defaultBlockState());
@@ -679,7 +688,11 @@ private void handleBlackHole() {
 
     public void gotEnergy(Direction facing) {
         pulseEnergy.put(facing, 1L);
-        collectingEnergy = 2;
+        collectingEnergy = 10;
+    }
+
+    public boolean canAnalyze() {
+        return analyzeDelay < 1;
     }
 
     public static class Recipe extends NcRecipe {