fix: BlockUpdateLogger & translation en_us.json

Author: OptiJava

README-en.md

@@ -2,12 +2,14 @@
 
 Language: English | [中文](https://github.com/OptiJava/OptCarpetAddition/blob/master/README.md)
 
+Thanks for the contributor: [jfglzs](https://github.com/jfglzs)
+
 > This is an extension mod of `Carpet`. The goal is to add some functions that do not greatly change the original game
 mechanism but optimize the player experience.
 
 **_WARNING_: Don't download mods with the `-source` suffix, it is just for development!!!**
 
-Build with [Preprocessor](https://github.com/ReplayMod/preprocessor)
+Build with [StoneCutter]
 
 **Dependencies:`Carpet` `fabric-api`**
 

README.md

@@ -2,11 +2,13 @@
 
 Language: [English](https://github.com/OptiJava/OptCarpetAddition/blob/master/README-en.md) | 中文
 
+感谢：[jfglzs](https://github.com/jfglzs)
+
 > 这是一个`Carpet`的扩展模组，目标是添加一些没有太大改变原版游戏机制但优化玩家体验~~降低腐竹血压~~的一些功能。
 
 **_警告_: 不要下载以`-source`结尾的模组jar文件，那仅用于开发！！！**
 
-使用[Preprocessor](https://github.com/ReplayMod/preprocessor)构建~~可供大家学习~~
+使用[StoneCutter]构建~~可供大家学习~~
 
 **本模组需要前置模组：`Carpet` `fabric-api`**
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -11,7 +11,7 @@ pluginManagement {
 }
 
 plugins {
-	id("dev.kikugie.stonecutter").version("0.9.2")
+	id("dev.kikugie.stonecutter").version("0.9.4")
 }
 
 stonecutter {

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java

@@ -153,7 +153,6 @@ public void registerLoggers() {
     }
 
     @Override
-    //TODO english translation(res/asssets/opt/lang/en_us.json)
     public Map<String, String> canHasTranslations(String lang) {
         //add rule translator
         return RuleTranslator.getTranslationFromResourcePath(lang);

src/main/java/io/github/optijava/opt_carpet_addition/RuleTranslator.java

@@ -24,6 +24,7 @@ public static Map<String, String> getTranslationFromResourcePath(String lang) {
         } catch (IOException e) {
             return Collections.emptyMap();
         }
+        // TODO: 使用了弃用的api
         Gson gson = new GsonBuilder().setLenient().create();
         return gson.fromJson(jsonData, new TypeToken<Map<String, String>>() {}.getType());
     }

src/main/java/io/github/optijava/opt_carpet_addition/commands/PlayerTpCommand.java

@@ -1,6 +1,5 @@
 package io.github.optijava.opt_carpet_addition.commands;
 
-import carpet.CarpetServer;
 import carpet.patches.EntityPlayerMPFake;
 import carpet.utils.Messenger;
 import com.google.common.util.concurrent.RateLimiter;
@@ -14,7 +13,6 @@
 import io.github.optijava.opt_carpet_addition.utils.McUtils;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.GameType;
 import java.util.HashMap;
@@ -27,7 +25,7 @@
 public class PlayerTpCommand {
 
     /* permit 1 request per 2 seconds < == > permit 0.5 request per 1 second */
-    public static Map<ServerPlayer, RateLimiter> rateLimiterMap = new HashMap<>();
+    public final static Map<ServerPlayer, RateLimiter> rateLimiterMap = new HashMap<>();
 
     private static final String COMMAND_PREFIX = "player";
 

src/main/java/io/github/optijava/opt_carpet_addition/logger/LoggerRegister.java

@@ -1,6 +1,7 @@
 package io.github.optijava.opt_carpet_addition.logger;
 
 import carpet.logging.LoggerRegistry;
+import io.github.optijava.opt_carpet_addition.logger.blockUpdate.BlockUpdateLogger;
 import io.github.optijava.opt_carpet_addition.logger.disk.DiskHUDLogger;
 
 public class LoggerRegister {
@@ -9,7 +10,6 @@ public class LoggerRegister {
 
     public static void registry() {
         LoggerRegistry.registerLogger("disk", DiskHUDLogger.INSTANCE);
-        //TODO incompatible with 26.1
-        //LoggerRegistry.registerLogger("blockUpdate", BlockUpdateLogger.INSTANCE);
+        LoggerRegistry.registerLogger("blockUpdate", BlockUpdateLogger.INSTANCE);
     }
 }

src/main/java/io/github/optijava/opt_carpet_addition/logger/blockUpdate/BlockUpdateLogger.java

@@ -0,0 +1,53 @@
+package io.github.optijava.opt_carpet_addition.logger.blockUpdate;
+
+import carpet.utils.Messenger;
+import io.github.optijava.opt_carpet_addition.OptCarpetAddition;
+import io.github.optijava.opt_carpet_addition.logger.AbstractLogger;
+import io.github.optijava.opt_carpet_addition.logger.LoggerRegister;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.block.Block;
+
+import java.lang.reflect.Field;
+
+public class BlockUpdateLogger extends AbstractLogger {
+    public static final BlockUpdateLogger INSTANCE;
+
+    static {
+        try {
+            INSTANCE = new BlockUpdateLogger(LoggerRegister.class.getField("__blockUpdate"), "blockUpdate", null, null, false);
+        } catch (NoSuchFieldException e) {
+            throw new Error("Failed to init BlockUpdateLogger.", e);
+        }
+    }
+
+    protected BlockUpdateLogger(Field acceleratorField, String logName, String def, String[] options, boolean strictOptions) {
+        super(acceleratorField, logName, def, options, strictOptions);
+    }
+
+    public void logBlockUpdate(BlockPos updatingBlockPos, Block updatingBlock, Block changedBlock) {
+        // 以下是我在旧版本研究的内容：
+        // 在1.17.1中，ServerWorld.updateNeighbor方法如下：
+        // public void updateNeighbor(BlockPos pos, Block sourceBlock, BlockPos neighborPos)
+        //                                    ^^^^         ^^^^^^^^^              ^^^^^^^
+        //                                  被更新方块     源方块（更新源）     由源方块指定的更新的中心方块
+
+        // 在1.19.3中，SimpleNeighborUpdater.updateNeighbor方法如下：
+        // public void updateNeighbor(BlockState state, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify)
+        //                                        ^^^^           ^^^         ^^^^^^^^               ^^^^^             ^^^^
+        //                                           这俩都是被更新的              源                    中心           不知道干什么的
+        // 在1.19.3中，ChainRestrictedNeighborUpdater.enqueue方法如下：
+        // private void enqueue(BlockPos pos, Entry entry)
+        //                               ^^          ^^^
+        //                             被更新的      一个封装
+
+        try {
+            super.log(() -> new Component[] {
+                        Messenger.c("w Updating BlockPos: [", "m " + updatingBlockPos.getX() + " " + updatingBlockPos.getY() + " " + updatingBlockPos.getZ(), "w " + "] Updating Block: ", "m " + updatingBlock.getName().getString(), "w " + " Source Block(before change): ", "m " + changedBlock.getName().getString())
+                    }
+            );
+        } catch (Exception e) {
+            OptCarpetAddition.LOGGER.error("Unexpected exception occurred when logging block update.", e);
+        }
+    }
+}