对梦核的小小修改

Circulate233 · Circulate233 · commit ee0ee9d028d9 · 2025-05-23T22:04:58.000+08:00
diff --git a/src/main/java/github/kasuminova/novaeng/client/gui/GuiGeocentricDrill.java b/src/main/java/github/kasuminova/novaeng/client/gui/GuiGeocentricDrill.java
@@ -113,7 +113,7 @@ protected void drawGuiContainerBackgroundLayer(final float partialTicks, final i
     }
 
     public void updateData() {
-        this.oreControlList.setStackList(GeocentricDrill.GEOCENTRIC_DRILL.getRawOres(), owner.getAccelerateOres());
+        this.oreControlList.setStackList(GeocentricDrill.INSTANCE.getRawOres(), owner.getAccelerateOres());
         this.dive.setAvailable(owner.getTargetDepth() < GeocentricDrill.MAX_DEPTH);
         this.ascend.setAvailable(owner.getTargetDepth() > GeocentricDrill.MIN_DEPTH);
     }
diff --git a/src/main/java/github/kasuminova/novaeng/common/CommonProxy.java b/src/main/java/github/kasuminova/novaeng/common/CommonProxy.java
@@ -15,11 +15,8 @@
 import github.kasuminova.novaeng.common.integration.IntegrationCRT;
 import github.kasuminova.novaeng.common.integration.ic2.IntegrationIC2;
 import github.kasuminova.novaeng.common.integration.theoneprobe.IntegrationTOP;
+import github.kasuminova.novaeng.common.machine.*;
 import github.kasuminova.novaeng.common.machine.Drills.*;
-import github.kasuminova.novaeng.common.machine.GeocentricDrill;
-import github.kasuminova.novaeng.common.machine.IllumPool;
-import github.kasuminova.novaeng.common.machine.MMAltar;
-import github.kasuminova.novaeng.common.machine.SingularityCore;
 import github.kasuminova.novaeng.common.registry.RegistryBlocks;
 import github.kasuminova.novaeng.common.registry.RegistryHyperNet;
 import github.kasuminova.novaeng.common.registry.RegistryItems;
@@ -93,23 +90,24 @@ public void init() {
         AssemblyLine.registerNetNode();
         HyperNetRecipeManager.registerRecipes();
         if (Mods.ASTRAL_SORCERY.isPresent() && Mods.BOTANIA.isPresent()) {
-            RegistryMachineSpecial.registrySpecialMachine(IllumPool.ILLUM_POOL);
+            RegistryMachineSpecial.registrySpecialMachine(IllumPool.INSTANCE);
         }
         if (Mods.GECKOLIB.isPresent()) {
-            RegistryMachineSpecial.registrySpecialMachine(SingularityCore.SINGULARITY_CORE);
+            RegistryMachineSpecial.registrySpecialMachine(SingularityCore.INSTANCE);
         }
-        RegistryMachineSpecial.registrySpecialMachine(MMAltar.MM_ALTAR);
-        RegistryMachineSpecial.registrySpecialMachine(GeocentricDrill.GEOCENTRIC_DRILL);
+        RegistryMachineSpecial.registrySpecialMachine(MMAltar.INSTANCE);
+        RegistryMachineSpecial.registrySpecialMachine(DreamEnergyCore.INSTANCE);
+        RegistryMachineSpecial.registrySpecialMachine(GeocentricDrill.INSTANCE);
         if (Mods.AE2.isPresent()) {
             List<ICellHandler> handlers = ((AccessorCellRegistry) (AEApi.instance().registries().cell())).getHandlers();
             handlers.add(0, EStorageCellHandler.INSTANCE);
         }
         if (Loader.isModLoaded("immersiveengineering")){
-            RegistryMachineSpecial.registrySpecialMachine(MineralExtractor.MINERAL_EXTRACTOR);
-            RegistryMachineSpecial.registrySpecialMachine(VoidMiner.VOID_MINER);
-            RegistryMachineSpecial.registrySpecialMachine(DifferentWorld.DIFFERENT_WORLD);
-            RegistryMachineSpecial.registrySpecialMachine(ManaOreDrill.MANA_ORE_DRILL);
-            RegistryMachineSpecial.registrySpecialMachine(OrichalcosDrill.ORICHALCOS_DRILL);
+            RegistryMachineSpecial.registrySpecialMachine(MineralExtractor.INSTANCE);
+            RegistryMachineSpecial.registrySpecialMachine(VoidMiner.INSTANCE);
+            RegistryMachineSpecial.registrySpecialMachine(DifferentWorld.INSTANCE);
+            RegistryMachineSpecial.registrySpecialMachine(ManaOreDrill.INSTANCE);
+            RegistryMachineSpecial.registrySpecialMachine(OrichalcosDrill.INSTANCE);
         }
         Register.TRAITREGISTER.registerModifiers();
     }
