Merge pull request #25 from udu3324/master

Add HubCommandBack

README.md

@@ -12,6 +12,7 @@
 # 📘 Features
 Poinpow adds **utilities/features** that **make the player experience 102% better**. If you catch a bug, create an issue in the repo or send it to me in this [discord server](https://discord.gg/NXm9tJvyBT).
 
+- **HubCommandBack** - Adds back the hub (instead of /mh) command in servers that don't have it
 - **BlockMinehutAds** - Blocks ads from minehut that are sent in free servers | `Example: [Minehut] boost your server speed!!! go to this link!!!`
 - **ChatPhraseFilter** - Store a user made list of regex and filter lobby`Example: /poinpow chat_phrase_filter "join my server"`
 - **BlockLobbyAds** - Blocks player made ads in the lobby | `Example: [Ad] NintendoOS: /join fishwind join my server for op yes`
@@ -25,13 +26,13 @@ Skipping ads **automatically** with AutoSkipBarrier **(very fast)**
 
 ![](https://cdn.modrinth.com/data/zmUzIoT1/images/aaa8cda2723de8979014cde22db46d34c8160553.png)
 
-Example of **Block Lobby Ads** (blocks /ad commands by player) and BlockLobbyMapAds. It clears up chat a lot and blocks those awful map ads.
+Example of **BlockLobbyAds** (blocks ads made by player) and **BlockLobbyMapAds**. It clears up chat a lot and blocks those awful map ads.
 
 ![](https://cdn.modrinth.com/data/zmUzIoT1/images/c49843c5f4e7412df0c53670e94f3434eb4c4238.png)
 
-/poinpow - **intractable/clickable** help command
+/poinpow - An **intractable/clickable** help command that easily allows the toggling of certain features.
 
-![](https://cdn.modrinth.com/data/zmUzIoT1/images/619e7e67d0165ede30130a569f68d224d7d6e445.png)
+![](https://cdn.modrinth.com/data/zmUzIoT1/images/257cc486abee7e7f68aca9fb0c6d5fc2d8979cd5.png)
 
 ## 💾 How to Install
 0. Make sure you have **[Fabric](https://fabricmc.net/use/installer/)** installed in your mc launcher

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.parallel=true
 	loader_version=0.15.3
 
 # Mod Properties
-	mod_version = 1.6.0
+	mod_version = 1.6.1
 	maven_group = com.udu3324
 	archives_base_name = poinpow
 

src/main/java/com/udu3324/poinpow/Config.java

@@ -223,6 +223,7 @@ public static void create() {
                     BlockMinehutAds.toggled.set(Boolean.parseBoolean(getValueFromConfig(BlockMinehutAds.name)));
                     BlockFreeCredits.toggled.set(Boolean.parseBoolean(getValueFromConfig(BlockFreeCredits.name)));
                     BlockLobbyMapAds.toggled.set(Boolean.parseBoolean(getValueFromConfig(BlockLobbyMapAds.name)));
+                    HubCommandBack.toggled.set(Boolean.parseBoolean(getValueFromConfig(HubCommandBack.name)));
                 }
             }
         } catch (IOException e) {
@@ -243,6 +244,7 @@ private static void writeDefaultConfig() throws IOException {
         w.write(BlockMinehutAds.name + ": true" + System.lineSeparator());
         w.write(BlockFreeCredits.name + ": true" + System.lineSeparator());
         w.write(BlockLobbyMapAds.name + ": true" + System.lineSeparator());
+        w.write(HubCommandBack.name + ": true" + System.lineSeparator());
         w.write(System.lineSeparator());
         w.write("# Each line below is regex for ChatPhraseFilter to use." + System.lineSeparator());
         w.write("/join");

src/main/java/com/udu3324/poinpow/commands/Commands.java

@@ -63,6 +63,11 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                         .executes(ctx -> description(ctx.getSource(), BlockLobbyMapAds.name, BlockLobbyMapAds.description, BlockLobbyMapAds.toggled))
                         .then(literal("true").executes(ctx -> toggle(ctx.getSource(), BlockLobbyMapAds.name, BlockLobbyMapAds.toggled, true)))
                         .then(literal("false").executes(ctx -> toggle(ctx.getSource(), BlockLobbyMapAds.name, BlockLobbyMapAds.toggled, false))))
+
+                .then(literal(HubCommandBack.name)
+                        .executes(ctx -> description(ctx.getSource(), HubCommandBack.name, HubCommandBack.description, HubCommandBack.toggled))
+                        .then(literal("true").executes(ctx -> toggle(ctx.getSource(), HubCommandBack.name, HubCommandBack.toggled, true)))
+                        .then(literal("false").executes(ctx -> toggle(ctx.getSource(), HubCommandBack.name, HubCommandBack.toggled, false))))
         );
     }
 
@@ -165,6 +170,13 @@ private static int help(FabricClientCommandSource source) {
                 .withColor(Formatting.DARK_GRAY)
         ));
 
+        //hub command back
+        source.sendFeedback(Text.literal("[toggled|" + HubCommandBack.toggled + "] " + HubCommandBack.name).styled(style -> style
+                .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal(HubCommandBack.description + "\n\nClick to Toggle")))
+                .withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/poinpow " + HubCommandBack.name + " " + !HubCommandBack.toggled.get()))
+                .withColor(Formatting.DARK_GRAY)
+        ));
+
         //lookup server
         source.sendFeedback(Text.literal("/" + ServerLookup.name + " <serverName>").styled(style -> style
                 .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal(ServerLookup.description + "\n\nClick to lookup a server!")))

