修复梦之能量端口的一些问题

Author: Circulate233

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

@@ -29,7 +29,6 @@ public void setCtrlPos(BlockPos ctrlPos) {
 
     @Override
     public void onCycleStart() {
-
     }
 
     @Override
@@ -49,9 +48,12 @@ public void addToBuffer(long energy) {
         }
     }
 
+    boolean init = true;
+
     public long removeFromBuffer(long energy) {
         long a = Math.min(Math.min(energy, this.getBuffer()), Math.max(Long.MAX_VALUE - this.removed,0));
-        if (a <= 0L) {
+        if (a <= 0L || init) {
+            init = false;
             return 0L;
         } else {
             DreamEnergyCore.extractEnergy(getCtrl(),1,a);

src/main/java/github/kasuminova/novaeng/common/machine/DreamEnergyCore.java

@@ -82,8 +82,8 @@ public void onClientTick(final TileMultiblockMachineController ctrl) {
         var world = ctrl.getWorld();
         if (world.getWorldTime() % (1200 / MinuteScale) == 0){
             var data = ctrl.getCustomDataTag();
-            var energyStored = data.getString("energyStored").isEmpty() ? "0":data.getString("energyStored");
-            getEnergyInfo(world,ctrl.getPos()).addFirst(energyStored);
+            var energyStored = data.getString("energyStored").isEmpty() ? "0" : data.getString("energyStored");
+            getEnergyInfo(world, ctrl.getPos()).addFirst(energyStored);
         }
     }
 
@@ -110,6 +110,7 @@ public void SInit(DynamicMachine machine){
                 ctrl.getCustomDataTag().setBoolean("wireless",false);
             }
         });
+
         var inputThreadName = "梦之收集者";
         machine.addCoreThread(FactoryRecipeThread.createCoreThread(inputThreadName));
         var outputThreadName = "梦之释放者";
@@ -125,12 +126,11 @@ public void SInit(DynamicMachine machine){
                 .addPreCheckHandler(event -> {
                     var ctrl = event.getController();
                     var data = ctrl.getCustomDataTag();
-                    var speed = Math.max(1.0f,data.getFloat("speed"));
-                    var energy = data.hasKey("energyStored") ? "0" : data.getString("energyStored");
                     if (data.getBoolean("wireless")){
                         event.setFailed("当前处于通量模式");
                         return;
                     }
+                    var speed = Math.max(1.0f,data.getFloat("speed"));
                     if (!canExtract(data, speed)) {
                         event.setFailed("内部能量储量不足！");
                         return;
@@ -142,6 +142,7 @@ public void SInit(DynamicMachine machine){
                     var data = ctrl.getCustomDataTag();
                     var speed = Math.max(1.0f,data.getFloat("speed"));
                     extractEnergy(data, speed, defaultTransferAmount);
+                    ctrl.markNoUpdateSync();
                 })
                 .setParallelized(false)
                 .addRecipeTooltip("由梦之收集者运行。", "在智能数据接口处修改速度。")
@@ -172,6 +173,7 @@ public void SInit(DynamicMachine machine){
                     var data = ctrl.getCustomDataTag();
                     var speed = Math.max(1.0f,data.getFloat("speed"));
                     receiveEnergy(data, speed,defaultTransferAmount);
+                    ctrl.markNoUpdateSync();
                 })
                 .setParallelized(false)
                 .addRecipeTooltip("由梦之释放者运行。", "在智能数据接口处修改速度。")
@@ -222,10 +224,12 @@ private static boolean canExtract(NBTTagCompound nbt,float speed){
      * 将能量存储进控制器内部。
      */
     public static void receiveEnergy(NBTTagCompound nbt,float speed,long defaultTransferAmount) {
-        var energyStored = getEnergyStored(nbt);
-        var sz = getBigInt((long) (speed * defaultTransferAmount));
+        synchronized (nbt) {
+            var energyStored = getEnergyStored(nbt);
+            var sz = getBigInt((long) (speed * defaultTransferAmount));
+            nbt.setString("energyStored", energyStored.add(sz).toString());
+        }
 
-        nbt.setString("energyStored",energyStored.add(sz).toString());
         if (ENERGY_STORED_CACHE.size() > 3000) {
             ENERGY_STORED_CACHE.clear();
         }
@@ -235,10 +239,12 @@ public static void receiveEnergy(NBTTagCompound nbt,float speed,long defaultTran
      * 提取控制器内部能量至能量输出仓。
      */
     public static void extractEnergy(NBTTagCompound nbt,float speed,long defaultTransferAmount) {
-        var energyStored = getEnergyStored(nbt);
-        var sz = getBigInt((long) (speed * defaultTransferAmount));
+        synchronized (nbt) {
+            var energyStored = getEnergyStored(nbt);
+            var sz = getBigInt((long) (speed * defaultTransferAmount));
+            nbt.setString("energyStored",energyStored.subtract(sz).toString());
+        }
 
-        nbt.setString("energyStored",energyStored.subtract(sz).toString());
         if (ENERGY_STORED_CACHE.size() > 3000) {
             ENERGY_STORED_CACHE.clear();
         }
@@ -262,6 +268,7 @@ public static BigInteger getEnergyStored(IMachineController ctrl){
     @ZenMethod
     public static void receiveEnergy(IMachineController ctrl,float speed,long amount){
         receiveEnergy(ctrl.getController().getCustomDataTag(),speed,amount);
+        ctrl.getController().markNoUpdateSync();
     }
 
     /**
@@ -273,6 +280,7 @@ public static void receiveEnergy(IMachineController ctrl,float speed,long amount
     @ZenMethod
     public static void extractEnergy(IMachineController ctrl,float speed,long amount){
         extractEnergy(ctrl.getController().getCustomDataTag(),speed,amount);
+        ctrl.getController().markNoUpdateSync();
     }
 
     @ZenMethod

src/main/java/github/kasuminova/novaeng/common/util/RecipePrimerEx.java

@@ -1,11 +1,17 @@
 package github.kasuminova.novaeng.common.util;
 
 import crafttweaker.annotations.ZenRegister;
+import crafttweaker.api.data.IData;
+import crafttweaker.api.minecraft.CraftTweakerMC;
 import github.kasuminova.novaeng.mixin.util.NovaRAB;
 import hellfirepvp.modularmachinery.common.crafting.helper.ComponentRequirement;
 import hellfirepvp.modularmachinery.common.crafting.helper.ComponentSelectorTag;
 import hellfirepvp.modularmachinery.common.crafting.requirement.RequirementItem;
 import hellfirepvp.modularmachinery.common.integration.crafttweaker.RecipePrimer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.util.text.translation.I18n;
 import stanhebben.zenscript.annotations.ZenExpansion;
 import stanhebben.zenscript.annotations.ZenMethod;
 
@@ -26,10 +32,8 @@ public static RecipePrimer setItemTags(final RecipePrimer primer, final String t
         for (ComponentRequirement<?, ?> component : primer.getComponents()) {
             if (component instanceof RequirementItem) {
                 switch (component.getActionType()) {
-                    case OUTPUT:
-                        if (isInput) continue;
-                    case INPUT:
-                        if (!isInput) continue;
+                    case OUTPUT -> {if (isInput) continue;}
+                    case INPUT -> {if (!isInput) continue;}
                 }
                 var tag = new ComponentSelectorTag(tagName);
                 component.setTag(tag);
@@ -44,4 +48,22 @@ public static RecipePrimer setMultipleParallelized(final RecipePrimer primer, fi
         return primer;
     }
 
+    @ZenMethod
+    public static RecipePrimer setLore(final RecipePrimer primer,String... key){
+        primer.setPreViewNBT(getData(key));
+        return primer;
+    }
+
+    private static IData getData(String... key){
+        var nbt = new NBTTagCompound();
+        var nbt1 = new NBTTagCompound();
+        var list = new NBTTagList();
+        for (String s : key) {
+            list.appendTag(new NBTTagString(I18n.translateToLocalFormatted(s)));
+        }
+        nbt1.setTag("Lore",list);
+        nbt.setTag("display",nbt1);
+        return CraftTweakerMC.getIData(nbt);
+    }
+
 }