diff --git a/src/main/java/github/kasuminova/novaeng/common/crafttweaker/util/NovaEngUtils.java b/src/main/java/github/kasuminova/novaeng/common/crafttweaker/util/NovaEngUtils.java
@@ -1,9 +1,11 @@
 package github.kasuminova.novaeng.common.crafttweaker.util;
 
 import crafttweaker.annotations.ZenRegister;
+import net.minecraftforge.fml.common.FMLCommonHandler;
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 
+import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -12,6 +14,8 @@
 @ZenClass("novaeng.NovaEngUtils")
 public class NovaEngUtils {
     private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#,###.##");
+    public static final BigInteger BigLongMax = BigInteger.valueOf(Long.MAX_VALUE);
+    public static boolean isClient = FMLCommonHandler.instance().getEffectiveSide().isClient();
 
     static {
         DECIMAL_FORMAT.setRoundingMode(RoundingMode.HALF_UP);
@@ -53,6 +57,36 @@ public static String formatNumber(long value) {
         }
     }
 
+    @ZenMethod
+    public static String formatNumber(String value) {
+        var BigValue = new BigInteger(value);
+        var big = BigValue.compareTo(BigLongMax) >= 0 ? Long.MAX_VALUE : BigValue.longValue();
+        String zf = "";
+        if (value.startsWith("-")){
+            zf += "-";
+        }
+        if (big < 1000) {
+            return zf + value;
+        } else if (big < 1000000) {
+            return zf + (big / 1000) + "K";
+        } else if (big < 1000000000) {
+            return zf + ((big / 1000)/ 1000) + "M";
+        } else if (big < 1000000000000L) {
+            return zf + ((big / 1000000)/ 1000) + "G";
+        } else if (big < 1000000000000000L) {
+            return zf + ((big / 1000000000)/ 1000) + "T";
+        } else if (big < 1000000000000000000L) {
+            return zf + ((big / 1_000_000_000_000L)/ 1000) + "P";
+        } else if (big != (Long.MAX_VALUE)){
+            return zf + ((big / 1_000_000_000_000_000L)/ 1000) + "E";
+        }  else {
+            int cfs = value.length() - 1;
+            float cft = (1.00f * Integer.parseInt(value.substring(0,3))) / 100;
+
+            return zf + cft + " * 10 ^ " + cfs;
+        }
+    }
+
     @ZenMethod
     public static String formatNumber(long value, int decimalFraction) {
         if (value < 1_000L) {
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/DreamEnergyCore.java b/src/main/java/github/kasuminova/novaeng/common/machine/DreamEnergyCore.java
@@ -0,0 +1,91 @@
+package github.kasuminova.novaeng.common.machine;
+
+import crafttweaker.annotations.ZenRegister;
+import github.kasuminova.mmce.common.event.client.ControllerGUIRenderEvent;
+import github.kasuminova.novaeng.common.util.FixedSizeDeque;
+import hellfirepvp.modularmachinery.ModularMachinery;
+import hellfirepvp.modularmachinery.common.machine.DynamicMachine;
+import hellfirepvp.modularmachinery.common.tiles.base.TileMultiblockMachineController;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
+
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static github.kasuminova.novaeng.common.crafttweaker.util.NovaEngUtils.*;
+
+@ZenRegister
+@ZenClass("novaeng.DreamEnergyCore")
+public class DreamEnergyCore implements MachineSpecial{
+    public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "dream_energy_core");
+    public static final DreamEnergyCore INSTANCE = new DreamEnergyCore();
+    public static long defaultTransferAmount = 10000000;
+    private static final Map<World,Map<BlockPos, FixedSizeDeque<String>>> map = new ConcurrentHashMap<>();
+    private static final int MinuteScale = 30;
+
+    @ZenMethod
+    public static long setDefaultTransferAmount(long value){
+        defaultTransferAmount = value;
+        return defaultTransferAmount;
+    }
+
+    @Override
+    public ResourceLocation getRegistryName() {
+        return REGISTRY_NAME;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    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);
+        }
+    }
+
+    @Override
+    public void init(DynamicMachine machine) {
+        if (isClient) {
+            machine.addMachineEventHandler(ControllerGUIRenderEvent.class, event -> {
+                var ctrl = event.getController();
+                var data = ctrl.getCustomDataTag();
+                var speed = data.getFloat("speed");
+                var energyStored = data.getString("energyStored").isEmpty() ? "0":data.getString("energyStored");
+
+                String[] info = {
+                        "§b/////////// 梦之管理者 ///////////",
+                        "§b能量储存：§a" + formatNumber(energyStored) + " RF",
+                        "§b输入输出值：§a" + formatNumber((long) (defaultTransferAmount * speed)) + " RF/t",
+                        "§b一分钟内平均交互速度：§a" + change(ctrl) + " RF/t",
+                        "§b///////////////////////////////////"
+                };
+
+                event.setExtraInfo(info);
+            });
+        }
+    }
+
+    private String change(TileMultiblockMachineController ctrl){
+        FixedSizeDeque<String> energy = getEnergyInfo(ctrl.getWorld(),ctrl.getPos());
+        var newtime = energy.getFirst();
+        var oldtime = energy.getLast();
+        var newbig = new BigInteger(newtime);
+        var oldbig = new BigInteger(oldtime);
+        var changel = newbig.subtract(oldbig);
+
+        return formatNumber(changel.compareTo(BigLongMax) >= 0 ? Long.MAX_VALUE : changel.longValue() / (1200L / MinuteScale * energy.size()));
+    }
+
+    private static FixedSizeDeque<String> getEnergyInfo(World world,BlockPos pos) {
+        return map.computeIfAbsent(world, k -> new ConcurrentHashMap<>())
+                .computeIfAbsent(pos, m -> new FixedSizeDeque<>(MinuteScale));
+    }
+}
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/Drills/DifferentWorld.java b/src/main/java/github/kasuminova/novaeng/common/machine/Drills/DifferentWorld.java
@@ -6,7 +6,7 @@
 public class DifferentWorld extends Drill {
 
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "different_world");
-    public static final DifferentWorld DIFFERENT_WORLD = new DifferentWorld();
+    public static final DifferentWorld INSTANCE = new DifferentWorld();
 
     @Override
     public ResourceLocation getRegistryName() {
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/Drills/ManaOreDrill.java b/src/main/java/github/kasuminova/novaeng/common/machine/Drills/ManaOreDrill.java
@@ -6,7 +6,7 @@
 public class ManaOreDrill extends Drill {
 
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "mana_ore_drill");
-    public static final ManaOreDrill MANA_ORE_DRILL = new ManaOreDrill();
+    public static final ManaOreDrill INSTANCE = new ManaOreDrill();
 
     @Override
     public ResourceLocation getRegistryName() {
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/Drills/MineralExtractor.java b/src/main/java/github/kasuminova/novaeng/common/machine/Drills/MineralExtractor.java
@@ -6,7 +6,7 @@
 public class MineralExtractor extends Drill{
 
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "mineral_extractor");
-    public static final MineralExtractor MINERAL_EXTRACTOR = new MineralExtractor();
+    public static final MineralExtractor INSTANCE = new MineralExtractor();
 
     @Override
     public ResourceLocation getRegistryName() {
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/Drills/OrichalcosDrill.java b/src/main/java/github/kasuminova/novaeng/common/machine/Drills/OrichalcosDrill.java
@@ -6,7 +6,7 @@
 public class OrichalcosDrill extends Drill {
 
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "orichalcos_drill");
-    public static final OrichalcosDrill ORICHALCOS_DRILL = new OrichalcosDrill();
+    public static final OrichalcosDrill INSTANCE = new OrichalcosDrill();
 
     @Override
     public ResourceLocation getRegistryName() {
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/Drills/VoidMiner.java b/src/main/java/github/kasuminova/novaeng/common/machine/Drills/VoidMiner.java
@@ -5,7 +5,7 @@
 
 public class VoidMiner extends Drill{
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "void_miner");
-    public static final VoidMiner VOID_MINER = new VoidMiner();
+    public static final VoidMiner INSTANCE = new VoidMiner();
 
     @Override
     public ResourceLocation getRegistryName() {
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/GeocentricDrill.java b/src/main/java/github/kasuminova/novaeng/common/machine/GeocentricDrill.java
@@ -32,7 +32,7 @@
 
 public class GeocentricDrill implements MachineSpecial {
 
-    public static final GeocentricDrill GEOCENTRIC_DRILL = new GeocentricDrill();
+    public static final GeocentricDrill INSTANCE = new GeocentricDrill();
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "earth_drill");
     public static final ResourceLocation RECIPE_REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "earth_drill_working");
 
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/IllumPool.java b/src/main/java/github/kasuminova/novaeng/common/machine/IllumPool.java
@@ -47,7 +47,7 @@
 
 public class IllumPool implements MachineSpecial {
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "illum_pool");
-    public static final IllumPool ILLUM_POOL = new IllumPool();
+    public static final IllumPool INSTANCE = new IllumPool();
 
     public static final int MAX_MANA_STORE = 10_000_000;
     public static final int MAX_ILLUM_STORE = 10_000;
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/MMAltar.java b/src/main/java/github/kasuminova/novaeng/common/machine/MMAltar.java
@@ -19,7 +19,7 @@
 
 public class MMAltar implements MachineSpecial {
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "mm_altar");
-    public static final MMAltar MM_ALTAR = new MMAltar();
+    public static final MMAltar INSTANCE = new MMAltar();
 
     public static final List<BlockPos> posSet1 = Arrays.asList(
         new BlockPos(-3,-5,-3), new BlockPos(-3,-5,3),
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/SingularityCore.java b/src/main/java/github/kasuminova/novaeng/common/machine/SingularityCore.java
@@ -8,7 +8,7 @@
 
 public class SingularityCore implements MachineSpecial {
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "singularity_core");
-    public static final SingularityCore SINGULARITY_CORE = new SingularityCore();
+    public static final SingularityCore INSTANCE = new SingularityCore();
 
     @Override
     public void init(final DynamicMachine machine) {
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/StardustDisintegrator.java b/src/main/java/github/kasuminova/novaeng/common/machine/StardustDisintegrator.java
@@ -20,7 +20,7 @@
 
 public class StardustDisintegrator implements MachineSpecial {
     public static final ResourceLocation REGISTRY_NAME = new ResourceLocation(ModularMachinery.MODID, "stardust_disintegrator");
-    public static final StardustDisintegrator STARDUST_DISINTEGRATOR = new StardustDisintegrator();
+    public static final StardustDisintegrator INSTANCE = new StardustDisintegrator();
 
     public static final List<BlockPos> CRYSTALS_POS_PRESET = Arrays.asList(
             // LEFT - MID - RIGHT
@@ -39,12 +39,17 @@ public void init(final DynamicMachine machine) {
 
     @Override
     public void onSyncTick(final TileMultiblockMachineController controller) {
-        
+        MachineSpecial.super.onSyncTick(controller);
     }
 
     @Override
-    public void onTOPInfo(final ProbeMode probeMode, final IProbeInfo probeInfo, final EntityPlayer player, final IProbeHitData data, final TileMultiblockMachineController controller) {
-        
+    public void onTOPInfo(final ProbeMode probeMode,
+                          final IProbeInfo probeInfo,
+                          final EntityPlayer player,
+                          final IProbeHitData data,
+                          final TileMultiblockMachineController controller) {
+
+        MachineSpecial.super.onTOPInfo(probeMode, probeInfo, player, data, controller);
     }
 
     protected static void checkStructure(final MachineStructureUpdateEvent event) {
diff --git a/src/main/java/github/kasuminova/novaeng/common/tile/machine/GeocentricDrillController.java b/src/main/java/github/kasuminova/novaeng/common/tile/machine/GeocentricDrillController.java
@@ -75,7 +75,7 @@ public Set<String> getAccelerateOres() {
     }
 
     public synchronized void addAccelerateOre(final String accelerateOre) {
-        if (GeocentricDrill.GEOCENTRIC_DRILL.getRawOres().containsKey(accelerateOre)) {
+        if (GeocentricDrill.INSTANCE.getRawOres().containsKey(accelerateOre)) {
             accelerateOres.add(accelerateOre);
             accelerateOresChanged = true;
             markNoUpdateSync();
@@ -91,7 +91,7 @@ public synchronized void removeAccelerateOre(final String accelerateOre) {
 
     @Override
     public synchronized RecipeCraftingContext createContext(final ActiveMachineRecipe activeRecipe) {
-        MachineRecipe newRecipe = GeocentricDrill.GEOCENTRIC_DRILL.rebuildRecipe(activeRecipe.getRecipe(), accelerateOres);
+        MachineRecipe newRecipe = GeocentricDrill.INSTANCE.rebuildRecipe(activeRecipe.getRecipe(), accelerateOres);
         ActiveMachineRecipe modifiedRecipe = new ActiveMachineRecipe(newRecipe, activeRecipe.getMaxParallelism());
         modifiedRecipe.setTick(activeRecipe.getTick());
         modifiedRecipe.setTotalTick(activeRecipe.getTotalTick());
diff --git a/src/main/java/github/kasuminova/novaeng/common/util/FixedSizeDeque.java b/src/main/java/github/kasuminova/novaeng/common/util/FixedSizeDeque.java
@@ -0,0 +1,46 @@
+package github.kasuminova.novaeng.common.util;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+
+public class FixedSizeDeque<E> {
+    private final Deque<E> deque;
+    private final int maxSize;
+
+    public FixedSizeDeque(int maxSize) {
+        this.maxSize = maxSize;
+        this.deque = new ArrayDeque<>(maxSize);
+    }
+
+    public void addFirst(E element) {
+        deque.addFirst(element);
+        if (deque.size() > maxSize) {
+            deque.removeLast();
+        }
+    }
+
+    public List<E> getList() {
+        return new ArrayList<>(deque);
+    }
+
+    public E get(int index) {
+        if (index < 0 || index >= deque.size()) {
+            throw new IndexOutOfBoundsException();
+        }
+        return deque.stream().skip(index).findFirst().orElse(null);
+    }
+
+    public E getFirst() {
+        return deque.getFirst();
+    }
+
+    public E getLast(){
+        return deque.getLast();
+    }
+
+    public int size() {
+        return deque.size();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ protected void drawGuiContainerBackgroundLayer(final float partialTicks, final i`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`public void updateData() {`
`116`		`- this.oreControlList.setStackList(GeocentricDrill.GEOCENTRIC_DRILL.getRawOres(), owner.getAccelerateOres());`
	`116`	`+ this.oreControlList.setStackList(GeocentricDrill.INSTANCE.getRawOres(), owner.getAccelerateOres());`
`117`	`117`	`this.dive.setAvailable(owner.getTargetDepth() < GeocentricDrill.MAX_DEPTH);`
`118`	`118`	`this.ascend.setAvailable(owner.getTargetDepth() > GeocentricDrill.MIN_DEPTH);`
`119`	`119`	`}`