Skip to content

Commit e6f68cf

Browse files
phitphit
committed
Stupid tabs
1 parent 104c2e6 commit e6f68cf

File tree

2 files changed

+65
-65
lines changed

2 files changed

+65
-65
lines changed

‎common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/BridgeIRCBot.java‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,34 @@ protected void logMessage(String msg) {
3232
}
3333

3434
/* event handling */
35-
// @Override
36-
// protected void onJoin(String channel, String sender) {
37-
// toMc(String.format(FORMAT1_IRC_JOIN, sender));
38-
// }
35+
// @Override
36+
// protected void onJoin(String channel, String sender) {
37+
// toMc(String.format(FORMAT1_IRC_JOIN, sender));
38+
// }
3939
//
40-
// @Override
41-
// protected void onPart(String channel, String sender, String reason) {
42-
// if (SIBConfig.MC_FORMATTING.get()) {
43-
// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason);
44-
// }
45-
// toMc(String.format(FORMAT2_IRC_PART, sender, reason));
46-
// }
40+
// @Override
41+
// protected void onPart(String channel, String sender, String reason) {
42+
// if (SIBConfig.MC_FORMATTING.get()) {
43+
// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason);
44+
// }
45+
// toMc(String.format(FORMAT2_IRC_PART, sender, reason));
46+
// }
4747
//
48-
// @Override
49-
// protected void onQuit(String sender, String reason) {
50-
// if (SIBConfig.MC_FORMATTING.get()) {
51-
// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason);
52-
// }
53-
// toMc(String.format(FORMAT2_IRC_QUIT, sender, reason));
54-
// }
48+
// @Override
49+
// protected void onQuit(String sender, String reason) {
50+
// if (SIBConfig.MC_FORMATTING.get()) {
51+
// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason);
52+
// }
53+
// toMc(String.format(FORMAT2_IRC_QUIT, sender, reason));
54+
// }
5555
//
56-
// @Override
57-
// protected void onKick(String channel, String opsender, String victim, String reason) {
58-
// if (SIBConfig.MC_FORMATTING.get()) {
59-
// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason);
60-
// }
61-
// toMc(String.format(FORMAT3_IRC_KICK, victim, opsender, reason));
62-
// }
56+
// @Override
57+
// protected void onKick(String channel, String opsender, String victim, String reason) {
58+
// if (SIBConfig.MC_FORMATTING.get()) {
59+
// reason = IRCMinecraftConverter.convIRCtoMinecraft(reason);
60+
// }
61+
// toMc(String.format(FORMAT3_IRC_KICK, victim, opsender, reason));
62+
// }
6363

6464
@Override
6565
protected void onMessage(String channel, String sender, String message) {
@@ -75,18 +75,18 @@ protected void onMessage(String channel, String sender, String message) {
7575
}
7676
}
7777

78-
// @Override
79-
// protected void onAction(String channel, String sender, String action) {
80-
// if (SIBConfig.MC_FORMATTING.get()) {
81-
// action = IRCMinecraftConverter.convIRCtoMinecraft(action);
82-
// }
83-
// toMc(String.format(FORMAT2_IRC_EMOTE, sender, action));
84-
// }
78+
// @Override
79+
// protected void onAction(String channel, String sender, String action) {
80+
// if (SIBConfig.MC_FORMATTING.get()) {
81+
// action = IRCMinecraftConverter.convIRCtoMinecraft(action);
82+
// }
83+
// toMc(String.format(FORMAT2_IRC_EMOTE, sender, action));
84+
// }
8585
//
86-
// @Override
87-
// protected void onNickChange(String sender, String newnick) {
88-
// toMc(String.format(FORMAT2_IRC_NICKCHG, sender, newnick));
89-
// }
86+
// @Override
87+
// protected void onNickChange(String sender, String newnick) {
88+
// toMc(String.format(FORMAT2_IRC_NICKCHG, sender, newnick));
89+
// }
9090

