Merge pull request #101 from Suisuroru/ss/RemovedConfig

add RemovedConfig interface for Config-update

luminol-api/paper-patches/features/0001-Rebrand-to-Luminol.patch

@@ -5,15 +5,19 @@ Subject: [PATCH] Rebrand to Luminol
 
 
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index 652ff54e7c50412503725d628bfe72ed03059790..ee163b9fa8f441aa4b3e2309f33e8f932dfc02d7 100644
+index 652ff54e7c50412503725d628bfe72ed03059790..db5e2f10278c20286779362cfdfadb2f42c724e0 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -19,6 +19,13 @@ public interface ServerBuildInfo {
+@@ -19,6 +19,17 @@ public interface ServerBuildInfo {
       */
      Key BRAND_PAPER_ID = Key.key("papermc", "paper");
  
 +    // Luminol start
 +    /**
++     * The brand id for folia
++     */
++    Key BRAND_FOLIA_ID = Key.key("papermc", "folia");
++    /**
 +     * The brand id for Luminol.
 +     */
 +    Key BRAND_LUMINOL_ID = Key.key("luminolmc", "luminol");

luminol-server/minecraft-patches/features/0016-Add-config-for-tripwire-dupe.patch

@@ -1,79 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
-Date: Mon, 24 Feb 2025 06:00:00 -0800
-Subject: [PATCH] Add config for tripwire dupe
-
-
-diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java
-index 9aace993c6c18f1a50610e4766225485984b8167..07ffe289b9556b45a9ef7db5357d85b14fe23feb 100644
---- a/net/minecraft/world/level/block/TripWireHookBlock.java
-+++ b/net/minecraft/world/level/block/TripWireHookBlock.java
-@@ -215,7 +215,7 @@ public class TripWireHookBlock extends Block {
-                     BlockState blockState2 = blockStates[i2];
-                     if (blockState2 != null) {
-                         BlockState blockState3 = level.getBlockState(blockPos1);
--                        if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
-+                        if (me.earthme.luminol.config.modules.misc.AllowTripwireDupe.enabled || blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
-                             if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE)) level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3); // Paper - prevent tripwire from updating
-                         }
-                     }
-diff --git a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
-index f96fc1391167dea48cac1caa464b9026657df89a..c7a46407f4f0915161f26e87241a806bd38145b1 100644
---- a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
-+++ b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
-@@ -27,6 +27,9 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
-         // CraftBukkit end
-         BlockPos.MutableBlockPos mutableBlockPos = pos.mutable();
- 
-+        // Luminol start - prevent tripwire dupe in end platform generate
-+        java.util.List<BlockPos> blockList1 = new java.util.ArrayList<>();
-+        java.util.List<BlockPos> blockList2 = new java.util.ArrayList<>();
-         for (int i = -2; i <= 2; i++) {
-             for (int i1 = -2; i1 <= 2; i1++) {
-                 for (int i2 = -1; i2 < 3; i2++) {
-@@ -34,7 +37,23 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
-                     Block block = i2 == -1 ? Blocks.OBSIDIAN : Blocks.AIR;
-                     // CraftBukkit start
-                     if (!blockList.getBlockState(blockPos).is(block)) {
--                        if (dropBlocks) {
-+                        boolean flag = false;
-+                        if (dropBlocks && me.earthme.luminol.config.modules.misc.AllowTripwireDupe.preventPlatformBreakString) {
-+                            net.minecraft.world.level.block.state.BlockState state = level.getBlockState(blockPos);
-+                            if (state.is(Blocks.TRIPWIRE)) {
-+                                if (state.getValue(net.minecraft.world.level.block.TripWireBlock.DISARMED)) {
-+                                    flag = true;
-+                                    blockList2.add(blockPos.immutable());
-+                                }
-+                                if (!flag) {
-+                                    flag = checkString(blockList2, blockPos);
-+                                }
-+                            }
-+                        }
-+                        if (flag) {
-+                            blockList1.add(blockPos.immutable());
-+                        } else if (dropBlocks) {
-+                        // Luminol end - prevent tripwire dupe in end platform generate
-                             blockList.destroyBlock(blockPos, true, null);
-                         }
- 
-@@ -56,9 +75,19 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
- 
-         // SPIGOT-7856: End platform not dropping items after replacing blocks
-         if (dropBlocks) {
--            blockList.getList().forEach((state) -> level.destroyBlock(state.getPosition(), true, null));
-+            blockList.getList().forEach((state) -> level.destroyBlock(state.getPosition(), !blockList1.contains(state.getPosition()), null)); // Luminol - prevent tripwire dupe in end platform generate
-         }
-         blockList.updateList();
-         // CraftBukkit end
-     }
-+
-+    // Luminol start - prevent tripwire dupe in end platform generate
-+    private static boolean checkString(java.util.List<BlockPos> blockList, BlockPos blockPos) {
-+        for (BlockPos pos : blockList) {
-+            if (pos.getY() != blockPos.getY()) continue;
-+            if (pos.getX() == blockPos.getX() || pos.getZ() == blockPos.getZ()) return true;
-+        }
-+        return false;
-+    }
-+    // Luminol end - prevent tripwire dupe in end platform generate
- }

luminol-server/minecraft-patches/features/0016-Add-config-to-modify-tripwire-behavior.patch

@@ -0,0 +1,126 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 18 May 2025 03:48:53 +0800
+Subject: [PATCH] Add config to modify tripwire behavior
+
+
+diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java
+index 9aace993c6c18f1a50610e4766225485984b8167..419c1c7e14691a472b70ed548ecb928cb289b939 100644
+--- a/net/minecraft/world/level/block/TripWireHookBlock.java
++++ b/net/minecraft/world/level/block/TripWireHookBlock.java
+@@ -214,10 +214,18 @@ public class TripWireHookBlock extends Block {
+                     BlockPos blockPos1 = pos.relative(direction, i2);
+                     BlockState blockState2 = blockStates[i2];
+                     if (blockState2 != null) {
+-                        BlockState blockState3 = level.getBlockState(blockPos1);
+-                        if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
+-                            if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE)) level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3); // Paper - prevent tripwire from updating
++                        // Luminol start - tripwire and tripwireHook dupe
++                        if (me.earthme.luminol.config.modules.misc.AllowTripwireDupe.enabled) {
++                            level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, flag2), 3);
++                            level.getBlockState(blockPos1);
++                        } else {
++                            BlockState blockState3 = level.getBlockState(blockPos1);
++                            if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
++                                if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE))
++                                    level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3); // Paper - prevent tripwire from updating
++                            }
+                         }
++                        // Luminol end - tripwire and tripwireHook dupe
+                     }
+                 }
+             }
+diff --git a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
+index f96fc1391167dea48cac1caa464b9026657df89a..eb869e574cee0d206684d5585c664a5f1d01ab65 100644
+--- a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
++++ b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
+@@ -27,15 +27,43 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
+         // CraftBukkit end
+         BlockPos.MutableBlockPos mutableBlockPos = pos.mutable();
+ 
++        // Luminol start - tripwire behavior modifier
++        java.util.List<BlockPos> blockList1 = new java.util.ArrayList<>();
++        java.util.List<BlockPos> blockList2 = new java.util.ArrayList<>();
++        boolean flag21 = !java.util.Objects.equals(me.earthme.luminol.config.modules.misc.AllowTripwireDupe.behaviorMode, "VANILLA20")
++                && !java.util.Objects.equals(me.earthme.luminol.config.modules.misc.AllowTripwireDupe.behaviorMode, "MIXED");
+         for (int i = -2; i <= 2; i++) {
+             for (int i1 = -2; i1 <= 2; i1++) {
+                 for (int i2 = -1; i2 < 3; i2++) {
+                     BlockPos blockPos = mutableBlockPos.set(pos).move(i1, i2, i);
+                     Block block = i2 == -1 ? Blocks.OBSIDIAN : Blocks.AIR;
+-                    // CraftBukkit start
+                     if (!blockList.getBlockState(blockPos).is(block)) {
+                         if (dropBlocks) {
+-                            blockList.destroyBlock(blockPos, true, null);
++                            boolean flag = false;
++                            if (me.earthme.luminol.config.modules.misc.AllowTripwireDupe.enabled) {
++                                switch (me.earthme.luminol.config.modules.misc.AllowTripwireDupe.behaviorMode) {
++                                    case "VANILLA20": {
++                                        flag = true;
++                                    }
++                                    case "MIXED": {
++                                        net.minecraft.world.level.block.state.BlockState state = level.getBlockState(blockPos);
++                                        if (state.is(Blocks.TRIPWIRE)) {
++                                            if (state.getValue(net.minecraft.world.level.block.TripWireBlock.DISARMED)) {
++                                                flag = true;
++                                                blockList2.add(blockPos.immutable());
++                                            }
++                                            if (!flag) {
++                                                flag = checkString(blockList2, blockPos);
++                                            }
++                                        }
++                                    }
++                                    default: {
++
++                                    } // Luminol - 1.21 Logic - default empty
++                                }
++                            }
++                            if (flag) blockList1.add(blockPos.immutable());
++                            else blockList.destroyBlock(blockPos, true, null);
+                         }
+ 
+                         blockList.setBlock(blockPos, block.defaultBlockState(), 3);
+@@ -54,11 +82,39 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
+             if (portalEvent.isCancelled()) return;
+         }
+ 
+-        // SPIGOT-7856: End platform not dropping items after replacing blocks
+-        if (dropBlocks) {
+-            blockList.getList().forEach((state) -> level.destroyBlock(state.getPosition(), true, null));
++        if (flag21 && !me.earthme.luminol.config.modules.misc.AllowTripwireDupe.enabled) {
++            // Luminol start - When updated replace it with newer code
++            if (dropBlocks) {
++                java.util.function.Consumer<? super org.bukkit.craftbukkit.block.CraftBlockState> beforeRun = state -> level.destroyBlock(state.getPosition(), !blockList1.contains(state.getPosition()), null);
++                java.util.function.Predicate<? super org.bukkit.block.BlockState> filter = $ -> true;
++                for (org.bukkit.craftbukkit.block.CraftBlockState state : blockList.getList()) {
++                    if (filter.test(state)) {
++                        beforeRun.accept(state);
++                        if (state.isPlaced()) {
++                            state.getWorldHandle().setBlock(state.getPosition(), state.getHandle(), state.getFlag());
++                        }
++                    }
++                }
++            } else {
++                blockList.updateList();
++            }
++            // Luminol end - When updated replace it with newer code
++        } else {
++            // SPIGOT-7856: End platform not dropping items after replacing blocks
++            if (dropBlocks) {
++                blockList.getList().forEach((state) -> level.destroyBlock(state.getPosition(), !blockList1.contains(state.getPosition()), null)); // Luminol - prevent tripwire dupe in end platform generate
++            }
++            blockList.updateList();
+         }
+-        blockList.updateList();
+         // CraftBukkit end
+     }
++
++    private static boolean checkString(java.util.List<BlockPos> blockList, BlockPos blockPos) {
++        for (BlockPos pos : blockList) {
++            if (pos.getY() != blockPos.getY()) continue;
++            if (pos.getX() == blockPos.getX() || pos.getZ() == blockPos.getZ()) return true;
++        }
++        return false;
++    }
++    // Luminol end - tripwire behavior modifier
+ }

luminol-server/paper-patches/features/0001-Rebrand-to-Luminol.patch

@@ -63,7 +63,7 @@ index 29bd788ae8bc61c1e62a4f84b9e259931a7041ce..1676ac5e6c8369836bf719f338603fbb
          } else {
              final Optional<String> gitBranch = build.gitBranch();
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-index e741201fdbea0dbbc0e42313ebd33368014c9dc4..673a81734a0903a0790f3007772642d3d9a044cc 100644
+index e741201fdbea0dbbc0e42313ebd33368014c9dc4..e3c5f4c31f084294a59830f3e764921433dd80d5 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 @@ -31,6 +31,7 @@ public record ServerBuildInfoImpl(
@@ -91,7 +91,7 @@ index e741201fdbea0dbbc0e42313ebd33368014c9dc4..673a81734a0903a0790f3007772642d3
      @Override
      public boolean isBrandCompatible(final @NotNull Key brandId) {
 -        return brandId.equals(this.brandId);
-+        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Luminol
++        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_FOLIA_ID); // Luminol
      }
  
      @Override

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/BasicTransferLogic.java.patch

@@ -0,0 +1,10 @@
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/config/BasicTransferLogic.java
+@@ -1,0 +_,7 @@
++package me.earthme.luminol.config;
++
++public class BasicTransferLogic {
++    public Object transform(Object obj) {
++        return obj;
++    }
++}

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/LuminolConfig.java.patch

@@ -1,8 +1,9 @@
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/LuminolConfig.java
-@@ -1,0 +_,226 @@
+@@ -1,0 +_,268 @@
 +package me.earthme.luminol.config;
 +
++import com.electronwill.nightconfig.core.UnmodifiableConfig;
 +import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 +import io.papermc.paper.threadedregions.RegionizedServer;
 +import me.earthme.luminol.commands.LuminolConfigCommand;
@@ -128,6 +129,33 @@
 +                final Object currentValue = field.get(null);
 +
 +                if (!configFileInstance.contains(fullConfigKeyName)){
++                    for (RemovedConfig removedConfig : field.getAnnotationsByType(RemovedConfig.class)) {
++                        final String oldConfigKeyName = String.join(".", removedConfig.category()) + "." + removedConfig.name();
++                        Object oldValue = configFileInstance.get(oldConfigKeyName);
++                        if (oldValue != null) {
++                            boolean success = true;
++                            if (removedConfig.transfer()) {
++                                try {
++                                    Object oldValueTransferred = ((BasicTransferLogic)removedConfig.transferLogic().getDeclaredConstructor().newInstance()).transform(oldValue);
++                                    configFileInstance.add(fullConfigKeyName, oldValueTransferred);
++                                } catch (Exception e) {
++                                    success = false;
++                                    logger.error("Failed to transfer removed config {}!", removedConfig.name());
++                                }
++                            }
++
++                            if (success) {
++                                removeConfig(oldConfigKeyName, removedConfig.category());
++                            }
++                            final String comments = configInfo.comments();
++
++                            if (!comments.isBlank()){
++                                configFileInstance.setComment(fullConfigKeyName,comments);
++                            }
++                            if (configFileInstance.get(fullConfigKeyName) != null) break;
++                        }
++                    }
++                    if (configFileInstance.get(fullConfigKeyName) != null) continue;
 +                    if (currentValue == null){
 +                        throw new UnsupportedOperationException("Config " + singleConfigModule.getBaseName() + "tried to add an null default value!");
 +                    }
@@ -148,6 +176,20 @@
 +        }
 +    }
 +
++    public static void removeConfig(String name,String[] keys) {
++        configFileInstance.remove(name);
++        if (configFileInstance.get(String.join(".", keys)) instanceof UnmodifiableConfig) {
++            removeConfig(keys);
++        }
++    }
++
++    public static void removeConfig(String[] keys) {
++        configFileInstance.remove(String.join(".", keys));
++        if (configFileInstance.get(String.join(".", Arrays.copyOfRange(keys, 1, keys.length))) instanceof UnmodifiableConfig) {
++            removeConfig(Arrays.copyOfRange(keys, 1, keys.length));
++        }
++    }
++
 +    public static @NotNull Set<Class<?>> getClasses(String pack) {
 +        Set<Class<?>> classes = new LinkedHashSet<>();
 +        String packageDirName = pack.replace('.', '/');

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/RemovedConfig.java.patch

@@ -0,0 +1,23 @@
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/config/RemovedConfig.java
+@@ -1,0 +_,20 @@
++package me.earthme.luminol.config;
++
++import java.lang.annotation.*;
++
++@Retention(RetentionPolicy.RUNTIME)
++@Repeatable(RemovedConfig.List.class)
++public @interface RemovedConfig {
++    String name() default "";
++
++    String[] category() default "";
++
++    boolean transfer() default true;
++
++    Class<?> transferLogic() default BasicTransferLogic.class;
++
++    @Retention(RetentionPolicy.RUNTIME)
++    @interface List {
++        RemovedConfig[] value();
++    }
++}

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/AllowTripwireDupe.java.patch

@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/AllowTripwireDupe.java
-@@ -1,0 +_,24 @@
+@@ -1,0 +_,27 @@
 +package me.earthme.luminol.config.modules.misc;
 +
 +import me.earthme.luminol.config.ConfigInfo;
@@ -10,10 +10,13 @@
 +public class AllowTripwireDupe implements IConfigModule {
 +    @ConfigInfo(baseName = "enabled")
 +    public static boolean enabled = false;
-+    @ConfigInfo(baseName = "prevent_platform_break_string", comments =
++    @ConfigInfo(baseName = "behavior-mode", comments =
 +            """
-+                    Prevent string drop when platform generate""")
-+    public static boolean preventPlatformBreakString = false;
++                    Allowed Value:
++                    VANILLA20
++                    VANILLA21
++                    MIXED""")
++    public static String behaviorMode = "VANILLA21";
 +
 +    @Override
 +    public EnumConfigCategory getCategory() {