Skip to content

Commit 8d19284

Browse files
Omega172Omega172
authored
Merge pull request #8 from Powie69/env-1.21.5
2 parents 6a67b9c + c26b741 commit 8d19284

14 files changed

Lines changed: 524 additions & 462 deletions

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
- **Better Baritone Build**
3232
- Add some improvements to the baritone build command
3333
- Can refill items from any storage block
34+
- Please use [this fork of baritone](https://github.com/Omega172/baritone-staircase) which fixes staircase building and carpet issues
3435
- I recommend to use this with [Litematica Printer](https://github.com/aleksilassila/litematica-printer) or [Meteor Litematica Printer](https://github.com/kkllffaa/meteor-litematica-printer)
3536
- Vide tutorial on how to use it [here](https://youtu.be/mpK_ld8JH34)
3637

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2G
22
org.gradle.configuration-cache=true
33

44
# Mod Global Properties
5-
mod_version=1.1.1
5+
mod_version=1.1.2
66
maven_group=xyz.omegaware
77
archives_base_name=OmegaWare Addons
88

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

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
import meteordevelopment.meteorclient.utils.Utils;
88
import net.fabricmc.loader.api.FabricLoader;
99
import net.fabricmc.loader.api.metadata.ModMetadata;
10-
import net.minecraft.client.MinecraftClient;
11-
import net.minecraft.client.network.ServerInfo;
12-
import net.minecraft.text.Text;
13-
import net.minecraft.util.Formatting;
1410
import xyz.omegaware.addon.commands.LinkCommand;
1511
import xyz.omegaware.addon.commands.ShulkerQueueCommand;
1612
import xyz.omegaware.addon.hud.OnlineTSRMembersHUD;
@@ -30,37 +26,12 @@ public class OmegawareAddons extends MeteorAddon {
3026
public static ModMetadata MOD_META;
3127
public static final Logger LOG = LogUtils.getLogger();
3228
public static final Category CATEGORY = new Category("OmegaWare");
33-
@SuppressWarnings("unused")
3429
public static final HudGroup HUD_GROUP = new HudGroup("OmegaWare");
3530

3631
public static File GetConfigFile(String key, String filename) {
3732
return new File(new File(new File(new File(MeteorClient.FOLDER, "omegaware"), key), Utils.getFileWorldName()), filename);
3833
}
3934

40-
public static String getCurrentServerAddress() {
41-
ServerInfo server = MinecraftClient.getInstance().getCurrentServerEntry();
42-
if (server == null) {
43-
return "singleplayer";
44-
}
45-
46-
if (server.address == null || server.address.isEmpty()) {
47-
return "unknown";
48-
}
49-
50-
return MinecraftClient.getInstance().getCurrentServerEntry().address;
51-
}
52-
53-
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
54-
public static boolean is6B6T() {
55-
String serverAddress = getCurrentServerAddress();
56-
return serverAddress.contains("6b6t.org");
57-
}
58-
59-
public static final Text PREFIX = Text.empty()
60-
.append(Text.literal("[").formatted(Formatting.WHITE))
61-
.append(Text.literal("OmegaWare").formatted(Formatting.AQUA))
62-
.append(Text.literal("] ").formatted(Formatting.WHITE));
63-
6435
@Override
6536
public void onInitialize() {
6637
LOG.info("Initializing OmegaWare Addons");
@@ -71,10 +42,13 @@ public void onInitialize() {
7142
Modules.get().add(new TPAAutomationModule());
7243
Modules.get().add(new BeaconRangeModule());
7344
Modules.get().add(new ChatFilterModule());
74-
//Modules.get().add(new TSRKitBotModule()); // Commented out because it is not ready yet
7545
Modules.get().add(new ItemFrameDupeModule());
7646
Modules.get().add(new BetterStashFinderModule());
7747

48+
if (FabricLoader.getInstance().isDevelopmentEnvironment()) {
49+
Modules.get().add(new TSRKitBotModule()); // Is not ready yet
50+
}
51+
7852
if (BaritoneUtils.IS_AVAILABLE) {
7953
Modules.get().add(new BetterBaritoneBuild());
8054
}

‎src/main/java/xyz/omegaware/addon/commands/LinkCommand.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package xyz.omegaware.addon.commands;
22

3-
43
import com.mojang.brigadier.arguments.StringArgumentType;
54
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
65
import meteordevelopment.meteorclient.commands.Command;

‎src/main/java/xyz/omegaware/addon/commands/ShulkerQueueCommand.java‎

Lines changed: 15 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
44
import meteordevelopment.meteorclient.commands.Command;
5-
import meteordevelopment.meteorclient.utils.player.ChatUtils;
65
import net.minecraft.command.CommandSource;
76
import net.minecraft.item.ItemStack;
8-
import net.minecraft.text.Text;
97
import net.minecraft.util.Formatting;
10-
import xyz.omegaware.addon.OmegawareAddons;
118
import xyz.omegaware.addon.modules.ItemFrameDupeModule;
9+
import xyz.omegaware.addon.utils.Logger;
1210

1311
public class ShulkerQueueCommand extends Command {
1412
public ShulkerQueueCommand() {
@@ -19,116 +17,71 @@ public ShulkerQueueCommand() {
1917
public void build(LiteralArgumentBuilder<CommandSource> builder) {
2018
builder.then(literal("add").executes(context -> {
2119
if (mc.player == null) {
22-
Text msg = OmegawareAddons.PREFIX.copy()
23-
.append(Text.literal("Error: ").formatted(Formatting.RED))
24-
.append(Text.literal("Player was somehow null").formatted(Formatting.WHITE));
25-
ChatUtils.sendMsg(msg);
26-
20+
Logger.error("Player was somehow null");
2721
return SINGLE_SUCCESS;
2822
}
2923

3024
ItemStack stack = mc.player.getMainHandStack();
3125
if (stack.isEmpty()) {
32-
Text msg = OmegawareAddons.PREFIX.copy()
33-
.append(Text.literal("Error: ").formatted(Formatting.RED))
34-
.append(Text.literal("You must hold an item in your main hand").formatted(Formatting.WHITE));
35-
ChatUtils.sendMsg(msg);
36-
26+
Logger.error("You must hold an item in your main hand");
3727
return SINGLE_SUCCESS;
3828
}
3929
ItemFrameDupeModule.shulkerQueue.add(stack.copy());
4030

41-
Text msg = OmegawareAddons.PREFIX.copy()
42-
.append(Text.literal("Added ").formatted(Formatting.GREEN))
43-
.append(stack.toHoverableText())
44-
.append(Text.literal(" to the shulker queue").formatted(Formatting.WHITE));
45-
ChatUtils.sendMsg(msg);
31+
Logger.info("%sAdded %s to the shulker queue", Formatting.GREEN, stack.toHoverableText());
4632

4733
return SINGLE_SUCCESS;
4834
}));
4935

5036
builder.then(literal("remove").executes(context -> {
5137
if (mc.player == null) {
52-
Text msg = OmegawareAddons.PREFIX.copy()
53-
.append(Text.literal("Error: ").formatted(Formatting.RED))
54-
.append(Text.literal("Player was somehow null").formatted(Formatting.WHITE));
55-
ChatUtils.sendMsg(msg);
56-
38+
Logger.error("Player was somehow null");
5739
return SINGLE_SUCCESS;
5840
}
5941

6042
ItemStack stack = mc.player.getMainHandStack();
6143
if (stack.isEmpty()) {
62-
Text msg = OmegawareAddons.PREFIX.copy()
63-
.append(Text.literal("Error: ").formatted(Formatting.RED))
64-
.append(Text.literal("You must hold an item in your main hand").formatted(Formatting.WHITE));
65-
ChatUtils.sendMsg(msg);
66-
44+
Logger.error("You must hold an item in your main hand");
6745
return SINGLE_SUCCESS;
6846
}
6947
if (!ItemFrameDupeModule.shulkerQueue.contains(stack.copy())) {
70-
Text msg = OmegawareAddons.PREFIX.copy()
71-
.append(Text.literal("Error: ").formatted(Formatting.RED))
72-
.append(Text.literal("Item is not in the shulker queue").formatted(Formatting.WHITE));
73-
ChatUtils.sendMsg(msg);
74-
48+
Logger.error("Item is not in the shulker queue");
7549
return SINGLE_SUCCESS;
7650
}
7751

7852
ItemFrameDupeModule.shulkerQueue.remove(stack.copy());
7953

80-
Text msg = OmegawareAddons.PREFIX.copy()
81-
.append(Text.literal("Removed ").formatted(Formatting.RED))
82-
.append(stack.toHoverableText())
83-
.append(Text.literal(" from the shulker queue").formatted(Formatting.WHITE));
84-
ChatUtils.sendMsg(msg);
85-
54+
Logger.info("%sRemoved%s %s from the shulker queue", Formatting.RED, Formatting.WHITE ,stack.toHoverableText());
8655
return SINGLE_SUCCESS;
8756
}));
8857

8958
builder.then(literal("list").executes(context -> {
9059
if (mc.player == null) {
91-
Text msg = OmegawareAddons.PREFIX.copy()
92-
.append(Text.literal("Error: ").formatted(Formatting.RED))
93-
.append(Text.literal("Player was somehow null").formatted(Formatting.WHITE));
94-
ChatUtils.sendMsg(msg);
95-
60+
Logger.error("Player was somehow null");
9661
return SINGLE_SUCCESS;
9762
}
9863

9964
if (ItemFrameDupeModule.shulkerQueue.isEmpty()) {
100-
Text msg = OmegawareAddons.PREFIX.copy()
101-
.append(Text.literal("Shulker queue is empty").formatted(Formatting.WHITE));
102-
ChatUtils.sendMsg(msg);
65+
Logger.info("Shulker queue is empty");
10366
} else {
104-
Text msg = OmegawareAddons.PREFIX.copy()
105-
.append(Text.literal("Shulker queue: ").formatted(Formatting.YELLOW));
106-
ChatUtils.sendMsg(msg);
107-
108-
ItemFrameDupeModule.shulkerQueue.forEach(itemStack -> {
109-
Text itemText = itemStack.toHoverableText();
110-
ChatUtils.sendMsg(itemText);
111-
});
67+
StringBuilder sb = new StringBuilder("Shulker queue: ");
68+
ItemFrameDupeModule.shulkerQueue.forEach(itemStack -> sb.append(itemStack.toHoverableText().getString()).append("\n"));
69+
Logger.info(sb.toString());
11270
}
11371

11472
return SINGLE_SUCCESS;
11573
}));
11674

11775
builder.then(literal("clear").executes(context -> {
11876
if (mc.player == null) {
119-
Text msg = OmegawareAddons.PREFIX.copy()
120-
.append(Text.literal("Error: ").formatted(Formatting.RED))
121-
.append(Text.literal("Player was somehow null").formatted(Formatting.WHITE));
122-
ChatUtils.sendMsg(msg);
77+
Logger.error("Player was somehow null");
12378

12479
return SINGLE_SUCCESS;
12580
}
12681

12782
ItemFrameDupeModule.shulkerQueue.clear();
12883

129-
Text msg = OmegawareAddons.PREFIX.copy()
130-
.append(Text.literal("Cleared the shulker queue").formatted(Formatting.WHITE));
131-
ChatUtils.sendMsg(msg);
84+
Logger.info("Cleared the shulker queue");
13285

13386
return SINGLE_SUCCESS;
13487
}));

‎src/main/java/xyz/omegaware/addon/hud/OnlineTSRMembersHUD.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ public User(String name, String[] mcNames, String rank) {
5656
new User("Slay", new String[]{"slay_dev"}, "Admin"),
5757
new User("crystal", new String[]{""}, "Admin"),
5858
new User("monstro", new String[]{""}, "Admin"),
59-
new User("Pietty", new String[]{"j26"}, "Admin"),
59+
new User("Pietty", new String[]{"Pietty"}, "Admin"),
6060
new User("Omega", new String[]{"LostEmotions", "LostFriendships", "WomenAreScary", "ElectricCallboy"}, "OmegaWare"),
6161
new User("Hastur", new String[]{"TheKingHastur", "chmoka90 "}, "Member"),
62-
new User("J26V5", new String[]{""}, "Member"),
62+
new User("J26V5", new String[]{"J26V5"}, "Member"),
6363
new User("pyro", new String[]{""}, "Member"),
64-
new User("Slyyy", new String[]{""}, "Member"),
64+
new User("Slyyy", new String[]{"TwoFresh4Yea"}, "Member"),
6565
new User("_kingdom_warrior_", new String[]{"kingdom_warrior"}, "Member"),
6666
new User("cerejo2", new String[]{"cerejo2", "cerejo222", "cerejo_2"}, "Member"),
6767
new User("Emily", new String[]{""}, "Member"),

0 commit comments

Comments
 (0)