一顿狂乱的修复

Circulate233 · Circulate233 · commit 5c70cd5faf30 · 2026-05-05T18:01:44.000+08:00
diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle
@@ -81,7 +81,6 @@ dependencies {
     modImplementation 'curse.maven:baubles-227083:2518667'
     modImplementation 'curse.maven:zenutil-401178:6895021'
     modImplementation 'curse.maven:scalingguis-319656:2716334'
-    modImplementation 'curse.maven:lolasm-460609:5257348'
     modCompileOnly 'curse.maven:matter-overdrive-community-edition-557428:4592069'
     modImplementation 'curse.maven:cofh-core-69162:2920433'
     modImplementation 'curse.maven:cofh-world-271384:2920434'
@@ -105,8 +104,6 @@ dependencies {
     modCompileOnly 'curse.maven:immersive-petroleum-268250:3382321'
     modCompileOnly 'curse.maven:ingame-info-xml-225604:2489566'
     modCompileOnly 'curse.maven:ftbq-289412:3156637'
-    modImplementation 'curse.maven:stellarcore-1064321:5952608'
-    modImplementation 'curse.maven:configanytime-870276:5212709'
     modImplementation 'curse.maven:AutoRegLib-250363:2746011'
     modImplementation 'curse.maven:Cucumber-272335:2645867'
     modImplementation 'curse.maven:extended-crafting-nomifactory-edition-398267:5778512'
diff --git a/src/main/java/github/kasuminova/novaeng/common/hypernet/old/ComputationCenter.java b/src/main/java/github/kasuminova/novaeng/common/hypernet/old/ComputationCenter.java
@@ -2,8 +2,8 @@
 
 import crafttweaker.annotations.ZenRegister;
 import github.kasuminova.mmce.common.event.recipe.RecipeCheckEvent;
-import github.kasuminova.novaeng.NovaEngineeringCore;
 import github.kasuminova.mmce.common.helper.IMachineController;
+import github.kasuminova.novaeng.NovaEngineeringCore;
 import github.kasuminova.novaeng.common.crafttweaker.hypernet.HyperNetHelper;
 import github.kasuminova.novaeng.common.hypernet.old.misc.ConnectResult;
 import github.kasuminova.novaeng.common.registry.RegistryHyperNet;
@@ -34,13 +34,10 @@
 @ZenClass("novaeng.hypernet.ComputationCenter")
 public class ComputationCenter {
     private static final Map<TileMultiblockMachineController, ComputationCenter> CACHED_COMPUTATION_CENTER = new WeakHashMap<>();
-
+    private static final boolean DEBUG_LOG_BUDGET = false;
     @Getter
     private final TileMultiblockMachineController owner;
     private final Map<Class<?>, Map<BlockPos, NetNode>> nodes = new ConcurrentHashMap<>();
-
-    private static final boolean DEBUG_LOG_BUDGET = false;
-
     private final ComputationCenterType type;
     private TickComputationBudget tickBudget = TickComputationBudget.empty(-1L);
 
diff --git a/src/main/java/github/kasuminova/novaeng/common/hypernet/old/research/ResearchStation.java b/src/main/java/github/kasuminova/novaeng/common/hypernet/old/research/ResearchStation.java
@@ -16,6 +16,7 @@
 import hellfirepvp.modularmachinery.common.machine.factory.FactoryRecipeThread;
 import hellfirepvp.modularmachinery.common.tiles.TileFactoryController;
 import hellfirepvp.modularmachinery.common.tiles.base.TileMultiblockMachineController;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import lombok.Setter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -81,9 +82,7 @@ public void onRecipeCheck(final RecipeCheckEvent event) {
             return;
         }
 
-        if (nodes.stream()
-                 .map(Database.class::cast)
-                 .noneMatch(database -> database.hasDatabaseSpace(currentResearching))) {
+        if (nodes.stream().noneMatch(database -> database.hasDatabaseSpace(currentResearching))) {
             event.setFailed("网络中所有的数据库存储已满！");
         }
     }
@@ -179,7 +178,7 @@ public void completeRecipe(FactoryRecipeThread thread) {
 
         Collection<Database> databases = center.getNode(Database.class).stream()
                                                .filter(Database::isWorking)
-                                               .collect(Collectors.toList());
+                                               .collect(Collectors.toCollection(ObjectArrayList::new));
         if (databases.isEmpty()) {
             return;
         }
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/MMAltar.kt b/src/main/java/github/kasuminova/novaeng/common/machine/MMAltar.kt
@@ -220,7 +220,12 @@ object MMAltar : MachineSpecial {
                         it.setFailed("novaeng.mm_altar.failed.1")
                         return@addPreCheckHandler
                     }
-                    val soulNetwork = NetworkHelper.getSoulNetwork(Binding.fromStack(item))
+                    val b = Binding.fromStack(item)
+                    if (b == null) {
+                        it.setFailed("novaeng.mm_altar.failed.1")
+                        return@addPreCheckHandler
+                    }
+                    val soulNetwork = NetworkHelper.getSoulNetwork(b)
                     if (soulNetwork.currentEssence >= NetworkHelper.getMaximumForTier(
                             NetworkHelper.getCurrentMaxOrb(
                                 soulNetwork
@@ -241,7 +246,8 @@ object MMAltar : MachineSpecial {
                 pos.release()
                 if (t is TileLifeEssenceProvider.Output) {
                     val item = t.inventory.getStackInSlot(0)
-                    val soul = NetworkHelper.getSoulNetwork(Binding.fromStack(item))
+                    val b = Binding.fromStack(item) ?: return@addFactoryFinishHandler
+                    val soul = NetworkHelper.getSoulNetwork(b)
                     soul.currentEssence += altar.drainBlood(10000)
                 }
 
diff --git a/src/main/java/github/kasuminova/novaeng/common/util/Functions.java b/src/main/java/github/kasuminova/novaeng/common/util/Functions.java
@@ -34,6 +34,7 @@
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 
+@SuppressWarnings("deprecation")
 @ZenRegister
 @ZenClass("novaeng.Function")
 public class Functions {
@@ -106,9 +107,6 @@ public static String getText(String key) {
 
     @ZenMethod
     public static String getText(String key, Object... objs) {
-        if (NovaEngineeringCore.proxy.isClient()) {
-            return I18n.translateToLocalFormatted(key, objs);
-        }
-        return key;
+        return I18n.translateToLocalFormatted(key, objs);
     }
 }
diff --git a/src/main/java/github/kasuminova/novaeng/common/util/OnlyWriteEnergyContainer.kt b/src/main/java/github/kasuminova/novaeng/common/util/OnlyWriteEnergyContainer.kt
@@ -0,0 +1,41 @@
+package github.kasuminova.novaeng.common.util
+
+import net.minecraftforge.energy.IEnergyStorage
+
+class OnlyWriteEnergyContainer : IEnergyStorage {
+
+    private var storage : IEnergyStorage
+
+    constructor(storage: IEnergyStorage) {
+        this.storage = storage
+    }
+
+    fun setStorage(storage: IEnergyStorage) : OnlyWriteEnergyContainer {
+        this.storage = storage
+        return this
+    }
+
+    override fun receiveEnergy(i: Int, bl: Boolean): Int {
+        return storage.receiveEnergy(i, bl)
+    }
+
+    override fun extractEnergy(i: Int, bl: Boolean): Int {
+        return 0
+    }
+
+    override fun getEnergyStored(): Int {
+        return storage.energyStored
+    }
+
+    override fun getMaxEnergyStored(): Int {
+        return storage.maxEnergyStored
+    }
+
+    override fun canExtract(): Boolean {
+        return false
+    }
+
+    override fun canReceive(): Boolean {
+        return storage.canReceive()
+    }
+}
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/ae2/MixinCraftingCPUClusterTwo.java b/src/main/java/github/kasuminova/novaeng/mixin/ae2/MixinCraftingCPUClusterTwo.java
@@ -96,12 +96,12 @@ public abstract class MixinCraftingCPUClusterTwo {
         for (IAEItemStack anInput : input) {
             if (anInput != null) {
                 if (anInput.getItem() == FCItems.FLUID_DROP) {
-                    sum += Math.max((double) anInput.getStackSize() / (double) 1000.0F, (double) 1.0F);
+                    sum += Math.max((double) anInput.getStackSize() / (double) 1000.0F, 1.0F);
                     continue;
                 }
 
                 if (ModAndClassUtil.GAS && anInput.getItem() == FCGasItems.GAS_DROP) {
-                    sum += Math.max((double) anInput.getStackSize() / (double) 4000.0F, (double) 1.0F);
+                    sum += Math.max((double) anInput.getStackSize() / (double) 4000.0F, 1.0F);
                     continue;
                 }
                 sum += anInput.getStackSize();
@@ -145,7 +145,7 @@ private void executeCrafting(IEnergyGrid eg, CraftingGridCache cc) {
 
         while (i.hasNext()) {
             Map.Entry<ICraftingPatternDetails, AccessorTaskProgress> e = i.next();
-            val value = ((AccessorTaskProgress) e.getValue());
+            val value = e.getValue();
             if (value.getValue() <= 0L) {
                 i.remove();
             } else {
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/ar/MixinTileForgePowerInput.java b/src/main/java/github/kasuminova/novaeng/mixin/ar/MixinTileForgePowerInput.java
@@ -0,0 +1,24 @@
+package github.kasuminova.novaeng.mixin.ar;
+
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.energy.CapabilityEnergy;
+import net.minecraftforge.energy.IEnergyStorage;
+import org.spongepowered.asm.mixin.Intrinsic;
+import org.spongepowered.asm.mixin.Mixin;
+import zmaster587.libVulpes.tile.energy.TileForgePowerInput;
+import zmaster587.libVulpes.tile.energy.TilePlugBase;
+
+@Mixin(value = TileForgePowerInput.class, remap = false)
+public abstract class MixinTileForgePowerInput extends TilePlugBase implements IEnergyStorage {
+
+    @Intrinsic
+    @Override
+    public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
+        if (capability == CapabilityEnergy.ENERGY) {
+            return CapabilityEnergy.ENERGY.cast(this);
+        }
+        return super.getCapability(capability, facing);
+    }
+
+}
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/ar/MixinTileForgePowerOutput.java b/src/main/java/github/kasuminova/novaeng/mixin/ar/MixinTileForgePowerOutput.java
@@ -0,0 +1,24 @@
+package github.kasuminova.novaeng.mixin.ar;
+
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.energy.CapabilityEnergy;
+import net.minecraftforge.energy.IEnergyStorage;
+import org.spongepowered.asm.mixin.Intrinsic;
+import org.spongepowered.asm.mixin.Mixin;
+import zmaster587.libVulpes.tile.energy.TileForgePowerOutput;
+import zmaster587.libVulpes.tile.energy.TilePlugBase;
+
+@Mixin(value = TileForgePowerOutput.class, remap = false)
+public abstract class MixinTileForgePowerOutput extends TilePlugBase implements IEnergyStorage {
+
+    @Intrinsic
+    @Override
+    public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
+        if (capability == CapabilityEnergy.ENERGY) {
+            return CapabilityEnergy.ENERGY.cast(this);
+        }
+        return super.getCapability(capability, facing);
+    }
+
+}
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/botania_r/MixinSubTileMunchdew.java b/src/main/java/github/kasuminova/novaeng/mixin/botania_r/MixinSubTileMunchdew.java
@@ -61,7 +61,7 @@ public void onUpdate(CallbackInfo ci) {
 
                     if (!coords.isEmpty()) {
                         Collections.shuffle(coords);
-                        BlockPos breakCoords = (BlockPos) coords.get(0);
+                        BlockPos breakCoords = coords.getFirst();
                         IBlockState state = this.supertile.getWorld().getBlockState(breakCoords);
                         this.supertile.getWorld().setBlockToAir(breakCoords);
                         this.ticksWithoutEating = 0;
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/electroblobs/MixinForfeit.java b/src/main/java/github/kasuminova/novaeng/mixin/electroblobs/MixinForfeit.java
@@ -9,14 +9,13 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.Arrays;
 import java.util.List;
 
 @Mixin(value = Forfeit.class, remap = false)
 public class MixinForfeit {
 
     @Unique
-    private static final List<String> novaEngineering_Core$banList = Arrays.asList(
+    private static final List<String> novaEngineering_Core$banList = List.of(
         "bury_self"
     );
 
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/ic2/MixinTileEntityBlock.java b/src/main/java/github/kasuminova/novaeng/mixin/ic2/MixinTileEntityBlock.java
@@ -0,0 +1,28 @@
+package github.kasuminova.novaeng.mixin.ic2;
+
+import github.kasuminova.novaeng.NovaEngineeringCore;
+import ic2.core.block.TileEntityBlock;
+import net.minecraft.tileentity.TileEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(TileEntityBlock.class)
+public class MixinTileEntityBlock extends TileEntity {
+
+    @Shadow
+    private byte loadState;
+
+    @Inject(method = "validate", at = @At(value = "INVOKE", target = "Lic2/core/block/TileEntityBlock;getWorld()Lnet/minecraft/world/World;"), cancellable = true)
+    public void validate(CallbackInfo ci) {
+        if (world != null && this.pos != null) {
+            if (this.loadState != 0 && this.loadState != 3) {
+                NovaEngineeringCore.log.error("[NoveEng-IC2-DEBUG] Incorrect device status:world:{},pos:{}", this.world, this.pos);
+                world.destroyBlock(pos, false);
+                ci.cancel();
+            }
+        }
+    }
+}
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/packagedauto/MixinTileBase.java b/src/main/java/github/kasuminova/novaeng/mixin/packagedauto/MixinTileBase.java
@@ -1,30 +1,50 @@
 package github.kasuminova.novaeng.mixin.packagedauto;
 
+import github.kasuminova.novaeng.common.util.OnlyWriteEnergyContainer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.energy.CapabilityEnergy;
+import net.minecraftforge.items.CapabilityItemHandler;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import thelm.packagedauto.energy.EnergyStorage;
+import thelm.packagedauto.inventory.InventoryTileBase;
 import thelm.packagedauto.tile.TileBase;
 
-@Mixin(value = TileBase.class,remap = false)
-public abstract class MixinTileBase {
+@Mixin(value = TileBase.class, remap = false)
+public abstract class MixinTileBase extends TileEntity {
 
     @Shadow
-    public abstract void setEnergyStorage(EnergyStorage energyStorage);
+    protected InventoryTileBase inventory;
 
     @Shadow
     protected EnergyStorage energyStorage;
 
-    @Inject(method = "<init>",at = @At("TAIL"))
-    public void onConstructed(CallbackInfo ci){
-        setEnergyStorage(energyStorage);
+    @Unique
+    private OnlyWriteEnergyContainer n$energy;
+
+    @Inject(method = "<init>", at = @At("TAIL"))
+    private void onInit(CallbackInfo ci) {
+        n$energy = new OnlyWriteEnergyContainer(energyStorage);
     }
 
-    @Inject(method = "setEnergyStorage",at = @At("HEAD"))
-    public void onSetEnergyStorage(EnergyStorage energyStorage, CallbackInfo ci){
-        energyStorage.setMaxExtract(0);
+    /**
+     * @author circulation
+     * @reason 仅向外暴露不可提取能量的容器
+     */
+    @Overwrite
+    public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
+        if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(this.inventory.getWrapperForDirection(facing));
+        } else {
+            return (capability == CapabilityEnergy.ENERGY && this.energyStorage.getMaxEnergyStored() > 0 ? CapabilityEnergy.ENERGY.cast(this.n$energy.setStorage(energyStorage)) : super.getCapability(capability, facing));
+        }
     }
 
 }
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/psi/MixinPieceTrickExplode.java b/src/main/java/github/kasuminova/novaeng/mixin/psi/MixinPieceTrickExplode.java
@@ -5,13 +5,19 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import vazkii.psi.api.spell.*;
+import vazkii.psi.api.spell.Spell;
+import vazkii.psi.api.spell.SpellCompilationException;
+import vazkii.psi.api.spell.SpellContext;
+import vazkii.psi.api.spell.SpellMetadata;
+import vazkii.psi.api.spell.SpellParam;
 import vazkii.psi.api.spell.piece.PieceTrick;
 import vazkii.psi.common.spell.trick.PieceTrickExplode;
 
-@Mixin(value = PieceTrickExplode.class,remap = false)
+@Mixin(value = PieceTrickExplode.class, remap = false)
 public abstract class MixinPieceTrickExplode extends PieceTrick {
 
+    @Unique
+    private static final Double novaEngineering_Core$MAXPOWER = 5.0D;
     @Shadow
     SpellParam position;
     @Shadow
@@ -21,12 +27,10 @@ public MixinPieceTrickExplode(Spell spell) {
         super(spell);
     }
 
-    @Shadow public abstract void addToMetadata(SpellMetadata meta) throws SpellCompilationException;
-
-    @Unique
-    private static final Double novaEngineering_Core$MAXPOWER = 5.0D;
+    @Shadow
+    public abstract void addToMetadata(SpellMetadata meta) throws SpellCompilationException;
 
-    @Redirect(method = "addToMetadata",at = @At(value = "INVOKE", target = "Lvazkii/psi/common/spell/trick/PieceTrickExplode;getParamEvaluation(Lvazkii/psi/api/spell/SpellParam;)Ljava/lang/Object;"))
+    @Redirect(method = "addToMetadata", at = @At(value = "INVOKE", target = "Lvazkii/psi/common/spell/trick/PieceTrickExplode;getParamEvaluation(Lvazkii/psi/api/spell/SpellParam;)Ljava/lang/Object;"))
     public Object addToMetadataMixin(PieceTrickExplode instance, SpellParam spellParam) throws SpellCompilationException {
         Double powerVal = this.getParamEvaluation(this.power);
         if (powerVal != null && powerVal > novaEngineering_Core$MAXPOWER) {
@@ -35,10 +39,10 @@ public Object addToMetadataMixin(PieceTrickExplode instance, SpellParam spellPar
         return powerVal;
     }
 
-    @Redirect(method = "execute",at = @At(value = "INVOKE", target = "Lvazkii/psi/common/spell/trick/PieceTrickExplode;getParamValue(Lvazkii/psi/api/spell/SpellContext;Lvazkii/psi/api/spell/SpellParam;)Ljava/lang/Object;",ordinal = 1))
+    @Redirect(method = "execute", at = @At(value = "INVOKE", target = "Lvazkii/psi/common/spell/trick/PieceTrickExplode;getParamValue(Lvazkii/psi/api/spell/SpellContext;Lvazkii/psi/api/spell/SpellParam;)Ljava/lang/Object;", ordinal = 1))
     public Object executeRed(PieceTrickExplode instance, SpellContext spellContext, SpellParam spellParam) {
         Double powerVal = this.getParamValue(spellContext, this.power);
-        if (spellContext != null && powerVal != null && powerVal > novaEngineering_Core$MAXPOWER){
+        if (spellContext != null && powerVal != null && powerVal > novaEngineering_Core$MAXPOWER) {
             return novaEngineering_Core$MAXPOWER;
         }
         return powerVal;
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/techguns/MixinBasicPoweredTileEnt.java b/src/main/java/github/kasuminova/novaeng/mixin/techguns/MixinBasicPoweredTileEnt.java
diff --git a/src/main/resources/assets/novaeng_core/lang/en_US.lang b/src/main/resources/assets/novaeng_core/lang/en_US.lang
diff --git a/src/main/resources/mixins.novaeng_core.mod.json b/src/main/resources/mixins.novaeng_core.mod.json

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`import hellfirepvp.modularmachinery.common.machine.factory.FactoryRecipeThread;`
`17`	`17`	`import hellfirepvp.modularmachinery.common.tiles.TileFactoryController;`
`18`	`18`	`import hellfirepvp.modularmachinery.common.tiles.base.TileMultiblockMachineController;`
	`19`	`+import it.unimi.dsi.fastutil.objects.ObjectArrayList;`
`19`	`20`	`import lombok.Setter;`
`20`	`21`	`import net.minecraft.entity.player.EntityPlayer;`
`21`	`22`	`import net.minecraft.entity.player.EntityPlayerMP;`
`@@ -81,9 +82,7 @@ public void onRecipeCheck(final RecipeCheckEvent event) {`
`81`	`82`	`return;`
`82`	`83`	`}`
`83`	`84`
`84`		`- if (nodes.stream()`
`85`		`- .map(Database.class::cast)`
`86`		`- .noneMatch(database -> database.hasDatabaseSpace(currentResearching))) {`
	`85`	`+ if (nodes.stream().noneMatch(database -> database.hasDatabaseSpace(currentResearching))) {`
`87`	`86`	`event.setFailed("网络中所有的数据库存储已满！");`
`88`	`87`	`}`
`89`	`88`	`}`
`@@ -179,7 +178,7 @@ public void completeRecipe(FactoryRecipeThread thread) {`
`179`	`178`
`180`	`179`	`Collection<Database> databases = center.getNode(Database.class).stream()`
`181`	`180`	`.filter(Database::isWorking)`
`182`		`- .collect(Collectors.toList());`
	`181`	`+ .collect(Collectors.toCollection(ObjectArrayList::new));`
`183`	`182`	`if (databases.isEmpty()) {`
`184`	`183`	`return;`
`185`	`184`	`}`