src/main/java/com/udu3324/poinpow/mixin/ClientChatMixin.java

@@ -0,0 +1,17 @@
+package com.udu3324.poinpow.mixin;
+
+import com.udu3324.poinpow.utils.HubCommandBack;
+import net.minecraft.client.gui.screen.ChatScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ChatScreen.class)
+public class ClientChatMixin {
+    @Inject(method = "sendMessage", at = @At("HEAD"), cancellable = true)
+
+    private void onSendMessage(String message, boolean addToHistory, CallbackInfoReturnable<Boolean> cir) {
+        HubCommandBack.scan(message, cir);
+    }
+}

src/main/java/com/udu3324/poinpow/utils/HubCommandBack.java

@@ -0,0 +1,52 @@
+package com.udu3324.poinpow.utils;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.tree.CommandNode;
+import com.udu3324.poinpow.Poinpow;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.command.CommandSource;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class HubCommandBack {
+    public static final String name = "hubCommandBack";
+    public static final String description = "Adds back the /hub command in sub-servers that don't have a hub.";
+
+    public static AtomicBoolean toggled = new AtomicBoolean(true);
+
+    public static void scan(String msg, CallbackInfoReturnable<Boolean> cir) {
+        // return if toggled off (no need for bool)
+        if (!toggled.get()) return;
+
+        // return if not on mh
+        if (!Poinpow.onMinehut) return;
+
+        // return if the message isn't the command
+        if (!msg.contains("/hub")) return;
+
+        // return if the sub-server already has /hub registered as a command
+        ClientPlayNetworkHandler clientPlayNetworkHandler = MinecraftClient.getInstance().getNetworkHandler();
+        if (clientPlayNetworkHandler == null) return;
+
+        CommandDispatcher<CommandSource> dispatcher = clientPlayNetworkHandler.getCommandDispatcher();
+        if (isCommandRegistered(dispatcher, "hub")) return;
+
+        // Prevent original message from sending
+        cir.setReturnValue(true);
+
+        ClientPlayerEntity player = MinecraftClient.getInstance().player;
+        if (player == null) return;
+
+        player.networkHandler.sendChatCommand("mh");
+    }
+
+    public static boolean isCommandRegistered(CommandDispatcher<CommandSource> dispatcher, String commandName) {
+        CommandNode<CommandSource> rootCommand = dispatcher.getRoot();
+
+        // Check if the command is present in the command tree
+        return rootCommand.getChild(commandName) != null;
+    }
+}

src/main/resources/poinpow.mixins.json

@@ -8,7 +8,8 @@
     "MapartMixin"
   ],
   "client": [
-    "ChatMixin"
+    "ChatMixin",
+    "ClientChatMixin"
   ],
   "injectors": {
     "defaultRequire": 1