修复数据库在未通电的情况下仍然可被识别的问题

阻止了斗轮式挖掘机破坏方块
暂时切断解包机弹出物品的功能，等待修复bug

Author: Circulate233

build.gradle.kts

@@ -297,6 +297,7 @@ dependencies {
     implementation(rfg.deobf("curse.maven:Flux-Networks-248020:3178199"))
     implementation(rfg.deobf("curse.maven:BloodMagic-224791:2822288"))
     implementation(rfg.deobf("curse.maven:dme-737252:5985530"))
+    implementation(rfg.deobf("curse.maven:packagedauto-308380:6312996"))
     implementation(kotlin("stdlib-jdk8"))
 }
 

src/main/java/github/kasuminova/novaeng/common/hypernet/old/Database.java

@@ -1,5 +1,6 @@
 package github.kasuminova.novaeng.common.hypernet.old;
 
+import com.github.bsideup.jabel.Desugar;
 import crafttweaker.annotations.ZenRegister;
 import github.kasuminova.mmce.common.event.recipe.FactoryRecipeTickEvent;
 import github.kasuminova.novaeng.common.hypernet.old.research.ResearchCognitionData;
@@ -212,17 +213,8 @@ public Status createStatus() {
         return new Status(type, storedResearchCognition.size(), researchingCognition.size());
     }
 
