Multiblock re-instancing in case of failures

igentuman · igentuman · commit 315587acd2bc · 2026-02-21T19:58:11.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.caching=true
 
-mod_version=1.2.14
+mod_version=1.2.15
 
 mc_version=1.20.1
 mappings_version=2023.09.03
diff --git a/src/main/java/igentuman/nc/block/entity/MultiblockControllerBE.java b/src/main/java/igentuman/nc/block/entity/MultiblockControllerBE.java
@@ -139,6 +139,9 @@ public void tickServer() {
         assert level != null;
         if(level.getGameTime() % 5 == 0) {
             MultiblockHandler.tickMultiblockAsync((ServerLevel) level, getMultiblock());
+            if(multiblock != null && multiblock.isMarkedForRemoval()) {
+                multiblock = null;
+            }
         }
     }
 
@@ -241,6 +244,7 @@ public void runAnalyze() {
         analyzeDelay = 100;
         if (getMultiblock() != null) {
             getMultiblock().wipeCache();
+            getMultiblock().setForRemoval();
             displayDetailedDataFlag = true;
         }
     }
diff --git a/src/main/java/igentuman/nc/block/fission/entity/FissionControllerBE.java b/src/main/java/igentuman/nc/block/fission/entity/FissionControllerBE.java
@@ -534,6 +534,7 @@ public FissionReactorMultiblock getMultiblock() {
             return null;
         }
         if(multiblock == null) {
+            validationsCounter = 0;
             multiblock = new FissionReactorMultiblock(this);
         }
         return (FissionReactorMultiblock) multiblock;
diff --git a/src/main/java/igentuman/nc/block/fusion/entity/FusionCoreBE.java b/src/main/java/igentuman/nc/block/fusion/entity/FusionCoreBE.java
@@ -600,6 +600,7 @@ public FusionReactorMultiblock getMultiblock() {
         }
         if(multiblock == null) {
             multiblock = new FusionReactorMultiblock(this);
+            validationsCounter = 0;
         }
         return (FusionReactorMultiblock) multiblock;
     }
diff --git a/src/main/java/igentuman/nc/block/kugelblitz/entity/ChamberTerminalBE.java b/src/main/java/igentuman/nc/block/kugelblitz/entity/ChamberTerminalBE.java
@@ -452,6 +452,7 @@ public KugelblitzMultiblock getMultiblock() {
         }
         if(multiblock == null) {
             multiblock = new KugelblitzMultiblock(this);
+            validationsCounter = 0;
         }
         return (KugelblitzMultiblock) multiblock;
     }
diff --git a/src/main/java/igentuman/nc/block/target_chamber/entity/TargetChamberControllerBE.java b/src/main/java/igentuman/nc/block/target_chamber/entity/TargetChamberControllerBE.java
@@ -325,6 +325,7 @@ public TargetChamberMultiblock getMultiblock() {
         }
         if(multiblock == null) {
             multiblock = new TargetChamberMultiblock(this);
+            validationsCounter = 0;
         }
         return (TargetChamberMultiblock) multiblock;
     }
diff --git a/src/main/java/igentuman/nc/block/turbine/entity/TurbineControllerBE.java b/src/main/java/igentuman/nc/block/turbine/entity/TurbineControllerBE.java
@@ -284,6 +284,7 @@ public TurbineMultiblock getMultiblock() {
         }
         if(multiblock == null) {
             multiblock = new TurbineMultiblock(this);
+            validationsCounter = 0;
         }
         return (TurbineMultiblock) multiblock;
     }
diff --git a/src/main/java/igentuman/nc/client/gui/MultiblockAnalyzeReportScreen.java b/src/main/java/igentuman/nc/client/gui/MultiblockAnalyzeReportScreen.java
@@ -5,7 +5,7 @@
 import igentuman.nc.client.NcClient;
 import igentuman.nc.client.gui.element.NCGuiElement;
 import igentuman.nc.client.gui.element.button.Button;
-import igentuman.nc.container.MultiblockControllerContailer;
+import igentuman.nc.container.MultiblockControllerContainer;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -21,7 +21,7 @@
 import static igentuman.nc.NuclearCraft.rl;
 import static igentuman.nc.util.TextUtils.__;
 
