diff --git a/lophine-server/src/main/java/me/earthme/luminol/commands/bar/BarSubcommand.java b/lophine-server/src/main/java/me/earthme/luminol/commands/bar/BarSubcommand.java index ed53d25..4b687cb 100644 --- a/lophine-server/src/main/java/me/earthme/luminol/commands/bar/BarSubcommand.java +++ b/lophine-server/src/main/java/me/earthme/luminol/commands/bar/BarSubcommand.java @@ -13,7 +13,7 @@ import java.util.List; public class BarSubcommand extends LiteralNode { public BarSubcommand(EnumBarType barType) { - super(barType.getCommandName()); + super(barType.getName()); children( new ToggleCommand(barType), new ConfigEditCommand(barType) diff --git a/lophine-server/src/main/java/me/earthme/luminol/utils/NullPlugin.java b/lophine-server/src/main/java/me/earthme/luminol/utils/NullPlugin.java deleted file mode 100644 index dbe5e87..0000000 --- a/lophine-server/src/main/java/me/earthme/luminol/utils/NullPlugin.java +++ /dev/null @@ -1,152 +0,0 @@ -package me.earthme.luminol.utils; - -import org.bukkit.Server; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.generator.BiomeProvider; -import org.bukkit.generator.ChunkGenerator; -import org.bukkit.plugin.PluginBase; -import org.bukkit.plugin.PluginDescriptionFile; -import org.bukkit.plugin.PluginLoader; -import org.bukkit.plugin.PluginLogger; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.InputStream; -import java.util.List; - -public class NullPlugin extends PluginBase { - private final String pluginName; - private boolean enabled = true; - private PluginDescriptionFile pdf; - - public NullPlugin() { - this.pluginName = "Minecraft"; - pdf = new PluginDescriptionFile(pluginName, "1.0", "nms"); - } - - @Override - public File getDataFolder() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public PluginDescriptionFile getDescription() { - return pdf; - } - - // Paper start - @Override - public io.papermc.paper.plugin.configuration.PluginMeta getPluginMeta() { - return pdf; - } - - @Override - public FileConfiguration getConfig() { - throw new UnsupportedOperationException("Not supported."); - } - // Paper end - - @Override - public InputStream getResource(String filename) { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public void saveConfig() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public void saveDefaultConfig() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public void saveResource(String resourcePath, boolean replace) { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public void reloadConfig() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public PluginLogger getLogger() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public PluginLoader getPluginLoader() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public Server getServer() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - @Override - public void onDisable() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public void onLoad() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public void onEnable() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public boolean isNaggable() { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public void setNaggable(boolean canNag) { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public @Nullable BiomeProvider getDefaultBiomeProvider(@NotNull String worldName, @Nullable String id) { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - throw new UnsupportedOperationException("Not supported."); - } - - @Override - public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { - throw new UnsupportedOperationException("Not supported."); - } - - // Paper start - lifecycle events - @Override - public @NotNull io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager getLifecycleManager() { - throw new UnsupportedOperationException("Not supported."); - } - // Paper end - lifecycle events -} \ No newline at end of file diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/LocatorBarConfig.java b/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/LocatorBarConfig.java index 26d88eb..409b990 100644 --- a/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/LocatorBarConfig.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/LocatorBarConfig.java @@ -21,12 +21,12 @@ import com.mojang.brigadier.arguments.BoolArgumentType; import fun.bm.lophine.LophineLogger; import fun.bm.lophine.config.modules.function.FakeplayerConfig; import me.earthme.luminol.config.modules.experiment.CommandConfig; -import me.earthme.luminol.utils.NullPlugin; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.waypoints.ServerWaypointManager; import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.command.CommandContext; +import org.leavesmc.leaves.plugin.MinecraftInternalPlugin; public class LocatorBarConfig extends AbstractBotConfig { private boolean value; @@ -60,7 +60,7 @@ public class LocatorBarConfig extends AbstractBotConfig setValue(value, count + 1), 20); + Bukkit.getGlobalRegionScheduler().runDelayed(MinecraftInternalPlugin.INSTANCE, (_) -> setValue(value, count + 1), 20); } } diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SimulationDistanceConfig.java b/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SimulationDistanceConfig.java index 061e791..4eebb15 100644 --- a/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SimulationDistanceConfig.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SimulationDistanceConfig.java @@ -21,11 +21,11 @@ import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.suggestion.SuggestionsBuilder; import fun.bm.lophine.LophineLogger; import fun.bm.lophine.config.modules.function.FakeplayerConfig; -import me.earthme.luminol.utils.NullPlugin; import net.minecraft.nbt.CompoundTag; import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.command.CommandContext; +import org.leavesmc.leaves.plugin.MinecraftInternalPlugin; import static net.minecraft.network.chat.Component.literal; @@ -80,7 +80,7 @@ public class SimulationDistanceConfig extends AbstractBotConfig load(nbt, count + 1), 20); + Bukkit.getGlobalRegionScheduler().runDelayed(MinecraftInternalPlugin.INSTANCE, (_) -> load(nbt, count + 1), 20); } } } diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SkipSleepConfig.java b/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SkipSleepConfig.java index f8a8737..a53d63b 100644 --- a/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SkipSleepConfig.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SkipSleepConfig.java @@ -20,11 +20,11 @@ package org.leavesmc.leaves.bot.agent.configs; import com.mojang.brigadier.arguments.BoolArgumentType; import fun.bm.lophine.LophineLogger; import fun.bm.lophine.config.modules.function.FakeplayerConfig; -import me.earthme.luminol.utils.NullPlugin; import net.minecraft.nbt.CompoundTag; import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.command.CommandContext; +import org.leavesmc.leaves.plugin.MinecraftInternalPlugin; public class SkipSleepConfig extends AbstractBotConfig { @@ -50,7 +50,7 @@ public class SkipSleepConfig extends AbstractBotConfig if (this.bot != null) { bot.fauxSleeping = value; } else { - Bukkit.getGlobalRegionScheduler().runDelayed(new NullPlugin(), (task0) -> setValue(value, count + 1), 20); + Bukkit.getGlobalRegionScheduler().runDelayed(MinecraftInternalPlugin.INSTANCE, (_) -> setValue(value, count + 1), 20); } } diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/litematics/placement/SchematicPlacement.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/litematics/placement/SchematicPlacement.java index 769845d..0318390 100644 --- a/lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/litematics/placement/SchematicPlacement.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/litematics/placement/SchematicPlacement.java @@ -20,7 +20,6 @@ package org.leavesmc.leaves.protocol.servux.litematics.placement; import com.google.common.collect.ImmutableMap; import fun.bm.lophine.config.modules.function.protocol.ServuxProtocolConfig; import io.papermc.paper.threadedregions.RegionizedServer; -import me.earthme.luminol.utils.NullPlugin; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.minecraft.core.BlockBox; @@ -36,6 +35,7 @@ import net.minecraft.world.phys.AABB; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; +import org.leavesmc.leaves.plugin.MinecraftInternalPlugin; import org.leavesmc.leaves.protocol.servux.ServuxProtocol; import org.leavesmc.leaves.protocol.servux.litematics.LitematicaSchematic; import org.leavesmc.leaves.protocol.servux.litematics.selection.Box; @@ -342,13 +342,13 @@ public class SchematicPlacement { } ); - final NullPlugin nullPlugin = new NullPlugin(); + final MinecraftInternalPlugin nullPlugin = MinecraftInternalPlugin.INSTANCE; scheduleTask(nullPlugin, serverWorld, count, count_full, player, timeStart, ServuxProtocolConfig.maxDelay); } private void scheduleTask(Plugin plugin, ServerLevel serverWorld, AtomicInteger count1, AtomicInteger count2, ServerPlayer player, long timeStart, int retryCount) { Bukkit.getGlobalRegionScheduler().runDelayed(plugin, - (unused) -> { + (_) -> { if (count1.get() >= count2.get()) { long timeElapsed = System.currentTimeMillis() - timeStart; player.getBukkitEntity().sendActionBar(