diff --git a/leaf-server/minecraft-patches/features/0094-Pufferfish-Dynamic-Activation-of-Brain.patch b/leaf-server/minecraft-patches/features/0094-Pufferfish-Dynamic-Activation-of-Brain.patch index b10a1ffc..23224617 100644 --- a/leaf-server/minecraft-patches/features/0094-Pufferfish-Dynamic-Activation-of-Brain.patch +++ b/leaf-server/minecraft-patches/features/0094-Pufferfish-Dynamic-Activation-of-Brain.patch @@ -32,7 +32,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java -index bdbbbc5e0c06c71584e7514623d0c8be168befd7..4ea2983dab1dfbfcd9aa7d8ee70d943777ce2a58 100644 +index bdbbbc5e0c06c71584e7514623d0c8be168befd7..f3ca86e09a4a076d143fb21eac529967ff004df4 100644 --- a/io/papermc/paper/entity/activation/ActivationRange.java +++ b/io/papermc/paper/entity/activation/ActivationRange.java @@ -173,6 +173,22 @@ public final class ActivationRange { @@ -42,7 +42,7 @@ index bdbbbc5e0c06c71584e7514623d0c8be168befd7..4ea2983dab1dfbfcd9aa7d8ee70d9437 + + // Pufferfish start + if (org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.enabled && entity.getType().dabEnabled && -+ (!org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.dontEnableIfInWater || entity.getType().is(net.minecraft.tags.EntityTypeTags.CAN_BREATHE_UNDER_WATER) || !entity.isInWaterOrBubble())) { // Leaf - Option for dontEnableIfInWater ++ (!org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.dontEnableIfInWater || entity.getType().is(net.minecraft.tags.EntityTypeTags.CAN_BREATHE_UNDER_WATER) || !entity.isInWaterOrRain())) { // Leaf - Option for dontEnableIfInWater + if (!entity.activatedPriorityReset) { + entity.activatedPriorityReset = true; + entity.activatedPriority = org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.maximumActivationPrio; diff --git a/leaf-archived-patches/unapplied/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java b/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java rename to leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java diff --git a/leaf-archived-patches/unapplied/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java b/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java rename to leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java diff --git a/leaf-archived-patches/unapplied/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java b/leaf-server/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java rename to leaf-server/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java diff --git a/leaf-archived-patches/unapplied/src/main/java/gg/pufferfish/pufferfish/util/IterableWrapper.java b/leaf-server/src/main/java/gg/pufferfish/pufferfish/util/IterableWrapper.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/gg/pufferfish/pufferfish/util/IterableWrapper.java rename to leaf-server/src/main/java/gg/pufferfish/pufferfish/util/IterableWrapper.java diff --git a/leaf-archived-patches/unapplied/src/main/java/me/titaniumtown/ArrayConstants.java b/leaf-server/src/main/java/me/titaniumtown/ArrayConstants.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/me/titaniumtown/ArrayConstants.java rename to leaf-server/src/main/java/me/titaniumtown/ArrayConstants.java diff --git a/leaf-archived-patches/unapplied/src/main/java/net/caffeinemc/mods/lithium/common/entity/EquipmentEntity.java b/leaf-server/src/main/java/net/caffeinemc/mods/lithium/common/entity/EquipmentEntity.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/net/caffeinemc/mods/lithium/common/entity/EquipmentEntity.java rename to leaf-server/src/main/java/net/caffeinemc/mods/lithium/common/entity/EquipmentEntity.java diff --git a/leaf-archived-patches/unapplied/src/main/java/net/caffeinemc/mods/lithium/common/util/change_tracking/ChangePublisher.java b/leaf-server/src/main/java/net/caffeinemc/mods/lithium/common/util/change_tracking/ChangePublisher.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/net/caffeinemc/mods/lithium/common/util/change_tracking/ChangePublisher.java rename to leaf-server/src/main/java/net/caffeinemc/mods/lithium/common/util/change_tracking/ChangePublisher.java diff --git a/leaf-archived-patches/unapplied/src/main/java/net/caffeinemc/mods/lithium/common/util/change_tracking/ChangeSubscriber.java b/leaf-server/src/main/java/net/caffeinemc/mods/lithium/common/util/change_tracking/ChangeSubscriber.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/net/caffeinemc/mods/lithium/common/util/change_tracking/ChangeSubscriber.java rename to leaf-server/src/main/java/net/caffeinemc/mods/lithium/common/util/change_tracking/ChangeSubscriber.java diff --git a/leaf-archived-patches/unapplied/src/main/java/net/caffeinemc/mods/lithium/common/world/chunk/LithiumHashPalette.java b/leaf-server/src/main/java/net/caffeinemc/mods/lithium/common/world/chunk/LithiumHashPalette.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/net/caffeinemc/mods/lithium/common/world/chunk/LithiumHashPalette.java rename to leaf-server/src/main/java/net/caffeinemc/mods/lithium/common/world/chunk/LithiumHashPalette.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/leaf-server/src/main/java/org/dreeam/leaf/LeafBootstrap.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/LeafBootstrap.java rename to leaf-server/src/main/java/org/dreeam/leaf/LeafBootstrap.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/LeafCommand.java b/leaf-server/src/main/java/org/dreeam/leaf/command/LeafCommand.java similarity index 97% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/LeafCommand.java rename to leaf-server/src/main/java/org/dreeam/leaf/command/LeafCommand.java index 09ec7aeb..309e0acb 100644 --- a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/LeafCommand.java +++ b/leaf-server/src/main/java/org/dreeam/leaf/command/LeafCommand.java @@ -5,7 +5,7 @@ import it.unimi.dsi.fastutil.Pair; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.minecraft.Util; -import org.dreeam.leaf.command.subcommands.MSPTCommand; +//import org.dreeam.leaf.command.subcommands.MSPTCommand; import org.dreeam.leaf.command.subcommands.ReloadCommand; import org.dreeam.leaf.command.subcommands.VersionCommand; import org.jetbrains.annotations.NotNull; @@ -38,13 +38,13 @@ public final class LeafCommand extends Command { // subcommand label -> subcommand private static final LeafSubcommand RELOAD_SUBCOMMAND = new ReloadCommand(); private static final LeafSubcommand VERSION_SUBCOMMAND = new VersionCommand(); - private static final LeafSubcommand MSPT_SUBCOMMAND = new MSPTCommand(); + //private static final LeafSubcommand MSPT_SUBCOMMAND = new MSPTCommand(); private static final Map SUBCOMMANDS = Util.make(() -> { final Map, LeafSubcommand> commands = new HashMap<>(); commands.put(Set.of(ReloadCommand.LITERAL_ARGUMENT), RELOAD_SUBCOMMAND); commands.put(Set.of(VersionCommand.LITERAL_ARGUMENT), VERSION_SUBCOMMAND); - commands.put(Set.of(MSPTCommand.LITERAL_ARGUMENT), MSPT_SUBCOMMAND); + //commands.put(Set.of(MSPTCommand.LITERAL_ARGUMENT), MSPT_SUBCOMMAND); return commands.entrySet().stream() .flatMap(entry -> entry.getKey().stream().map(s -> Map.entry(s, entry.getValue()))) diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/LeafCommands.java b/leaf-server/src/main/java/org/dreeam/leaf/command/LeafCommands.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/LeafCommands.java rename to leaf-server/src/main/java/org/dreeam/leaf/command/LeafCommands.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/LeafSubcommand.java b/leaf-server/src/main/java/org/dreeam/leaf/command/LeafSubcommand.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/LeafSubcommand.java rename to leaf-server/src/main/java/org/dreeam/leaf/command/LeafSubcommand.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/PermissionedLeafSubcommand.java b/leaf-server/src/main/java/org/dreeam/leaf/command/PermissionedLeafSubcommand.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/PermissionedLeafSubcommand.java rename to leaf-server/src/main/java/org/dreeam/leaf/command/PermissionedLeafSubcommand.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/subcommands/ReloadCommand.java b/leaf-server/src/main/java/org/dreeam/leaf/command/subcommands/ReloadCommand.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/subcommands/ReloadCommand.java rename to leaf-server/src/main/java/org/dreeam/leaf/command/subcommands/ReloadCommand.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/subcommands/VersionCommand.java b/leaf-server/src/main/java/org/dreeam/leaf/command/subcommands/VersionCommand.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/command/subcommands/VersionCommand.java rename to leaf-server/src/main/java/org/dreeam/leaf/command/subcommands/VersionCommand.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/ConfigModules.java b/leaf-server/src/main/java/org/dreeam/leaf/config/ConfigModules.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/ConfigModules.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/ConfigModules.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/EnumConfigCategory.java b/leaf-server/src/main/java/org/dreeam/leaf/config/EnumConfigCategory.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/EnumConfigCategory.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/EnumConfigCategory.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/LeafConfig.java b/leaf-server/src/main/java/org/dreeam/leaf/config/LeafConfig.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/LeafConfig.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/LeafConfig.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/LeafGlobalConfig.java b/leaf-server/src/main/java/org/dreeam/leaf/config/LeafGlobalConfig.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/LeafGlobalConfig.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/LeafGlobalConfig.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/annotations/DoNotLoad.java b/leaf-server/src/main/java/org/dreeam/leaf/config/annotations/DoNotLoad.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/annotations/DoNotLoad.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/annotations/DoNotLoad.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/annotations/Experimental.java b/leaf-server/src/main/java/org/dreeam/leaf/config/annotations/Experimental.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/annotations/Experimental.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/annotations/Experimental.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/annotations/HotReloadUnsupported.java b/leaf-server/src/main/java/org/dreeam/leaf/config/annotations/HotReloadUnsupported.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/annotations/HotReloadUnsupported.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/annotations/HotReloadUnsupported.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/fixes/DontPlacePlayerIfFull.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/fixes/DontPlacePlayerIfFull.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/fixes/DontPlacePlayerIfFull.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/fixes/DontPlacePlayerIfFull.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/AfkCommand.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/AfkCommand.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/AfkCommand.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/AfkCommand.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/ConfigurableMaxUseItemDistance.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/ConfigurableMaxUseItemDistance.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/ConfigurableMaxUseItemDistance.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/ConfigurableMaxUseItemDistance.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/ConfigurableTripWireDupe.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/ConfigurableTripWireDupe.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/ConfigurableTripWireDupe.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/ConfigurableTripWireDupe.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/HideItemComponent.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/HideItemComponent.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/HideItemComponent.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/HideItemComponent.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/OnlyPlayerPushable.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/OnlyPlayerPushable.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/OnlyPlayerPushable.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/OnlyPlayerPushable.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/SmoothTeleport.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/SmoothTeleport.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/SmoothTeleport.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/SmoothTeleport.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/SpawnerSettings.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/SpawnerSettings.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/SpawnerSettings.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/SpawnerSettings.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseSpigotItemMergingMech.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseSpigotItemMergingMech.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseSpigotItemMergingMech.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseSpigotItemMergingMech.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/Cache.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/Cache.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/Cache.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/Cache.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/ConnectionMessage.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/ConnectionMessage.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/ConnectionMessage.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/ConnectionMessage.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/Including5sIngetTPS.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/Including5sIngetTPS.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/Including5sIngetTPS.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/Including5sIngetTPS.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/LagCompensation.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/LagCompensation.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/LagCompensation.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/LagCompensation.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveChangeNonEditableSignWarning.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveChangeNonEditableSignWarning.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveChangeNonEditableSignWarning.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveChangeNonEditableSignWarning.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveSpigotCheckBungee.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveSpigotCheckBungee.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveSpigotCheckBungee.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveSpigotCheckBungee.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveVanillaUsernameCheck.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveVanillaUsernameCheck.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveVanillaUsernameCheck.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/RemoveVanillaUsernameCheck.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/SecureSeed.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/SecureSeed.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/SecureSeed.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/SecureSeed.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/ServerBrand.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/ServerBrand.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/ServerBrand.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/ServerBrand.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/UnknownCommandMessage.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/UnknownCommandMessage.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/misc/UnknownCommandMessage.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/UnknownCommandMessage.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/network/ChatMessageSignature.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/network/ChatMessageSignature.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/network/ChatMessageSignature.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/network/ChatMessageSignature.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/network/OptimizeNonFlushPacketSending.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/network/OptimizeNonFlushPacketSending.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/network/OptimizeNonFlushPacketSending.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/network/OptimizeNonFlushPacketSending.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/BrainRunningBehaviorCacheUpdate.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/BrainRunningBehaviorCacheUpdate.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/BrainRunningBehaviorCacheUpdate.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/BrainRunningBehaviorCacheUpdate.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/DontSaveEntity.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/DontSaveEntity.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/DontSaveEntity.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/DontSaveEntity.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/DynamicActivationofBrain.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/DynamicActivationofBrain.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/DynamicActivationofBrain.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/DynamicActivationofBrain.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/EnableCachedMTBEntityTypeConvert.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/EnableCachedMTBEntityTypeConvert.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/EnableCachedMTBEntityTypeConvert.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/EnableCachedMTBEntityTypeConvert.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/FastRNG.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/FastRNG.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/FastRNG.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/FastRNG.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/FasterStructureGenFutureSequencing.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/FasterStructureGenFutureSequencing.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/FasterStructureGenFutureSequencing.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/FasterStructureGenFutureSequencing.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/ReduceUselessPackets.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ReduceUselessPackets.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/ReduceUselessPackets.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ReduceUselessPackets.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/SkipAIForNonAwareMob.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/SkipAIForNonAwareMob.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/SkipAIForNonAwareMob.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/SkipAIForNonAwareMob.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/SkipMapItemDataUpdates.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/SkipMapItemDataUpdates.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/SkipMapItemDataUpdates.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/SkipMapItemDataUpdates.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleHopperWhenFull.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleHopperWhenFull.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleHopperWhenFull.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleHopperWhenFull.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleInactiveGoalSelectorTick.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleInactiveGoalSelectorTick.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleInactiveGoalSelectorTick.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleInactiveGoalSelectorTick.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/TileEntitySnapshotCreation.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/TileEntitySnapshotCreation.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/TileEntitySnapshotCreation.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/TileEntitySnapshotCreation.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/VT4BukkitScheduler.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/VT4BukkitScheduler.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/VT4BukkitScheduler.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/VT4BukkitScheduler.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/VT4ChatExecutor.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/VT4ChatExecutor.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/VT4ChatExecutor.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/VT4ChatExecutor.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/VT4UserAuthenticator.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/VT4UserAuthenticator.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/config/modules/opt/VT4UserAuthenticator.java rename to leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/VT4UserAuthenticator.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/misc/LagCompensation.java b/leaf-server/src/main/java/org/dreeam/leaf/misc/LagCompensation.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/misc/LagCompensation.java rename to leaf-server/src/main/java/org/dreeam/leaf/misc/LagCompensation.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/biome/PositionalBiomeGetter.java b/leaf-server/src/main/java/org/dreeam/leaf/util/biome/PositionalBiomeGetter.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/biome/PositionalBiomeGetter.java rename to leaf-server/src/main/java/org/dreeam/leaf/util/biome/PositionalBiomeGetter.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/cache/CachedOrNewBitsGetter.java b/leaf-server/src/main/java/org/dreeam/leaf/util/cache/CachedOrNewBitsGetter.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/cache/CachedOrNewBitsGetter.java rename to leaf-server/src/main/java/org/dreeam/leaf/util/cache/CachedOrNewBitsGetter.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/cache/IterateOutwardsCache.java b/leaf-server/src/main/java/org/dreeam/leaf/util/cache/IterateOutwardsCache.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/cache/IterateOutwardsCache.java rename to leaf-server/src/main/java/org/dreeam/leaf/util/cache/IterateOutwardsCache.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/cache/LongList2BlockPosMutableIterable.java b/leaf-server/src/main/java/org/dreeam/leaf/util/cache/LongList2BlockPosMutableIterable.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/cache/LongList2BlockPosMutableIterable.java rename to leaf-server/src/main/java/org/dreeam/leaf/util/cache/LongList2BlockPosMutableIterable.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/item/ItemStackStripper.java b/leaf-server/src/main/java/org/dreeam/leaf/util/item/ItemStackStripper.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/item/ItemStackStripper.java rename to leaf-server/src/main/java/org/dreeam/leaf/util/item/ItemStackStripper.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/list/BlockEntityTickersList.java b/leaf-server/src/main/java/org/dreeam/leaf/util/list/BlockEntityTickersList.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/list/BlockEntityTickersList.java rename to leaf-server/src/main/java/org/dreeam/leaf/util/list/BlockEntityTickersList.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/map/ConcurrentLongHashSet.java b/leaf-server/src/main/java/org/dreeam/leaf/util/map/ConcurrentLongHashSet.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/map/ConcurrentLongHashSet.java rename to leaf-server/src/main/java/org/dreeam/leaf/util/map/ConcurrentLongHashSet.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/map/StringCanonizingOpenHashMap.java b/leaf-server/src/main/java/org/dreeam/leaf/util/map/StringCanonizingOpenHashMap.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/map/StringCanonizingOpenHashMap.java rename to leaf-server/src/main/java/org/dreeam/leaf/util/map/StringCanonizingOpenHashMap.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/math/random/FasterRandomSource.java b/leaf-server/src/main/java/org/dreeam/leaf/util/math/random/FasterRandomSource.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/util/math/random/FasterRandomSource.java rename to leaf-server/src/main/java/org/dreeam/leaf/util/math/random/FasterRandomSource.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java b/leaf-server/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java rename to leaf-server/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/configuration/GaleConfigurations.java b/leaf-server/src/main/java/org/galemc/gale/configuration/GaleConfigurations.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/configuration/GaleConfigurations.java rename to leaf-server/src/main/java/org/galemc/gale/configuration/GaleConfigurations.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/leaf-server/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java similarity index 86% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java rename to leaf-server/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java index bba8ca8f..4c1b1454 100644 --- a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/leaf-server/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -119,21 +119,5 @@ public class GaleGlobalConfiguration extends ConfigurationPart { } // Gale end - Purpur - do not log plugin library loads - - // Gale start - EMC - softly log invalid pool element errors - public String invalidPoolElementErrorLogLevel = "info"; - public transient Consumer invalidPoolElementErrorStringConsumer; - - @PostProcess - public void postProcess() { - this.invalidPoolElementErrorStringConsumer = switch (this.invalidPoolElementErrorLogLevel.toLowerCase(Locale.ROOT)) { - case "none" -> $ -> {}; - case "info", "log" -> PoolElementStructurePiece.LOGGER::info; - case "warn", "warning" -> PoolElementStructurePiece.LOGGER::warn; - default -> PoolElementStructurePiece.LOGGER::error; - }; - } - // Gale end - EMC - softly log invalid pool element errors - } } diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/configuration/GaleRemovedConfigurations.java b/leaf-server/src/main/java/org/galemc/gale/configuration/GaleRemovedConfigurations.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/configuration/GaleRemovedConfigurations.java rename to leaf-server/src/main/java/org/galemc/gale/configuration/GaleRemovedConfigurations.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/leaf-server/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java rename to leaf-server/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java b/leaf-server/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java rename to leaf-server/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/leaf-server/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java rename to leaf-server/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java b/leaf-server/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java rename to leaf-server/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/virtualthread/DirectVirtualThreadService.java b/leaf-server/src/main/java/org/galemc/gale/virtualthread/DirectVirtualThreadService.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/virtualthread/DirectVirtualThreadService.java rename to leaf-server/src/main/java/org/galemc/gale/virtualthread/DirectVirtualThreadService.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/virtualthread/ReflectionVirtualThreadService.java b/leaf-server/src/main/java/org/galemc/gale/virtualthread/ReflectionVirtualThreadService.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/virtualthread/ReflectionVirtualThreadService.java rename to leaf-server/src/main/java/org/galemc/gale/virtualthread/ReflectionVirtualThreadService.java diff --git a/leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/virtualthread/VirtualThreadService.java b/leaf-server/src/main/java/org/galemc/gale/virtualthread/VirtualThreadService.java similarity index 100% rename from leaf-archived-patches/unapplied/src/main/java/org/galemc/gale/virtualthread/VirtualThreadService.java rename to leaf-server/src/main/java/org/galemc/gale/virtualthread/VirtualThreadService.java