-    @SuppressWarnings("unused")
-    public static class Status {
-        private final DatabaseType type;
-        private final int storedCognition;
-        private final int researchingCognition;
-
-        public Status(final DatabaseType type, final int storedCognition, final int researchingCognition) {
-            this.type = type;
-            this.storedCognition = storedCognition;
-            this.researchingCognition = researchingCognition;
-        }
+    @Desugar
+    public record Status(DatabaseType type, int storedCognition, int researchingCognition) {
 
         public static Status readFromNBT(final NBTTagCompound tag) {
             if (!tag.hasKey("t") || !tag.hasKey("s") || !tag.hasKey("r")) {
@@ -249,17 +241,5 @@ public NBTTagCompound writeToNBT() {
         public boolean hasDatabaseSpace() {
             return type.getMaxResearchDataStoreSize() > storedCognition + researchingCognition;
         }
-
-        public DatabaseType getType() {
-            return type;
-        }
-
-        public int getStoredCognition() {
-            return storedCognition;
-        }
-
-        public int getResearchingCognition() {
-            return researchingCognition;
-        }
     }
 }

src/main/java/github/kasuminova/novaeng/common/hypernet/old/DatabaseType.java

@@ -36,7 +36,7 @@ public void registerRecipesAndThreads() {
         String name = typeName;
         MachineModifier.addCoreThread(name, FactoryRecipeThread.createCoreThread(DATABASE_WORKING_THREAD_NAME));
 
-        RecipeBuilder.newBuilder(name + "_working", name, 20, 100, false)
+        RecipeBuilder.newBuilder(name + "_working", name, 20, 100, true)
                 .addEnergyPerTickInput(energyUsage)
                 .addFactoryPreTickHandler(event -> {
                     Database database = NetNodeCache.getCache(event.getController(), Database.class);

src/main/java/github/kasuminova/novaeng/common/hypernet/old/research/ResearchStation.java

@@ -27,6 +27,7 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * TODO: 硬编码喵
@@ -172,7 +173,9 @@ public void completeRecipe(FactoryRecipeThread thread) {
         ActiveMachineRecipe recipe = thread.getActiveRecipe();
         recipe.setTick(recipe.getTotalTick() + 1);
 
-        Collection<Database> databases = center.getNode(Database.class);
+        Collection<Database> databases = center.getNode(Database.class).stream()
+                .filter(Database::isWorking)
+                .collect(Collectors.toList());
         if (databases.isEmpty()) {
             return;
         }

src/main/java/github/kasuminova/novaeng/common/network/PktTerminalGuiData.java

@@ -79,7 +79,9 @@ public void toBytes(final ByteBuf buf) {
             return;
         }
 
-        Collection<Database> databases = center.getNode(Database.class);
+        Collection<Database> databases = center.getNode(Database.class).stream()
+                .filter(Database::isWorking)
+                .collect(Collectors.toList());
 
         Set<ResearchCognitionData> researchCognition = databases.stream()
                 .flatMap(database -> database.getStoredResearchCognition().stream())

src/main/java/github/kasuminova/novaeng/mixin/NovaEngCoreLateMixinLoader.java

@@ -39,6 +39,7 @@ public class NovaEngCoreLateMixinLoader implements ILateMixinLoader {
         addModdedMixinCFG("mixins.novaeng_core_lootoverhaul.json","lootoverhaul");
         addModdedMixinCFG("mixins.novaeng_core_fluxnetworks.json","fluxnetworks");
         addModdedMixinCFG("mixins.novaeng_core_extrabotany.json","extrabotany");
+        addModdedMixinCFG("mixins.novaeng_core_packagedauto.json","packagedauto");
 
         addMixinCFG("mixins.novaeng_core_forge_late.json");
         addMixinCFG("mixins.novaeng_core_dme.json",                               

src/main/java/github/kasuminova/novaeng/mixin/immersiveengineering/MixinTileEntityExcavator.java

@@ -1,11 +1,13 @@
 package github.kasuminova.novaeng.mixin.immersiveengineering;
 
+import blusunrize.immersiveengineering.common.blocks.metal.TileEntityBucketWheel;
 import blusunrize.immersiveengineering.common.blocks.metal.TileEntityExcavator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
@@ -24,5 +26,28 @@ public class MixinTileEntityExcavator {
     private void redirectDoProcessOutput(final World ei, final BlockPos world, final ItemStack pos, final EnumFacing stack) {
         // 销毁物品！为什么不做掉落物清理！
     }
-    
+
+    @Redirect(method = "update",at = @At(value = "INVOKE", target = "Lblusunrize/immersiveengineering/common/blocks/metal/TileEntityExcavator;digBlocksInTheWay(Lblusunrize/immersiveengineering/common/blocks/metal/TileEntityBucketWheel;)Lnet/minecraft/item/ItemStack;",remap = false))
+    public ItemStack preventBlockDestruction(TileEntityExcavator instance, TileEntityBucketWheel wheel){
+        // 好吧，我觉得斗轮用来挖生成在斗轮下面的刷石机太荒缪了
+        return ItemStack.EMPTY;
+    }
+
+    /**
+     * @author circulation
+     * @reason 彻底清理
+     */
+    @Overwrite(remap = false)
+    ItemStack digBlocksInTheWay(TileEntityBucketWheel wheel) {
+        return ItemStack.EMPTY;
+    }
+
+    /**
+     * @author circulation
+     * @reason 彻底清理
+     */
+    @Overwrite(remap = false)
+    ItemStack digBlock(BlockPos pos) {
+        return ItemStack.EMPTY;
+    }
 }

src/main/java/github/kasuminova/novaeng/mixin/packagedauto/MixinGuiUnpackager.java

@@ -0,0 +1,25 @@
+package github.kasuminova.novaeng.mixin.packagedauto;
+
+import net.minecraft.client.gui.GuiButton;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import thelm.packagedauto.client.gui.GuiContainerTileBase;
+import thelm.packagedauto.client.gui.GuiUnpackager;
+import thelm.packagedauto.container.ContainerUnpackager;
+
+@Mixin(GuiUnpackager.class)
+public abstract class MixinGuiUnpackager extends GuiContainerTileBase<ContainerUnpackager> {
+
+    public MixinGuiUnpackager(ContainerUnpackager containerUnpackager) {
+        super(containerUnpackager);
+    }
+
+    @Redirect(method = "initGui",at = @At(value = "INVOKE", target = "Lthelm/packagedauto/client/gui/GuiUnpackager;addButton(Lnet/minecraft/client/gui/GuiButton;)Lnet/minecraft/client/gui/GuiButton;"))
+    public GuiButton initGui(GuiUnpackager instance, GuiButton guiButton) {
+        if (guiButton.getClass().getSimpleName().equals("GuiButtonTracker")){
+            return null;
+        }
+        return this.addButton(guiButton);
+    }
+}

src/main/java/github/kasuminova/novaeng/mixin/packagedauto/MixinPacketEjectTracker.java

@@ -0,0 +1,18 @@
+package github.kasuminova.novaeng.mixin.packagedauto;
+
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import thelm.packagedauto.network.packet.PacketEjectTracker;
+
+@Mixin(value = PacketEjectTracker.class,remap = false)
+public class MixinPacketEjectTracker {
+
+    @Inject(method = "onMessage",at = @At("HEAD"), cancellable = true)
+    public void onMessage(MessageContext ctx, CallbackInfoReturnable<IMessage> cir) {
+        cir.setReturnValue(null);
+    }
+}

src/main/resources/mixins.novaeng_core_packagedauto.json

@@ -0,0 +1,13 @@
+{
+  "package": "github.kasuminova.novaeng.mixin.packagedauto",
+  "refmap": "mixins.novaeng_core.refmap.json",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.8",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "MixinGuiUnpackager"
+  ],
+  "mixins": [
+    "MixinPacketEjectTracker"
+  ]
+}