仍然是解决硬编码...

Circulate233 · Circulate233 · commit e7b4f0a62edd · 2025-09-11T02:25:06.000+08:00
新的本地化方法，在服务端时直接返回key，确保传输到客户端的仍然是key
重构了一下IData的get方法调用
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
@@ -12,6 +12,7 @@
 import hellfirepvp.modularmachinery.common.machine.factory.FactoryRecipeThread;
 import hellfirepvp.modularmachinery.common.tiles.TileFactoryController;
 import hellfirepvp.modularmachinery.common.tiles.base.TileMultiblockMachineController;
+import lombok.Getter;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
@@ -35,6 +36,7 @@
 public class ComputationCenter {
     private static final Map<TileMultiblockMachineController, ComputationCenter> CACHED_COMPUTATION_CENTER = new WeakHashMap<>();
 
+    @Getter
     private final TileMultiblockMachineController owner;
     private final Map<Class<?>, Map<BlockPos, NetNode>> nodes = new ConcurrentHashMap<>();
 
@@ -43,6 +45,7 @@ public class ComputationCenter {
     // 计算点计数器，计算当前 Tick 总共消耗了多少算力。
     private final AtomicReference<Double> computationPointCounter = new AtomicReference<>(0D);
 
+    @Getter
     private UUID networkOwner = null;
 
     private int circuitDurability = 0;
@@ -295,10 +298,6 @@ public void setCircuitDurability(final int circuitDurability) {
         writeNBT();
     }
 
-    public UUID getNetworkOwner() {
-        return networkOwner;
-    }
-
     public void setNetworkOwner(final UUID networkOwner) {
         this.networkOwner = networkOwner;
         writeNBT();
@@ -339,7 +338,4 @@ public double getComputationPointConsumption() {
         return sum;
     }
 
-    public TileMultiblockMachineController getOwner() {
-        return owner;
-    }
 }
diff --git a/src/main/java/github/kasuminova/novaeng/common/integration/theoneprobe/HyperNetInfoProvider.java b/src/main/java/github/kasuminova/novaeng/common/integration/theoneprobe/HyperNetInfoProvider.java
@@ -26,6 +26,8 @@
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 
+import static github.kasuminova.novaeng.common.crafttweaker.util.NovaEngUtils.formatPercent;
+
 public class HyperNetInfoProvider implements IProbeInfoProvider {
     public static final HyperNetInfoProvider INSTANCE = new HyperNetInfoProvider();
 
@@ -151,14 +153,14 @@ private static void processDataProcessorTOP(final DataProcessor processor,
                 " / " + NovaEngUtils.formatFLOPS(maxGeneration));
 
         leftInfo.text("{*top.hypernet.processor.load*}");
-        rightInfo.text(TextFormatting.AQUA + NovaEngUtils.formatPercent(load, maxGeneration));
+        rightInfo.text(TextFormatting.AQUA + formatPercent(load, maxGeneration));
 
         leftInfo.text("{*top.hypernet.processor.efficiency*}");
-        rightInfo.text(TextFormatting.GREEN + NovaEngUtils.formatPercent(efficiency, 1.0F));
+        rightInfo.text(TextFormatting.GREEN + formatPercent(efficiency, 1.0F));
 
         leftInfo.text("{*top.hypernet.processor.heat*}");
         rightInfo.text(TextFormatting.RED + MiscUtils.formatDecimal(storedHU) + "HU (" +
-                NovaEngUtils.formatPercent(heatPercent, 1.0F) + ")");
+                formatPercent(heatPercent, 1.0F) + ")");
     }
 
     private static IProbeInfo newVertical(final IProbeInfo probeInfo) {
@@ -228,8 +230,10 @@ private static void processCenterTOP(final ComputationCenter center, final IProb
     {
         if (center.isWorking()) {
             probeInfo.text("{*top.hypernet.online*}");
+            probeInfo.text("{*top.hypernet.processor.circuit_durability*}" + center.getCircuitDurability() + "（" + formatPercent(center.getCircuitDurability(), center.getType().getCircuitDurability()) + "）");
         } else {
             probeInfo.text("{*top.hypernet.offline*}");
+            probeInfo.text("{*top.hypernet.processor.circuit_durability*}" + center.getCircuitDurability() + "（" + formatPercent(center.getCircuitDurability(), center.getType().getCircuitDurability()) + "）");
             return;
         }
 
diff --git a/src/main/java/github/kasuminova/novaeng/common/util/Function.java b/src/main/java/github/kasuminova/novaeng/common/util/Function.java
@@ -23,14 +23,14 @@ public static String getText(String key){
         if (NovaEngineeringCore.proxy.isClient()){
             return I18n.translateToLocal(key);
         }
-        return "empty";
+        return key;
     }
 
     @ZenMethod
     public static String getText(String key,Object... objs){
         if (NovaEngineeringCore.proxy.isClient()){
             return I18n.translateToLocalFormatted(key, objs);
         }
-        return "empty";
+        return key;
     }
 }
diff --git a/src/main/java/github/kasuminova/novaeng/common/util/IDataUtils.java b/src/main/java/github/kasuminova/novaeng/common/util/IDataUtils.java
@@ -1,9 +1,9 @@
 package github.kasuminova.novaeng.common.util;
 
 import crafttweaker.annotations.ZenRegister;
+import crafttweaker.api.data.DataMap;
 import crafttweaker.api.data.IData;
-import crafttweaker.api.minecraft.CraftTweakerMC;
-import net.minecraft.nbt.NBTTagCompound;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
 import stanhebben.zenscript.annotations.Optional;
 import stanhebben.zenscript.annotations.ZenExpansion;
 import stanhebben.zenscript.annotations.ZenMethod;
@@ -15,104 +15,97 @@
 @ZenExpansion("crafttweaker.data.IData")
 public class IDataUtils {
 
-    private static NBTTagCompound get(IData data) {
-        return get(data,"NULL");
-    }
-
-    private static NBTTagCompound get(IData data,String path) {
-        var datan = CraftTweakerMC.getNBT(data);
-        if (datan instanceof NBTTagCompound nt){
-            return nt;
+    private static Map<String,IData> get(IData data) {
+        if (data instanceof DataMap){
+            return data.asMap();
         }
-        var nbt = new NBTTagCompound();
-        nbt.setTag(path,datan);
-        return nbt;
+        return Object2ObjectMaps.emptyMap();
     }
 
     @ZenMethod
     public static IData get(IData data,String path,@Optional IData defaultValue) {
         if (check(data,path)){
-            return CraftTweakerMC.getIData(get(data,path).getTag(path));
+            return get(data).get(path);
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static boolean getBool(IData data, String path,@Optional boolean defaultValue){
         if (check(data,path)){
-            return get(data,path).getBoolean(path);
+            return get(data).get(path).asBool();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static byte getByte(IData data, String path,@Optional byte defaultValue) {
         if (check(data,path)){
-            return get(data,path).getByte(path);
+            return get(data).get(path).asByte();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static double getDouble(IData data, String path, @Optional double defaultValue) {
         if (check(data, path)) {
-            return get(data,path).getDouble(path);
+            return get(data).get(path).asDouble();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static float getFloat(IData data, String path, @Optional float defaultValue) {
         if (check(data, path)) {
-            return get(data,path).getFloat(path);
+            return get(data).get(path).asFloat();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static int getInt(IData data, String path, @Optional int defaultValue) {
         if (check(data, path)) {
-            return get(data,path).getInteger(path);
+            return get(data).get(path).asInt();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static List<IData> getList(IData data, String path, @Optional List<IData> defaultValue) {
         if (check(data, path)) {
-            return CraftTweakerMC.getIData(get(data,path).getTag(path)).asList();
+            return get(data).get(path).asList();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static long getLong(IData data, String path, @Optional long defaultValue) {
         if (check(data, path)) {
-            return get(data,path).getLong(path);
+            return get(data).get(path).asLong();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static Map<String, IData> getMap(IData data, String path, @Optional Map<String, IData> defaultValue) {
         if (check(data, path)) {
-            return CraftTweakerMC.getIData(get(data,path).getTag(path)).asMap();
+            return get(data).get(path).asMap();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static short getShort(IData data, String path, @Optional short defaultValue) {
         if (check(data, path)) {
-            return get(data,path).getShort(path);
+            return get(data).get(path).asShort();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static String getString(IData data, String path, @Optional String defaultValue) {
         if (check(data, path)) {
-            return get(data,path).getString(path);
+            return get(data).get(path).asString();
         }
         return defaultValue;
     }
@@ -121,7 +114,7 @@ public static String getString(IData data, String path, @Optional String default
     public static boolean check(IData data, String... path){
         final var nbt = get(data);
         for (String key : path) {
-            if (!nbt.hasKey(key)){
+            if (!nbt.containsKey(key)){
                 return false;
             }
         }
diff --git a/src/main/java/github/kasuminova/novaeng/common/util/StringUtils.java b/src/main/java/github/kasuminova/novaeng/common/util/StringUtils.java
@@ -4,12 +4,12 @@
 import crafttweaker.annotations.ZenRegister;
 import github.kasuminova.novaeng.NovaEngineeringCore;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import it.unimi.dsi.fastutil.objects.ObjectLists;
 import net.minecraft.util.text.translation.I18n;
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.PriorityQueue;
 import java.util.stream.Collectors;
@@ -86,15 +86,15 @@ public static List<String> getText(String key) {
             var s = I18n.translateToLocal(key);
             return new ObjectArrayList<>(s.split("&n"));
         }
-        return Collections.emptyList();
+        return ObjectLists.singleton(key);
     }
 
     public static List<String> getText(String key, Object... objs) {
         if (NovaEngineeringCore.proxy.isClient()) {
             var s = I18n.translateToLocalFormatted(key, objs);
             return new ObjectArrayList<>(s.split("&n"));
         }
-        return Collections.emptyList();
+        return ObjectLists.singleton(key);
     }
 
     @Desugar
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/assets/novaeng_core/lang/zh_CN.lang b/src/main/resources/assets/novaeng_core/lang/zh_CN.lang

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@ public static String getText(String key){`
`23`	`23`	`if (NovaEngineeringCore.proxy.isClient()){`
`24`	`24`	`return I18n.translateToLocal(key);`
`25`	`25`	`}`
`26`		`- return "empty";`
	`26`	`+ return key;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@ZenMethod`
`30`	`30`	`public static String getText(String key,Object... objs){`
`31`	`31`	`if (NovaEngineeringCore.proxy.isClient()){`
`32`	`32`	`return I18n.translateToLocalFormatted(key, objs);`
`33`	`33`	`}`
`34`		`- return "empty";`
	`34`	`+ return key;`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`package github.kasuminova.novaeng.common.util;`
`2`	`2`
`3`	`3`	`import crafttweaker.annotations.ZenRegister;`
	`4`	`+import crafttweaker.api.data.DataMap;`
`4`	`5`	`import crafttweaker.api.data.IData;`
`5`		`-import crafttweaker.api.minecraft.CraftTweakerMC;`
`6`		`-import net.minecraft.nbt.NBTTagCompound;`
	`6`	`+import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;`
`7`	`7`	`import stanhebben.zenscript.annotations.Optional;`
`8`	`8`	`import stanhebben.zenscript.annotations.ZenExpansion;`
`9`	`9`	`import stanhebben.zenscript.annotations.ZenMethod;`
`@@ -15,104 +15,97 @@`
`15`	`15`	`@ZenExpansion("crafttweaker.data.IData")`
`16`	`16`	`public class IDataUtils {`
`17`	`17`
`18`		`- private static NBTTagCompound get(IData data) {`
`19`		`- return get(data,"NULL");`
`20`		`- }`
`21`		`-`
`22`		`- private static NBTTagCompound get(IData data,String path) {`
`23`		`- var datan = CraftTweakerMC.getNBT(data);`
`24`		`- if (datan instanceof NBTTagCompound nt){`
`25`		`- return nt;`
	`18`	`+ private static Map<String,IData> get(IData data) {`
	`19`	`+ if (data instanceof DataMap){`
	`20`	`+ return data.asMap();`
`26`	`21`	`}`
`27`		`- var nbt = new NBTTagCompound();`
`28`		`- nbt.setTag(path,datan);`
`29`		`- return nbt;`
	`22`	`+ return Object2ObjectMaps.emptyMap();`
`30`	`23`	`}`
`31`	`24`
`32`	`25`	`@ZenMethod`
`33`	`26`	`public static IData get(IData data,String path,@Optional IData defaultValue) {`
`34`	`27`	`if (check(data,path)){`
`35`		`- return CraftTweakerMC.getIData(get(data,path).getTag(path));`
	`28`	`+ return get(data).get(path);`
`36`	`29`	`}`
`37`	`30`	`return defaultValue;`
`38`	`31`	`}`
`39`	`32`
`40`	`33`	`@ZenMethod`
`41`	`34`	`public static boolean getBool(IData data, String path,@Optional boolean defaultValue){`
`42`	`35`	`if (check(data,path)){`
`43`		`- return get(data,path).getBoolean(path);`
	`36`	`+ return get(data).get(path).asBool();`
`44`	`37`	`}`
`45`	`38`	`return defaultValue;`
`46`	`39`	`}`
`47`	`40`
`48`	`41`	`@ZenMethod`
`49`	`42`	`public static byte getByte(IData data, String path,@Optional byte defaultValue) {`
`50`	`43`	`if (check(data,path)){`
`51`		`- return get(data,path).getByte(path);`
	`44`	`+ return get(data).get(path).asByte();`
`52`	`45`	`}`
`53`	`46`	`return defaultValue;`
`54`	`47`	`}`
`55`	`48`
`56`	`49`	`@ZenMethod`
`57`	`50`	`public static double getDouble(IData data, String path, @Optional double defaultValue) {`
`58`	`51`	`if (check(data, path)) {`
`59`		`- return get(data,path).getDouble(path);`
	`52`	`+ return get(data).get(path).asDouble();`
`60`	`53`	`}`
`61`	`54`	`return defaultValue;`
`62`	`55`	`}`
`63`	`56`
`64`	`57`	`@ZenMethod`
`65`	`58`	`public static float getFloat(IData data, String path, @Optional float defaultValue) {`
`66`	`59`	`if (check(data, path)) {`
`67`		`- return get(data,path).getFloat(path);`
	`60`	`+ return get(data).get(path).asFloat();`
`68`	`61`	`}`
`69`	`62`	`return defaultValue;`
`70`	`63`	`}`
`71`	`64`
`72`	`65`	`@ZenMethod`
`73`	`66`	`public static int getInt(IData data, String path, @Optional int defaultValue) {`
`74`	`67`	`if (check(data, path)) {`
`75`		`- return get(data,path).getInteger(path);`
	`68`	`+ return get(data).get(path).asInt();`
`76`	`69`	`}`
`77`	`70`	`return defaultValue;`
`78`	`71`	`}`
`79`	`72`
`80`	`73`	`@ZenMethod`
`81`	`74`	`public static List<IData> getList(IData data, String path, @Optional List<IData> defaultValue) {`
`82`	`75`	`if (check(data, path)) {`
`83`		`- return CraftTweakerMC.getIData(get(data,path).getTag(path)).asList();`
	`76`	`+ return get(data).get(path).asList();`
`84`	`77`	`}`
`85`	`78`	`return defaultValue;`
`86`	`79`	`}`
`87`	`80`
`88`	`81`	`@ZenMethod`
`89`	`82`	`public static long getLong(IData data, String path, @Optional long defaultValue) {`
`90`	`83`	`if (check(data, path)) {`
`91`		`- return get(data,path).getLong(path);`
	`84`	`+ return get(data).get(path).asLong();`
`92`	`85`	`}`
`93`	`86`	`return defaultValue;`
`94`	`87`	`}`
`95`	`88`
`96`	`89`	`@ZenMethod`
`97`	`90`	`public static Map<String, IData> getMap(IData data, String path, @Optional Map<String, IData> defaultValue) {`
`98`	`91`	`if (check(data, path)) {`
`99`		`- return CraftTweakerMC.getIData(get(data,path).getTag(path)).asMap();`
	`92`	`+ return get(data).get(path).asMap();`
`100`	`93`	`}`
`101`	`94`	`return defaultValue;`
`102`	`95`	`}`
`103`	`96`
`104`	`97`	`@ZenMethod`
`105`	`98`	`public static short getShort(IData data, String path, @Optional short defaultValue) {`
`106`	`99`	`if (check(data, path)) {`
`107`		`- return get(data,path).getShort(path);`
	`100`	`+ return get(data).get(path).asShort();`
`108`	`101`	`}`
`109`	`102`	`return defaultValue;`
`110`	`103`	`}`
`111`	`104`
`112`	`105`	`@ZenMethod`
`113`	`106`	`public static String getString(IData data, String path, @Optional String defaultValue) {`
`114`	`107`	`if (check(data, path)) {`
`115`		`- return get(data,path).getString(path);`
	`108`	`+ return get(data).get(path).asString();`
`116`	`109`	`}`
`117`	`110`	`return defaultValue;`
`118`	`111`	`}`
`@@ -121,7 +114,7 @@ public static String getString(IData data, String path, @Optional String default`
`121`	`114`	`public static boolean check(IData data, String... path){`
`122`	`115`	`final var nbt = get(data);`
`123`	`116`	`for (String key : path) {`
`124`		`- if (!nbt.hasKey(key)){`
	`117`	`+ if (!nbt.containsKey(key)){`
`125`	`118`	`return false;`
`126`	`119`	`}`
`127`	`120`	`}`