Skip to content

Commit 50cb256

Browse files
OptiJavaOptiJava
committed
update mod version to 1.1
1 parent cf73cd4 commit 50cb256

File tree

11 files changed

+92
-79
lines changed

11 files changed

+92
-79
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ minecraft_version=1.16.5
66
yarn_mappings=1.16.5+build.9
77
loader_version=0.11.3
88
# Mod Properties
9-
mod_version=1.0
9+
mod_version=1.1
1010
maven_group=io.github.optijava
1111
archives_base_name=opt-carpet-addition
1212
# Dependencies

‎src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java‎

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,46 @@
44
import carpet.CarpetServer;
55
import carpet.CarpetSettings;
66
import carpet.patches.EntityPlayerMPFake;
7+
import carpet.utils.Messenger;
78
import com.mojang.brigadier.CommandDispatcher;
89
import io.github.optijava.opt_carpet_addition.commands.ListAdvanceCommand;
910
import io.github.optijava.opt_carpet_addition.commands.PlayerTpCommand;
11+
import io.github.optijava.opt_carpet_addition.commands.TpLimitCommand;
1012
import io.github.optijava.opt_carpet_addition.events.FixExperienceBug;
13+
import io.github.optijava.opt_carpet_addition.utils.ConfigUtil;
14+
import io.github.optijava.opt_carpet_addition.utils.TpLimit;
1115
import net.fabricmc.api.ModInitializer;
1216
import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
1317
import net.minecraft.server.command.ServerCommandSource;
1418
import net.minecraft.server.network.ServerPlayerEntity;
1519
import net.minecraft.world.GameMode;
16-
import org.apache.logging.log4j.Logger;
1720

21+
import java.io.File;
1822
import java.util.Objects;
1923