9191
@Override
9292
protected void onNumeric001() {

‎common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/GameEventHandler.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,33 @@ public void playerLoggedOut(ServerPlayer e) {
2727
toIrc(String.format(FORMAT1_MC_LOGOUT, SIBUtil.mangle(e.getName().getString())));
2828
}
2929

30-
// @SubscribeEvent
31-
// public void command(CommandEvent e) {
32-
// String nickname = SIBUtil.mangle(e.getSender().getDisplayName().getUnformattedText());
33-
// /*
34-
// * Usually these would be instanceof checks, checking for
35-
// * net.minecraft.command.server.CommandEmote and
36-
// * net.minecraft.command.server.CommandBroadcast.
37-
// *
38-
// * However, some mods insist on overriding commands with their own wrappers
39-
// * (looking at you, FTBUtilities) so we're checking the names here.
40-
// */
30+
// @SubscribeEvent
31+
// public void command(CommandEvent e) {
32+
// String nickname = SIBUtil.mangle(e.getSender().getDisplayName().getUnformattedText());
33+
// /*
34+
// * Usually these would be instanceof checks, checking for
35+
// * net.minecraft.command.server.CommandEmote and
36+
// * net.minecraft.command.server.CommandBroadcast.
37+
// *
38+
// * However, some mods insist on overriding commands with their own wrappers
39+
// * (looking at you, FTBUtilities) so we're checking the names here.
40+
// */
4141
//
42-
// String content = SIBUtil.join(" ", e.getParameters());
42+
// String content = SIBUtil.join(" ", e.getParameters());
4343
//
44-
// if ("say".equals(e.getCommand().getName())) {
45-
// if (this.bridge.getSibConf().ircFormatting) {
46-
// content = IRCMinecraftConverter.convMinecraftToIRC(content);
47-
// }
48-
// toIrc(String.format(FORMAT2_MC_BROADCAST, nickname, content));
44+
// if ("say".equals(e.getCommand().getName())) {
45+
// if (this.bridge.getSibConf().ircFormatting) {
46+
// content = IRCMinecraftConverter.convMinecraftToIRC(content);
47+
// }
48+
// toIrc(String.format(FORMAT2_MC_BROADCAST, nickname, content));
4949
//
50-
// } else if ("me".equals(e.getCommand().getName())) {
51-
// if (this.bridge.getSibConf().ircFormatting) {
52-
// content = IRCMinecraftConverter.convMinecraftToIRC(content);
53-
// }
54-
// toIrc(String.format(FORMAT2_MC_EMOTE, nickname, content));
55-
// }
56-
// }
50+
// } else if ("me".equals(e.getCommand().getName())) {
51+
// if (this.bridge.getSibConf().ircFormatting) {
52+
// content = IRCMinecraftConverter.convMinecraftToIRC(content);
53+
// }
54+
// toIrc(String.format(FORMAT2_MC_EMOTE, nickname, content));
55+
// }
56+
// }
5757

5858
public void serverChat(ServerPlayer player, ChatEvent.ChatComponent component) {
5959
Component chatComponent = component.get().copy();
@@ -73,12 +73,12 @@ public void serverChat(ServerPlayer player, ChatEvent.ChatComponent component) {
7373
}
7474
}
7575

76-
public EventResult livingDeath(LivingEntity livingEntity, DamageSource damageSource) {
77-
if (livingEntity instanceof ServerPlayer) {
78-
toIrc(String.format(FORMAT1_MC_DEATH, damageSource.getLocalizedDeathMessage(livingEntity).getString().replace(livingEntity.getName().toString(), SIBUtil.mangle(livingEntity.getName().toString())) ));
79-
}
76+
public EventResult livingDeath(LivingEntity livingEntity, DamageSource damageSource) {
77+
if (livingEntity instanceof ServerPlayer) {
78+
toIrc(String.format(FORMAT1_MC_DEATH, damageSource.getLocalizedDeathMessage(livingEntity).getString().replace(livingEntity.getName().toString(), SIBUtil.mangle(livingEntity.getName().toString())) ));
79+
}
8080
return EventResult.pass();
81-
}
81+
}
8282

8383
private void toIrc(String s) {
8484
this.bridge.sendToIrc(s);

0 commit comments

Comments
 (0)