Skip to content

Commit

Permalink
refactor: rename xxxModule into xxxInitializer
Browse files Browse the repository at this point in the history
  • Loading branch information
sakurawald committed Jul 7, 2024
1 parent 02b5310 commit 8507144
Show file tree
Hide file tree
Showing 76 changed files with 128 additions and 153 deletions.
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.quartz.JobExecutionException;


public class AfkModule extends ModuleInitializer {
public class AfkInitializer extends ModuleInitializer {

@Override
public void onInitialize() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ServerCommandSource> dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) {
dispatcher.register(CommandManager.literal("anvil").executes(this::$anvil));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.HashMap;

@SuppressWarnings("LombokGetterMayBeUsed")
public class BackModule extends ModuleInitializer {
public class BackInitializer extends ModuleInitializer {

@Getter
private final HashMap<String, Position> player2lastPos = new HashMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import net.minecraft.world.World;


public class BedModule extends ModuleInitializer {
public class BedInitializer extends ModuleInitializer {

@Override
public void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import net.minecraft.server.command.ServerCommandSource;


public class BetterInfoModule extends ModuleInitializer {
public class BetterInfoInitializer extends ModuleInitializer {


@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
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;
import net.minecraft.server.command.ServerCommandSource;
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<ServerCommandSource> dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) {
dispatcher.register(CommandManager.literal("cartography").executes(this::$cartography));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<ChatModel> 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<Component> chatHistory;

Expand Down Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ServerPlayerEntity, HashMap<String, Long>> map = new HashMap<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.function.Predicate;


public class CommandPermissionModule extends ModuleInitializer {
public class CommandPermissionInitializer extends ModuleInitializer {

@Override
public void onInitialize() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import net.minecraft.server.command.ServerCommandSource;


public class ConfigModule extends ModuleInitializer {
public class ConfigInitializer extends ModuleInitializer {


@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ServerCommandSource> dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) {
dispatcher.register(CommandManager.literal("enchantment").executes(this::$enchantment));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import net.minecraft.text.Text;


public class EnderChestModule extends ModuleInitializer {
public class EnderChestInitializer extends ModuleInitializer {

@Override
public void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import net.minecraft.server.command.ServerCommandSource;


public class ExtinguishModule extends ModuleInitializer {
public class ExtinguishInitializer extends ModuleInitializer {


@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.time.LocalTime;
import java.util.*;

public class FakePlayerManagerModule extends ModuleInitializer {
public class FakePlayerManagerInitializer extends ModuleInitializer {
private final ArrayList<String> CONSTANT_EMPTY_LIST = new ArrayList<>();
private final HashMap<String, ArrayList<String>> player2fakePlayers = new HashMap<>();
private final HashMap<String, Long> player2expiration = new HashMap<>();
Expand Down Expand Up @@ -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);
}
});
}
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import net.minecraft.server.command.ServerCommandSource;


public class FeedModule extends ModuleInitializer {
public class FeedInitializer extends ModuleInitializer {


@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ServerCommandSource> dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import net.minecraft.server.command.ServerCommandSource;


public class GodModule extends ModuleInitializer {
public class GodInitializer extends ModuleInitializer {


@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ServerCommandSource> dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) {
dispatcher.register(CommandManager.literal("grindstone").executes(this::$grindstone));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import net.minecraft.util.Hand;


public class HatModule extends ModuleInitializer {
public class HatInitializer extends ModuleInitializer {


@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<HeadModel> headHandler = new ObjectConfigHandler<>("head.json", HeadModel.class);
public final HeadDatabaseAPI HEAD_DATABASE = new HeadDatabaseAPI();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Head> heads) {
Expand Down Expand Up @@ -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()));
}
Expand Down Expand Up @@ -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();
Expand All @@ -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);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down Expand Up @@ -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()));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import net.minecraft.server.command.ServerCommandSource;


public class HealModule extends ModuleInitializer {
public class HealInitializer extends ModuleInitializer {


@Override
Expand Down
Loading

0 comments on commit 8507144

Please sign in to comment.