一些修正处理

Author: Circulate233

build.gradle.kts

@@ -320,8 +320,8 @@ dependencies {
     implementation(rfg.deobf("curse.maven:draconic-evolution-223565:3431261"))
     implementation(rfg.deobf("curse.maven:packagedauto-308380:6932932"))
     implementation(rfg.deobf("curse.maven:packagedastral-811828:7063119"))
-    implementation(rfg.deobf("curse.maven:Aroma1997Core-223735:2914062"))
-    implementation(rfg.deobf("curse.maven:tatw-263980:2585616"))
+    compileOnly(rfg.deobf("curse.maven:Aroma1997Core-223735:2914062"))
+    compileOnly(rfg.deobf("curse.maven:tatw-263980:2585616"))
 }
 
 // Publishing to a Maven repository

src/main/java/github/kasuminova/novaeng/common/handler/WorldLoadedHandler.java

@@ -1,11 +1,9 @@
 package github.kasuminova.novaeng.common.handler;
 
-import com.feed_the_beast.ftblib.lib.data.Universe;
 import crafttweaker.annotations.ZenRegister;
 import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.DimensionManager;
@@ -58,7 +56,7 @@ public static void loadWorld(int id) {
         }
     }
 
-    private void request(MinecraftServer server) {
+    private void request() {
         if (init) {
             loadWorld(0, 1, -1);
             init = false;
@@ -73,7 +71,7 @@ public void onServerTick(TickEvent.ServerTickEvent event) {
             case START -> {
                 if (SERVER.forceChunkHandler) {
                     if (time % 100 == 0) {
-                        request(Universe.get().server);
+                        request();
                     }
                     ++time;
                 }

src/main/java/github/kasuminova/novaeng/common/machine/drills/Drill.java

@@ -49,6 +49,7 @@
 import static github.kasuminova.novaeng.common.crafttweaker.expansion.RecipePrimerHyperNet.requireResearch;
 import static net.minecraft.util.text.translation.I18n.translateToLocalFormatted;
 
+//TODO:未消耗液态魔力等额外材料
 public abstract class Drill implements MachineSpecial {
     protected static final int[] tqsz = {-1, 0, 1};
     protected static final Object2IntMap<String> tqdzb = new Object2IntOpenHashMap<>();

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/ecalculator/ECalculatorController.java

@@ -15,6 +15,7 @@
 import hellfirepvp.modularmachinery.client.ClientProxy;
 import hellfirepvp.modularmachinery.common.machine.MachineRegistry;
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;

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

@@ -51,6 +51,7 @@ public class NovaEngCoreLateMixinLoader implements ILateMixinLoader {
         addModdedMixinCFG("mixins.novaeng_core_packagedauto.json", "packagedauto");
         addModdedMixinCFG("mixins.novaeng_core_rftools.json", "rftools");
         addModdedMixinCFG("mixins.novaeng_core_advancedrocketry.json", "advancedrocketry");
+        addModdedMixinCFG("mixins.novaeng_core_aroma1997core.json", "aroma1997core");
 
         addMixinCFG("mixins.novaeng_core_botania_r.json", () -> {
             ConfigManager.sync(MOD_ID, Config.Type.INSTANCE);

src/main/java/github/kasuminova/novaeng/mixin/ae2/MixinCraftingCPUClusterTwo.java

@@ -154,7 +154,7 @@ private void executeCrafting(IEnergyGrid eg, CraftingGridCache cc) {
                         didPatternCraft = false;
 
                         if (!this.visitedMediums.containsKey(key) || this.visitedMediums.get(key).isEmpty()) {
-                            this.visitedMediums.put(key, new ArrayDeque<>(cc.getMediums(key).stream().filter(Objects::nonNull).collect(Collectors.toList())));
+                            this.visitedMediums.put(key, cc.getMediums(key).stream().filter(Objects::nonNull).collect(Collectors.toCollection(ArrayDeque::new)));
                         }
 
                         while (!this.visitedMediums.get(key).isEmpty()) {
@@ -372,8 +372,8 @@ private void executeCrafting(IEnergyGrid eg, CraftingGridCache cc) {
     @NotNull
     private MediumType r$specialMediumTreatment(ICraftingMedium m, ICraftingPatternDetails details) {
         if (m instanceof MEPatternProviderNova mep) {
-            if (mep.getWorkMode() == MEPatternProvider.WorkModeSetting.DEFAULT
-                || mep.getWorkMode() == MEPatternProvider.WorkModeSetting.ENHANCED_BLOCKING_MODE) {
+            if (mep.getWorkMode() != MEPatternProvider.WorkModeSetting.BLOCKING_MODE
+                && mep.getWorkMode() != MEPatternProvider.WorkModeSetting.CRAFTING_LOCK_MODE) {
 
                 for (IAEItemStack input : details.getCondensedInputs()) {
                     long size = input.getStackSize() * this.r$craftingFrequency;

src/main/resources/mixins.novaeng_core_aroma1997core.json

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