Merge pull request #103 from CoderFrish/ver/1.21.8

Split Config File.

Author: CoderFrish

README.md

@@ -20,7 +20,7 @@ cd Traium
 ./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
 ```
 
-## 2 | Development API
+## 2 | Plugin API
 
 Maven
 
@@ -34,11 +34,20 @@ Maven
 </dependencies>
 ```
 
-## 3 | Bstats
+## 3 | 配置文件
+
+服务端的配置文件位于根目录的traium_config里面
+```
+traium_config
+├─ traium_global.toml
+└─ traium_world.toml
+```
+
+## 4 | Bstats
 
 [![bStats](https://bstats.org/signatures/server-implementation/Traium.svg)](https://bstats.org/plugin/server-implementation/Traium/)
 
-## 4 | 最后
+## 5 | 最后
 > [!TIP]
 > 你的每一个免费的 ⭐Star 就是我们每一个前进的动力！
 

traium-server/minecraft-patches/features/0002-Purpur-Barrels-and-enderchests-six-rows.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur Barrels and enderchests six rows.
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 976a8982a0b0a9ae459cf08e13d69031d4238eca..d590baf0414653fd970b62f4735a6465417deb76 100644
+index 976a8982a0b0a9ae459cf08e13d69031d4238eca..c208ad9a5c49fcd92f5c1d05f119e155745d55d2 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -1071,6 +1071,27 @@ public abstract class PlayerList {
@@ -14,7 +14,7 @@ index 976a8982a0b0a9ae459cf08e13d69031d4238eca..d590baf0414653fd970b62f4735a6465
          } // Paper - Add sendOpLevel API
 +
 +        // Traium start - Purpur Barrels and enderchests 6 rows
-+        if (me.coderfrish.traium.config.GlobalConfig.enableEnderChestSixRows && me.coderfrish.traium.config.GlobalConfig.enderChestPermissionRows) {
++        if (me.coderfrish.traium.config.WorldConfig.enableEnderChestSixRows && me.coderfrish.traium.config.WorldConfig.enderChestPermissionRows) {
 +            org.bukkit.craftbukkit.entity.CraftHumanEntity bukkit = player.getBukkitEntity();
 +            if (bukkit.hasPermission("traium.enderchest.rows.six")) {
 +                player.sixRowEnderchestSlotCount = 54;
@@ -85,15 +85,15 @@ index 0fffa384f928ab84451331380968fb4650eafe26..ea2fd33356458d52c7a6de38144601f6
      public ChestMenu(MenuType<?> type, int containerId, Inventory playerInventory, Container container, int rows) {
          super(type, containerId);
 diff --git a/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-index 51148b7b95c93a9e25da70ac9275c63f1458d84c..f99ae15656dc20af88f644f8f217d4f15912794e 100644
+index 51148b7b95c93a9e25da70ac9275c63f1458d84c..d4bbc0ba205b585a5cc36d3ea216a7adf6a1e5ef 100644
 --- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java
 +++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
 @@ -26,11 +26,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
      }
 
      public PlayerEnderChestContainer(Player owner) {
 -        super(27);
-+        super(me.coderfrish.traium.config.GlobalConfig.enableEnderChestSixRows ? 54 : 27); // Traium - Purpur Barrels and enderchests 6 rows
++        super(me.coderfrish.traium.config.WorldConfig.enableEnderChestSixRows ? 54 : 27); // Traium - Purpur Barrels and enderchests 6 rows
          this.owner = owner;
          // CraftBukkit end
      }
@@ -109,7 +109,7 @@ index 51148b7b95c93a9e25da70ac9275c63f1458d84c..f99ae15656dc20af88f644f8f217d4f1
          this.activeChest = enderChestBlockEntity;
      }
 diff --git a/net/minecraft/world/level/block/EnderChestBlock.java b/net/minecraft/world/level/block/EnderChestBlock.java
-index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..811fafa9011a98a4b7d4afe3833cf7804846c626 100644
+index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..9f0a4f9c21a2db3704d0dce6a5368eaab8672822 100644
 --- a/net/minecraft/world/level/block/EnderChestBlock.java
 +++ b/net/minecraft/world/level/block/EnderChestBlock.java
 @@ -85,8 +85,8 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
@@ -118,7 +118,7 @@ index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..811fafa9011a98a4b7d4afe3833cf780
                      new SimpleMenuProvider(
 -                        (containerId, playerInventory, player1) -> ChestMenu.threeRows(containerId, playerInventory, enderChestInventory), CONTAINER_TITLE
 -                    )
-+                            (containerId, playerInventory, player1) -> me.coderfrish.traium.config.GlobalConfig.enableEnderChestSixRows ? getEnderChestSixRows(containerId, playerInventory, player, enderChestInventory) : ChestMenu.threeRows(containerId, playerInventory, enderChestInventory), CONTAINER_TITLE
++                            (containerId, playerInventory, player1) -> me.coderfrish.traium.config.WorldConfig.enableEnderChestSixRows ? getEnderChestSixRows(containerId, playerInventory, player, enderChestInventory) : ChestMenu.threeRows(containerId, playerInventory, enderChestInventory), CONTAINER_TITLE
 +                    ) // Traium - Purpur Barrels and enderchests 6 rows
                  ).isPresent()) {
                  // Paper end - Fix InventoryOpenEvent cancellation - moved up;
@@ -129,7 +129,7 @@ index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..811fafa9011a98a4b7d4afe3833cf780
 
 +    // Traium start - Purupr Barrels and enderchests 6 rows
 +    private ChestMenu getEnderChestSixRows(int syncId, net.minecraft.world.entity.player.Inventory inventory, Player player, PlayerEnderChestContainer playerEnderChestContainer) {
-+        if (me.coderfrish.traium.config.GlobalConfig.enderChestPermissionRows) {
++        if (me.coderfrish.traium.config.WorldConfig.enderChestPermissionRows) {
 +            org.bukkit.craftbukkit.entity.CraftHumanEntity bukkitPlayer = player.getBukkitEntity();
 +            if (bukkitPlayer.hasPermission("traium.enderchest.rows.six")) {
 +                player.sixRowEnderchestSlotCount = 54;
@@ -160,15 +160,15 @@ index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..811fafa9011a98a4b7d4afe3833cf780
      public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
          return new EnderChestBlockEntity(pos, state);
 diff --git a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index d679ab599dfd0bdbdc3ab5530d7fcd1c38baf7fa..561195318bb36d531a3946c20da62b655e8e35b4 100644
+index d679ab599dfd0bdbdc3ab5530d7fcd1c38baf7fa..f01aad8115ff51647f294a5f9ac777a9a7cd7748 100644
 --- a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
 @@ -56,7 +56,15 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
      }
      // CraftBukkit end
 
 -    private NonNullList<ItemStack> items = NonNullList.withSize(27, ItemStack.EMPTY);
-+    private NonNullList<ItemStack> items = NonNullList.withSize(switch (me.coderfrish.traium.config.GlobalConfig.barrelRows) {
++    private NonNullList<ItemStack> items = NonNullList.withSize(switch (me.coderfrish.traium.config.WorldConfig.barrelRows) {
 +        case 6 -> 54;
 +        case 5 -> 45;
 +        case 4 -> 36;
@@ -185,7 +185,7 @@ index d679ab599dfd0bdbdc3ab5530d7fcd1c38baf7fa..561195318bb36d531a3946c20da62b65
      @Override
      public int getContainerSize() {
 -        return 27;
-+        return switch (me.coderfrish.traium.config.GlobalConfig.barrelRows) {
++        return switch (me.coderfrish.traium.config.WorldConfig.barrelRows) {
 +            case 6 -> 54;
 +            case 5 -> 45;
 +            case 4 -> 36;
@@ -203,7 +203,7 @@ index d679ab599dfd0bdbdc3ab5530d7fcd1c38baf7fa..561195318bb36d531a3946c20da62b65
      protected AbstractContainerMenu createMenu(int id, Inventory player) {
 -        return ChestMenu.threeRows(id, player, this);
 +        // Traium start - Purpur Barrels and enderchests 6 rows
-+        return switch (me.coderfrish.traium.config.GlobalConfig.barrelRows) {
++        return switch (me.coderfrish.traium.config.WorldConfig.barrelRows) {
 +            case 6 -> ChestMenu.sixRows(id, player, this);
 +            case 5 -> ChestMenu.fiveRows(id, player, this);
 +            case 4 -> ChestMenu.fourRows(id, player, this);

traium-server/minecraft-patches/features/0003-Luminol-Unsafe-Teleportation-Config.patch

@@ -5,36 +5,45 @@ Subject: [PATCH] Luminol Unsafe Teleportation Config.
 
 
 diff --git a/net/minecraft/world/entity/item/FallingBlockEntity.java b/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 34e31fa13e5107f13e166f694fafe58e306330ae..6fa6c8c57377fea28acce60c26d455b7560687f7 100644
+index 34e31fa13e5107f13e166f694fafe58e306330ae..f1ffd6688d7558e93d650184fd9fad09c79a1c21 100644
 --- a/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -70,7 +70,7 @@ public class FallingBlockEntity extends Entity {
+@@ -3,6 +3,8 @@ package net.minecraft.world.entity.item;
+ import com.mojang.logging.LogUtils;
+ import java.util.function.Predicate;
+ import javax.annotation.Nullable;
++
++import me.coderfrish.traium.config.WorldConfig;
+ import net.minecraft.CrashReportCategory;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.Direction;
+@@ -70,7 +72,7 @@ public class FallingBlockEntity extends Entity {
      public float fallDamagePerDistance = 0.0F;
      @Nullable
      public CompoundTag blockData;
 -    public boolean forceTickAfterTeleportToDuplicate;
-+    public boolean forceTickAfterTeleportToDuplicate = me.coderfrish.traium.config.GlobalConfig.enableUnsafeTeleportation;
++    public boolean forceTickAfterTeleportToDuplicate = WorldConfig.enableUnsafeTeleportation;
      protected static final EntityDataAccessor<BlockPos> DATA_START_POS = SynchedEntityData.defineId(FallingBlockEntity.class, EntityDataSerializers.BLOCK_POS);
      public boolean autoExpire = true; // Paper - Expand FallingBlock API
 
-@@ -387,7 +387,7 @@ public class FallingBlockEntity extends Entity {
+@@ -387,7 +389,7 @@ public class FallingBlockEntity extends Entity {
          ResourceKey<Level> resourceKey1 = this.level().dimension();
          boolean flag = (resourceKey1 == Level.END || resourceKey == Level.END) && resourceKey1 != resourceKey;
          Entity entity = super.teleport(teleportTransition);
 -        this.forceTickAfterTeleportToDuplicate = entity != null && flag && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation; // Paper
-+        this.forceTickAfterTeleportToDuplicate = entity != null && flag && (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation || me.coderfrish.traium.config.GlobalConfig.enableUnsafeTeleportation); // Paper
++        this.forceTickAfterTeleportToDuplicate = entity != null && flag && (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation || WorldConfig.enableUnsafeTeleportation); // Paper
          return entity;
      }
  }
 diff --git a/net/minecraft/world/level/block/EndPortalBlock.java b/net/minecraft/world/level/block/EndPortalBlock.java
-index 6e495b2c4176d5a30ea911f8e44a22655df92ef6..af1075ec3283d95ea2c20f7dab1d25ade474db51 100644
+index 6e495b2c4176d5a30ea911f8e44a22655df92ef6..832838877f20b2c6ac114dc5928c229d3568a564 100644
 --- a/net/minecraft/world/level/block/EndPortalBlock.java
 +++ b/net/minecraft/world/level/block/EndPortalBlock.java
 @@ -69,6 +69,9 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
                  if (level.paperConfig().misc.disableEndCredits) {serverPlayer.seenCredits = true; return;} // Paper - Option to disable end credits
                  serverPlayer.showEndCredits();
              } else {
-+                if (me.coderfrish.traium.config.GlobalConfig.enableUnsafeTeleportation && !(entity instanceof net.minecraft.world.entity.player.Player)) {
++                if (me.coderfrish.traium.config.WorldConfig.enableUnsafeTeleportation && !(entity instanceof net.minecraft.world.entity.player.Player)) {
 +                    entity.endPortalLogicAsync(pos);
 +                }
                  entity.setAsInsidePortal(this, pos);

traium-server/paper-patches/features/0002-Purpur-Barrels-and-enderchests-six-rows.patch

@@ -5,19 +5,19 @@ Subject: [PATCH] Purpur Barrels and enderchests six rows.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 2f41a92465b9da28e026297cc3528898bb1c8412..a99c3ef198c426c7142c862172c8fc0a4dee5a1d 100644
+index 2f41a92465b9da28e026297cc3528898bb1c8412..59623457cc68d462698ee58561fa81de98a9ad86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 @@ -148,8 +148,18 @@ public class CraftContainer extends AbstractContainerMenu {
              case PLAYER:
              case CHEST:
              case ENDER_CHEST:
 +                // Traium - Purpur Barrels and enderchests 6 rows
-+                this.delegate = new ChestMenu(me.coderfrish.traium.config.GlobalConfig.enableEnderChestSixRows ? net.minecraft.world.inventory.MenuType.GENERIC_9x6 : net.minecraft.world.inventory.MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
++                this.delegate = new ChestMenu(me.coderfrish.traium.config.WorldConfig.enableEnderChestSixRows ? net.minecraft.world.inventory.MenuType.GENERIC_9x6 : net.minecraft.world.inventory.MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
 +                break;
              case BARREL:
 -                this.delegate = new ChestMenu(net.minecraft.world.inventory.MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
-+                this.delegate = new ChestMenu(switch (me.coderfrish.traium.config.GlobalConfig.barrelRows) {
++                this.delegate = new ChestMenu(switch (me.coderfrish.traium.config.WorldConfig.barrelRows) {
 +                    case 6 -> net.minecraft.world.inventory.MenuType.GENERIC_9x6;
 +                    case 5 -> net.minecraft.world.inventory.MenuType.GENERIC_9x5;
 +                    case 4 -> net.minecraft.world.inventory.MenuType.GENERIC_9x4;

traium-server/src/main/java/me/coderfrish/traium/config/GlobalConfig.java

@@ -31,29 +31,8 @@ public GlobalConfig() {
     })
     public static String language = "en_us";
 
-    @ConfigField(name = "enabled", type = ConfigTypes.fixed, parent = "unsafe_teleportation", comments = {
-            "If you want to use sand duping,please turn on this.",
-            "Warning: This would cause some unsafe issues, you could learn more on : https://github.com/PaperMC/Folia/issues/297."
-    })
-    public static boolean enableUnsafeTeleportation = true;
-
     @ConfigField(type = ConfigTypes.misc, parent = "server_brand_name", comments = {
             "Server brand name displayed to clients."
     }, name = "value")
     public static String serverBrandName = "Traium";
-
-    @ConfigField(type = ConfigTypes.misc, parent = "ender_chest_six_rows", comments = {
-            "The amount of rows a barrel should have. Min: 1, Max: 6"
-    }, name = "barrel_rows")
-    public static int barrelRows = 3;
-
-    @ConfigField(name = "enabled", type = ConfigTypes.misc, parent = "ender_chest_six_rows", comments = {
-            "When enabled, ender chests should have six rows of inventory space."
-    })
-    public static boolean enableEnderChestSixRows = false;
-
-    @ConfigField(type = ConfigTypes.misc, parent = "ender_chest_six_rows", comments = {
-            "Use permission nodes to determine the number of rows. By default, with this setting enabled, all players have rows unless otherwise specified using permissions"
-    }, name = "ender_chest_permission_rows")
-    public static boolean enderChestPermissionRows = false;
 }

traium-server/src/main/java/me/coderfrish/traium/config/TraiumConfig.java

@@ -46,6 +46,7 @@ public static void setupTraium() {
 
     public static void loadAllConfig() throws Exception {
         globalConfig = new GlobalConfig();
+        new WorldConfig();
     }
 
     public CommentedFileConfig getCurrentConfig() {

traium-server/src/main/java/me/coderfrish/traium/config/WorldConfig.java

@@ -0,0 +1,34 @@
+package me.coderfrish.traium.config;
+
+import java.io.File;
+
+import static me.coderfrish.traium.utils.Constants.CONFIG_FOLDER;
+
+public class WorldConfig extends TraiumConfig{
+    private static final File CONFIG_WORLD_FILE = new File(CONFIG_FOLDER, "traium_world.toml");
+
+    public WorldConfig() {
+        super(CONFIG_WORLD_FILE);
+    }
+
+    @ConfigField(name = "enabled", type = ConfigTypes.fixed, parent = "unsafe_teleportation", comments = {
+            "If you want to use sand duping,please turn on this.",
+            "Warning: This would cause some unsafe issues, you could learn more on : https://github.com/PaperMC/Folia/issues/297."
+    })
+    public static boolean enableUnsafeTeleportation = false;
+
+    @ConfigField(type = ConfigTypes.misc, parent = "ender_chest_six_rows", comments = {
+            "The amount of rows a barrel should have. Min: 1, Max: 6"
+    }, name = "barrel_rows")
+    public static int barrelRows = 3;
+
+    @ConfigField(name = "enabled", type = ConfigTypes.misc, parent = "ender_chest_six_rows", comments = {
+            "When enabled, ender chests should have six rows of inventory space."
+    })
+    public static boolean enableEnderChestSixRows = false;
+
+    @ConfigField(type = ConfigTypes.misc, parent = "ender_chest_six_rows", comments = {
+            "Use permission nodes to determine the number of rows. By default, with this setting enabled, all players have rows unless otherwise specified using permissions"
+    }, name = "ender_chest_permission_rows")
+    public static boolean enderChestPermissionRows = false;
+}