Skip to content

Commit 65137bd

Browse files
BlockyTheDevBlockyTheDev
committed
Use the CommonHandler#addMessageToChat
1 parent 2d22705 commit 65137bd

14 files changed

Lines changed: 232 additions & 292 deletions

File tree

‎versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/command/CheckSubcommand.java‎

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,89 +24,82 @@
2424
import net.minecraft.client.Minecraft;
2525
import net.minecraft.client.network.NetHandlerPlayClient;
2626
import net.minecraft.client.network.NetworkPlayerInfo;
27-
import net.minecraft.entity.player.EntityPlayer;
2827
import org.jetbrains.annotations.NotNull;
2928

3029
/**
3130
* Holds the logic of the check subcommand.
3231
*/
3332
public class CheckSubcommand implements Subcommand {
3433
private final CommonHandler commonHandler;
35-
private final EntityPlayer player;
3634
private final String[] args;
3735

3836
/**
3937
* Constructs a {@link CheckSubcommand}.
4038
*
4139
* @param commonHandler The common handler.
42-
* @param player The player.
4340
* @param args The args.
4441
*/
45-
public CheckSubcommand(final @NotNull CommonHandler commonHandler, final @NotNull EntityPlayer player, final @NotNull String[] args) {
42+
public CheckSubcommand(final @NotNull CommonHandler commonHandler, final @NotNull String[] args) {
4643
this.commonHandler = commonHandler;
47-
this.player = player;
4844
this.args = args;
4945
}
5046

5147
@Override
5248
public void run() {
5349
if (args.length != 2) {
5450
// missing arguments
55-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
56-
.build().toChatComponentText());
51+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
52+
.build().getMessage());
5753
return;
5854
}
5955

6056
if (args[1].equalsIgnoreCase("*")) {
6157
// check all argument
62-
handleCheckAllSubcommand(player);
58+
handleCheckAllSubcommand();
6359
return;
6460
}
65-
handleCheckPlayerSubcommand(player, args);
61+
handleCheckPlayerSubcommand(args);
6662
}
6763

6864
/**
6965
* Handles the check - player subcommand.
7066
*
71-
* @param player The player, which executed the subcommand.
7267
* @param args The arguments passed to the main command.
7368
*/
74-
private void handleCheckPlayerSubcommand(final @NotNull EntityPlayer player, final @NotNull String[] args) {
75-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.INPUT_PROCESSING)
76-
.build().toChatComponentText());
69+
private void handleCheckPlayerSubcommand(final @NotNull String[] args) {
70+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.INPUT_PROCESSING)
71+
.build().getMessage());
7772
Utils.getUUID(commonHandler, args[1]).thenAccept(checkPlayerOptional -> {
7873
if (!checkPlayerOptional.isPresent()) {
7974
// player uuid could not be fetched
80-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.Check.FAILED)
81-
.build().toChatComponentText());
75+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.Check.FAILED)
76+
.build().getMessage());
8277
return;
8378
}
8479

8580
final Optional<RadarListEntry> entryOptional = commonHandler.getListManager().getRadarListEntry(checkPlayerOptional.get());
8681
if (!entryOptional.isPresent()) {
8782
// player uuid is on no list
88-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.Check.FAILED)
89-
.build().toChatComponentText());
83+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.Check.FAILED)
84+
.build().getMessage());
9085
return;
9186
}
9287

9388
final RadarListEntry entry = entryOptional.get();
94-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.Check.FOUND + "\n" + Messages.Check.CHECK_ENTRY)
89+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.Check.FOUND + "\n" + Messages.Check.CHECK_ENTRY)
9590
.replaceWithColorCodes("{prefix}", commonHandler.getListManager().getPrefix(entry.uuid()))
9691
.replace("{name}", entry.name())
9792
.replace("{cause}", entry.cause())
9893
.replace("{entryCreationDate}", commonHandler.formatDateTime(entry.entryCreationDate()))
9994
.replace("{entryUpdateDate}", commonHandler.formatDateTime(entry.entryUpdateDate()))
100-
.build().toChatComponentText());
95+
.build().getMessage());
10196
});
10297
}
10398

10499
/**
105100
* Handles the check - all subcommand.
106-
*
107-
* @param player The player, which executed the subcommand.
108101
*/
109-
private void handleCheckAllSubcommand(final @NotNull EntityPlayer player) {
102+
private void handleCheckAllSubcommand() {
110103
boolean anyPlayerFound = false;
111104
final NetHandlerPlayClient connection = Minecraft.getMinecraft().getConnection();
112105
if (connection != null) {
@@ -123,25 +116,25 @@ private void handleCheckAllSubcommand(final @NotNull EntityPlayer player) {
123116
}
124117

125118
if (!anyPlayerFound) {
126-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.Check.EVERYONE)
127-
.build().toChatComponentText());
119+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.Check.EVERYONE)
120+
.build().getMessage());
128121
anyPlayerFound = true;
129122
}
130123

