Add command /gokistats gui [player], closes #40.

LasmGratel · Takakura-Anri · commit 9fe284de14df · 2020-02-16T10:31:15.000+08:00
Solved death loss multiplier cast to int problem
diff --git a/src/main/java/net/infstudio/goki/client/ClientProxy.java b/src/main/java/net/infstudio/goki/client/ClientProxy.java
@@ -1,7 +1,7 @@
 package net.infstudio.goki.client;
 
 import net.infstudio.goki.common.CommonProxy;
-import net.infstudio.goki.common.handlers.GokiKeyHandler;
+import net.infstudio.goki.common.config.GokiConfig;
 import net.minecraftforge.common.MinecraftForge;
 
 public class ClientProxy extends CommonProxy {
@@ -13,6 +13,7 @@ public void registerKeybinding() {
     @Override
     public void registerHandlers() {
         super.registerHandlers();
-        registerKeybinding();
+        if (GokiConfig.keyBindingEnabled)
+            registerKeybinding();
     }
 }
diff --git a/src/main/java/net/infstudio/goki/client/GokiKeyHandler.java b/src/main/java/net/infstudio/goki/client/GokiKeyHandler.java
@@ -1,4 +1,4 @@
-package net.infstudio.goki.common.handlers;
+package net.infstudio.goki.client;
 
 import net.infstudio.goki.GokiStats;
 import net.minecraft.client.Minecraft;
@@ -42,4 +42,4 @@ public void keyDown(InputEvent.KeyInputEvent event) {
                     (int) player.posZ);
         }
     }
-}
+}
diff --git a/src/main/java/net/infstudio/goki/client/gui/GuiStats.java b/src/main/java/net/infstudio/goki/client/gui/GuiStats.java
@@ -1,6 +1,7 @@
 package net.infstudio.goki.client.gui;
 
-import net.infstudio.goki.common.handlers.GokiKeyHandler;
+import net.infstudio.goki.common.config.GokiConfig;
+import net.infstudio.goki.client.GokiKeyHandler;
 import net.infstudio.goki.common.network.GokiPacketHandler;
 import net.infstudio.goki.common.network.message.C2SStatSync;
 import net.infstudio.goki.common.stats.StatBase;