-public class MultiblockAnalyzeReportScreen<T extends MultiblockControllerContailer> extends AbstractContainerScreen<T> {
+public class MultiblockAnalyzeReportScreen<T extends MultiblockControllerContainer> extends AbstractContainerScreen<T> {
     protected final ResourceLocation GUI = rl("textures/gui/window_no_inventory.png");
     protected int relX;
     protected int relY;
@@ -126,7 +126,7 @@ protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
         graphics.pose().popPose();
     }
 
-    private MultiblockControllerContailer container() {
+    private MultiblockControllerContainer container() {
         return this.getMenu();
     }
 
diff --git a/src/main/java/igentuman/nc/client/gui/element/button/Button.java b/src/main/java/igentuman/nc/client/gui/element/button/Button.java
@@ -7,7 +7,7 @@
 import igentuman.nc.client.gui.element.NCGuiElement;
 import igentuman.nc.client.gui.processor.side.SideConfigSlotSelectionScreen;
 import igentuman.nc.compat.emi.EMIPlugin;
-import igentuman.nc.container.MultiblockControllerContailer;
+import igentuman.nc.container.MultiblockControllerContainer;
 import igentuman.nc.network.toServer.PacketBuildMultiblock;
 import igentuman.nc.network.toServer.PacketGuiButtonPress;
 import igentuman.nc.util.builder.ReactorDesignParser;
@@ -301,7 +301,7 @@ public static class MultiblockAnalyze extends Button {
 
         public MultiblockAnalyze(int xPos, int yPos, AbstractContainerScreen<?> screen, BlockPos pos) {
             super(xPos, yPos, screen, BTN_ID);
-            MultiblockControllerContailer container = new MultiblockControllerContailer(pos);
+            MultiblockControllerContainer container = new MultiblockControllerContainer(pos);
             this.pos = pos;
             height = 18;
             width = 18;
diff --git a/src/main/java/igentuman/nc/container/MultiblockControllerContainer.java b/src/main/java/igentuman/nc/container/MultiblockControllerContainer.java
@@ -12,17 +12,17 @@
 
 import static igentuman.nc.setup.Registration.MULTIBLOCK_REPORT_CONTAINER;
 
-public class MultiblockControllerContailer extends AbstractContainerMenu {
+public class MultiblockControllerContainer extends AbstractContainerMenu {
     protected final MultiblockControllerBE blockEntity;
     protected final Player playerEntity;
 
-    public MultiblockControllerContailer(int pContainerId, BlockPos pos, Inventory playerInventory) {
+    public MultiblockControllerContainer(int pContainerId, BlockPos pos, Inventory playerInventory) {
         super(MULTIBLOCK_REPORT_CONTAINER.get(), pContainerId);
         this.playerEntity = playerInventory.player;
         blockEntity = (MultiblockControllerBE) playerEntity.getCommandSenderWorld().getBlockEntity(pos);
     }
 
-    public MultiblockControllerContailer(BlockPos pos) {
+    public MultiblockControllerContainer(BlockPos pos) {
         super(MULTIBLOCK_REPORT_CONTAINER.get(), 777);
         playerEntity = Minecraft.getInstance().player;
         blockEntity = (MultiblockControllerBE) playerEntity.getCommandSenderWorld().getBlockEntity(pos);
diff --git a/src/main/java/igentuman/nc/multiblock/AbstractMultiblock.java b/src/main/java/igentuman/nc/multiblock/AbstractMultiblock.java
@@ -32,6 +32,8 @@
 
 public abstract class AbstractMultiblock implements Multiblock {
 
+    protected int failedValidations = 0;
+    protected boolean toDeleteFlag = false;
     public boolean hasToRefresh = true;
     public BlockPos errorBlockPos = BlockPos.ZERO;
     public int connectedPorts = 0;
@@ -81,6 +83,14 @@ protected AbstractMultiblock(HashSet<Block> validOuterBlocks, HashSet<Block> val
                 validInnerBlocks.size() + " valid inner blocks");
     }
 
+    public boolean isMarkedForRemoval() {
+        return toDeleteFlag;
+    }
+
+    public void setForRemoval() {
+        toDeleteFlag = true;
+    }
+
     public void dispose() {
         debugLog("Disposing multiblock " + getClass().getSimpleName() + " at " + controllerPos.toShortString());
         
@@ -809,6 +819,11 @@ protected Direction getMultiblockDirection() {
 
     @Override
     public void validate() {
+        failedValidations++;
+        if(failedValidations > 10) {
+            toDeleteFlag = true;
+            return;
+        }
         isValidating = true;
         connectedPorts = 0;
         long startTime = System.currentTimeMillis();
@@ -836,6 +851,7 @@ public void validate() {
         isFormed = outerValid && innerValid;
         
         if (isFormed) {
+            failedValidations--;
             validationResult = ValidationResult.VALID;
             fullValidation = false;
             debugLog("Multiblock formation successful!");
diff --git a/src/main/java/igentuman/nc/multiblock/MultiblockHandler.java b/src/main/java/igentuman/nc/multiblock/MultiblockHandler.java
@@ -38,6 +38,10 @@ public static MultiblockHandler get(ResourceKey<Level> dimension) {
 
     public static void tickMultiblockAsync(ServerLevel level, AbstractMultiblock multiblock) {
         MultiblockHandler handler = get(level.dimension());
+        if(multiblock.isMarkedForRemoval()) {
+            multiblock.dispose();
+            return;
+        }
         if (multiblock.getValidationFuture() != null && !multiblock.getValidationFuture().isDone()) {
             return;
         }
diff --git a/src/main/java/igentuman/nc/setup/Registration.java b/src/main/java/igentuman/nc/setup/Registration.java
@@ -1,6 +1,6 @@
 package igentuman.nc.setup;
 
-import igentuman.nc.container.MultiblockControllerContailer;
+import igentuman.nc.container.MultiblockControllerContainer;
 import igentuman.nc.content.NCRadiationDamageSource;
 import igentuman.nc.content.particles.ParticleSources;
 import igentuman.nc.effect.RadiationDecay;
@@ -19,7 +19,6 @@
 import net.minecraft.world.effect.MobEffectCategory;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraftforge.common.extensions.IForgeMenuType;
-import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -32,8 +31,8 @@ public class Registration {
 
     public static final RegistryObject<MobEffect> RADIATION_RESISTANCE = EFFECTS.register("radiation_resistance", () -> new RadiationResistance(MobEffectCategory.BENEFICIAL, 0xd4ffFF));
     public static final RegistryObject<MobEffect> RADIATION_DECAY = EFFECTS.register("radiation_decay", () -> new RadiationDecay(MobEffectCategory.BENEFICIAL, 0xd4ffFF));
-    public static final RegistryObject<MenuType<MultiblockControllerContailer>> MULTIBLOCK_REPORT_CONTAINER = CONTAINERS.register("multilblock_report_container",
-            () -> IForgeMenuType.create((windowId, inv, data) -> new MultiblockControllerContailer(windowId, data.readBlockPos(), inv))
+    public static final RegistryObject<MenuType<MultiblockControllerContainer>> MULTIBLOCK_REPORT_CONTAINER = CONTAINERS.register("multilblock_report_container",
+            () -> IForgeMenuType.create((windowId, inv, data) -> new MultiblockControllerContainer(windowId, data.readBlockPos(), inv))
     );
 
     @SubscribeEvent
diff --git a/src/main/resources/assets/nuclearcraft/lang/ru_ru.json b/src/main/resources/assets/nuclearcraft/lang/ru_ru.json
@@ -2567,15 +2567,15 @@
   "report.nc.2.magnets": "Магниты: %s",
   "report.nc.2.reactor_moderators": "Действительные замедлители: %s",
   "report.nc.3.amplifiers": "RF усилители: %s",
-  "report.nc.3.reactor_moderator_attachments": "Присоединения замедлителей: %s",
+  "report.nc.3.reactor_moderator_attachments": "Касания замедлителей: %s",
   "report.nc.4.fusion_rf_amplification": "RF усиление: %s",
   "report.nc.4.reactor_all_heat_sinks": "Все теплоотводы: %s",
   "report.nc.5.casing_blocks": "Блоки корпуса: %s",
-  "report.nc.5.reactor_heat_sinks": "Действительные теплоотводы: %s",
-  "report.nc.6.active_cooling_heatsinks": "Активные охлаждающие теплоотводы: %s",
+  "report.nc.5.reactor_heat_sinks": "Рабочие теплоотводы: %s",
+  "report.nc.6.active_cooling_heatsinks": "Активные теплоотводы: %s",
   "report.nc.6.connectors": "Соединители: %s",
   "report.nc.7.all_irradiators": "Все облучатели: %s",
-  "report.nc.8.irradiators": "Действительные облучатели: %s",
+  "report.nc.8.irradiators": "Рабочие облучатели: %s",
   "report.nc.9.ports": "Порты: %s",
   "rtg.fe_generation": "Генерация энергии: %s FE/т",
   "side_config.back": "ЗАД: ",
@@ -2643,7 +2643,7 @@
   "tooltip.nc.accelerator.strength": "Сила магнита: %s Тл",
   "tooltip.nc.accelerator.voltage": "Напряжение: %sВ",
   "tooltip.nc.analyze": "Проанализировать структуру",
-  "tooltip.nc.analyze.descr": "Обновляет данные мультиблока, анализирует и предоставляет больше информации",
+  "tooltip.nc.analyze.descr": "Сброс настроек и подробный отчет",
   "tooltip.nc.analyzed": "Анализ предмета завершен",
   "tooltip.nc.bearing.desc": "Соединяет вал ротора с стеной турбины и динамо. Должен полностью покрывать область каждого конца вала.",
   "tooltip.nc.blade.desc": "Преобразует энергию поступающего потока жидкости во вращательную энергию в валу ротора. Коэффициент расширения больше единицы, поэтому объем потока жидкости будет увеличиваться каждый раз при прохождении через набор. Должен быть установлен в полных наборах из четырех копланарных групп, простирающихся от вала турбины до стены. Каждый блок лопасти может обрабатывать до %s поступающей жидкости.",
diff --git a/src/main/resources/assets/nuclearcraft/textures/gui/window_no_inventory.png b/src/main/resources/assets/nuclearcraft/textures/gui/window_no_inventory.png

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,9 @@ public void tickServer() {`
`139`	`139`	`assert level != null;`
`140`	`140`	`if(level.getGameTime() % 5 == 0) {`
`141`	`141`	`MultiblockHandler.tickMultiblockAsync((ServerLevel) level, getMultiblock());`
	`142`	`+ if(multiblock != null && multiblock.isMarkedForRemoval()) {`
	`143`	`+ multiblock = null;`
	`144`	`+ }`
`142`	`145`	`}`
`143`	`146`	`}`
`144`	`147`
`@@ -241,6 +244,7 @@ public void runAnalyze() {`
`241`	`244`	`analyzeDelay = 100;`
`242`	`245`	`if (getMultiblock() != null) {`
`243`	`246`	`getMultiblock().wipeCache();`
	`247`	`+ getMultiblock().setForRemoval();`
`244`	`248`	`displayDetailedDataFlag = true;`
`245`	`249`	`}`
`246`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -534,6 +534,7 @@ public FissionReactorMultiblock getMultiblock() {`
`534`	`534`	`return null;`
`535`	`535`	`}`
`536`	`536`	`if(multiblock == null) {`
	`537`	`+ validationsCounter = 0;`
`537`	`538`	`multiblock = new FissionReactorMultiblock(this);`
`538`	`539`	`}`
`539`	`540`	`return (FissionReactorMultiblock) multiblock;`
Original file line number	Diff line number	Diff line change
`@@ -600,6 +600,7 @@ public FusionReactorMultiblock getMultiblock() {`
`600`	`600`	`}`
`601`	`601`	`if(multiblock == null) {`
`602`	`602`	`multiblock = new FusionReactorMultiblock(this);`
	`603`	`+ validationsCounter = 0;`
`603`	`604`	`}`
`604`	`605`	`return (FusionReactorMultiblock) multiblock;`
`605`	`606`	`}`
Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,7 @@ public KugelblitzMultiblock getMultiblock() {`
`452`	`452`	`}`
`453`	`453`	`if(multiblock == null) {`
`454`	`454`	`multiblock = new KugelblitzMultiblock(this);`
	`455`	`+ validationsCounter = 0;`
`455`	`456`	`}`
`456`	`457`	`return (KugelblitzMultiblock) multiblock;`
`457`	`458`	`}`
Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,7 @@ public TargetChamberMultiblock getMultiblock() {`
`325`	`325`	`}`
`326`	`326`	`if(multiblock == null) {`
`327`	`327`	`multiblock = new TargetChamberMultiblock(this);`
	`328`	`+ validationsCounter = 0;`
`328`	`329`	`}`
`329`	`330`	`return (TargetChamberMultiblock) multiblock;`
`330`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ public TurbineMultiblock getMultiblock() {`
`284`	`284`	`}`
`285`	`285`	`if(multiblock == null) {`
`286`	`286`	`multiblock = new TurbineMultiblock(this);`
	`287`	`+ validationsCounter = 0;`
`287`	`288`	`}`
`288`	`289`	`return (TurbineMultiblock) multiblock;`
`289`	`290`	`}`