Skip to content

Commit b5c5fe7

Browse files
Powie69Powie69
committed
betterbaritonebuild logging 💀💀 and also use isNot6B6T()
1 parent 12e1e9d commit b5c5fe7

File tree

8 files changed

+88
-105
lines changed

8 files changed

+88
-105
lines changed

‎src/main/java/xyz/omegaware/addon/OmegawareAddons.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void onInitialize() {
7474
Modules.get().add(new ItemFrameDupeModule());
7575
Modules.get().add(new BetterStashFinderModule());
7676

77-
if (System.getenv("env").equals("dev")) {
77+
if (FabricLoader.getInstance().isDevelopmentEnvironment()) {
7878
Modules.get().add(new TSRKitBotModule()); // Is not ready yet
7979
}
8080

‎src/main/java/xyz/omegaware/addon/modules/BetterBaritoneBuild.java‎

Lines changed: 47 additions & 86 deletions
Large diffs are not rendered by default.

‎src/main/java/xyz/omegaware/addon/modules/ChatFilterModule.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import meteordevelopment.meteorclient.events.game.ReceiveMessageEvent;
1616
import meteordevelopment.meteorclient.systems.modules.Module;
1717
import meteordevelopment.orbit.EventHandler;
18+
import xyz.omegaware.addon.utils.Logger;
1819

1920
import java.io.File;
2021
import java.io.FileWriter;
@@ -23,6 +24,8 @@
2324
import java.nio.file.Files;
2425
import java.util.List;
2526

27+
import static xyz.omegaware.addon.utils.ServerCheck.isNot6B6T;
28+
2629
public class ChatFilterModule extends Module {
2730
public ChatFilterModule() {
2831
super(OmegawareAddons.CATEGORY, "6B6T-chat-filter", "This module filters chat messages based on selected criteria.");
@@ -140,10 +143,9 @@ public void loadFilteredCount() {
140143

141144
@Override
142145
public void onActivate() {
143-
if (!OmegawareAddons.is6B6T()) {
144-
ChatUtils.sendMsg(OmegawareAddons.PREFIX.copy()
145-
.append(Text.literal("The 6B6T Chat Filter module is only intended for use on 6b6t.").formatted(Formatting.RED)));
146-
this.toggle();
146+
if (isNot6B6T()) {
147+
Logger.error("%s is only intended for use on 6b6t.", name.replace("-", " "));
148+
toggle();
147149
return;
148150
}
149151

‎src/main/java/xyz/omegaware/addon/modules/ItemFrameDupeModule.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@
2626
import net.minecraft.world.GameMode;
2727
import org.jetbrains.annotations.NotNull;
2828
import xyz.omegaware.addon.OmegawareAddons;
29+
import xyz.omegaware.addon.utils.Logger;
2930

3031
import java.util.ArrayList;
3132
import java.util.List;
3233

34+
import static xyz.omegaware.addon.utils.ServerCheck.isNot6B6T;
35+
3336
// Shamelessly taken from https://github.com/kybe236/rusher-auto-item-frame-dupe/
3437
public class ItemFrameDupeModule extends Module {
3538
public ItemFrameDupeModule() {
@@ -115,10 +118,9 @@ public ItemFrameDupeModule() {
115118

116119
@Override
117120
public void onActivate() {
118-
if (!OmegawareAddons.is6B6T()) {
119-
ChatUtils.sendMsg(OmegawareAddons.PREFIX.copy()
120-
.append(Text.literal("The 6B6T Item Frame Dupe module is only intended for use on 6b6t.").formatted(Formatting.RED)));
121-
this.toggle();
121+
if (isNot6B6T()) {
122+
Logger.error("%s is only intended for use on 6b6t.", name.replace("-", " "));
123+
toggle();
122124
}
123125
}
124126

‎src/main/java/xyz/omegaware/addon/modules/TPAAutomationModule.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@
99
import meteordevelopment.meteorclient.events.game.ReceiveMessageEvent;
1010
import meteordevelopment.meteorclient.systems.modules.Module;
1111
import meteordevelopment.orbit.EventHandler;
12+
import xyz.omegaware.addon.utils.Logger;
1213

1314
import java.util.List;
1415
import java.util.Set;
1516
import java.util.regex.Matcher;
1617
import java.util.regex.Pattern;
1718

19+
import static xyz.omegaware.addon.utils.ServerCheck.isNot6B6T;
20+
1821
public class TPAAutomationModule extends Module {
1922
public TPAAutomationModule() {
2023
super(OmegawareAddons.CATEGORY, "TPA-automations", "A module that automatically accepts or denies teleport requests based on a list of approved players.");
@@ -96,10 +99,12 @@ public TPAAutomationModule() {
9699

97100
@Override
98101
public void onActivate() {
99-
if (!OmegawareAddons.is6B6T()) {
100-
ChatUtils.sendMsg(OmegawareAddons.PREFIX.copy()
101-
.append(Text.literal("The TPA Automations module is only intended for use on 6b6t.").formatted(Formatting.RED)));
102-
this.toggle();
102+
Logger.warn("TPAAutomationModule is not yet fully implemented.");
103+
Logger.error("TPAAutomationModule is not yet fully implemented.");
104+
105+
if (isNot6B6T()) {
106+
Logger.error("%s is only intended for use on 6b6t.", name.replace("-", " "));
107+
toggle();
103108
}
104109
}
105110

‎src/main/java/xyz/omegaware/addon/modules/TSRKitBotModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ private static void conditionallyPrintOrders(String... statusFlag) {
332332
@Override
333333
public void onActivate() {
334334
if (isNot6B6T()) {
335-
Logger.error("%s is only intended for use on 6b6t.", name);
335+
Logger.error("%s is only intended for use on 6b6t.", name.replace("-", " "));
336336
toggle();
337337
return;
338338
}

‎src/main/java/xyz/omegaware/addon/utils/Logger.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ public class Logger {
1111
.append(Text.literal("OmegaWare").formatted(Formatting.AQUA))
1212
.append(Text.literal("] ").formatted(Formatting.WHITE));
1313

14+
private static final Text WARN = Text.empty()
15+
.append(Text.literal("[").formatted(Formatting.WHITE))
16+
.append(Text.literal("WARNING").formatted(Formatting.YELLOW))
17+
.append(Text.literal("] ").formatted(Formatting.WHITE));
18+
19+
private static final Text ERROR = Text.empty()
20+
.append(Text.literal("[").formatted(Formatting.WHITE))
21+
.append(Text.literal("ERROR").formatted(Formatting.RED))
22+
.append(Text.literal("] ").formatted(Formatting.WHITE));
23+
1424
/**
1525
* Sends a message to the chat with the given format string and arguments, prefixed with the OmegaWare prefix.
1626
* <pre>
@@ -27,11 +37,11 @@ public static void info(String message, Object... args) {
2737
* The message will be yellow in color.
2838
* <pre>
2939
* Example:
30-
* Logger.warn( %d %sdiamonds went missing", 5, Formatting.AQUA);
40+
* Logger.warn(%d %sdiamonds went missing", 5, Formatting.AQUA);
3141
* </pre>
3242
*/
3343
public static void warn(String message, Object... args) {
34-
ChatUtils.sendMsg(PREFIX.copy().append(Text.literal(String.format(message, args))).formatted(Formatting.YELLOW));
44+
ChatUtils.sendMsg(PREFIX.copy().append(WARN).append(Text.literal(String.format(message, args))).formatted(Formatting.YELLOW));
3545
}
3646

3747
/**
@@ -43,6 +53,6 @@ public static void warn(String message, Object... args) {
4353
* </pre>
4454
*/
4555
public static void error(String message, Object... args) {
46-
ChatUtils.sendMsg(PREFIX.copy().append(Text.literal(String.format(message, args))).formatted(Formatting.RED));
56+
ChatUtils.sendMsg(PREFIX.copy().append(ERROR).append(Text.literal(String.format(message, args))).formatted(Formatting.RED));
4757
}
4858
}

‎src/main/java/xyz/omegaware/addon/utils/ServerCheck.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
package xyz.omegaware.addon.utils;
22

3+
import meteordevelopment.meteorclient.MeteorClient;
4+
import net.fabricmc.loader.api.FabricLoader;
35
import net.minecraft.client.network.ServerInfo;
46
import static meteordevelopment.meteorclient.MeteorClient.mc;
57

68
public class ServerCheck {
79

10+
811
public static boolean isNot6B6T() {
9-
if (System.getenv("env").equals("dev")) return false; // Bypass check in dev environment
12+
if (FabricLoader.getInstance().isDevelopmentEnvironment()) return false; // Bypass check in dev environment
1013
if (mc.isIntegratedServerRunning()) return true;
1114
ServerInfo server = mc.getCurrentServerEntry();
1215
if (server == null) return false;
13-
return !server.name.endsWith("6b6t.org");
16+
return !server.address.endsWith("6b6t.org");
1417
}
1518

1619
// Idk how to turn off the module from here

0 commit comments

Comments
 (0)