@@ -117,7 +118,7 @@ protected void keyTyped(char c, int keyCode) throws IOException {
         super.keyTyped(c, keyCode);
         // 1 is the Esc key, and we made our keybinding array public and static
         // so we can access it here
-        if (c == 1 || keyCode == GokiKeyHandler.statsMenu.getKeyCode()) {
+        if (c == 1 || (GokiConfig.keyBindingEnabled && keyCode == GokiKeyHandler.statsMenu.getKeyCode())) {
             mc.player.closeScreen();
         }
     }
diff --git a/src/main/java/net/infstudio/goki/client/network/handler/PacketGuiClientHandler.java b/src/main/java/net/infstudio/goki/client/network/handler/PacketGuiClientHandler.java
@@ -0,0 +1,17 @@
+package net.infstudio.goki.client.network.handler;
+
+import net.infstudio.goki.client.gui.GuiStats;
+import net.infstudio.goki.common.network.message.S2COpenGui;
+import net.minecraft.client.Minecraft;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+
+public class PacketGuiClientHandler implements IMessageHandler<S2COpenGui, IMessage> {
+    @Override
+    public IMessage onMessage(S2COpenGui message, MessageContext ctx) {
+        Minecraft.getMinecraft().addScheduledTask(() ->
+                Minecraft.getMinecraft().displayGuiScreen(new GuiStats(Minecraft.getMinecraft().player)));
+        return null;
+    }
+}
diff --git a/src/main/java/net/infstudio/goki/client/network/handler/PacketSyncClientHandler.java b/src/main/java/net/infstudio/goki/client/network/handler/PacketSyncClientHandler.java
@@ -1,4 +1,4 @@
-package net.infstudio.goki.common.network.handler;
+package net.infstudio.goki.client.network.handler;
 
 import net.infstudio.goki.common.network.message.S2CStatSync;
 import net.infstudio.goki.common.network.message.S2CSyncAll;
diff --git a/src/main/java/net/infstudio/goki/common/StatsCommand.java b/src/main/java/net/infstudio/goki/common/StatsCommand.java
@@ -1,44 +1,94 @@
 package net.infstudio.goki.common;
 
+import com.google.common.collect.Lists;
+import com.mojang.authlib.GameProfile;
 import net.infstudio.goki.common.config.ConfigManager;
 import net.infstudio.goki.common.config.Configurable;
+import net.infstudio.goki.common.network.GokiPacketHandler;
+import net.infstudio.goki.common.network.message.S2COpenGui;
 import net.infstudio.goki.common.stats.StatBase;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
+import net.minecraft.command.*;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextComponentString;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 public class StatsCommand extends CommandBase {
     @Nonnull
     @Override
     public String getName() {
-        return "reloadGokiStats";
+        return "gokistats";
     }
 
     @Nonnull
     @Override
     public String getUsage(@Nonnull ICommandSender sender) {
-        return "/gokistats reload";
+        return "/gokistats";
     }
 
     @Override
-    public void execute(MinecraftServer server, ICommandSender icommandsender, String[] astring) {
-        StatBase.stats.forEach(Configurable::reloadConfig);
-        ConfigManager.INSTANCE.reloadConfig();
-        EntityPlayer player;
-        if ((icommandsender instanceof EntityPlayer)) {
-            player = (EntityPlayer) icommandsender;
-            player.sendMessage(new TextComponentTranslation("Reloaded gokistats configuration file."));
+    public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
+        if (args.length < 1)
+            throw new WrongUsageException("Invalid usage! Valid commands: /gokistats reload, /gokistats gui");
+
+        if (args[0].equals("reload")) {
+            StatBase.stats.forEach(Configurable::reloadConfig);
+            ConfigManager.INSTANCE.reloadConfig();
+            EntityPlayer player;
+            if ((sender instanceof EntityPlayer)) {
+                player = (EntityPlayer) sender;
+                player.sendMessage(new TextComponentString("Reloaded gokistats configuration file."));
+            } else {
+                server.logInfo("Reloaded gokistats configuration file.");
+            }
+        } else if (args[0].equals("gui")) {
+            EntityPlayerMP player = null;
+            if (args.length == 1) {
+                if ((sender instanceof EntityPlayerMP)) {
+                    player = (EntityPlayerMP) sender;
+                } else {
+                    throw new WrongUsageException("This command should be only used by player");
+                }
+            } else if (args.length == 2) player = server.getPlayerList().getPlayerByUsername(args[1]);
+            if (player == null)
+                throw new PlayerNotFoundException(args[1]);
+            GokiPacketHandler.CHANNEL.sendTo(new S2COpenGui(0), player);
         } else {
-            server.logInfo("Reloaded gokistats configuration file.");
+            throw new CommandNotFoundException("No sub-command " + args[0]);
         }
     }
 
-    public String getCommandUsage(ICommandSender icommandsender) {
-        return null;
+    @Nonnull
+    public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
+        if (args.length == 1) {
+            String s = args[args.length - 1];
+            if (args[0].isEmpty()) return Arrays.asList("reload", "gui");
+            if (doesStringStartWith(s, "reload"))
+                return Collections.singletonList("reload");
+            else if (doesStringStartWith(s, "gui"))
+                return Collections.singletonList("gui");
+        } else if (args.length == 2) {
+            if (args[0].equals("gui")) {
+                List<String> list = Lists.newArrayList();
+
+                for (GameProfile gameprofile : server.getOnlinePlayerProfiles())
+                    if (!server.getPlayerList().canSendCommands(gameprofile) && doesStringStartWith(args[1], gameprofile.getName()))
+                        list.add(gameprofile.getName());
+
+                return list;
+            }
+        }
+        return Arrays.asList("reload", "gui");
     }
 
-}
+    public String getCommandUsage(ICommandSender sender) {
+        return null;
+    }
+}
diff --git a/src/main/java/net/infstudio/goki/common/config/GokiConfig.java b/src/main/java/net/infstudio/goki/common/config/GokiConfig.java
@@ -8,6 +8,11 @@ public class GokiConfig {
     @Config.Name("Configuration Version")
     public static String version = "v3";
 
+    @Config.Name("Keybinding Enabled")
+    @Config.Comment({"Should register gokistats keybinding (default Y)", "If set to false, player can only use /gokistats gui to open gui"})
+    @Config.RequiresMcRestart
+    public static boolean keyBindingEnabled = true;
+
     @Config.Name("Global Modifiers")
     public static GlobalModifiers globalModifiers = new GlobalModifiers();
 
diff --git a/src/main/java/net/infstudio/goki/common/handlers/CommonHandler.java b/src/main/java/net/infstudio/goki/common/handlers/CommonHandler.java
@@ -159,7 +159,7 @@ public void playerRespawn(PlayerRespawnEvent event) {
             for (int stat = 0; stat < StatBase.totalStats; stat++) {
                 DataHelper.multiplyPlayerStatLevel(player,
                         StatBase.stats.get(stat),
-                        level -> level - (int) GokiConfig.globalModifiers.loseStatsMultiplier * level);
+                        level -> level - (int) (GokiConfig.globalModifiers.loseStatsMultiplier * level));
             }
             GokiPacketHandler.CHANNEL.sendTo(new S2CSyncAll(player), (EntityPlayerMP) player);
         }
diff --git a/src/main/java/net/infstudio/goki/common/handlers/TickHandler.java b/src/main/java/net/infstudio/goki/common/handlers/TickHandler.java
@@ -26,7 +26,7 @@ public class TickHandler {
 
     @SubscribeEvent
     public void playerTick(TickEvent.PlayerTickEvent event) {
-        if (event.phase == TickEvent.Phase.END) { // Due to issue #32
+        if (event.phase == TickEvent.Phase.START) { // Due to issue #32
             EntityPlayer player = event.player;
 
             handleTaskPlayerAPI(player);
@@ -150,4 +150,4 @@ private void handleFurnace(EntityPlayer player) {
 
     }
 
-}
+}
diff --git a/src/main/java/net/infstudio/goki/common/network/GokiPacketHandler.java b/src/main/java/net/infstudio/goki/common/network/GokiPacketHandler.java
@@ -1,8 +1,10 @@
 package net.infstudio.goki.common.network;
 
-import net.infstudio.goki.common.network.handler.PacketSyncClientHandler;
+import net.infstudio.goki.client.network.handler.PacketGuiClientHandler;
+import net.infstudio.goki.client.network.handler.PacketSyncClientHandler;
 import net.infstudio.goki.common.network.handler.PacketSyncHandler;
 import net.infstudio.goki.common.network.message.C2SStatSync;
+import net.infstudio.goki.common.network.message.S2COpenGui;
 import net.infstudio.goki.common.network.message.S2CStatSync;
 import net.infstudio.goki.common.network.message.S2CSyncAll;
 import net.infstudio.goki.common.utils.Reference;
@@ -17,6 +19,7 @@ public class GokiPacketHandler {
         CHANNEL.registerMessage(new PacketSyncHandler.Stat(), C2SStatSync.class, 0, Side.SERVER);
         CHANNEL.registerMessage(PacketSyncClientHandler.StatAll.class, S2CSyncAll.class, 1, Side.CLIENT);
         CHANNEL.registerMessage(PacketSyncClientHandler.Stat.class, S2CStatSync.class, 2, Side.CLIENT);
+        CHANNEL.registerMessage(PacketGuiClientHandler.class, S2COpenGui.class, 3, Side.CLIENT);
 //        CHANNEL.registerMessage(new PacketConfigHandler(), MessageConfig.class, 0, Side.CLIENT);
 
 //        CHANNEL.registerMessage(new PacketSyncHandler.XP(), MessageXPSync.class, 0, Side.SERVER);
diff --git a/src/main/java/net/infstudio/goki/common/network/message/S2COpenGui.java b/src/main/java/net/infstudio/goki/common/network/message/S2COpenGui.java
@@ -0,0 +1,25 @@
+package net.infstudio.goki.common.network.message;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+
+public class S2COpenGui implements IMessage {
+    public int ID;
+
+    public S2COpenGui() {
+    }
+
+    public S2COpenGui(int ID) {
+        this.ID = ID;
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        ID = buf.readInt();
+    }
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeInt(ID);
+    }
+}
diff --git a/src/main/java/net/infstudio/goki/common/utils/Reference.java b/src/main/java/net/infstudio/goki/common/utils/Reference.java
@@ -4,10 +4,10 @@
 
 public class Reference {
     public static final String MODID = "gokistats";
-    public static final String MOD_NAME = "gokistats";
+    public static final String MOD_NAME = "Goki Stats";
     public static final ResourceLocation RPG_ICON_TEXTURE_LOCATION = new ResourceLocation("gokistats".toLowerCase(), "textures/rpg_icons.png");
     public static final ResourceLocation RPG_ICON_2_TEXTURE_LOCATION = new ResourceLocation("gokistats".toLowerCase(), "textures/rpg_icons_2.png");
     public static final ResourceLocation PARTICLES_TEXTURE = new ResourceLocation("gokistats".toLowerCase(), "textures/particles.png");
     public static final String STAT_TAG = "gokistats_Stats";
     public static boolean isPlayerAPILoaded = false;
-}
+}
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -1,7 +1,7 @@
 [
 {
   "modid": "gokistats",
-  "name": "gokiStats",
+  "name": "Goki Stats",
   "description": "A mod provides player some RPG abilities",
   "version": "@version@",
   "mcversion": "1.12.2",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.infstudio.goki.common.handlers;`
	`1`	`+package net.infstudio.goki.client;`
`2`	`2`
`3`	`3`	`import net.infstudio.goki.GokiStats;`
`4`	`4`	`import net.minecraft.client.Minecraft;`
`@@ -42,4 +42,4 @@ public void keyDown(InputEvent.KeyInputEvent event) {`
`42`	`42`	`(int) player.posZ);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`		`-}`
	`45`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.infstudio.goki.common.network.handler;`
	`1`	`+package net.infstudio.goki.client.network.handler;`
`2`	`2`
`3`	`3`	`import net.infstudio.goki.common.network.message.S2CStatSync;`
`4`	`4`	`import net.infstudio.goki.common.network.message.S2CSyncAll;`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public void playerRespawn(PlayerRespawnEvent event) {`
`159`	`159`	`for (int stat = 0; stat < StatBase.totalStats; stat++) {`
`160`	`160`	`DataHelper.multiplyPlayerStatLevel(player,`
`161`	`161`	`StatBase.stats.get(stat),`
`162`		`- level -> level - (int) GokiConfig.globalModifiers.loseStatsMultiplier * level);`
	`162`	`+ level -> level - (int) (GokiConfig.globalModifiers.loseStatsMultiplier * level));`
`163`	`163`	`}`
`164`	`164`	`GokiPacketHandler.CHANNEL.sendTo(new S2CSyncAll(player), (EntityPlayerMP) player);`
`165`	`165`	`}`