From e6f68cf131b8cfcdfc9889add700be07d5d0022d Mon Sep 17 00:00:00 2001 From: phit <2097483+phit@users.noreply.github.com> Date: Sun, 25 Aug 2024 23:06:29 +0200 Subject: [PATCH] Stupid tabs --- .../simpleircbridge/BridgeIRCBot.java | 72 +++++++++---------- .../simpleircbridge/GameEventHandler.java | 58 +++++++-------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/BridgeIRCBot.java b/common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/BridgeIRCBot.java index bb2c7bc..973d67c 100644 --- a/common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/BridgeIRCBot.java +++ b/common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/BridgeIRCBot.java @@ -32,34 +32,34 @@ protected void logMessage(String msg) { } /* event handling */ -// @Override -// protected void onJoin(String channel, String sender) { -// toMc(String.format(FORMAT1_IRC_JOIN, sender)); -// } +// @Override +// protected void onJoin(String channel, String sender) { +// toMc(String.format(FORMAT1_IRC_JOIN, sender)); +// } // -// @Override -// protected void onPart(String channel, String sender, String reason) { -// if (SIBConfig.MC_FORMATTING.get()) { -// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason); -// } -// toMc(String.format(FORMAT2_IRC_PART, sender, reason)); -// } +// @Override +// protected void onPart(String channel, String sender, String reason) { +// if (SIBConfig.MC_FORMATTING.get()) { +// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason); +// } +// toMc(String.format(FORMAT2_IRC_PART, sender, reason)); +// } // -// @Override -// protected void onQuit(String sender, String reason) { -// if (SIBConfig.MC_FORMATTING.get()) { -// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason); -// } -// toMc(String.format(FORMAT2_IRC_QUIT, sender, reason)); -// } +// @Override +// protected void onQuit(String sender, String reason) { +// if (SIBConfig.MC_FORMATTING.get()) { +// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason); +// } +// toMc(String.format(FORMAT2_IRC_QUIT, sender, reason)); +// } // -// @Override -// protected void onKick(String channel, String opsender, String victim, String reason) { -// if (SIBConfig.MC_FORMATTING.get()) { -// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason); -// } -// toMc(String.format(FORMAT3_IRC_KICK, victim, opsender, reason)); -// } +// @Override +// protected void onKick(String channel, String opsender, String victim, String reason) { +// if (SIBConfig.MC_FORMATTING.get()) { +// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason); +// } +// toMc(String.format(FORMAT3_IRC_KICK, victim, opsender, reason)); +// } @Override protected void onMessage(String channel, String sender, String message) { @@ -75,18 +75,18 @@ protected void onMessage(String channel, String sender, String message) { } } -// @Override -// protected void onAction(String channel, String sender, String action) { -// if (SIBConfig.MC_FORMATTING.get()) { -// action = IRCMinecraftConverter.convIRCtoMinecraft(action); -// } -// toMc(String.format(FORMAT2_IRC_EMOTE, sender, action)); -// } +// @Override +// protected void onAction(String channel, String sender, String action) { +// if (SIBConfig.MC_FORMATTING.get()) { +// action = IRCMinecraftConverter.convIRCtoMinecraft(action); +// } +// toMc(String.format(FORMAT2_IRC_EMOTE, sender, action)); +// } // -// @Override -// protected void onNickChange(String sender, String newnick) { -// toMc(String.format(FORMAT2_IRC_NICKCHG, sender, newnick)); -// } +// @Override +// protected void onNickChange(String sender, String newnick) { +// toMc(String.format(FORMAT2_IRC_NICKCHG, sender, newnick)); +// } @Override protected void onNumeric001() { diff --git a/common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/GameEventHandler.java b/common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/GameEventHandler.java index 192d367..891f414 100644 --- a/common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/GameEventHandler.java +++ b/common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/GameEventHandler.java @@ -27,33 +27,33 @@ public void playerLoggedOut(ServerPlayer e) { toIrc(String.format(FORMAT1_MC_LOGOUT, SIBUtil.mangle(e.getName().getString()))); } -// @SubscribeEvent -// public void command(CommandEvent e) { -// String nickname = SIBUtil.mangle(e.getSender().getDisplayName().getUnformattedText()); -// /* -// * Usually these would be instanceof checks, checking for -// * net.minecraft.command.server.CommandEmote and -// * net.minecraft.command.server.CommandBroadcast. -// * -// * However, some mods insist on overriding commands with their own wrappers -// * (looking at you, FTBUtilities) so we're checking the names here. -// */ +// @SubscribeEvent +// public void command(CommandEvent e) { +// String nickname = SIBUtil.mangle(e.getSender().getDisplayName().getUnformattedText()); +// /* +// * Usually these would be instanceof checks, checking for +// * net.minecraft.command.server.CommandEmote and +// * net.minecraft.command.server.CommandBroadcast. +// * +// * However, some mods insist on overriding commands with their own wrappers +// * (looking at you, FTBUtilities) so we're checking the names here. +// */ // -// String content = SIBUtil.join(" ", e.getParameters()); +// String content = SIBUtil.join(" ", e.getParameters()); // -// if ("say".equals(e.getCommand().getName())) { -// if (this.bridge.getSibConf().ircFormatting) { -// content = IRCMinecraftConverter.convMinecraftToIRC(content); -// } -// toIrc(String.format(FORMAT2_MC_BROADCAST, nickname, content)); +// if ("say".equals(e.getCommand().getName())) { +// if (this.bridge.getSibConf().ircFormatting) { +// content = IRCMinecraftConverter.convMinecraftToIRC(content); +// } +// toIrc(String.format(FORMAT2_MC_BROADCAST, nickname, content)); // -// } else if ("me".equals(e.getCommand().getName())) { -// if (this.bridge.getSibConf().ircFormatting) { -// content = IRCMinecraftConverter.convMinecraftToIRC(content); -// } -// toIrc(String.format(FORMAT2_MC_EMOTE, nickname, content)); -// } -// } +// } else if ("me".equals(e.getCommand().getName())) { +// if (this.bridge.getSibConf().ircFormatting) { +// content = IRCMinecraftConverter.convMinecraftToIRC(content); +// } +// toIrc(String.format(FORMAT2_MC_EMOTE, nickname, content)); +// } +// } public void serverChat(ServerPlayer player, ChatEvent.ChatComponent component) { Component chatComponent = component.get().copy(); @@ -73,12 +73,12 @@ public void serverChat(ServerPlayer player, ChatEvent.ChatComponent component) { } } - public EventResult livingDeath(LivingEntity livingEntity, DamageSource damageSource) { - if (livingEntity instanceof ServerPlayer) { - toIrc(String.format(FORMAT1_MC_DEATH, damageSource.getLocalizedDeathMessage(livingEntity).getString().replace(livingEntity.getName().toString(), SIBUtil.mangle(livingEntity.getName().toString())) )); - } + public EventResult livingDeath(LivingEntity livingEntity, DamageSource damageSource) { + if (livingEntity instanceof ServerPlayer) { + toIrc(String.format(FORMAT1_MC_DEATH, damageSource.getLocalizedDeathMessage(livingEntity).getString().replace(livingEntity.getName().toString(), SIBUtil.mangle(livingEntity.getName().toString())) )); + } return EventResult.pass(); - } + } private void toIrc(String s) { this.bridge.sendToIrc(s);