From 8507144b03a94ef20aa25f4dbd83563af212daf6 Mon Sep 17 00:00:00 2001 From: sakurawald Date: Mon, 8 Jul 2024 07:53:46 +0800 Subject: [PATCH] refactor: rename `xxxModule` into `xxxInitializer` --- .../sakurawald/config/model/HeadModel.java | 4 ++-- .../afk/{AfkModule.java => AfkInitializer.java} | 2 +- .../{AnvilModule.java => AnvilInitializer.java} | 2 +- .../{BackModule.java => BackInitializer.java} | 2 +- .../bed/{BedModule.java => BedInitializer.java} | 2 +- ...foModule.java => BetterInfoInitializer.java} | 2 +- ...yModule.java => CartographyInitializer.java} | 3 +-- .../{ChatModule.java => ChatInitializer.java} | 8 ++++---- ...Module.java => CommandAliasInitializer.java} | 2 +- ...ule.java => CommandCooldownInitializer.java} | 2 +- ...e.java => CommandPermissionInitializer.java} | 2 +- ...ConfigModule.java => ConfigInitializer.java} | 2 +- ...hLogModule.java => DeathLogInitializer.java} | 2 +- ...tModule.java => EnchantmentInitializer.java} | 17 +---------------- ...stModule.java => EnderChestInitializer.java} | 2 +- ...shModule.java => ExtinguishInitializer.java} | 2 +- ...e.java => FakePlayerManagerInitializer.java} | 6 +++--- .../{FeedModule.java => FeedInitializer.java} | 2 +- .../fly/{FlyModule.java => FlyInitializer.java} | 2 +- .../god/{GodModule.java => GodInitializer.java} | 2 +- ...neModule.java => GrindStoneInitializer.java} | 2 +- .../hat/{HatModule.java => HatInitializer.java} | 2 +- .../{HeadModule.java => HeadInitializer.java} | 2 +- .../module/initializer/head/gui/HeadGui.java | 4 ++-- .../initializer/head/gui/PagedHeadsGui.java | 10 +++++----- .../initializer/head/gui/PlayerInputGui.java | 6 +++--- .../initializer/head/gui/SearchInputGui.java | 6 +++--- .../{HealModule.java => HealInitializer.java} | 2 +- .../{HomeModule.java => HomeInitializer.java} | 2 +- ...uageModule.java => LanguageInitializer.java} | 2 +- .../{LoomModule.java => LoomInitializer.java} | 2 +- ...atsModule.java => MainStatsInitializer.java} | 10 +++++----- .../{MoreModule.java => MoreInitializer.java} | 2 +- .../{MotdModule.java => MotdInitializer.java} | 2 +- ...va => MultiObsidianPlatformInitializer.java} | 2 +- ...odule.java => NewbieWelcomeInitializer.java} | 2 +- .../{PingModule.java => PingInitializer.java} | 2 +- ...ilerModule.java => ProfilerInitializer.java} | 2 +- .../pvp/{PvpModule.java => PvpInitializer.java} | 2 +- ...RepairModule.java => RepairInitializer.java} | 2 +- .../{ReplyModule.java => ReplyInitializer.java} | 2 +- ...odule.java => ResourceWorldInitializer.java} | 9 +++------ .../resource_world/ResourceWorldManager.java | 8 ++++---- .../initializer/scheduler/ScheduleJob.java | 2 +- ...lerModule.java => SchedulerInitializer.java} | 2 +- .../{SeenModule.java => SeenInitializer.java} | 2 +- .../sit/{SitModule.java => SitInitializer.java} | 2 +- .../SkinModule.java => SkinInitializer.java} | 5 ++--- ...rModule.java => StoneCutterInitializer.java} | 2 +- ...icideModule.java => SuicideInitializer.java} | 2 +- ...dule.java => TeleportWarmupInitializer.java} | 2 +- .../{TestModule.java => TestInitializer.java} | 10 +++------- ...nksModule.java => TopChunksInitializer.java} | 2 +- .../tpa/{TpaModule.java => TpaInitializer.java} | 2 +- .../module/initializer/tpa/TpaRequest.java | 2 +- ...nchModule.java => WorkbenchInitializer.java} | 2 +- .../{WorksModule.java => WorksInitializer.java} | 2 +- .../initializer/works/work_type/Work.java | 6 +++--- .../world_downloader/FileDownloadHandler.java | 2 +- ...ule.java => WorldDownloaderInitializer.java} | 2 +- .../module/mixin/back/ServerPlayerMixin.java | 10 +++++----- .../module/mixin/chat/PlayerListMixin.java | 4 ++-- .../chat/ServerGamePacketListenerImplMixin.java | 4 ++-- .../mixin/command_cooldown/CommandsMixin.java | 5 ++--- .../mixin/deathlog/ServerPlayerMixin.java | 4 ++-- .../fake_player_manager/PlayerCommandMixin.java | 4 ++-- .../fake_player_manager/PlayerListMixin.java | 4 ++-- .../mixin/fake_player_manager/PlayerMixin.java | 4 ++-- .../ServerStatusPacketListenerImplMixin.java | 4 ++-- .../EndPortalBlockMixin.java | 4 ++-- .../mixin/newbie_welcome/PlayerListMixin.java | 4 ++-- .../module/mixin/pvp/PvpToggleMixin.java | 4 ++-- .../module/mixin/reply/MsgCommandMixin.java | 4 ++-- .../module/mixin/seen/PlayerListMixin.java | 4 ++-- .../module/mixin/sit/InteractModifierMixin.java | 4 ++-- .../teleport_warmup/ServerPlayerMixin.java | 12 ++++++------ 76 files changed, 128 insertions(+), 153 deletions(-) rename src/main/java/io/github/sakurawald/module/initializer/afk/{AfkModule.java => AfkInitializer.java} (98%) rename src/main/java/io/github/sakurawald/module/initializer/anvil/{AnvilModule.java => AnvilInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/back/{BackModule.java => BackInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/bed/{BedModule.java => BedInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/better_info/{BetterInfoModule.java => BetterInfoInitializer.java} (92%) rename src/main/java/io/github/sakurawald/module/initializer/cartography/{CartographyModule.java => CartographyInitializer.java} (94%) rename src/main/java/io/github/sakurawald/module/initializer/chat/{ChatModule.java => ChatInitializer.java} (98%) rename src/main/java/io/github/sakurawald/module/initializer/command_alias/{CommandAliasModule.java => CommandAliasInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/command_cooldown/{CommandCooldownModule.java => CommandCooldownInitializer.java} (95%) rename src/main/java/io/github/sakurawald/module/initializer/command_permission/{CommandPermissionModule.java => CommandPermissionInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/config/{ConfigModule.java => ConfigInitializer.java} (95%) rename src/main/java/io/github/sakurawald/module/initializer/deathlog/{DeathLogModule.java => DeathLogInitializer.java} (99%) rename src/main/java/io/github/sakurawald/module/initializer/enchantment/{EnchantmentModule.java => EnchantmentInitializer.java} (66%) rename src/main/java/io/github/sakurawald/module/initializer/enderchest/{EnderChestModule.java => EnderChestInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/extinguish/{ExtinguishModule.java => ExtinguishInitializer.java} (94%) rename src/main/java/io/github/sakurawald/module/initializer/fake_player_manager/{FakePlayerManagerModule.java => FakePlayerManagerInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/feed/{FeedModule.java => FeedInitializer.java} (95%) rename src/main/java/io/github/sakurawald/module/initializer/fly/{FlyModule.java => FlyInitializer.java} (95%) rename src/main/java/io/github/sakurawald/module/initializer/god/{GodModule.java => GodInitializer.java} (95%) rename src/main/java/io/github/sakurawald/module/initializer/grindstone/{GrindStoneModule.java => GrindStoneInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/hat/{HatModule.java => HatInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/head/{HeadModule.java => HeadInitializer.java} (98%) rename src/main/java/io/github/sakurawald/module/initializer/heal/{HealModule.java => HealInitializer.java} (95%) rename src/main/java/io/github/sakurawald/module/initializer/home/{HomeModule.java => HomeInitializer.java} (99%) rename src/main/java/io/github/sakurawald/module/initializer/language/{LanguageModule.java => LanguageInitializer.java} (81%) rename src/main/java/io/github/sakurawald/module/initializer/loom/{LoomModule.java => LoomInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/main_stats/{MainStatsModule.java => MainStatsInitializer.java} (88%) rename src/main/java/io/github/sakurawald/module/initializer/more/{MoreModule.java => MoreInitializer.java} (95%) rename src/main/java/io/github/sakurawald/module/initializer/motd/{MotdModule.java => MotdInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/multi_obsidian_platform/{MultiObsidianPlatformModule.java => MultiObsidianPlatformInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/newbie_welcome/{NewbieWelcomeModule.java => NewbieWelcomeInitializer.java} (90%) rename src/main/java/io/github/sakurawald/module/initializer/ping/{PingModule.java => PingInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/profiler/{ProfilerModule.java => ProfilerInitializer.java} (99%) rename src/main/java/io/github/sakurawald/module/initializer/pvp/{PvpModule.java => PvpInitializer.java} (98%) rename src/main/java/io/github/sakurawald/module/initializer/repair/{RepairModule.java => RepairInitializer.java} (95%) rename src/main/java/io/github/sakurawald/module/initializer/reply/{ReplyModule.java => ReplyInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/resource_world/{ResourceWorldModule.java => ResourceWorldInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/scheduler/{SchedulerModule.java => SchedulerInitializer.java} (98%) rename src/main/java/io/github/sakurawald/module/initializer/seen/{SeenModule.java => SeenInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/sit/{SitModule.java => SitInitializer.java} (98%) rename src/main/java/io/github/sakurawald/module/initializer/skin/{command/SkinModule.java => SkinInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/stonecutter/{StoneCutterModule.java => StoneCutterInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/suicide/{SuicideModule.java => SuicideInitializer.java} (94%) rename src/main/java/io/github/sakurawald/module/initializer/teleport_warmup/{TeleportWarmupModule.java => TeleportWarmupInitializer.java} (97%) rename src/main/java/io/github/sakurawald/module/initializer/test/{TestModule.java => TestInitializer.java} (85%) rename src/main/java/io/github/sakurawald/module/initializer/top_chunks/{TopChunksModule.java => TopChunksInitializer.java} (98%) rename src/main/java/io/github/sakurawald/module/initializer/tpa/{TpaModule.java => TpaInitializer.java} (99%) rename src/main/java/io/github/sakurawald/module/initializer/workbench/{WorkbenchModule.java => WorkbenchInitializer.java} (96%) rename src/main/java/io/github/sakurawald/module/initializer/works/{WorksModule.java => WorksInitializer.java} (99%) rename src/main/java/io/github/sakurawald/module/initializer/world_downloader/{WorldDownloaderModule.java => WorldDownloaderInitializer.java} (99%) diff --git a/src/main/java/io/github/sakurawald/config/model/HeadModel.java b/src/main/java/io/github/sakurawald/config/model/HeadModel.java index 7f02a4e87..fea3f82fe 100644 --- a/src/main/java/io/github/sakurawald/config/model/HeadModel.java +++ b/src/main/java/io/github/sakurawald/config/model/HeadModel.java @@ -1,9 +1,9 @@ package io.github.sakurawald.config.model; -import io.github.sakurawald.module.initializer.head.HeadModule; +import io.github.sakurawald.module.initializer.head.HeadInitializer; public class HeadModel { - public HeadModule.EconomyType economyType = HeadModule.EconomyType.ITEM; + public HeadInitializer.EconomyType economyType = HeadInitializer.EconomyType.ITEM; public String costType = "minecraft:emerald_block"; public int costAmount = 1; } diff --git a/src/main/java/io/github/sakurawald/module/initializer/afk/AfkModule.java b/src/main/java/io/github/sakurawald/module/initializer/afk/AfkInitializer.java similarity index 98% rename from src/main/java/io/github/sakurawald/module/initializer/afk/AfkModule.java rename to src/main/java/io/github/sakurawald/module/initializer/afk/AfkInitializer.java index d8c5c0a1e..28a80c212 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/afk/AfkModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/afk/AfkInitializer.java @@ -20,7 +20,7 @@ import org.quartz.JobExecutionException; -public class AfkModule extends ModuleInitializer { +public class AfkInitializer extends ModuleInitializer { @Override public void onInitialize() { diff --git a/src/main/java/io/github/sakurawald/module/initializer/anvil/AnvilModule.java b/src/main/java/io/github/sakurawald/module/initializer/anvil/AnvilInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/anvil/AnvilModule.java rename to src/main/java/io/github/sakurawald/module/initializer/anvil/AnvilInitializer.java index 474d08eb1..406580e35 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/anvil/AnvilModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/anvil/AnvilInitializer.java @@ -14,7 +14,7 @@ import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; -public class AnvilModule extends ModuleInitializer { +public class AnvilInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { dispatcher.register(CommandManager.literal("anvil").executes(this::$anvil)); diff --git a/src/main/java/io/github/sakurawald/module/initializer/back/BackModule.java b/src/main/java/io/github/sakurawald/module/initializer/back/BackInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/back/BackModule.java rename to src/main/java/io/github/sakurawald/module/initializer/back/BackInitializer.java index 3c1cb7979..2abd5651e 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/back/BackModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/back/BackInitializer.java @@ -16,7 +16,7 @@ import java.util.HashMap; @SuppressWarnings("LombokGetterMayBeUsed") -public class BackModule extends ModuleInitializer { +public class BackInitializer extends ModuleInitializer { @Getter private final HashMap player2lastPos = new HashMap<>(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/bed/BedModule.java b/src/main/java/io/github/sakurawald/module/initializer/bed/BedInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/bed/BedModule.java rename to src/main/java/io/github/sakurawald/module/initializer/bed/BedInitializer.java index 9fe384f23..fd8143b20 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/bed/BedModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/bed/BedInitializer.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; -public class BedModule extends ModuleInitializer { +public class BedInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { diff --git a/src/main/java/io/github/sakurawald/module/initializer/better_info/BetterInfoModule.java b/src/main/java/io/github/sakurawald/module/initializer/better_info/BetterInfoInitializer.java similarity index 92% rename from src/main/java/io/github/sakurawald/module/initializer/better_info/BetterInfoModule.java rename to src/main/java/io/github/sakurawald/module/initializer/better_info/BetterInfoInitializer.java index 65ca00452..325b39967 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/better_info/BetterInfoModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/better_info/BetterInfoInitializer.java @@ -8,7 +8,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class BetterInfoModule extends ModuleInitializer { +public class BetterInfoInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/cartography/CartographyModule.java b/src/main/java/io/github/sakurawald/module/initializer/cartography/CartographyInitializer.java similarity index 94% rename from src/main/java/io/github/sakurawald/module/initializer/cartography/CartographyModule.java rename to src/main/java/io/github/sakurawald/module/initializer/cartography/CartographyInitializer.java index cda2db134..021f27436 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/cartography/CartographyModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/cartography/CartographyInitializer.java @@ -8,7 +8,6 @@ import net.minecraft.command.CommandRegistryAccess; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.screen.CartographyTableScreenHandler; -import net.minecraft.screen.LoomScreenHandler; import net.minecraft.screen.ScreenHandlerContext; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.server.command.CommandManager; @@ -16,7 +15,7 @@ import net.minecraft.stat.Stats; import net.minecraft.text.Text; -public class CartographyModule extends ModuleInitializer { +public class CartographyInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { dispatcher.register(CommandManager.literal("cartography").executes(this::$cartography)); diff --git a/src/main/java/io/github/sakurawald/module/initializer/chat/ChatModule.java b/src/main/java/io/github/sakurawald/module/initializer/chat/ChatInitializer.java similarity index 98% rename from src/main/java/io/github/sakurawald/module/initializer/chat/ChatModule.java rename to src/main/java/io/github/sakurawald/module/initializer/chat/ChatInitializer.java index 7e8b3c249..b2f9a54d2 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/chat/ChatModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/chat/ChatInitializer.java @@ -15,7 +15,7 @@ import io.github.sakurawald.module.initializer.chat.display.DisplayHelper; import io.github.sakurawald.module.initializer.chat.mention.MentionPlayersJob; import io.github.sakurawald.module.initializer.main_stats.MainStats; -import io.github.sakurawald.module.initializer.main_stats.MainStatsModule; +import io.github.sakurawald.module.initializer.main_stats.MainStatsInitializer; import io.github.sakurawald.util.CommandUtil; import io.github.sakurawald.util.MessageUtil; import lombok.Getter; @@ -48,13 +48,13 @@ import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; -public class ChatModule extends ModuleInitializer { +public class ChatInitializer extends ModuleInitializer { public static final ConfigHandler chatHandler = new ObjectConfigHandler<>("chat.json", ChatModel.class); private static final Pattern xaero_waypoint_pattern = Pattern.compile( "^xaero-waypoint:([^:]+):.+:(-?\\d+):(~?-?\\d*):(-?\\d+).*?-(.*)-waypoints$"); private static final Pattern pos_pattern = Pattern.compile("^xaero-waypoint:|pos"); private final MiniMessage miniMessage = MiniMessage.builder().build(); - private final MainStatsModule mainStatsModule = ModuleManager.getInitializer(MainStatsModule.class); + private final MainStatsInitializer mainStatsInitializer = ModuleManager.getInitializer(MainStatsInitializer.class); @Getter private Queue chatHistory; @@ -283,7 +283,7 @@ public void broadcastChatMessage(ServerPlayerEntity player, String message) { format = format.replace("%player%", player.getGameProfile().getName()); /* resolve stats */ - if (mainStatsModule != null) { + if (mainStatsInitializer != null) { MainStats stats = MainStats.uuid2stats.getOrDefault(player.getUuid().toString(), new MainStats()); format = stats.update(player).resolve(Fuji.SERVER, format); } diff --git a/src/main/java/io/github/sakurawald/module/initializer/command_alias/CommandAliasModule.java b/src/main/java/io/github/sakurawald/module/initializer/command_alias/CommandAliasInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/command_alias/CommandAliasModule.java rename to src/main/java/io/github/sakurawald/module/initializer/command_alias/CommandAliasInitializer.java index dc87d118b..2d20c1af8 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/command_alias/CommandAliasModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/command_alias/CommandAliasInitializer.java @@ -11,7 +11,7 @@ import static net.minecraft.server.command.CommandManager.literal; -public class CommandAliasModule extends ModuleInitializer { +public class CommandAliasInitializer extends ModuleInitializer { @Override public void onInitialize() { ServerLifecycleEvents.SERVER_STARTED.register((server -> { diff --git a/src/main/java/io/github/sakurawald/module/initializer/command_cooldown/CommandCooldownModule.java b/src/main/java/io/github/sakurawald/module/initializer/command_cooldown/CommandCooldownInitializer.java similarity index 95% rename from src/main/java/io/github/sakurawald/module/initializer/command_cooldown/CommandCooldownModule.java rename to src/main/java/io/github/sakurawald/module/initializer/command_cooldown/CommandCooldownInitializer.java index 3c4516076..0aa79a62a 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/command_cooldown/CommandCooldownModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/command_cooldown/CommandCooldownInitializer.java @@ -6,7 +6,7 @@ import java.util.Map; import net.minecraft.server.network.ServerPlayerEntity; -public class CommandCooldownModule extends ModuleInitializer { +public class CommandCooldownInitializer extends ModuleInitializer { private final HashMap> map = new HashMap<>(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/command_permission/CommandPermissionModule.java b/src/main/java/io/github/sakurawald/module/initializer/command_permission/CommandPermissionInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/command_permission/CommandPermissionModule.java rename to src/main/java/io/github/sakurawald/module/initializer/command_permission/CommandPermissionInitializer.java index 8837e0d85..983d96297 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/command_permission/CommandPermissionModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/command_permission/CommandPermissionInitializer.java @@ -12,7 +12,7 @@ import java.util.function.Predicate; -public class CommandPermissionModule extends ModuleInitializer { +public class CommandPermissionInitializer extends ModuleInitializer { @Override public void onInitialize() { diff --git a/src/main/java/io/github/sakurawald/module/initializer/config/ConfigModule.java b/src/main/java/io/github/sakurawald/module/initializer/config/ConfigInitializer.java similarity index 95% rename from src/main/java/io/github/sakurawald/module/initializer/config/ConfigModule.java rename to src/main/java/io/github/sakurawald/module/initializer/config/ConfigInitializer.java index 30c2ce110..28cbdd63a 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/config/ConfigModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/config/ConfigInitializer.java @@ -12,7 +12,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class ConfigModule extends ModuleInitializer { +public class ConfigInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/deathlog/DeathLogModule.java b/src/main/java/io/github/sakurawald/module/initializer/deathlog/DeathLogInitializer.java similarity index 99% rename from src/main/java/io/github/sakurawald/module/initializer/deathlog/DeathLogModule.java rename to src/main/java/io/github/sakurawald/module/initializer/deathlog/DeathLogInitializer.java index db51ba72f..c928014f1 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/deathlog/DeathLogModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/deathlog/DeathLogInitializer.java @@ -41,7 +41,7 @@ @SuppressWarnings("ResultOfMethodCallIgnored") -public class DeathLogModule extends ModuleInitializer { +public class DeathLogInitializer extends ModuleInitializer { private final Path STORAGE_PATH = Fuji.CONFIG_PATH.resolve("deathlog"); private final String DEATHS = "Deaths"; private final String TIME = "time"; diff --git a/src/main/java/io/github/sakurawald/module/initializer/enchantment/EnchantmentModule.java b/src/main/java/io/github/sakurawald/module/initializer/enchantment/EnchantmentInitializer.java similarity index 66% rename from src/main/java/io/github/sakurawald/module/initializer/enchantment/EnchantmentModule.java rename to src/main/java/io/github/sakurawald/module/initializer/enchantment/EnchantmentInitializer.java index db5e4540b..482a7c927 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/enchantment/EnchantmentModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/enchantment/EnchantmentInitializer.java @@ -5,29 +5,14 @@ import com.mojang.brigadier.context.CommandContext; import io.github.sakurawald.module.initializer.ModuleInitializer; import io.github.sakurawald.util.CommandUtil; -import net.minecraft.block.EnchantingTableBlock; import net.minecraft.command.CommandRegistryAccess; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.EnchantmentLevelEntry; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.screen.EnchantmentScreenHandler; import net.minecraft.screen.ScreenHandlerContext; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; -import net.minecraft.util.collection.IndexedIterable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import java.util.List; - -public class EnchantmentModule extends ModuleInitializer { +public class EnchantmentInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { dispatcher.register(CommandManager.literal("enchantment").executes(this::$enchantment)); diff --git a/src/main/java/io/github/sakurawald/module/initializer/enderchest/EnderChestModule.java b/src/main/java/io/github/sakurawald/module/initializer/enderchest/EnderChestInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/enderchest/EnderChestModule.java rename to src/main/java/io/github/sakurawald/module/initializer/enderchest/EnderChestInitializer.java index 0d10bf6d1..2e4fcd384 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/enderchest/EnderChestModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/enderchest/EnderChestInitializer.java @@ -15,7 +15,7 @@ import net.minecraft.text.Text; -public class EnderChestModule extends ModuleInitializer { +public class EnderChestInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { diff --git a/src/main/java/io/github/sakurawald/module/initializer/extinguish/ExtinguishModule.java b/src/main/java/io/github/sakurawald/module/initializer/extinguish/ExtinguishInitializer.java similarity index 94% rename from src/main/java/io/github/sakurawald/module/initializer/extinguish/ExtinguishModule.java rename to src/main/java/io/github/sakurawald/module/initializer/extinguish/ExtinguishInitializer.java index 8625fd9f0..efe8b9a6e 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/extinguish/ExtinguishModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/extinguish/ExtinguishInitializer.java @@ -10,7 +10,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class ExtinguishModule extends ModuleInitializer { +public class ExtinguishInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/fake_player_manager/FakePlayerManagerModule.java b/src/main/java/io/github/sakurawald/module/initializer/fake_player_manager/FakePlayerManagerInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/fake_player_manager/FakePlayerManagerModule.java rename to src/main/java/io/github/sakurawald/module/initializer/fake_player_manager/FakePlayerManagerInitializer.java index 1ce3861ee..93317568e 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/fake_player_manager/FakePlayerManagerModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/fake_player_manager/FakePlayerManagerInitializer.java @@ -27,7 +27,7 @@ import java.time.LocalTime; import java.util.*; -public class FakePlayerManagerModule extends ModuleInitializer { +public class FakePlayerManagerInitializer extends ModuleInitializer { private final ArrayList CONSTANT_EMPTY_LIST = new ArrayList<>(); private final HashMap> player2fakePlayers = new HashMap<>(); private final HashMap player2expiration = new HashMap<>(); @@ -155,7 +155,7 @@ private int getCurrentAmountLimit() { public void registerScheduleTask(MinecraftServer server) { ScheduleUtil.addJob(ManageFakePlayersJob.class, null, null, ScheduleUtil.CRON_EVERY_MINUTE, new JobDataMap() { { - this.put(FakePlayerManagerModule.class.getName(), FakePlayerManagerModule.this); + this.put(FakePlayerManagerInitializer.class.getName(), FakePlayerManagerInitializer.this); } }); } @@ -174,7 +174,7 @@ public static class ManageFakePlayersJob implements Job { @Override public void execute(JobExecutionContext context) { /* validate */ - FakePlayerManagerModule module = (FakePlayerManagerModule) context.getJobDetail().getJobDataMap().get(FakePlayerManagerModule.class.getName()); + FakePlayerManagerInitializer module = (FakePlayerManagerInitializer) context.getJobDetail().getJobDataMap().get(FakePlayerManagerInitializer.class.getName()); module.validateFakePlayers(); int limit = module.getCurrentAmountLimit(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/feed/FeedModule.java b/src/main/java/io/github/sakurawald/module/initializer/feed/FeedInitializer.java similarity index 95% rename from src/main/java/io/github/sakurawald/module/initializer/feed/FeedModule.java rename to src/main/java/io/github/sakurawald/module/initializer/feed/FeedInitializer.java index 134ef3e31..e7c776229 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/feed/FeedModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/feed/FeedInitializer.java @@ -12,7 +12,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class FeedModule extends ModuleInitializer { +public class FeedInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/fly/FlyModule.java b/src/main/java/io/github/sakurawald/module/initializer/fly/FlyInitializer.java similarity index 95% rename from src/main/java/io/github/sakurawald/module/initializer/fly/FlyModule.java rename to src/main/java/io/github/sakurawald/module/initializer/fly/FlyInitializer.java index 079c87b64..69cf6ec60 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/fly/FlyModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/fly/FlyInitializer.java @@ -11,7 +11,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class FlyModule extends ModuleInitializer { +public class FlyInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { diff --git a/src/main/java/io/github/sakurawald/module/initializer/god/GodModule.java b/src/main/java/io/github/sakurawald/module/initializer/god/GodInitializer.java similarity index 95% rename from src/main/java/io/github/sakurawald/module/initializer/god/GodModule.java rename to src/main/java/io/github/sakurawald/module/initializer/god/GodInitializer.java index 456e013a7..25f3082b3 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/god/GodModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/god/GodInitializer.java @@ -11,7 +11,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class GodModule extends ModuleInitializer { +public class GodInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/grindstone/GrindStoneModule.java b/src/main/java/io/github/sakurawald/module/initializer/grindstone/GrindStoneInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/grindstone/GrindStoneModule.java rename to src/main/java/io/github/sakurawald/module/initializer/grindstone/GrindStoneInitializer.java index 1987a1f82..b310b24fc 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/grindstone/GrindStoneModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/grindstone/GrindStoneInitializer.java @@ -14,7 +14,7 @@ import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; -public class GrindStoneModule extends ModuleInitializer { +public class GrindStoneInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { dispatcher.register(CommandManager.literal("grindstone").executes(this::$grindstone)); diff --git a/src/main/java/io/github/sakurawald/module/initializer/hat/HatModule.java b/src/main/java/io/github/sakurawald/module/initializer/hat/HatInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/hat/HatModule.java rename to src/main/java/io/github/sakurawald/module/initializer/hat/HatInitializer.java index 51d6bf7ed..4b46b13b2 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/hat/HatModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/hat/HatInitializer.java @@ -14,7 +14,7 @@ import net.minecraft.util.Hand; -public class HatModule extends ModuleInitializer { +public class HatInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/head/HeadModule.java b/src/main/java/io/github/sakurawald/module/initializer/head/HeadInitializer.java similarity index 98% rename from src/main/java/io/github/sakurawald/module/initializer/head/HeadModule.java rename to src/main/java/io/github/sakurawald/module/initializer/head/HeadInitializer.java index 42db2f087..12d039146 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/head/HeadModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/head/HeadInitializer.java @@ -28,7 +28,7 @@ import java.util.concurrent.CompletableFuture; // Thanks to: https://modrinth.com/mod/headindex -public class HeadModule extends ModuleInitializer { +public class HeadInitializer extends ModuleInitializer { public static final ConfigHandler headHandler = new ObjectConfigHandler<>("head.json", HeadModel.class); public final HeadDatabaseAPI HEAD_DATABASE = new HeadDatabaseAPI(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/head/gui/HeadGui.java b/src/main/java/io/github/sakurawald/module/initializer/head/gui/HeadGui.java index 37d2310f7..74cd66cde 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/head/gui/HeadGui.java +++ b/src/main/java/io/github/sakurawald/module/initializer/head/gui/HeadGui.java @@ -3,7 +3,7 @@ import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.gui.SimpleGui; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.head.HeadModule; +import io.github.sakurawald.module.initializer.head.HeadInitializer; import io.github.sakurawald.module.initializer.head.api.Category; import io.github.sakurawald.util.MessageUtil; import java.util.ArrayList; @@ -13,7 +13,7 @@ public class HeadGui extends SimpleGui { protected final ServerPlayerEntity player; - final HeadModule module = ModuleManager.getInitializer(HeadModule.class); + final HeadInitializer module = ModuleManager.getInitializer(HeadInitializer.class); public HeadGui(ServerPlayerEntity player) { super(ScreenHandlerType.GENERIC_9X2, player, false); diff --git a/src/main/java/io/github/sakurawald/module/initializer/head/gui/PagedHeadsGui.java b/src/main/java/io/github/sakurawald/module/initializer/head/gui/PagedHeadsGui.java index f6a441e9a..29ac595c2 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/head/gui/PagedHeadsGui.java +++ b/src/main/java/io/github/sakurawald/module/initializer/head/gui/PagedHeadsGui.java @@ -6,7 +6,7 @@ import eu.pb4.sgui.api.gui.layered.Layer; import eu.pb4.sgui.api.gui.layered.LayeredGui; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.head.HeadModule; +import io.github.sakurawald.module.initializer.head.HeadInitializer; import io.github.sakurawald.module.initializer.head.api.Head; import io.github.sakurawald.util.GuiUtil; import io.github.sakurawald.util.MessageUtil; @@ -22,7 +22,7 @@ public class PagedHeadsGui extends LayeredGui { final GuiInterface parent; final Layer contentLayer; final Layer navigationLayer; - final HeadModule module = ModuleManager.getInitializer(HeadModule.class); + final HeadInitializer module = ModuleManager.getInitializer(HeadInitializer.class); public int page = 0; public PagedHeadsGui(GuiInterface parent, List heads) { @@ -84,7 +84,7 @@ private void updateContent() { if (heads.size() > i + (this.page * 45)) { Head head = heads.get(i + (this.page * 45)); var builder = GuiElementBuilder.from(head.of()); - if (HeadModule.headHandler.model().economyType != HeadModule.EconomyType.FREE) { + if (HeadInitializer.headHandler.model().economyType != HeadInitializer.EconomyType.FREE) { builder.addLoreLine(Text.empty()); builder.addLoreLine(MessageUtil.ofVomponent(parent.getPlayer(), "head.price").copy().append(module.getCost())); } @@ -120,7 +120,7 @@ private void processHeadClick(Head head, ClickType type) { if (type.isLeft) { module.tryPurchase(player, 1, () -> cursorStack.increment(1)); } else if (type.isRight) { - if (HeadModule.headHandler.model().economyType == HeadModule.EconomyType.FREE) + if (HeadInitializer.headHandler.model().economyType == HeadInitializer.EconomyType.FREE) cursorStack.decrement(1); } else if (type.isMiddle) { var amount = headStack.getMaxCount() - cursorStack.getCount(); @@ -130,7 +130,7 @@ private void processHeadClick(Head head, ClickType type) { }); } } else { - if (HeadModule.headHandler.model().economyType == HeadModule.EconomyType.FREE) + if (HeadInitializer.headHandler.model().economyType == HeadInitializer.EconomyType.FREE) player.currentScreenHandler.setCursorStack(ItemStack.EMPTY); } } diff --git a/src/main/java/io/github/sakurawald/module/initializer/head/gui/PlayerInputGui.java b/src/main/java/io/github/sakurawald/module/initializer/head/gui/PlayerInputGui.java index e2dffd810..a8cfb9eaf 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/head/gui/PlayerInputGui.java +++ b/src/main/java/io/github/sakurawald/module/initializer/head/gui/PlayerInputGui.java @@ -8,7 +8,7 @@ import eu.pb4.sgui.api.gui.AnvilInputGui; import io.github.sakurawald.Fuji; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.head.HeadModule; +import io.github.sakurawald.module.initializer.head.HeadInitializer; import io.github.sakurawald.util.MessageUtil; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; class PlayerInputGui extends AnvilInputGui { - final HeadModule module = ModuleManager.getInitializer(HeadModule.class); + final HeadInitializer module = ModuleManager.getInitializer(HeadInitializer.class); private final HeadGui parentGui; private long apiDebounce = 0; private final ItemStack DEFAULT_PLAYER_HEAD = Items.PLAYER_HEAD.getDefaultStack(); @@ -72,7 +72,7 @@ public void onTick() { } GuiElementBuilder builder = new GuiElementBuilder().setItem(Items.PLAYER_HEAD); - if (HeadModule.headHandler.model().economyType != HeadModule.EconomyType.FREE) { + if (HeadInitializer.headHandler.model().economyType != HeadInitializer.EconomyType.FREE) { builder.addLoreLine(Text.empty()); builder.addLoreLine(MessageUtil.ofVomponent(player, "head.price").copy().append(module.getCost())); } diff --git a/src/main/java/io/github/sakurawald/module/initializer/head/gui/SearchInputGui.java b/src/main/java/io/github/sakurawald/module/initializer/head/gui/SearchInputGui.java index d0ac57fd4..11bd53295 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/head/gui/SearchInputGui.java +++ b/src/main/java/io/github/sakurawald/module/initializer/head/gui/SearchInputGui.java @@ -3,14 +3,14 @@ import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.gui.AnvilInputGui; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.head.HeadModule; +import io.github.sakurawald.module.initializer.head.HeadInitializer; import io.github.sakurawald.util.MessageUtil; -import java.util.List; + import java.util.stream.Collectors; import net.minecraft.item.Items; class SearchInputGui extends AnvilInputGui { - final HeadModule module = ModuleManager.getInitializer(HeadModule.class); + final HeadInitializer module = ModuleManager.getInitializer(HeadInitializer.class); private final HeadGui parentGui; public SearchInputGui(HeadGui parentGui) { diff --git a/src/main/java/io/github/sakurawald/module/initializer/heal/HealModule.java b/src/main/java/io/github/sakurawald/module/initializer/heal/HealInitializer.java similarity index 95% rename from src/main/java/io/github/sakurawald/module/initializer/heal/HealModule.java rename to src/main/java/io/github/sakurawald/module/initializer/heal/HealInitializer.java index 034be61f3..c883fb42c 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/heal/HealModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/heal/HealInitializer.java @@ -11,7 +11,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class HealModule extends ModuleInitializer { +public class HealInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/home/HomeModule.java b/src/main/java/io/github/sakurawald/module/initializer/home/HomeInitializer.java similarity index 99% rename from src/main/java/io/github/sakurawald/module/initializer/home/HomeModule.java rename to src/main/java/io/github/sakurawald/module/initializer/home/HomeInitializer.java index cedf64a5e..290c54ae8 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/home/HomeModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/home/HomeInitializer.java @@ -27,7 +27,7 @@ @SuppressWarnings("LombokGetterMayBeUsed") -public class HomeModule extends ModuleInitializer { +public class HomeInitializer extends ModuleInitializer { @Getter diff --git a/src/main/java/io/github/sakurawald/module/initializer/language/LanguageModule.java b/src/main/java/io/github/sakurawald/module/initializer/language/LanguageInitializer.java similarity index 81% rename from src/main/java/io/github/sakurawald/module/initializer/language/LanguageModule.java rename to src/main/java/io/github/sakurawald/module/initializer/language/LanguageInitializer.java index 6ab983df4..93043a361 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/language/LanguageModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/language/LanguageInitializer.java @@ -4,7 +4,7 @@ import io.github.sakurawald.util.MessageUtil; -public class LanguageModule extends ModuleInitializer { +public class LanguageInitializer extends ModuleInitializer { @Override public void onReload() { diff --git a/src/main/java/io/github/sakurawald/module/initializer/loom/LoomModule.java b/src/main/java/io/github/sakurawald/module/initializer/loom/LoomInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/loom/LoomModule.java rename to src/main/java/io/github/sakurawald/module/initializer/loom/LoomInitializer.java index 8e9e7a21b..a1bcaee36 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/loom/LoomModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/loom/LoomInitializer.java @@ -13,7 +13,7 @@ import net.minecraft.stat.Stats; import net.minecraft.text.Text; -public class LoomModule extends ModuleInitializer { +public class LoomInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { dispatcher.register(CommandManager.literal("loom").executes(this::$loom)); diff --git a/src/main/java/io/github/sakurawald/module/initializer/main_stats/MainStatsModule.java b/src/main/java/io/github/sakurawald/module/initializer/main_stats/MainStatsInitializer.java similarity index 88% rename from src/main/java/io/github/sakurawald/module/initializer/main_stats/MainStatsModule.java rename to src/main/java/io/github/sakurawald/module/initializer/main_stats/MainStatsInitializer.java index 86dba7caf..993a1fd8d 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/main_stats/MainStatsModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/main_stats/MainStatsInitializer.java @@ -4,7 +4,7 @@ import io.github.sakurawald.config.model.ConfigModel; import io.github.sakurawald.module.ModuleManager; import io.github.sakurawald.module.initializer.ModuleInitializer; -import io.github.sakurawald.module.initializer.motd.MotdModule; +import io.github.sakurawald.module.initializer.motd.MotdInitializer; import io.github.sakurawald.util.ScheduleUtil; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.minecraft.server.MinecraftServer; @@ -17,10 +17,10 @@ import java.util.List; -public class MainStatsModule extends ModuleInitializer { +public class MainStatsInitializer extends ModuleInitializer { private final List colors = Arrays.asList('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'); - private final MotdModule motd_module = ModuleManager.getInitializer(MotdModule.class); + private final MotdInitializer motd_module = ModuleManager.getInitializer(MotdInitializer.class); @Override public void onInitialize() { @@ -82,7 +82,7 @@ public void registerScheduleTask(MinecraftServer server) { ScheduleUtil.addJob(UpdateMainStatsJob.class, null, null, ScheduleUtil.CRON_EVERY_MINUTE, new JobDataMap() { { this.put(MinecraftServer.class.getName(), server); - this.put(MainStatsModule.class.getName(), MainStatsModule.this); + this.put(MainStatsInitializer.class.getName(), MainStatsInitializer.this); } }); } @@ -96,7 +96,7 @@ public void execute(JobExecutionContext context) { server.getPlayerManager().getPlayerList().forEach((p) -> p.getStatHandler().save()); // update main stats - MainStatsModule module = (MainStatsModule) context.getJobDetail().getJobDataMap().get(MainStatsModule.class.getName()); + MainStatsInitializer module = (MainStatsInitializer) context.getJobDetail().getJobDataMap().get(MainStatsInitializer.class.getName()); module.updateMainStats(server); } } diff --git a/src/main/java/io/github/sakurawald/module/initializer/more/MoreModule.java b/src/main/java/io/github/sakurawald/module/initializer/more/MoreInitializer.java similarity index 95% rename from src/main/java/io/github/sakurawald/module/initializer/more/MoreModule.java rename to src/main/java/io/github/sakurawald/module/initializer/more/MoreInitializer.java index 12299ddff..54deec636 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/more/MoreModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/more/MoreInitializer.java @@ -11,7 +11,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class MoreModule extends ModuleInitializer { +public class MoreInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/motd/MotdModule.java b/src/main/java/io/github/sakurawald/module/initializer/motd/MotdInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/motd/MotdModule.java rename to src/main/java/io/github/sakurawald/module/initializer/motd/MotdInitializer.java index 0d4e47568..84a16fdff 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/motd/MotdModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/motd/MotdInitializer.java @@ -18,7 +18,7 @@ import java.util.Random; -public class MotdModule extends ModuleInitializer { +public class MotdInitializer extends ModuleInitializer { private final File ICON_FOLDER = Fuji.CONFIG_PATH.resolve("icon").toFile(); private List descriptions = new ArrayList<>(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/multi_obsidian_platform/MultiObsidianPlatformModule.java b/src/main/java/io/github/sakurawald/module/initializer/multi_obsidian_platform/MultiObsidianPlatformInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/multi_obsidian_platform/MultiObsidianPlatformModule.java rename to src/main/java/io/github/sakurawald/module/initializer/multi_obsidian_platform/MultiObsidianPlatformInitializer.java index d10823669..0da244ccc 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/multi_obsidian_platform/MultiObsidianPlatformModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/multi_obsidian_platform/MultiObsidianPlatformInitializer.java @@ -9,7 +9,7 @@ import net.minecraft.util.math.BlockPos; -public class MultiObsidianPlatformModule extends ModuleInitializer { +public class MultiObsidianPlatformInitializer extends ModuleInitializer { private final HashMap TRANSFORM_CACHE = new HashMap<>(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/newbie_welcome/NewbieWelcomeModule.java b/src/main/java/io/github/sakurawald/module/initializer/newbie_welcome/NewbieWelcomeInitializer.java similarity index 90% rename from src/main/java/io/github/sakurawald/module/initializer/newbie_welcome/NewbieWelcomeModule.java rename to src/main/java/io/github/sakurawald/module/initializer/newbie_welcome/NewbieWelcomeInitializer.java index be29786d3..a01a9957b 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/newbie_welcome/NewbieWelcomeModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/newbie_welcome/NewbieWelcomeInitializer.java @@ -6,7 +6,7 @@ import net.minecraft.server.network.ServerPlayerEntity; -public class NewbieWelcomeModule extends ModuleInitializer { +public class NewbieWelcomeInitializer extends ModuleInitializer { public void welcomeNewbiePlayer(ServerPlayerEntity player) { /* welcome message */ diff --git a/src/main/java/io/github/sakurawald/module/initializer/ping/PingModule.java b/src/main/java/io/github/sakurawald/module/initializer/ping/PingInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/ping/PingModule.java rename to src/main/java/io/github/sakurawald/module/initializer/ping/PingInitializer.java index c5740efbc..3f5be3720 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/ping/PingModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/ping/PingInitializer.java @@ -14,7 +14,7 @@ import static net.minecraft.server.command.CommandManager.argument; -public class PingModule extends ModuleInitializer { +public class PingInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/profiler/ProfilerModule.java b/src/main/java/io/github/sakurawald/module/initializer/profiler/ProfilerInitializer.java similarity index 99% rename from src/main/java/io/github/sakurawald/module/initializer/profiler/ProfilerModule.java rename to src/main/java/io/github/sakurawald/module/initializer/profiler/ProfilerInitializer.java index 67a1e96dc..76d43c040 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/profiler/ProfilerModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/profiler/ProfilerInitializer.java @@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture; -public class ProfilerModule extends ModuleInitializer { +public class ProfilerInitializer extends ModuleInitializer { public String formatBytes(long bytes) { if (bytes == -1) return "N/A"; if (bytes < 1024) { diff --git a/src/main/java/io/github/sakurawald/module/initializer/pvp/PvpModule.java b/src/main/java/io/github/sakurawald/module/initializer/pvp/PvpInitializer.java similarity index 98% rename from src/main/java/io/github/sakurawald/module/initializer/pvp/PvpModule.java rename to src/main/java/io/github/sakurawald/module/initializer/pvp/PvpInitializer.java index 3ff9d3c87..b3a2c4d1b 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/pvp/PvpModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/pvp/PvpInitializer.java @@ -15,7 +15,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class PvpModule extends ModuleInitializer { +public class PvpInitializer extends ModuleInitializer { public static final ConfigHandler pvpHandler = new ObjectConfigHandler<>("pvp.json", PvPModel.class); diff --git a/src/main/java/io/github/sakurawald/module/initializer/repair/RepairModule.java b/src/main/java/io/github/sakurawald/module/initializer/repair/RepairInitializer.java similarity index 95% rename from src/main/java/io/github/sakurawald/module/initializer/repair/RepairModule.java rename to src/main/java/io/github/sakurawald/module/initializer/repair/RepairInitializer.java index 5bb2784cc..44d27e4fa 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/repair/RepairModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/repair/RepairInitializer.java @@ -11,7 +11,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class RepairModule extends ModuleInitializer { +public class RepairInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { diff --git a/src/main/java/io/github/sakurawald/module/initializer/reply/ReplyModule.java b/src/main/java/io/github/sakurawald/module/initializer/reply/ReplyInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/reply/ReplyModule.java rename to src/main/java/io/github/sakurawald/module/initializer/reply/ReplyInitializer.java index d34a6bc3e..d33438e78 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/reply/ReplyModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/reply/ReplyInitializer.java @@ -17,7 +17,7 @@ import static net.minecraft.server.command.CommandManager.argument; -public class ReplyModule extends ModuleInitializer { +public class ReplyInitializer extends ModuleInitializer { private final HashMap player2target = new HashMap<>(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldModule.java b/src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldModule.java rename to src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldInitializer.java index 2c6d68698..4e9763d8f 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldInitializer.java @@ -11,7 +11,6 @@ import io.github.sakurawald.module.initializer.newbie_welcome.random_teleport.RandomTeleport; import io.github.sakurawald.module.initializer.resource_world.interfaces.DimensionOptionsMixinInterface; import io.github.sakurawald.module.initializer.resource_world.interfaces.SimpleRegistryMixinInterface; -import io.github.sakurawald.module.mixin.resource_world.ServerWorldMixin; import io.github.sakurawald.util.CommandUtil; import io.github.sakurawald.util.MessageUtil; import io.github.sakurawald.util.ScheduleUtil; @@ -32,10 +31,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.Util; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Position; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.random.RandomSeed; -import net.minecraft.world.ServerWorldAccess; import net.minecraft.world.World; import net.minecraft.world.biome.source.BiomeAccess; import net.minecraft.world.dimension.DimensionOptions; @@ -51,7 +48,7 @@ import static net.minecraft.server.command.CommandManager.literal; -public class ResourceWorldModule extends ModuleInitializer { +public class ResourceWorldInitializer extends ModuleInitializer { private final String DEFAULT_RESOURCE_WORLD_NAMESPACE = "resource_world"; private final String DEFAULT_THE_NETHER_PATH = "the_nether"; @@ -71,7 +68,7 @@ public void registerScheduleTask(MinecraftServer server) { ScheduleUtil.addJob(ResourceWorldAutoResetJob.class, null, null, Configs.configHandler.model().modules.resource_world.auto_reset_cron, new JobDataMap() { { this.put(MinecraftServer.class.getName(), server); - this.put(ResourceWorldModule.class.getName(), ResourceWorldModule.this); + this.put(ResourceWorldInitializer.class.getName(), ResourceWorldInitializer.this); } }); } @@ -269,7 +266,7 @@ public static class ResourceWorldAutoResetJob implements Job { public void execute(JobExecutionContext context) { Fuji.LOGGER.info("Start to reset resource worlds."); MinecraftServer server = (MinecraftServer) context.getJobDetail().getJobDataMap().get(MinecraftServer.class.getName()); - ResourceWorldModule module = (ResourceWorldModule) context.getJobDetail().getJobDataMap().get(ResourceWorldModule.class.getName()); + ResourceWorldInitializer module = (ResourceWorldInitializer) context.getJobDetail().getJobDataMap().get(ResourceWorldInitializer.class.getName()); server.execute(() -> module.resetWorlds(server)); } } diff --git a/src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldManager.java b/src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldManager.java index 1c29ae1ae..5478d3b01 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldManager.java +++ b/src/main/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldManager.java @@ -4,7 +4,7 @@ import io.github.sakurawald.module.initializer.resource_world.interfaces.SimpleRegistryMixinInterface; import io.github.sakurawald.common.structure.Position; import io.github.sakurawald.module.initializer.teleport_warmup.TeleportTicket; -import io.github.sakurawald.module.initializer.teleport_warmup.TeleportWarmupModule; +import io.github.sakurawald.module.initializer.teleport_warmup.TeleportWarmupInitializer; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; @@ -26,7 +26,7 @@ public class ResourceWorldManager { - private static final TeleportWarmupModule teleportWarmupModule = ModuleManager.getInitializer(TeleportWarmupModule.class); + private static final TeleportWarmupInitializer TELEPORT_WARMUP_INITIALIZER = ModuleManager.getInitializer(TeleportWarmupInitializer.class); private static final Set deletionQueue = new ReferenceOpenHashSet<>(); static { @@ -67,8 +67,8 @@ private static void kickPlayers(ServerWorld world) { List players = new ArrayList<>(world.getPlayers()); for (ServerPlayerEntity player : players) { // fix: if the player is inside resource-world while resetting the worlds, then resource worlds will delay its deletion until the player left the resource-world. - if (teleportWarmupModule != null) { - teleportWarmupModule.tickets.put(player.getGameProfile().getName(), + if (TELEPORT_WARMUP_INITIALIZER != null) { + TELEPORT_WARMUP_INITIALIZER.tickets.put(player.getGameProfile().getName(), new TeleportTicket(player , Position.of(player), new Position(overworld, spawnPos.getX() + 0.5, spawnPos.getY() + 0.5, spawnPos.getZ() + 0.5, 0, 0) , true)); diff --git a/src/main/java/io/github/sakurawald/module/initializer/scheduler/ScheduleJob.java b/src/main/java/io/github/sakurawald/module/initializer/scheduler/ScheduleJob.java index 2d0efe632..5cd561100 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/scheduler/ScheduleJob.java +++ b/src/main/java/io/github/sakurawald/module/initializer/scheduler/ScheduleJob.java @@ -25,7 +25,7 @@ public void trigger() { if (left_trigger_times == 0) { this.enable = false; } - SchedulerModule.schedulerHandler.saveToDisk(); + SchedulerInitializer.schedulerHandler.saveToDisk(); } List commands = this.commands_list.get(new Random().nextInt(this.commands_list.size())); diff --git a/src/main/java/io/github/sakurawald/module/initializer/scheduler/SchedulerModule.java b/src/main/java/io/github/sakurawald/module/initializer/scheduler/SchedulerInitializer.java similarity index 98% rename from src/main/java/io/github/sakurawald/module/initializer/scheduler/SchedulerModule.java rename to src/main/java/io/github/sakurawald/module/initializer/scheduler/SchedulerInitializer.java index d540291e9..6c6558726 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/scheduler/SchedulerModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/scheduler/SchedulerInitializer.java @@ -25,7 +25,7 @@ import static net.minecraft.server.command.CommandManager.argument; -public class SchedulerModule extends ModuleInitializer { +public class SchedulerInitializer extends ModuleInitializer { public static final ConfigHandler schedulerHandler = new ObjectConfigHandler<>("scheduler.json", SchedulerModel.class); diff --git a/src/main/java/io/github/sakurawald/module/initializer/seen/SeenModule.java b/src/main/java/io/github/sakurawald/module/initializer/seen/SeenInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/seen/SeenModule.java rename to src/main/java/io/github/sakurawald/module/initializer/seen/SeenInitializer.java index cd6da3796..6031e1215 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/seen/SeenModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/seen/SeenInitializer.java @@ -18,7 +18,7 @@ @SuppressWarnings("LombokGetterMayBeUsed") -public class SeenModule extends ModuleInitializer { +public class SeenInitializer extends ModuleInitializer { @Getter private final ConfigHandler data = new ObjectConfigHandler<>("seen.json", SeenModel.class); diff --git a/src/main/java/io/github/sakurawald/module/initializer/sit/SitModule.java b/src/main/java/io/github/sakurawald/module/initializer/sit/SitInitializer.java similarity index 98% rename from src/main/java/io/github/sakurawald/module/initializer/sit/SitModule.java rename to src/main/java/io/github/sakurawald/module/initializer/sit/SitInitializer.java index 39bf65f9e..a2440450f 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/sit/SitModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/sit/SitInitializer.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Set; -public class SitModule extends ModuleInitializer { +public class SitInitializer extends ModuleInitializer { public final Set CHAIRS = new HashSet<>(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/skin/command/SkinModule.java b/src/main/java/io/github/sakurawald/module/initializer/skin/SkinInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/skin/command/SkinModule.java rename to src/main/java/io/github/sakurawald/module/initializer/skin/SkinInitializer.java index f95c4b814..89470183f 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/skin/command/SkinModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/skin/SkinInitializer.java @@ -1,11 +1,10 @@ -package io.github.sakurawald.module.initializer.skin.command; +package io.github.sakurawald.module.initializer.skin; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; import io.github.sakurawald.module.initializer.ModuleInitializer; -import io.github.sakurawald.module.initializer.skin.SkinRestorer; import io.github.sakurawald.module.initializer.skin.enums.SkinVariant; import io.github.sakurawald.module.initializer.skin.provider.MineSkinSkinProvider; import io.github.sakurawald.module.initializer.skin.provider.MojangSkinProvider; @@ -24,7 +23,7 @@ // todo: code review -public class SkinModule extends ModuleInitializer { +public class SkinInitializer extends ModuleInitializer { @SuppressWarnings("unused") @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/stonecutter/StoneCutterModule.java b/src/main/java/io/github/sakurawald/module/initializer/stonecutter/StoneCutterInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/stonecutter/StoneCutterModule.java rename to src/main/java/io/github/sakurawald/module/initializer/stonecutter/StoneCutterInitializer.java index dd1c2c21d..1ddb50d95 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/stonecutter/StoneCutterModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/stonecutter/StoneCutterInitializer.java @@ -14,7 +14,7 @@ import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; -public class StoneCutterModule extends ModuleInitializer { +public class StoneCutterInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { dispatcher.register(CommandManager.literal("stonecutter").executes(this::$stonecutter)); diff --git a/src/main/java/io/github/sakurawald/module/initializer/suicide/SuicideModule.java b/src/main/java/io/github/sakurawald/module/initializer/suicide/SuicideInitializer.java similarity index 94% rename from src/main/java/io/github/sakurawald/module/initializer/suicide/SuicideModule.java rename to src/main/java/io/github/sakurawald/module/initializer/suicide/SuicideInitializer.java index 7c1057311..8b77c0f81 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/suicide/SuicideModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/suicide/SuicideInitializer.java @@ -10,7 +10,7 @@ import net.minecraft.server.command.ServerCommandSource; -public class SuicideModule extends ModuleInitializer { +public class SuicideInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/teleport_warmup/TeleportWarmupModule.java b/src/main/java/io/github/sakurawald/module/initializer/teleport_warmup/TeleportWarmupInitializer.java similarity index 97% rename from src/main/java/io/github/sakurawald/module/initializer/teleport_warmup/TeleportWarmupModule.java rename to src/main/java/io/github/sakurawald/module/initializer/teleport_warmup/TeleportWarmupInitializer.java index 6fa4ee3db..d7cf9516a 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/teleport_warmup/TeleportWarmupModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/teleport_warmup/TeleportWarmupInitializer.java @@ -12,7 +12,7 @@ import java.util.Map; -public class TeleportWarmupModule extends ModuleInitializer { +public class TeleportWarmupInitializer extends ModuleInitializer { public final HashMap tickets = new HashMap<>(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/test/TestModule.java b/src/main/java/io/github/sakurawald/module/initializer/test/TestInitializer.java similarity index 85% rename from src/main/java/io/github/sakurawald/module/initializer/test/TestModule.java rename to src/main/java/io/github/sakurawald/module/initializer/test/TestInitializer.java index df8f002df..fde0476e4 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/test/TestModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/test/TestInitializer.java @@ -3,21 +3,17 @@ import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.context.CommandContext; -import io.github.sakurawald.Fuji; import io.github.sakurawald.module.initializer.ModuleInitializer; -import lombok.SneakyThrows; import me.lucko.fabric.api.permissions.v0.Permissions; import net.fabricmc.fabric.api.util.TriState; import net.kyori.adventure.text.Component; import net.minecraft.command.CommandRegistryAccess; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; -import net.minecraft.world.World; -public class TestModule extends ModuleInitializer { +public class TestInitializer extends ModuleInitializer { private static int clearChat(CommandContext ctx) { for (int i = 0; i < 50; i++) { @@ -37,8 +33,8 @@ private static int magic(CommandContext ctx) { public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { dispatcher.register( CommandManager.literal("test").requires(s -> s.hasPermissionLevel(4)) - .then(CommandManager.literal("clear-chat").executes(TestModule::clearChat)) - .then(CommandManager.literal("magic").executes(TestModule::magic)) + .then(CommandManager.literal("clear-chat").executes(TestInitializer::clearChat)) + .then(CommandManager.literal("magic").executes(TestInitializer::magic)) ); } } diff --git a/src/main/java/io/github/sakurawald/module/initializer/top_chunks/TopChunksModule.java b/src/main/java/io/github/sakurawald/module/initializer/top_chunks/TopChunksInitializer.java similarity index 98% rename from src/main/java/io/github/sakurawald/module/initializer/top_chunks/TopChunksModule.java rename to src/main/java/io/github/sakurawald/module/initializer/top_chunks/TopChunksInitializer.java index 0c09c5c87..848aa7f9a 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/top_chunks/TopChunksModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/top_chunks/TopChunksInitializer.java @@ -28,7 +28,7 @@ import java.util.concurrent.CompletableFuture; -public class TopChunksModule extends ModuleInitializer { +public class TopChunksInitializer extends ModuleInitializer { @Override diff --git a/src/main/java/io/github/sakurawald/module/initializer/tpa/TpaModule.java b/src/main/java/io/github/sakurawald/module/initializer/tpa/TpaInitializer.java similarity index 99% rename from src/main/java/io/github/sakurawald/module/initializer/tpa/TpaModule.java rename to src/main/java/io/github/sakurawald/module/initializer/tpa/TpaInitializer.java index d2fbe3665..3f2a1e852 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/tpa/TpaModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/tpa/TpaInitializer.java @@ -22,7 +22,7 @@ @SuppressWarnings("LombokGetterMayBeUsed") -public class TpaModule extends ModuleInitializer { +public class TpaInitializer extends ModuleInitializer { @Getter private final ArrayList requests = new ArrayList<>(); diff --git a/src/main/java/io/github/sakurawald/module/initializer/tpa/TpaRequest.java b/src/main/java/io/github/sakurawald/module/initializer/tpa/TpaRequest.java index f66cba761..5c27ab6a3 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/tpa/TpaRequest.java +++ b/src/main/java/io/github/sakurawald/module/initializer/tpa/TpaRequest.java @@ -21,7 +21,7 @@ public class TpaRequest { private static final String CIRCLE = "●"; private static final String TICK = "[✔]"; private static final String CROSS = "[❌]"; - private static final TpaModule module = ModuleManager.getInitializer(TpaModule.class); + private static final TpaInitializer module = ModuleManager.getInitializer(TpaInitializer.class); @Getter private final ServerPlayerEntity sender; @Getter diff --git a/src/main/java/io/github/sakurawald/module/initializer/workbench/WorkbenchModule.java b/src/main/java/io/github/sakurawald/module/initializer/workbench/WorkbenchInitializer.java similarity index 96% rename from src/main/java/io/github/sakurawald/module/initializer/workbench/WorkbenchModule.java rename to src/main/java/io/github/sakurawald/module/initializer/workbench/WorkbenchInitializer.java index 07a6d6a23..698fb9cfe 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/workbench/WorkbenchModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/workbench/WorkbenchInitializer.java @@ -15,7 +15,7 @@ import net.minecraft.stat.Stats; import net.minecraft.text.Text; -public class WorkbenchModule extends ModuleInitializer { +public class WorkbenchInitializer extends ModuleInitializer { @Override public void registerCommand(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { dispatcher.register(CommandManager.literal("workbench").executes(this::$workbench)); diff --git a/src/main/java/io/github/sakurawald/module/initializer/works/WorksModule.java b/src/main/java/io/github/sakurawald/module/initializer/works/WorksInitializer.java similarity index 99% rename from src/main/java/io/github/sakurawald/module/initializer/works/WorksModule.java rename to src/main/java/io/github/sakurawald/module/initializer/works/WorksInitializer.java index f681ebbd9..53b3995ef 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/works/WorksModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/works/WorksInitializer.java @@ -41,7 +41,7 @@ @SuppressWarnings("SameReturnValue") -public class WorksModule extends ModuleInitializer { +public class WorksInitializer extends ModuleInitializer { public static final ConfigHandler worksHandler = new ObjectConfigHandler<>("works.json", WorksModel.class); private final int PAGE_SIZE = 9 * 5; diff --git a/src/main/java/io/github/sakurawald/module/initializer/works/work_type/Work.java b/src/main/java/io/github/sakurawald/module/initializer/works/work_type/Work.java index 255bd8818..d55fb6685 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/works/work_type/Work.java +++ b/src/main/java/io/github/sakurawald/module/initializer/works/work_type/Work.java @@ -7,7 +7,7 @@ import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.gui.SimpleGui; import io.github.sakurawald.Fuji; -import io.github.sakurawald.module.initializer.works.WorksModule; +import io.github.sakurawald.module.initializer.works.WorksInitializer; import io.github.sakurawald.module.initializer.works.gui.ConfirmGui; import io.github.sakurawald.module.initializer.works.gui.InputSignGui; import io.github.sakurawald.util.DateUtil; @@ -70,7 +70,7 @@ public Work(ServerPlayerEntity player, String name) { } private static Work getWorkByID(String uuid) { - List works = WorksModule.worksHandler.model().works; + List works = WorksInitializer.worksHandler.model().works; for (Work work : works) { if (work.getId().equals(uuid)) { return work; @@ -165,7 +165,7 @@ public void onClose() { .setCallback(() -> new ConfirmGui(player) { @Override public void onConfirm() { - WorksModule.worksHandler.model().works.remove(work); + WorksInitializer.worksHandler.model().works.remove(work); MessageUtil.sendActionBar(player, "works.work.delete.done"); } }.open()) diff --git a/src/main/java/io/github/sakurawald/module/initializer/world_downloader/FileDownloadHandler.java b/src/main/java/io/github/sakurawald/module/initializer/world_downloader/FileDownloadHandler.java index b07485213..ad0bf2b23 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/world_downloader/FileDownloadHandler.java +++ b/src/main/java/io/github/sakurawald/module/initializer/world_downloader/FileDownloadHandler.java @@ -16,7 +16,7 @@ public class FileDownloadHandler implements HttpHandler { private static final long NANO_TO_S = 1000000000L; - private final WorldDownloaderModule module; + private final WorldDownloaderInitializer module; private final File file; private final int bytesPerSecond; diff --git a/src/main/java/io/github/sakurawald/module/initializer/world_downloader/WorldDownloaderModule.java b/src/main/java/io/github/sakurawald/module/initializer/world_downloader/WorldDownloaderInitializer.java similarity index 99% rename from src/main/java/io/github/sakurawald/module/initializer/world_downloader/WorldDownloaderModule.java rename to src/main/java/io/github/sakurawald/module/initializer/world_downloader/WorldDownloaderInitializer.java index 48032a01e..9ea611ed5 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/world_downloader/WorldDownloaderModule.java +++ b/src/main/java/io/github/sakurawald/module/initializer/world_downloader/WorldDownloaderInitializer.java @@ -35,7 +35,7 @@ import java.nio.file.Files; import java.util.UUID; -public class WorldDownloaderModule extends ModuleInitializer { +public class WorldDownloaderInitializer extends ModuleInitializer { private EvictingQueue contextQueue; private HttpServer server; diff --git a/src/main/java/io/github/sakurawald/module/mixin/back/ServerPlayerMixin.java b/src/main/java/io/github/sakurawald/module/mixin/back/ServerPlayerMixin.java index b8a0bd4ca..a45fade0c 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/back/ServerPlayerMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/back/ServerPlayerMixin.java @@ -1,8 +1,8 @@ package io.github.sakurawald.module.mixin.back; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.back.BackModule; -import io.github.sakurawald.module.initializer.teleport_warmup.TeleportWarmupModule; +import io.github.sakurawald.module.initializer.back.BackInitializer; +import io.github.sakurawald.module.initializer.teleport_warmup.TeleportWarmupInitializer; import net.minecraft.entity.damage.DamageSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; @@ -17,9 +17,9 @@ public abstract class ServerPlayerMixin { @Unique - private static final BackModule module = ModuleManager.getInitializer(BackModule.class); + private static final BackInitializer module = ModuleManager.getInitializer(BackInitializer.class); @Unique - private static final TeleportWarmupModule teleportWarmupModule = ModuleManager.getInitializer(TeleportWarmupModule.class); + private static final TeleportWarmupInitializer TELEPORT_WARMUP_INITIALIZER = ModuleManager.getInitializer(TeleportWarmupInitializer.class); @Inject(method = "onDeath", at = @At("HEAD")) public void $onDeath(DamageSource damageSource, CallbackInfo ci) { @@ -32,7 +32,7 @@ public abstract class ServerPlayerMixin { ServerPlayerEntity player = (ServerPlayerEntity) (Object) this; // note: if TeleportWarmupModule don't update back-position for us, we do it ourselves. - if (teleportWarmupModule == null) { + if (TELEPORT_WARMUP_INITIALIZER == null) { module.updatePlayer(player); } } diff --git a/src/main/java/io/github/sakurawald/module/mixin/chat/PlayerListMixin.java b/src/main/java/io/github/sakurawald/module/mixin/chat/PlayerListMixin.java index a9e4af039..04252d45c 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/chat/PlayerListMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/chat/PlayerListMixin.java @@ -1,7 +1,7 @@ package io.github.sakurawald.module.mixin.chat; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.chat.ChatModule; +import io.github.sakurawald.module.initializer.chat.ChatInitializer; import io.github.sakurawald.util.CarpetUtil; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; @@ -17,7 +17,7 @@ public abstract class PlayerListMixin { @Unique - private static final ChatModule module = ModuleManager.getInitializer(ChatModule.class); + private static final ChatInitializer module = ModuleManager.getInitializer(ChatInitializer.class); @Inject(at = @At(value = "TAIL"), method = "onPlayerConnect") private void $onPlayerConnect(ClientConnection connection, ServerPlayerEntity serverPlayer, ConnectedClientData commonListenerCookie, CallbackInfo ci) { diff --git a/src/main/java/io/github/sakurawald/module/mixin/chat/ServerGamePacketListenerImplMixin.java b/src/main/java/io/github/sakurawald/module/mixin/chat/ServerGamePacketListenerImplMixin.java index 8c557ec26..566c7ad5d 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/chat/ServerGamePacketListenerImplMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/chat/ServerGamePacketListenerImplMixin.java @@ -1,7 +1,7 @@ package io.github.sakurawald.module.mixin.chat; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.chat.ChatModule; +import io.github.sakurawald.module.initializer.chat.ChatInitializer; import net.minecraft.network.message.SignedMessage; import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; @@ -15,7 +15,7 @@ @Mixin(value = ServerPlayNetworkHandler.class, priority = 1001) public abstract class ServerGamePacketListenerImplMixin { @Unique - private static final ChatModule module = ModuleManager.getInitializer(ChatModule.class); + private static final ChatInitializer module = ModuleManager.getInitializer(ChatInitializer.class); @Shadow public ServerPlayerEntity player; diff --git a/src/main/java/io/github/sakurawald/module/mixin/command_cooldown/CommandsMixin.java b/src/main/java/io/github/sakurawald/module/mixin/command_cooldown/CommandsMixin.java index 5baa240ee..04938aed8 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/command_cooldown/CommandsMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/command_cooldown/CommandsMixin.java @@ -2,7 +2,7 @@ import com.mojang.brigadier.ParseResults; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.command_cooldown.CommandCooldownModule; +import io.github.sakurawald.module.initializer.command_cooldown.CommandCooldownInitializer; import io.github.sakurawald.util.MessageUtil; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; @@ -12,14 +12,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(CommandManager.class) public class CommandsMixin { @Unique - private static final CommandCooldownModule module = ModuleManager.getInitializer(CommandCooldownModule.class); + private static final CommandCooldownInitializer module = ModuleManager.getInitializer(CommandCooldownInitializer.class); // If you issue "///abcdefg", then commandLine = "//abcdefg" @Inject(method = "execute", at = @At("HEAD"), cancellable = true) diff --git a/src/main/java/io/github/sakurawald/module/mixin/deathlog/ServerPlayerMixin.java b/src/main/java/io/github/sakurawald/module/mixin/deathlog/ServerPlayerMixin.java index c43ba26d3..32461c6e2 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/deathlog/ServerPlayerMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/deathlog/ServerPlayerMixin.java @@ -1,7 +1,7 @@ package io.github.sakurawald.module.mixin.deathlog; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.deathlog.DeathLogModule; +import io.github.sakurawald.module.initializer.deathlog.DeathLogInitializer; import net.minecraft.entity.damage.DamageSource; import net.minecraft.server.network.ServerPlayerEntity; import org.spongepowered.asm.mixin.Mixin; @@ -13,7 +13,7 @@ @Mixin(ServerPlayerEntity.class) public abstract class ServerPlayerMixin { @Unique - private static final DeathLogModule module = ModuleManager.getInitializer(DeathLogModule.class); + private static final DeathLogInitializer module = ModuleManager.getInitializer(DeathLogInitializer.class); @Inject(method = "onDeath", at = @At("HEAD")) public void $onDeath(DamageSource damageSource, CallbackInfo ci) { diff --git a/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerCommandMixin.java b/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerCommandMixin.java index c2eacc53c..3fea209c1 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerCommandMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerCommandMixin.java @@ -6,7 +6,7 @@ import io.github.sakurawald.Fuji; import io.github.sakurawald.config.Configs; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.fake_player_manager.FakePlayerManagerModule; +import io.github.sakurawald.module.initializer.fake_player_manager.FakePlayerManagerInitializer; import io.github.sakurawald.util.MessageUtil; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; @@ -22,7 +22,7 @@ public abstract class PlayerCommandMixin { @Unique - private static final FakePlayerManagerModule module = ModuleManager.getInitializer(FakePlayerManagerModule.class); + private static final FakePlayerManagerInitializer module = ModuleManager.getInitializer(FakePlayerManagerInitializer.class); @Unique private static String transformFakePlayerName(String fakePlayerName) { diff --git a/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerListMixin.java b/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerListMixin.java index 5ff6c893e..06f568378 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerListMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerListMixin.java @@ -1,7 +1,7 @@ package io.github.sakurawald.module.mixin.fake_player_manager; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.fake_player_manager.FakePlayerManagerModule; +import io.github.sakurawald.module.initializer.fake_player_manager.FakePlayerManagerInitializer; import io.github.sakurawald.util.CarpetUtil; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; @@ -16,7 +16,7 @@ @Mixin(PlayerManager.class) public abstract class PlayerListMixin { @Unique - private static final FakePlayerManagerModule module = ModuleManager.getInitializer(FakePlayerManagerModule.class); + private static final FakePlayerManagerInitializer module = ModuleManager.getInitializer(FakePlayerManagerInitializer.class); @Inject(at = @At(value = "TAIL"), method = "onPlayerConnect") private void $onPlayerConnect(ClientConnection connection, ServerPlayerEntity serverPlayer, ConnectedClientData commonListenerCookie, CallbackInfo ci) { diff --git a/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerMixin.java b/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerMixin.java index 01af05798..82fa46e1e 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/fake_player_manager/PlayerMixin.java @@ -2,7 +2,7 @@ import carpet.patches.EntityPlayerMPFake; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.fake_player_manager.FakePlayerManagerModule; +import io.github.sakurawald.module.initializer.fake_player_manager.FakePlayerManagerInitializer; import io.github.sakurawald.util.MessageUtil; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -25,7 +25,7 @@ public abstract class PlayerMixin extends LivingEntity { @Unique - private static final FakePlayerManagerModule FAKE_PLAYER_MANAGER_MODULE = ModuleManager.getInitializer(FakePlayerManagerModule.class); + private static final FakePlayerManagerInitializer FAKE_PLAYER_MANAGER_MODULE = ModuleManager.getInitializer(FakePlayerManagerInitializer.class); protected PlayerMixin(EntityType entityType, World level) { super(entityType, level); diff --git a/src/main/java/io/github/sakurawald/module/mixin/motd/ServerStatusPacketListenerImplMixin.java b/src/main/java/io/github/sakurawald/module/mixin/motd/ServerStatusPacketListenerImplMixin.java index 46e4613b4..4db01d692 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/motd/ServerStatusPacketListenerImplMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/motd/ServerStatusPacketListenerImplMixin.java @@ -25,7 +25,7 @@ import io.github.sakurawald.Fuji; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.motd.MotdModule; +import io.github.sakurawald.module.initializer.motd.MotdInitializer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -39,7 +39,7 @@ abstract class ServerStatusPacketListenerImplMixin { @Unique - private static final MotdModule module = ModuleManager.getInitializer(MotdModule.class); + private static final MotdInitializer module = ModuleManager.getInitializer(MotdInitializer.class); @Redirect(method = "onRequest", at = @At(value = "FIELD", target = "Lnet/minecraft/server/network/ServerQueryNetworkHandler;metadata:Lnet/minecraft/server/ServerMetadata;")) public ServerMetadata $handleStatusRequest(final ServerQueryNetworkHandler instance) { diff --git a/src/main/java/io/github/sakurawald/module/mixin/multi_obsidian_platform/EndPortalBlockMixin.java b/src/main/java/io/github/sakurawald/module/mixin/multi_obsidian_platform/EndPortalBlockMixin.java index 1c00f03f2..ee27b3bad 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/multi_obsidian_platform/EndPortalBlockMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/multi_obsidian_platform/EndPortalBlockMixin.java @@ -2,7 +2,7 @@ import com.llamalad7.mixinextras.sugar.Local; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.multi_obsidian_platform.MultiObsidianPlatformModule; +import io.github.sakurawald.module.initializer.multi_obsidian_platform.MultiObsidianPlatformInitializer; import net.minecraft.block.EndPortalBlock; import net.minecraft.entity.Entity; import net.minecraft.server.world.ServerWorld; @@ -17,7 +17,7 @@ public class EndPortalBlockMixin { @Unique - private static final MultiObsidianPlatformModule module = ModuleManager.getInitializer(MultiObsidianPlatformModule.class); + private static final MultiObsidianPlatformInitializer module = ModuleManager.getInitializer(MultiObsidianPlatformInitializer.class); @Unique BlockPos getTransformedEndSpawnPoint(Entity entity) { diff --git a/src/main/java/io/github/sakurawald/module/mixin/newbie_welcome/PlayerListMixin.java b/src/main/java/io/github/sakurawald/module/mixin/newbie_welcome/PlayerListMixin.java index 571af8d9a..e878fb938 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/newbie_welcome/PlayerListMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/newbie_welcome/PlayerListMixin.java @@ -1,7 +1,7 @@ package io.github.sakurawald.module.mixin.newbie_welcome; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.newbie_welcome.NewbieWelcomeModule; +import io.github.sakurawald.module.initializer.newbie_welcome.NewbieWelcomeInitializer; import io.github.sakurawald.util.CarpetUtil; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; @@ -17,7 +17,7 @@ @Mixin(PlayerManager.class) public abstract class PlayerListMixin { @Unique - private static final NewbieWelcomeModule module = ModuleManager.getInitializer(NewbieWelcomeModule.class); + private static final NewbieWelcomeInitializer module = ModuleManager.getInitializer(NewbieWelcomeInitializer.class); @Inject(at = @At(value = "TAIL"), method = "onPlayerConnect") private void $onPlayerConnect(ClientConnection connection, ServerPlayerEntity serverPlayer, ConnectedClientData commonListenerCookie, CallbackInfo ci) { diff --git a/src/main/java/io/github/sakurawald/module/mixin/pvp/PvpToggleMixin.java b/src/main/java/io/github/sakurawald/module/mixin/pvp/PvpToggleMixin.java index 457c52dfc..d1a96ecb2 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/pvp/PvpToggleMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/pvp/PvpToggleMixin.java @@ -2,7 +2,7 @@ import com.mojang.authlib.GameProfile; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.pvp.PvpModule; +import io.github.sakurawald.module.initializer.pvp.PvpInitializer; import io.github.sakurawald.util.MessageUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; @@ -17,7 +17,7 @@ @Mixin(ServerPlayerEntity.class) public abstract class PvpToggleMixin extends PlayerEntity { @Unique - private static final PvpModule module = ModuleManager.getInitializer(PvpModule.class); + private static final PvpInitializer module = ModuleManager.getInitializer(PvpInitializer.class); public PvpToggleMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile) { super(world, pos, yaw, gameProfile); diff --git a/src/main/java/io/github/sakurawald/module/mixin/reply/MsgCommandMixin.java b/src/main/java/io/github/sakurawald/module/mixin/reply/MsgCommandMixin.java index 599541a41..cb7f22acb 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/reply/MsgCommandMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/reply/MsgCommandMixin.java @@ -1,7 +1,7 @@ package io.github.sakurawald.module.mixin.reply; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.reply.ReplyModule; +import io.github.sakurawald.module.initializer.reply.ReplyInitializer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -18,7 +18,7 @@ public class MsgCommandMixin { @Unique - private static final ReplyModule module = ModuleManager.getInitializer(ReplyModule.class); + private static final ReplyInitializer module = ModuleManager.getInitializer(ReplyInitializer.class); @Inject(method = "execute", at = @At("HEAD")) private static void $execute(ServerCommandSource commandSourceStack, Collection collection, SignedMessage playerChatMessage, CallbackInfo ci) { diff --git a/src/main/java/io/github/sakurawald/module/mixin/seen/PlayerListMixin.java b/src/main/java/io/github/sakurawald/module/mixin/seen/PlayerListMixin.java index fc00b56a7..d5e3483f6 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/seen/PlayerListMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/seen/PlayerListMixin.java @@ -1,7 +1,7 @@ package io.github.sakurawald.module.mixin.seen; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.seen.SeenModule; +import io.github.sakurawald.module.initializer.seen.SeenInitializer; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; import org.spongepowered.asm.mixin.Mixin; @@ -15,7 +15,7 @@ public abstract class PlayerListMixin { @Unique - private SeenModule module = ModuleManager.getInitializer(SeenModule.class); + private SeenInitializer module = ModuleManager.getInitializer(SeenInitializer.class); @Inject(method = "remove", at = @At("TAIL")) private void remove(ServerPlayerEntity player, CallbackInfo ci) { diff --git a/src/main/java/io/github/sakurawald/module/mixin/sit/InteractModifierMixin.java b/src/main/java/io/github/sakurawald/module/mixin/sit/InteractModifierMixin.java index ccc4bf4d1..3f66b8143 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/sit/InteractModifierMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/sit/InteractModifierMixin.java @@ -2,7 +2,7 @@ import io.github.sakurawald.config.Configs; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.sit.SitModule; +import io.github.sakurawald.module.initializer.sit.SitInitializer; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SideShapeType; @@ -49,7 +49,7 @@ public class InteractModifierMixin { @Unique - private static final SitModule module = ModuleManager.getInitializer(SitModule.class); + private static final SitInitializer module = ModuleManager.getInitializer(SitInitializer.class); @Final @Shadow diff --git a/src/main/java/io/github/sakurawald/module/mixin/teleport_warmup/ServerPlayerMixin.java b/src/main/java/io/github/sakurawald/module/mixin/teleport_warmup/ServerPlayerMixin.java index 3d58e7183..9a2181509 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/teleport_warmup/ServerPlayerMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/teleport_warmup/ServerPlayerMixin.java @@ -1,11 +1,11 @@ package io.github.sakurawald.module.mixin.teleport_warmup; import io.github.sakurawald.module.ModuleManager; -import io.github.sakurawald.module.initializer.back.BackModule; +import io.github.sakurawald.module.initializer.back.BackInitializer; import io.github.sakurawald.common.structure.Position; import io.github.sakurawald.module.initializer.teleport_warmup.ServerPlayerCombatStateAccessor; import io.github.sakurawald.module.initializer.teleport_warmup.TeleportTicket; -import io.github.sakurawald.module.initializer.teleport_warmup.TeleportWarmupModule; +import io.github.sakurawald.module.initializer.teleport_warmup.TeleportWarmupInitializer; import io.github.sakurawald.util.CarpetUtil; import io.github.sakurawald.util.MessageUtil; import net.minecraft.entity.damage.DamageSource; @@ -23,9 +23,9 @@ public abstract class ServerPlayerMixin implements ServerPlayerCombatStateAccessor { @Unique - private static final BackModule backModule = ModuleManager.getInitializer(BackModule.class); + private static final BackInitializer BACK_INITIALIZER = ModuleManager.getInitializer(BackInitializer.class); @Unique - private static final TeleportWarmupModule module = ModuleManager.getInitializer(TeleportWarmupModule.class); + private static final TeleportWarmupInitializer module = ModuleManager.getInitializer(TeleportWarmupInitializer.class); @Unique public boolean fuji$inCombat; @@ -54,8 +54,8 @@ public abstract class ServerPlayerMixin implements ServerPlayerCombatStateAccess } // let's do teleport now. - if (backModule != null) { - backModule.updatePlayer(player); + if (BACK_INITIALIZER != null) { + BACK_INITIALIZER.updatePlayer(player); } }