131124
final RadarListEntry entry = listEntryOptional.get();
132-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.Check.CHECK_ENTRY)
125+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.Check.CHECK_ENTRY)
133126
.replaceWithColorCodes("{prefix}", commonHandler.getListManager().getPrefix(entry.uuid()))
134127
.replace("{name}", entry.name())
135128
.replace("{cause}", entry.cause())
136129
.replace("{entryCreationDate}", commonHandler.formatDateTime(entry.entryCreationDate()))
137130
.replace("{entryUpdateDate}", commonHandler.formatDateTime(entry.entryUpdateDate()))
138-
.build().toChatComponentText());
131+
.build().getMessage());
139132
}
140133
}
141134

142135
if (!anyPlayerFound) {
143-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.Check.NOT_FOUND)
144-
.build().toChatComponentText());
136+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.Check.NOT_FOUND)
137+
.build().getMessage());
145138
}
146139
}
147140
}

‎versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/command/HelpSubcommand.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,28 @@
1818
import io.github.communityradargg.forgemod.util.CommonHandler;
1919
import io.github.communityradargg.forgemod.util.Messages;
2020
import io.github.communityradargg.forgemod.util.RadarMessage;
21-
import net.minecraft.entity.player.EntityPlayer;
2221
import org.jetbrains.annotations.NotNull;
2322

2423
/**
2524
* Holds the logic of the help subcommand.
2625
*/
2726
public class HelpSubcommand implements Subcommand {
2827
private final CommonHandler commonHandler;
29-
private final EntityPlayer player;
3028

3129
/**
3230
* Constructs a {@link HelpSubcommand}.
3331
*
3432
* @param commonHandler The common handler.
35-
* @param player The player.
3633
*/
37-
public HelpSubcommand(final @NotNull CommonHandler commonHandler, final @NotNull EntityPlayer player) {
34+
public HelpSubcommand(final @NotNull CommonHandler commonHandler) {
3835
this.commonHandler = commonHandler;
39-
this.player = player;
4036
}
4137

4238
@Override
4339
public void run() {
44-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.HELP)
40+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.HELP)
4541
.replace("{code_version}", commonHandler.getVersion())
4642
.excludePrefix()
47-
.build().toChatComponentText());
43+
.build().getMessage());
4844
}
4945
}

‎versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/command/ListSubcommand.java‎

Lines changed: 40 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -26,101 +26,95 @@
2626
import java.util.Optional;
2727
import java.util.Set;
2828
import java.util.UUID;
29-
import net.minecraft.entity.player.EntityPlayer;
3029
import org.jetbrains.annotations.NotNull;
3130

3231
/**
3332
* Holds the logic of the list subcommand.
3433
*/
3534
public class ListSubcommand implements Subcommand {
3635
private final CommonHandler commonHandler;
37-
private final EntityPlayer player;
3836
private final String[] args;
3937

4038
/**
4139
* Constructs a {@link ListSubcommand}.
4240
*
4341
* @param commonHandler The common handler.
44-
* @param player The player.
4542
* @param args The args.
4643
*/
47-
public ListSubcommand(final @NotNull CommonHandler commonHandler, final @NotNull EntityPlayer player, final @NotNull String[] args) {
44+
public ListSubcommand(final @NotNull CommonHandler commonHandler, final @NotNull String[] args) {
4845
this.commonHandler = commonHandler;
49-
this.player = player;
5046
this.args = args;
5147
}
5248

5349
@Override
5450
public void run() {
5551
if (args.length < 2) {
5652
// missing arguments
57-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
58-
.build().toChatComponentText());
53+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
54+
.build().getMessage());
5955
return;
6056
}
6157

6258
switch (args[1].toUpperCase(Locale.ENGLISH)) {
6359
case "ADD":
64-
handleListAddSubcommand(player, args);
60+
handleListAddSubcommand(args);
6561
break;
6662
case "PREFIX":
67-
handleListPrefixSubcommand(player, args);
63+
handleListPrefixSubcommand(args);
6864
break;
6965
case "DELETE":
70-
handleListDeleteSubcommand(player, args);
66+
handleListDeleteSubcommand(args);
7167
break;
7268
case "SHOW":
73-
handleListShowSubcommand(player, args);
69+
handleListShowSubcommand(args);
7470
break;
7571
default:
76-
new HelpSubcommand(commonHandler, player).run();
72+
new HelpSubcommand(commonHandler).run();
7773
break;
7874
}
7975
}
8076

8177
/**
8278
* Handles the list - add subcommand.
8379
*
84-
* @param player The player, which executed the subcommand.
8580
* @param args The arguments passed to the main command.
8681
*/
87-
private void handleListAddSubcommand(final @NotNull EntityPlayer player, final @NotNull String[] args) {
82+
private void handleListAddSubcommand(final @NotNull String[] args) {
8883
if (args.length != 4) {
8984
// missing arguments
90-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
91-
.build().toChatComponentText());
85+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
86+
.build().getMessage());
9287
return;
9388
}
9489

9590
if (commonHandler.getListManager().getRadarList(args[2]).isPresent()) {
9691
// list already existing
97-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.CREATE_FAILED)
98-
.build().toChatComponentText());
92+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.CREATE_FAILED)
93+
.build().getMessage());
9994
return;
10095
}
10196