2024
public class OptCarpetAddition implements CarpetExtension, ModInitializer {
21-
public static final Logger LOGGER = CarpetSettings.LOG;
22-
23-
public static final OptCarpetAddition additionInstance = new OptCarpetAddition();
2425

2526
@Override
2627
public void onInitialize() {
27-
CarpetServer.manageExtension(additionInstance);
28+
CarpetServer.manageExtension(new OptCarpetAddition());
2829

2930
ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register(new FixExperienceBug());
3031
}
3132

3233
@Override
3334
public void onGameStarted() {
35+
// add setting class to carpet extension manager
3436
CarpetServer.settingsManager.parseSettingsClass(OptCarpetSettings.class);
37+
38+
// add rule observer
3539
CarpetServer.settingsManager.addRuleObserver(((serverCommandSource, rule, s) -> {
3640
if (Objects.equals(rule.name, "forceFakePlayerGameMode") && !Objects.equals(OptCarpetSettings.forceFakePlayerGameMode, "false")) {
3741
GameMode gameMode = GameMode.SURVIVAL;
3842

39-
switch (OptCarpetSettings.forceFakePlayerGameMode) {
40-
case "survival": {
41-
gameMode = GameMode.SURVIVAL;
42-
break;
43-
}
44-
case "creative": {
45-
gameMode = GameMode.CREATIVE;
46-
break;
47-
}
48-
case "adventure": {
49-
gameMode = GameMode.ADVENTURE;
50-
break;
51-
}
43+
if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative")) {
44+
gameMode = GameMode.CREATIVE;
45+
} else if (OptCarpetSettings.forceFakePlayerGameMode.equals("adventure")) {
46+
gameMode = GameMode.ADVENTURE;
5247
}
5348

5449
for (ServerPlayerEntity player : serverCommandSource.getMinecraftServer().getPlayerManager().getPlayerList()) {
@@ -57,34 +52,54 @@ public void onGameStarted() {
5752
}
5853
}
5954
}
55+
56+
if (rule.name.equals("enableTpPrefixBlacklist") && OptCarpetSettings.enableTpPrefixBlacklist && OptCarpetSettings.enableTpPrefixWhitelist) {
57+
OptCarpetSettings.enableTpPrefixBlacklist = false;
58+
Messenger.m(serverCommandSource, "r You can't enable TpPrefixBlacklist because you have enabled TpPrefixWhitelist");
59+
}
60+
61+
if (rule.name.equals("enableTpPrefixWhitelist") && OptCarpetSettings.enableTpPrefixWhitelist && OptCarpetSettings.enableTpPrefixBlacklist) {
62+
OptCarpetSettings.enableTpPrefixWhitelist = false;
63+
Messenger.m(serverCommandSource, "r You can't enable TpPrefixWhitelist because you have enabled TpPrefixBlacklist");
64+
}
65+
66+
if (rule.name.equals("enableTpherePrefixWhitelist") && OptCarpetSettings.enableTpHerePrefixWhitelist && OptCarpetSettings.enableTpHerePrefixBlacklist) {
67+
OptCarpetSettings.enableTpHerePrefixWhitelist = false;
68+
Messenger.m(serverCommandSource, "r You can't enable TpherePrefixWhitelist because you have enabled TpherePrefixBlacklist");
69+
}
70+
71+
if (rule.name.equals("enableTpherePrefixBlacklist") && OptCarpetSettings.enableTpHerePrefixBlacklist && OptCarpetSettings.enableTpHerePrefixWhitelist) {
72+
OptCarpetSettings.enableTpHerePrefixBlacklist = false;
73+
Messenger.m(serverCommandSource, "r You can't enable TpherePrefixBlacklist because you have enabled TpherePrefixWhitelist");
74+
}
6075
}));
76+
77+
// config
78+
if (!ConfigUtil.init()) {
79+
CarpetSettings.LOG.error("[OptCarpetAddition] Failed to create config folder:" + OptCarpetSettings.configDirectory.toString() + File.separator + "opt-carpet-addition");
80+
return;
81+
}
82+
TpLimit.loadConfigFile();
6183
}
6284

6385
@Override
6486
public void registerCommands(CommandDispatcher<ServerCommandSource> dispatcher) {
6587
PlayerTpCommand.registerCommands(dispatcher);
6688
ListAdvanceCommand.registerCommand(dispatcher);
89+
TpLimitCommand.registerCommand(dispatcher);
6790
}
6891

6992
@Override
7093
public void onPlayerLoggedIn(ServerPlayerEntity player) {
7194
if (player instanceof EntityPlayerMPFake && !(Objects.equals(OptCarpetSettings.forceFakePlayerGameMode, "false"))) {
7295
GameMode gameMode = GameMode.SURVIVAL;
7396

74-
switch (OptCarpetSettings.forceFakePlayerGameMode) {
75-
case "survival": {
76-
gameMode = GameMode.SURVIVAL;
77-
break;
78-
}
79-
case "creative": {
80-
gameMode = GameMode.CREATIVE;
81-
break;
82-
}
83-
case "adventure": {
84-
gameMode = GameMode.ADVENTURE;
85-
break;
86-
}
97+
if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative")) {
98+
gameMode = GameMode.CREATIVE;
99+
} else if (OptCarpetSettings.forceFakePlayerGameMode.equals("adventure")) {
100+
gameMode = GameMode.ADVENTURE;
87101
}
102+
88103
player.setGameMode(gameMode);
89104
}
90105
}

‎src/main/java/io/github/optijava/opt_carpet_addition/commands/ListAdvanceCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.optijava.opt_carpet_addition.commands;
22

3+
import carpet.CarpetSettings;
34
import com.mojang.brigadier.CommandDispatcher;
45
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
56
import com.mojang.brigadier.context.CommandContext;
6-
import io.github.optijava.opt_carpet_addition.OptCarpetAddition;
77
import net.minecraft.server.MinecraftServer;
88
import net.minecraft.server.command.ServerCommandSource;
99
import net.minecraft.server.network.ServerPlayerEntity;
@@ -26,11 +26,11 @@ private static int listAdvance(CommandContext<ServerCommandSource> context) {
2626
for (ServerPlayerEntity s : minecraftServer.getPlayerManager().getPlayerList()) {
2727
sb.append(s.getGameProfile().getName()).append(" ").append(s.interactionManager.getGameMode().getName()).append(" ").append(s.pingMilliseconds).append("ms ").append(s.getGameProfile().getId().toString()).append("\n");
2828
}
29-
OptCarpetAddition.LOGGER.info(sb.toString());
29+
CarpetSettings.LOG.info(sb.toString());
3030
context.getSource().sendFeedback(new LiteralText(sb.toString()), false);
3131
} catch (Exception e) {
3232
context.getSource().sendError(new LiteralText("Unexpected exception occurred when command list advance executed."));
33-
OptCarpetAddition.LOGGER.error("Unexpected exception occurred when command list advance executed.", e);
33+
CarpetSettings.LOG.error("Unexpected exception occurred when command list advance executed.", e);
3434
return 0;
3535
}
3636
return 1;

‎src/main/java/io/github/optijava/opt_carpet_addition/commands/PlayerTpCommand.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package io.github.optijava.opt_carpet_addition.commands;
22

3+
import carpet.CarpetSettings;
34
import carpet.patches.EntityPlayerMPFake;
45
import carpet.utils.Messenger;
56
import com.mojang.brigadier.CommandDispatcher;
67
import com.mojang.brigadier.arguments.StringArgumentType;
78
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
89
import com.mojang.brigadier.context.CommandContext;
910
import com.mojang.brigadier.exceptions.CommandSyntaxException;
10-
import io.github.optijava.opt_carpet_addition.OptCarpetAddition;
1111
import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
1212
import net.minecraft.server.MinecraftServer;
1313
import net.minecraft.server.command.ServerCommandSource;
@@ -37,7 +37,7 @@ private static int teleport(CommandContext<ServerCommandSource> context) {
3737

3838
if (context.getSource().equals(server.getCommandSource())) {
3939
Messenger.m(context.getSource(), "r Console can't tp to player.");
40-
OptCarpetAddition.LOGGER.warn("[OptCarpetAddition] Console can't tp to player");
40+
CarpetSettings.LOG.warn("[OptCarpetAddition] Console can't tp to player");
4141
return 0;
4242
}
4343
if (StringArgumentType.getString(context, COMMAND_PREFIX).equals("") || StringArgumentType.getString(context, COMMAND_PREFIX) == null) {
@@ -48,7 +48,7 @@ private static int teleport(CommandContext<ServerCommandSource> context) {
4848
try {
4949
final String commandSourcePlayerName = context.getSource().getPlayer().getGameProfile().getName();
5050

51-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] " + commandSourcePlayerName + " submit command: /player " + StringArgumentType.getString(context, COMMAND_PREFIX) + " tp");
51+
CarpetSettings.LOG.info("[OptCarpetAddition] " + commandSourcePlayerName + " submit command: /player " + StringArgumentType.getString(context, COMMAND_PREFIX) + " tp");
5252

5353
if (server.getPlayerManager().getPlayer(StringArgumentType.getString(context, COMMAND_PREFIX)) instanceof EntityPlayerMPFake) {
5454

@@ -83,7 +83,7 @@ private static int teleport(CommandContext<ServerCommandSource> context) {
8383

8484
} catch (CommandSyntaxException e) {
8585
Messenger.m(context.getSource(), "r Maybe player name is not correct.");
86-
OptCarpetAddition.LOGGER.error("[OptCarpetAddition] Unknown error occurred when execute command.", e);
86+
CarpetSettings.LOG.error("[OptCarpetAddition] Unknown error occurred when execute command.", e);
8787
return 0;
8888
}
8989
return 1;
@@ -94,7 +94,7 @@ private static int teleportHere(CommandContext<ServerCommandSource> context) {
9494

9595
if (context.getSource().equals(server.getCommandSource())) {
9696
Messenger.m(context.getSource(), "r Console can't tp here player.");
97-
OptCarpetAddition.LOGGER.warn("[OptCarpetAddition] Console can't tp here player");
97+
CarpetSettings.LOG.warn("[OptCarpetAddition] Console can't tp here player");
9898
return 0;
9999
}
100100
if (StringArgumentType.getString(context, COMMAND_PREFIX).equals("") || StringArgumentType.getString(context, "player") == null) {
@@ -105,7 +105,7 @@ private static int teleportHere(CommandContext<ServerCommandSource> context) {
105105
try {
106106
final String commandSourcePlayerName = context.getSource().getPlayer().getGameProfile().getName();
107107

108-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] " + commandSourcePlayerName + " submit command: /player " + StringArgumentType.getString(context, COMMAND_PREFIX) + " tphere");
108+
CarpetSettings.LOG.info("[OptCarpetAddition] " + commandSourcePlayerName + " submit command: /player " + StringArgumentType.getString(context, COMMAND_PREFIX) + " tphere");
109109

110110
if (server.getPlayerManager().getPlayer(StringArgumentType.getString(context, COMMAND_PREFIX)) instanceof EntityPlayerMPFake) {
111111

@@ -139,7 +139,7 @@ private static int teleportHere(CommandContext<ServerCommandSource> context) {
139139

140140
} catch (CommandSyntaxException e) {
141141
Messenger.m(context.getSource(), "r Unknown error occurred when execute command : com.mojang.brigadier.exceptions.CommandSyntaxException");
142-
OptCarpetAddition.LOGGER.error("[OptCarpetAddition] Unknown error occurred when execute command.", e);
142+
CarpetSettings.LOG.error("[OptCarpetAddition] Unknown error occurred when execute command.", e);
143143
return 0;
144144
}
145145
return 1;
@@ -170,7 +170,7 @@ private static void executeTpHere(String commandSourcePlayerName, CommandContext
170170
}
171171

172172
private static boolean checkTpBlacklist(String name) {
173-
for (String s : OptCarpetSettings.bean.TpBlacklist) {
173+
for (String s : OptCarpetSettings.bean.tpBlacklist) {
174174
if (name.startsWith(s)) {
175175
return false;
176176
}
@@ -179,7 +179,7 @@ private static boolean checkTpBlacklist(String name) {
179179
}
180180

181181
private static boolean checkTpWhitelist(String name) {
182-
for (String s : OptCarpetSettings.bean.TpWhitelist) {
182+
for (String s : OptCarpetSettings.bean.tpWhitelist) {
183183
if (name.startsWith(s)) {
184184
return true;
185185
}
@@ -188,7 +188,7 @@ private static boolean checkTpWhitelist(String name) {
188188
}
189189

190190
private static boolean checkTpHereBlacklist(String name) {
191-
for (String s : OptCarpetSettings.bean.TphereBlacklist) {
191+
for (String s : OptCarpetSettings.bean.tphereBlacklist) {
192192
if (name.startsWith(s)) {
193193
return false;
194194
}
@@ -197,7 +197,7 @@ private static boolean checkTpHereBlacklist(String name) {
197197
}
198198

199199
private static boolean checkTpHereWhitelist(String name) {
200-
for (String s : OptCarpetSettings.bean.TphereWhitelist) {
200+
for (String s : OptCarpetSettings.bean.tphereWhitelist) {
201201
if (name.startsWith(s)) {
202202
return true;
203203
}

‎src/main/java/io/github/optijava/opt_carpet_addition/commands/TpLimitCommand.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.github.optijava.opt_carpet_addition.commands;
22

3+
import carpet.CarpetSettings;
34
import com.mojang.brigadier.CommandDispatcher;
45
import com.mojang.brigadier.arguments.StringArgumentType;
56
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
67
import com.mojang.brigadier.context.CommandContext;
7-
import io.github.optijava.opt_carpet_addition.OptCarpetAddition;
88
import io.github.optijava.opt_carpet_addition.utils.TpLimit;
99
import net.minecraft.server.command.ServerCommandSource;
1010

@@ -76,56 +76,56 @@ public static void registerCommand(CommandDispatcher<ServerCommandSource> dispat
7676

7777
public static int addTpWhitelist(CommandContext<ServerCommandSource> context) {
7878
TpLimit.add(StringArgumentType.getString(context, "prefix"), "TpWhitelist");
79-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] Add TpWhitelist prefix : " + StringArgumentType.getString(context, "prefix"));
79+
CarpetSettings.LOG.info("[OptCarpetAddition] Add TpWhitelist prefix : " + StringArgumentType.getString(context, "prefix"));
8080
TpLimit.flush();
8181
return 1;
8282
}
8383

8484
public static int addTpBlacklist(CommandContext<ServerCommandSource> context) {
8585
TpLimit.add(StringArgumentType.getString(context, "prefix"), "TpBlacklist");
86-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] Add TpBlacklist prefix : " + StringArgumentType.getString(context, "prefix"));
86+
CarpetSettings.LOG.info("[OptCarpetAddition] Add TpBlacklist prefix : " + StringArgumentType.getString(context, "prefix"));
8787
TpLimit.flush();
8888
return 1;
8989
}
9090

9191
public static int addTphereWhitelist(CommandContext<ServerCommandSource> context) {
9292
TpLimit.add(StringArgumentType.getString(context, "prefix"), "TphereWhitelist");
93-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] Add TphereWhitelist prefix : " + StringArgumentType.getString(context, "prefix"));
93+
CarpetSettings.LOG.info("[OptCarpetAddition] Add TphereWhitelist prefix : " + StringArgumentType.getString(context, "prefix"));
9494
TpLimit.flush();
9595
return 1;
9696
}
9797

9898
public static int addTphereBlacklist(CommandContext<ServerCommandSource> context) {
9999
TpLimit.add(StringArgumentType.getString(context, "prefix"), "TphereBlacklist");
100-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] Add TphereBlacklist prefix : " + StringArgumentType.getString(context, "prefix"));
100+
CarpetSettings.LOG.info("[OptCarpetAddition] Add TphereBlacklist prefix : " + StringArgumentType.getString(context, "prefix"));
101101
TpLimit.flush();
102102
return 1;
103103
}
104104

105105
public static int removeTpWhitelist(CommandContext<ServerCommandSource> context) {
106106
TpLimit.remove(StringArgumentType.getString(context, "prefix"), "TpWhitelist");
107-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] Remove TpWhitelist prefix : " + StringArgumentType.getString(context, "prefix"));
107+
CarpetSettings.LOG.info("[OptCarpetAddition] Remove TpWhitelist prefix : " + StringArgumentType.getString(context, "prefix"));
108108
TpLimit.flush();
109109
return 1;
110110
}
111111

112112
public static int removeTpBlacklist(CommandContext<ServerCommandSource> context) {
113113
TpLimit.remove(StringArgumentType.getString(context, "prefix"), "TpBlacklist");
114-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] Remove TpBlacklist prefix : " + StringArgumentType.getString(context, "prefix"));
114+
CarpetSettings.LOG.info("[OptCarpetAddition] Remove TpBlacklist prefix : " + StringArgumentType.getString(context, "prefix"));
115115
TpLimit.flush();
116116
return 1;
117117
}
118118

119119
public static int removeTphereWhitelist(CommandContext<ServerCommandSource> context) {
120120
TpLimit.remove(StringArgumentType.getString(context, "prefix"), "TphereWhitelist");
121-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] Remove TphereWhitelist prefix : " + StringArgumentType.getString(context, "prefix"));
121+
CarpetSettings.LOG.info("[OptCarpetAddition] Remove TphereWhitelist prefix : " + StringArgumentType.getString(context, "prefix"));
122122
TpLimit.flush();
123123
return 1;
124124
}
125125

126126
public static int removeTphereBlacklist(CommandContext<ServerCommandSource> context) {
127127
TpLimit.remove(StringArgumentType.getString(context, "prefix"), "TphereBlacklist");
128-
OptCarpetAddition.LOGGER.info("[OptCarpetAddition] Remove TphereBlacklist prefix : " + StringArgumentType.getString(context, "prefix"));
128+
CarpetSettings.LOG.info("[OptCarpetAddition] Remove TphereBlacklist prefix : " + StringArgumentType.getString(context, "prefix"));
129129
TpLimit.flush();
130130
return 1;
131131
}

‎src/main/java/io/github/optijava/opt_carpet_addition/utils/ConfigUtil.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
public class ConfigUtil {
1111
public static String load(String fileName) {
1212
try {
13-
1413
return Arrays.toString(Files.readAllBytes(OptCarpetSettings.configDirectory.resolve(fileName)));
1514
} catch (IOException e) {
1615
e.printStackTrace();

0 commit comments

Comments
 (0)