Merge pull request #14 from OptiJava/dev

Merge request

Author: jfglzs

.github/workflows/build.yml

@@ -18,11 +18,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: validate gradle wrapper
         uses: gradle/actions/wrapper-validation@v4
       - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: 'adopt'

README-en.md

@@ -17,6 +17,7 @@ Most other MC versions that are the same as the supported major versions but hav
 
 | Minecraft Version | Support Status                                                           | 
 |-------------------|--------------------------------------------------------------------------| 
+| 1.21.10           | Supporting, developing actively                                          |
 | 1.21.5            | Supporting, developing actively                                          | 
 | 1.21              | Supporting, developing actively                                          | 
 | 1.20.4            | Supporting, developing actively                                          | 
@@ -296,6 +297,8 @@ Fix bug: lagging when spawn bot because mojang server is too slow :(
 
 This rule force any bot use offline uuid.
 
+Due to difficulties in porting, it is just for `1.17.1-1.21.5`. Use alternatives in higher versions. [iss#10](https://github.com/OptiJava/OptCarpetAddition/issues/10)
+
 - Default value: `false`
 - Acceptable value: `true` `false`
 - Categories: `Optimization`

README.md

@@ -16,6 +16,7 @@ Language: [English](https://github.com/OptiJava/OptCarpetAddition/blob/master/RE
 
 | Minecraft 版本 | 支持状态                       |
 |--------------|----------------------------|
+| 1.21.10      | 支持，积极开发                    |
 | 1.21.5       | 支持，积极开发                    |
 | 1.21         | 支持，积极开发                    |
 | 1.20.4       | 支持，积极开发                    |
@@ -297,6 +298,8 @@ DispenserBlockEntity dispenserBlockEntity = (DispenserBlockEntity)blockPointerIm
 
 如果你的服务器连接mojang服务器的时间长，spawn假人的时候就会卡顿一会，此规则强制所有假人使用离线uuid，解决这一问题（但是也许引发新的问题
 
+由于移植困难，仅支持`1.17.1-1.21.5`版本，高版本请使用替代品 [iss#10](https://github.com/OptiJava/OptCarpetAddition/issues/10)
+
 - Default value: `false`
 - Acceptable value: `true` `false`
 - Categories: `Optimization`

build.gradle

@@ -1,5 +1,7 @@
 plugins {
-    id 'fabric-loom' version '1.10-SNAPSHOT' apply false
+//旧版fabric loom 无法识别1.21.10
+//    id 'fabric-loom' version '1.10-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.11-SNAPSHOT' apply false
     id 'maven-publish'
     id 'com.replaymod.preprocess' version '20c7ec554a'
 }
@@ -10,8 +12,10 @@ preprocess {
 	def mc1204 = createNode('1.20.4' , 1_20_04, 'yarn')
 	def mc1210 = createNode('1.21' , 1_21_00, 'yarn')
 	def mc1215 = createNode('1.21.5' , 1_21_05, 'yarn')
+    def mc12110 = createNode('1.21.10', 1_21_10, 'yarn')
 
 	mc117 .link(mc1204, null)
 	mc1204.link(mc1210, null)
 	mc1210.link(mc1215, null)
+    mc1215.link(mc12110, null)
 }

gradle.properties

@@ -8,7 +8,7 @@ systemProp.http.socketTimeout=60000
 systemProp.https.socketTimeout=60000
 
 # Fabric Configurations
-loader_version=0.16.14
+loader_version=0.17.3
 loader_requirement_version=>=0.15
 
 # Mod Metadata

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

@@ -24,6 +24,7 @@
 import org.apache.logging.log4j.Logger;
 
 import java.io.File;
+import java.util.Map;
 import java.util.Objects;
 
 public class OptCarpetAddition implements CarpetExtension, ModInitializer {
@@ -33,7 +34,7 @@ public class OptCarpetAddition implements CarpetExtension, ModInitializer {
     @Override
     public void onInitialize() {
         LOGGER.info("OptCarpetAddition is loading...");
-        CarpetServer.manageExtension(new OptCarpetAddition());
+        CarpetServer.manageExtension(this);
 
         ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register(new FixExperienceBug());
     }
@@ -54,19 +55,21 @@ public void onGameStarted() {
             //#else
             if (Objects.equals(rule.name, "forceFakePlayerGameMode") && !Objects.equals(OptCarpetSettings.forceFakePlayerGameMode, "false")) {
             //#endif
-                GameMode gameMode = GameMode.SURVIVAL;
+                GameMode gameMode;
 
                 if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative")) {
                     gameMode = GameMode.CREATIVE;
                 } else if (OptCarpetSettings.forceFakePlayerGameMode.equals("adventure")) {
                     gameMode = GameMode.ADVENTURE;
+                } else {
+                    gameMode = GameMode.SURVIVAL;
                 }
 
-                for (ServerPlayerEntity player : serverCommandSource.getServer().getPlayerManager().getPlayerList()) {
+                serverCommandSource.getServer().getPlayerManager().getPlayerList().forEach(player -> {
                     if (player instanceof EntityPlayerMPFake) {
                         player.changeGameMode(gameMode);
                     }
-                }
+                });
             }
 
             //#if MC >= 11900
@@ -144,7 +147,7 @@ public void registerCommands(CommandDispatcher<ServerCommandSource> dispatcher)
 
     @Override
     public void onPlayerLoggedIn(ServerPlayerEntity player) {
-        if (player instanceof EntityPlayerMPFake && !(Objects.equals(OptCarpetSettings.forceFakePlayerGameMode, "false"))) {
+        if (!(Objects.equals(OptCarpetSettings.forceFakePlayerGameMode, "false")) && player instanceof EntityPlayerMPFake) {
             GameMode gameMode = GameMode.SURVIVAL;
 
             if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative")) {
@@ -174,4 +177,10 @@ public void onPlayerLoggedOut(ServerPlayerEntity player) {
     public void registerLoggers() {
         LoggerRegister.registry();
     }
+
+    @Override
+    public Map<String, String> canHasTranslations(String lang) {
+        //add rule translator
+        return RuleTranslator.getTranslationFromResourcePath(lang);
+    }
 }