10297
if (!commonHandler.getListManager().registerPrivateList(args[2], args[3])) {
10398
// list could not be registered
104-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.CREATE_FAILED)
105-
.build().toChatComponentText());
99+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.CREATE_FAILED)
100+
.build().getMessage());
106101
return;
107102
}
108103

109-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.CREATE_SUCCESS)
110-
.build().toChatComponentText());
104+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.CREATE_SUCCESS)
105+
.build().getMessage());
111106
}
112107

113108
/**
114109
* Handles the list - delete subcommand.
115110
*
116-
* @param player The player, which executed the subcommand.
117111
* @param args The arguments passed to the main command.
118112
*/
119-
private void handleListDeleteSubcommand(final @NotNull EntityPlayer player, final @NotNull String[] args) {
113+
private void handleListDeleteSubcommand(final @NotNull String[] args) {
120114
if (args.length != 3) {
121115
// missing arguments
122-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
123-
.build().toChatComponentText());
116+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
117+
.build().getMessage());
124118
return;
125119
}
126120

@@ -132,75 +126,73 @@ private void handleListDeleteSubcommand(final @NotNull EntityPlayer player, fina
132126

133127
if (!listManager.unregisterList(args[2])) {
134128
// list is not existing, list is not private, file cannot be deleted
135-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.DELETE_FAILED)
136-
.build().toChatComponentText());
129+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.DELETE_FAILED)
130+
.build().getMessage());
137131
return;
138132
}
139133

140134
oldUuids.forEach(uuid -> Utils.updatePlayerByUuid(commonHandler, uuid, oldPrefixes));
141-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.DELETE_SUCCESS)
142-
.build().toChatComponentText());
135+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.DELETE_SUCCESS)
136+
.build().getMessage());
143137
}
144138

145139
/**
146140
* Handles the list - show subcommand.
147141
*
148-
* @param player The player, which executed the subcommand.
149142
* @param args The arguments passed to the main command.
150143
*/
151-
private void handleListShowSubcommand(final @NotNull EntityPlayer player, final @NotNull String[] args) {
144+
private void handleListShowSubcommand(final @NotNull String[] args) {
152145
if (args.length != 3) {
153146
// missing arguments
154-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
155-
.build().toChatComponentText());
147+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
148+
.build().getMessage());
156149
return;
157150
}
158151

159152
final Optional<RadarList> listOptional = commonHandler.getListManager().getRadarList(args[2]);
160153
if (!listOptional.isPresent()) {
161154
// list is not existing
162-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.SHOW_FAILED)
163-
.build().toChatComponentText());
155+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.SHOW_FAILED)
156+
.build().getMessage());
164157
return;
165158
}
166159

167160
final RadarList list = listOptional.get();
168161
if (list.getPlayerMap().isEmpty()) {
169162
// list is empty
170-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.SHOW_EMPTY)
171-
.build().toChatComponentText());
163+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.SHOW_EMPTY)
164+
.build().getMessage());
172165
return;
173166
}
174167

175168
final StringBuilder players = new StringBuilder();
176169
list.getPlayerMap().values().forEach(value -> players.append(value.name()).append(", "));
177-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.SHOW_SUCCESS)
170+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.SHOW_SUCCESS)
178171
.replace("{list}", list.getNamespace())
179172
.replaceWithColorCodes("{prefix}", listOptional.get().getPrefix())
180173
.replace("{players}", players.substring(0, players.length() - 2))
181-
.build().toChatComponentText());
174+
.build().getMessage());
182175
}
183176

184177
/**
185178
* Handles the list - prefix subcommand.
186179
*
187-
* @param player The player, which executed the subcommand.
188180
* @param args The arguments passed to the main command.
189181
*/
190-
private void handleListPrefixSubcommand(final @NotNull EntityPlayer player, final @NotNull String[] args) {
182+
private void handleListPrefixSubcommand(final @NotNull String[] args) {
191183
if (args.length != 4) {
192184
// missing arguments
193-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
194-
.build().toChatComponentText());
185+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.MISSING_ARGS)
186+
.build().getMessage());
195187
return;
196188
}
197189

198190
final ListManager listManager = commonHandler.getListManager();
199191
final Optional<RadarList> listOptional = listManager.getRadarList(args[2]);
200192
if (!listOptional.isPresent()) {
201193
// list is not existing
202-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.PREFIX_FAILED)
203-
.build().toChatComponentText());
194+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.PREFIX_FAILED)
195+
.build().getMessage());
204196
return;
205197
}
206198

@@ -210,8 +202,8 @@ private void handleListPrefixSubcommand(final @NotNull EntityPlayer player, fina
210202
list.saveList();
211203
list.getPlayerMap().keySet().forEach(uuid -> Utils.updatePlayerByUuid(commonHandler, uuid, oldPrefixes));
212204

213-
player.sendMessage(new RadarMessage.RadarMessageBuilder(Messages.List.PREFIX_SUCCESS)
205+
commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.PREFIX_SUCCESS)
214206
.replaceWithColorCodes("{prefix}", args[3])
215-
.build().toChatComponentText());
207+
.build().getMessage());
216208
}
217209
}

0 commit comments

Comments
 (0)