删除计算机的计算组件的耐久设定

Circulate233 · Circulate233 · commit bbcbd7c695bb · 2025-07-29T11:51:30.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 
 // Project properties
 group = "github.kasuminova.novaeng"
-version = "1.22.4"
+version = "1.22.5"
 
 // Set the toolchain version to decouple the Java we run Gradle with from the Java used to compile and run the mod
 java {
@@ -259,7 +259,9 @@ dependencies {
     implementation(rfg.deobf("curse.maven:cofh-world-271384:2920434"))
     implementation(rfg.deobf("curse.maven:thermal-foundation-222880:2926428"))
     compileOnly(rfg.deobf("curse.maven:thermal-innovation-291737:2920441"))
-    compileOnly(rfg.deobf("curse.maven:rftools-224641:2861573"))
+    compileOnly(rfg.deobf("curse.maven:tesla-244651:2487959"))
+    implementation(rfg.deobf("curse.maven:mcjtylib-233105:2745846"))
+    implementation(rfg.deobf("curse.maven:rftools-224641:2861573"))
     implementation(rfg.deobf("curse.maven:thermal-expansion-69163:2926431"))
     compileOnly(rfg.deobf("curse.maven:athenaeum-284350:4633750"))
     compileOnly(rfg.deobf("curse.maven:artisan-worktables-284351:3205284"))
diff --git a/src/main/java/github/kasuminova/novaeng/NovaEngineeringCore.java b/src/main/java/github/kasuminova/novaeng/NovaEngineeringCore.java
@@ -2,6 +2,7 @@
 
 import github.kasuminova.novaeng.client.hitokoto.HitokotoAPI;
 import github.kasuminova.novaeng.common.CommonProxy;
+import github.kasuminova.novaeng.common.command.CommandBuilder;
 import github.kasuminova.novaeng.common.command.CommandSPacketProfiler;
 import github.kasuminova.novaeng.common.config.NovaEngCoreConfig;
 import github.kasuminova.novaeng.common.handler.WorldLoadedHandler;
@@ -124,6 +125,7 @@ public void loadComplete(FMLLoadCompleteEvent event) {
     @Mod.EventHandler
     public void onServerStart(FMLServerStartingEvent event) {
         event.registerServerCommand(CommandSPacketProfiler.INSTANCE);
+        event.registerServerCommand(CommandBuilder.INSTANCE);
         WorldLoadedHandler.REGISTERED_DIMENSIONS.clear();
         WorldLoadedHandler.ERRORWROLD.clear();
         WorldLoadedHandler.init = true;
diff --git a/src/main/java/github/kasuminova/novaeng/common/command/CommandBuilder.java b/src/main/java/github/kasuminova/novaeng/common/command/CommandBuilder.java
@@ -0,0 +1,55 @@
+package github.kasuminova.novaeng.common.command;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.math.BlockPos;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+public class CommandBuilder extends CommandBase {
+    public static final CommandBuilder INSTANCE = new CommandBuilder();
+    public boolean isTickWork = false;
+    public boolean isQuarryWork = false;
+
+    private CommandBuilder(){
+
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return "builder_log";
+    }
+
+    @Override
+    public @NotNull String getUsage(@NotNull ICommandSender sender) {
+        return "Usage: /builder_log [tick|quarry] [true|false]";
+    }
+
+    @Override
+    public void execute(@NotNull MinecraftServer server, @NotNull ICommandSender sender, String @NotNull [] args) {
+        if (args.length >= 2){
+            switch (args[0]){
+                case "tick" -> isTickWork = args[1].equals("true");
+                case "quarry" -> isQuarryWork = args[1].equals("true");
+            }
+        }
+    }
+
+    public @NotNull List<String> getTabCompletions(@NotNull MinecraftServer server, @NotNull ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
+        if (args.length == 1) {
+            return getListOfStringsMatchingLastWord(args,
+                    "tick","quarry"
+            );
+        }
+        if (args.length == 2) {
+            return getListOfStringsMatchingLastWord(args,
+                    "true","false"
+            );
+        }
+        return super.getTabCompletions(server, sender, args, targetPos);
+    }
+
+}
diff --git a/src/main/java/github/kasuminova/novaeng/common/handler/WorldLoadedHandler.java b/src/main/java/github/kasuminova/novaeng/common/handler/WorldLoadedHandler.java
@@ -69,13 +69,15 @@ public static void loadWorld(int id){
 
     @SubscribeEvent
     public void onServerTick(TickEvent.ServerTickEvent event) {
-        if (!SERVER.ForceChunkHandler)return;
-        if (event.phase == TickEvent.Phase.START) {
-            if (time % 100 == 0) {
-                request(Universe.get().server);
+        switch (event.phase){
+            case START -> {
+                if (SERVER.ForceChunkHandler) {
+                    if (time % 100 == 0) {
+                        request(Universe.get().server);
+                    }
+                    ++time;
+                }
             }
-            ++time;
         }
     }
-
 }
diff --git a/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/DataProcessorModule.java b/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/DataProcessorModule.java
@@ -22,7 +22,7 @@ public DataProcessorModule(final UpgradeType type) {
     }
 
     @ZenGetter("energyConsumption")
-    public abstract int getEnergyConsumption();
+    public abstract long getEnergyConsumption();
 
     protected void getEnergyDurabilityTip(final List<String> desc, ProcessorModuleType moduleType) {
         desc.add(I18n.format("upgrade.data_processor.module.energy.tip",
diff --git a/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/ProcessorModuleCPU.java b/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/ProcessorModuleCPU.java
@@ -53,7 +53,7 @@ public float getEfficiency() {
     }
 
     @Override
-    public int getEnergyConsumption() {
+    public long getEnergyConsumption() {
         return moduleType.getEnergyConsumption();
     }
 
diff --git a/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/ProcessorModuleRAM.java b/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/ProcessorModuleRAM.java
@@ -52,7 +52,7 @@ public float getEfficiency() {
     }
 
     @Override
-    public int getEnergyConsumption() {
+    public long getEnergyConsumption() {
         return moduleType.getEnergyConsumption();
     }
 
diff --git a/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/type/ProcessorModuleCPUType.java b/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/type/ProcessorModuleCPUType.java
@@ -14,7 +14,7 @@
 public class ProcessorModuleCPUType extends ProcessorModuleType {
     protected final double computationPointGeneration;
 
-    public ProcessorModuleCPUType(final int energyConsumption,
+    public ProcessorModuleCPUType(final long energyConsumption,
                                   final double computationPointGeneration)
     {
         super(energyConsumption);
@@ -28,14 +28,14 @@ public ProcessorModuleCPUType(final int energyConsumption,
     @ZenMethod
     public static ProcessorModuleCPUType create(final int minDurability,
                                                 final int maxDurability,
-                                                final int energyConsumption,
+                                                final long energyConsumption,
                                                 final double computationPointGeneration)
     {
         return new ProcessorModuleCPUType(energyConsumption, computationPointGeneration);
     }
 
     @ZenMethod
-    public static ProcessorModuleCPUType create(final int energyConsumption,
+    public static ProcessorModuleCPUType create(final long energyConsumption,
                                                 final double computationPointGeneration)
     {
         return new ProcessorModuleCPUType(energyConsumption, computationPointGeneration);
diff --git a/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/type/ProcessorModuleGPUType.java b/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/type/ProcessorModuleGPUType.java
@@ -11,7 +11,7 @@
 @ZenRegister
 @ZenClass("novaeng.hypernet.upgrade.type.ProcessorModuleGPUType")
 public class ProcessorModuleGPUType extends ProcessorModuleCPUType {
-    public ProcessorModuleGPUType(final int energyConsumption,
+    public ProcessorModuleGPUType(final long energyConsumption,
                                   final double computationPointGeneration)
     {
         super(energyConsumption, computationPointGeneration);
@@ -24,14 +24,14 @@ public ProcessorModuleGPUType(final int energyConsumption,
     @ZenMethod
     public static ProcessorModuleGPUType createGPUType(final int minDurability,
                                                 final int maxDurability,
-                                                final int energyConsumption,
+                                                final long energyConsumption,
                                                 final double computationPointGeneration)
     {
         return new ProcessorModuleGPUType(energyConsumption, computationPointGeneration);
     }
 
     @ZenMethod
-    public static ProcessorModuleGPUType createGPUType(final int energyConsumption,
+    public static ProcessorModuleGPUType createGPUType(final long energyConsumption,
                                                        final double computationPointGeneration)
     {
         return new ProcessorModuleGPUType(energyConsumption, computationPointGeneration);
diff --git a/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/type/ProcessorModuleRAMType.java b/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/type/ProcessorModuleRAMType.java
@@ -14,7 +14,7 @@
 public class ProcessorModuleRAMType extends ProcessorModuleType {
     private final double computationPointGenerationLimit;
 
-    public ProcessorModuleRAMType(final int energyConsumption,
+    public ProcessorModuleRAMType(final long energyConsumption,
                                   final double computationPointGenerationLimit)
     {
         super(energyConsumption);
@@ -28,14 +28,14 @@ public ProcessorModuleRAMType(final int energyConsumption,
     @ZenMethod
     public static ProcessorModuleRAMType create(final int minDurability,
                                                 final int maxDurability,
-                                                final int energyConsumption,
+                                                final long energyConsumption,
                                                 final double computationPointGenerationLimit)
     {
         return new ProcessorModuleRAMType(energyConsumption, computationPointGenerationLimit);
     }
 
     @ZenMethod
-    public static ProcessorModuleRAMType create(final int energyConsumption,
+    public static ProcessorModuleRAMType create(final long energyConsumption,
                                                 final double computationPointGenerationLimit)
     {
         return new ProcessorModuleRAMType(energyConsumption, computationPointGenerationLimit);
diff --git a/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/type/ProcessorModuleType.java b/src/main/java/github/kasuminova/novaeng/common/hypernet/old/upgrade/type/ProcessorModuleType.java
@@ -8,17 +8,17 @@
 @ZenRegister
 @ZenClass("novaeng.hypernet.upgrade.type.ProcessorModuleType")
 public abstract class ProcessorModuleType {
-    protected final int energyConsumption;
+    protected final long energyConsumption;
 
-    public ProcessorModuleType(final int energyConsumption) {
+    public ProcessorModuleType(final long energyConsumption) {
         this.energyConsumption = energyConsumption;
     }
 
     @ZenMethod
     public abstract ProcessorModuleType register(String typeName, String localizedName, int level);
 
     @ZenGetter("energyConsumption")
-    public int getEnergyConsumption() {
+    public long getEnergyConsumption() {
         return energyConsumption;
     }
 }
diff --git a/src/main/java/github/kasuminova/novaeng/common/machine/DreamEnergyCore.java b/src/main/java/github/kasuminova/novaeng/common/machine/DreamEnergyCore.java
@@ -321,4 +321,4 @@ 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/mixin/NovaEngCoreLateMixinLoader.java b/src/main/java/github/kasuminova/novaeng/mixin/NovaEngCoreLateMixinLoader.java
@@ -40,6 +40,7 @@ public class NovaEngCoreLateMixinLoader implements ILateMixinLoader {
         addModdedMixinCFG("mixins.novaeng_core_fluxnetworks.json","fluxnetworks");
         addModdedMixinCFG("mixins.novaeng_core_extrabotany.json","extrabotany");
         addModdedMixinCFG("mixins.novaeng_core_packagedauto.json","packagedauto");
+        addModdedMixinCFG("mixins.novaeng_core_rftools.json","rftools");
 
         addMixinCFG("mixins.novaeng_core_forge_late.json");
         addMixinCFG("mixins.novaeng_core_dme.json",                               
diff --git a/src/main/java/github/kasuminova/novaeng/mixin/rftools/MixinBuilderTileEntity.java b/src/main/java/github/kasuminova/novaeng/mixin/rftools/MixinBuilderTileEntity.java
@@ -0,0 +1,62 @@
+package github.kasuminova.novaeng.mixin.rftools;
+
+import github.kasuminova.novaeng.common.command.CommandBuilder;
+import mcjty.lib.tileentity.GenericEnergyReceiverTileEntity;
+import mcjty.rftools.blocks.builder.BuilderTileEntity;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.world.WorldServer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = BuilderTileEntity.class,remap = false)
+public abstract class MixinBuilderTileEntity extends GenericEnergyReceiverTileEntity {
+
+    public MixinBuilderTileEntity(long maxEnergy, long maxReceive) {
+        super(maxEnergy, maxReceive);
+    }
+
+    @Inject(method = "update",at = @At("HEAD"))
+    private void commonQuarryBlockI(CallbackInfo ci) {
+        if (CommandBuilder.INSTANCE.isTickWork){
+            if (this.getWorld() instanceof WorldServer w){
+                if (w.getWorldTime() % 200 != 0)return;
+                if (w.getMinecraftServer() != null){
+                    var server = w.getMinecraftServer();
+                    var playerList = server.getPlayerList();
+                    var players = playerList.getPlayers();
+                    for (EntityPlayerMP player : players) {
+                        player.sendMessage(new TextComponentString("位于world:" + w.provider.getDimension() + n$getPosName(this.pos) + "的属于玩家" + this.getOwnerName() + "[" + this.getOwnerUUID() + "]的建造机正常工作"));
+                    }
+                }
+            }
+        }
+    }
+
+    @Inject(method = "commonQuarryBlock",at = @At("HEAD"))
+    private void commonQuarryBlockI(boolean silk, int rfNeeded, BlockPos srcPos, IBlockState srcState, CallbackInfoReturnable<Boolean> cir) {
+        if (CommandBuilder.INSTANCE.isQuarryWork){
+            if (this.getWorld() instanceof WorldServer w){
+                if (w.getMinecraftServer() != null){
+                    var server = w.getMinecraftServer();
+                    var playerList = server.getPlayerList();
+                    var players = playerList.getPlayers();
+                    for (EntityPlayerMP player : players) {
+                        player.sendMessage(new TextComponentString("位于world:" + w.provider.getDimension() + n$getPosName(this.pos) + "的属于玩家" + this.getOwnerName() + "[" + this.getOwnerUUID() + "]的建造机挖掘了位于" + n$getPosName(srcPos) + "的方块"));
+                    }
+                }
+            }
+        }
+    }
+
+    @Unique
+    private String n$getPosName(BlockPos pos){
+        return "x:" + pos.getX() + ",y:" + pos.getY() + ",z:" + pos.getZ();
+    }
+}
diff --git a/src/main/resources/mixins.novaeng_core_rftools.json b/src/main/resources/mixins.novaeng_core_rftools.json
@@ -0,0 +1,12 @@
+{
+  "package": "github.kasuminova.novaeng.mixin.rftools",
+  "refmap": "mixins.novaeng_core.refmap.json",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.8",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+  ],
+  "mixins": [
+    "MixinBuilderTileEntity"
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,15 @@ public static void loadWorld(int id){`
`69`	`69`
`70`	`70`	`@SubscribeEvent`
`71`	`71`	`public void onServerTick(TickEvent.ServerTickEvent event) {`
`72`		`- if (!SERVER.ForceChunkHandler)return;`
`73`		`- if (event.phase == TickEvent.Phase.START) {`
`74`		`- if (time % 100 == 0) {`
`75`		`- request(Universe.get().server);`
	`72`	`+ switch (event.phase){`
	`73`	`+ case START -> {`
	`74`	`+ if (SERVER.ForceChunkHandler) {`
	`75`	`+ if (time % 100 == 0) {`
	`76`	`+ request(Universe.get().server);`
	`77`	`+ }`
	`78`	`+ ++time;`
	`79`	`+ }`
`76`	`80`	`}`
`77`		`- ++time;`
`78`	`81`	`}`
`79`	`82`	`}`
`80`		`-`
`81`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public DataProcessorModule(final UpgradeType type) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@ZenGetter("energyConsumption")`
`25`		`- public abstract int getEnergyConsumption();`
	`25`	`+ public abstract long getEnergyConsumption();`
`26`	`26`
`27`	`27`	`protected void getEnergyDurabilityTip(final List<String> desc, ProcessorModuleType moduleType) {`
`28`	`28`	`desc.add(I18n.format("upgrade.data_processor.module.energy.tip",`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public float getEfficiency() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public int getEnergyConsumption() {`
	`56`	`+ public long getEnergyConsumption() {`
`57`	`57`	`return moduleType.getEnergyConsumption();`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public float getEfficiency() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`		`- public int getEnergyConsumption() {`
	`55`	`+ public long getEnergyConsumption() {`
`56`	`56`	`return moduleType.getEnergyConsumption();`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`public class ProcessorModuleCPUType extends ProcessorModuleType {`
`15`	`15`	`protected final double computationPointGeneration;`
`16`	`16`
`17`		`- public ProcessorModuleCPUType(final int energyConsumption,`
	`17`	`+ public ProcessorModuleCPUType(final long energyConsumption,`
`18`	`18`	`final double computationPointGeneration)`
`19`	`19`	`{`
`20`	`20`	`super(energyConsumption);`
`@@ -28,14 +28,14 @@ public ProcessorModuleCPUType(final int energyConsumption,`
`28`	`28`	`@ZenMethod`
`29`	`29`	`public static ProcessorModuleCPUType create(final int minDurability,`
`30`	`30`	`final int maxDurability,`
`31`		`- final int energyConsumption,`
	`31`	`+ final long energyConsumption,`
`32`	`32`	`final double computationPointGeneration)`
`33`	`33`	`{`
`34`	`34`	`return new ProcessorModuleCPUType(energyConsumption, computationPointGeneration);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@ZenMethod`
`38`		`- public static ProcessorModuleCPUType create(final int energyConsumption,`
	`38`	`+ public static ProcessorModuleCPUType create(final long energyConsumption,`
`39`	`39`	`final double computationPointGeneration)`
`40`	`40`	`{`
`41`	`41`	`return new ProcessorModuleCPUType(energyConsumption, computationPointGeneration);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`@ZenRegister`
`12`	`12`	`@ZenClass("novaeng.hypernet.upgrade.type.ProcessorModuleGPUType")`
`13`	`13`	`public class ProcessorModuleGPUType extends ProcessorModuleCPUType {`
`14`		`- public ProcessorModuleGPUType(final int energyConsumption,`
	`14`	`+ public ProcessorModuleGPUType(final long energyConsumption,`
`15`	`15`	`final double computationPointGeneration)`
`16`	`16`	`{`
`17`	`17`	`super(energyConsumption, computationPointGeneration);`
`@@ -24,14 +24,14 @@ public ProcessorModuleGPUType(final int energyConsumption,`
`24`	`24`	`@ZenMethod`
`25`	`25`	`public static ProcessorModuleGPUType createGPUType(final int minDurability,`
`26`	`26`	`final int maxDurability,`
`27`		`- final int energyConsumption,`
	`27`	`+ final long energyConsumption,`
`28`	`28`	`final double computationPointGeneration)`
`29`	`29`	`{`
`30`	`30`	`return new ProcessorModuleGPUType(energyConsumption, computationPointGeneration);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@ZenMethod`
`34`		`- public static ProcessorModuleGPUType createGPUType(final int energyConsumption,`
	`34`	`+ public static ProcessorModuleGPUType createGPUType(final long energyConsumption,`
`35`	`35`	`final double computationPointGeneration)`
`36`	`36`	`{`
`37`	`37`	`return new ProcessorModuleGPUType(energyConsumption, computationPointGeneration);`