diff options
author | Tec <daniel112092@gmail.com> | 2018-05-29 20:00:34 +0200 |
---|---|---|
committer | Tec <daniel112092@gmail.com> | 2018-05-29 20:00:34 +0200 |
commit | 800ba161d060036ae785a3f2ece41bcb941ec4b0 (patch) | |
tree | 1200edf4e99a90b8ef42ecd2a6216a3a0f53e6dc /src/main | |
parent | c76832e0af36c282e0cde867df85ca05c663149d (diff) | |
download | GT5-Unofficial-800ba161d060036ae785a3f2ece41bcb941ec4b0.tar.gz GT5-Unofficial-800ba161d060036ae785a3f2ece41bcb941ec4b0.tar.bz2 GT5-Unofficial-800ba161d060036ae785a3f2ece41bcb941ec4b0.zip |
Add 2 commands and fix the component loader
Diffstat (limited to 'src/main')
5 files changed, 159 insertions, 3 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index c289845934..5f6345e941 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -2,6 +2,8 @@ package com.github.technus.tectech; import com.github.technus.tectech.loader.MainLoader; import com.github.technus.tectech.loader.TecTechConfig; +import com.github.technus.tectech.mechanics.ConvertFloat; +import com.github.technus.tectech.mechanics.ConvertInteger; import com.github.technus.tectech.mechanics.elementalMatter.core.commands.GiveEM; import com.github.technus.tectech.mechanics.elementalMatter.core.commands.ListEM; import com.github.technus.tectech.proxy.CommonProxy; @@ -80,6 +82,8 @@ public class TecTech { @Mod.EventHandler public void serverLoad(FMLServerStartingEvent pEvent) { + pEvent.registerServerCommand(new ConvertInteger()); + pEvent.registerServerCommand(new ConvertFloat()); pEvent.registerServerCommand(new ListEM()); if(DEBUG_MODE) { pEvent.registerServerCommand(new GiveEM()); diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 83a1832bc1..691e457216 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -57,6 +57,7 @@ public final class MainLoader { GT_Values.VN[i]=VN[i]; GT_Values.VOLTAGE_NAMES[i]=VOLTAGE_NAMES[i]; } + new ComponentLoader(); } public static void preLoad(){ @@ -77,8 +78,6 @@ public final class MainLoader { }catch (Throwable t){ LOGGER.error("Loading textures...",t); } - - new ComponentLoader(); } public static void load() { diff --git a/src/main/java/com/github/technus/tectech/mechanics/ConvertFloat.java b/src/main/java/com/github/technus/tectech/mechanics/ConvertFloat.java new file mode 100644 index 0000000000..8e25b8908a --- /dev/null +++ b/src/main/java/com/github/technus/tectech/mechanics/ConvertFloat.java @@ -0,0 +1,76 @@ +package com.github.technus.tectech.mechanics; + +import com.github.technus.tectech.Util; +import net.minecraft.command.ICommand; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +import java.util.ArrayList; +import java.util.List; + +public class ConvertFloat implements ICommand { + ArrayList<String> aliases=new ArrayList<>(); + + public ConvertFloat(){ + aliases.add("convert_float"); + aliases.add("c_f"); + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (!sender.getEntityWorld().isRemote) { + if(args.length == 1) { + try{ + float value=Float.parseFloat(args[0]); + sender.addChatMessage(new ChatComponentText( + EnumChatFormatting.AQUA.toString()+ EnumChatFormatting.BOLD + + Util.intBitsToShortString(Float.floatToIntBits(value))+" "+ + EnumChatFormatting.RESET+EnumChatFormatting.BLUE +value)); + }catch (Exception e){ + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED+"Invalid Float "+args[0])); + } + }else{ + sender.addChatMessage(new ChatComponentText(getCommandUsage(sender))); + } + } + } + + @Override + public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) { + return false; + } + + @Override + public List<String> getCommandAliases() { + return aliases; + } + + @Override + public String getCommandName() { + return aliases.get(0); + } + + @Override + public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) { + return null; + } + + @Override + public String getCommandUsage(ICommandSender p_71518_1_) { + return "c_f Float"; + } + + @Override + public int compareTo(Object o) { + if(o instanceof ICommand){ + return getCommandName().compareTo(((ICommand) o).getCommandName()); + } + return 0; + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/src/main/java/com/github/technus/tectech/mechanics/ConvertInteger.java b/src/main/java/com/github/technus/tectech/mechanics/ConvertInteger.java new file mode 100644 index 0000000000..c381f34939 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/mechanics/ConvertInteger.java @@ -0,0 +1,76 @@ +package com.github.technus.tectech.mechanics; + +import com.github.technus.tectech.Util; +import net.minecraft.command.ICommand; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; + +import java.util.ArrayList; +import java.util.List; + +public class ConvertInteger implements ICommand { + ArrayList<String> aliases=new ArrayList<>(); + + public ConvertInteger(){ + aliases.add("convert_integer"); + aliases.add("c_i"); + } + + @Override + public void processCommand(ICommandSender sender, String[] args) { + if (!sender.getEntityWorld().isRemote) { + if(args.length == 1) { + try{ + int value=Integer.parseInt(args[0]); + sender.addChatMessage(new ChatComponentText( + EnumChatFormatting.AQUA.toString()+ EnumChatFormatting.BOLD + + Util.intBitsToShortString(value)+" "+ + EnumChatFormatting.RESET+EnumChatFormatting.BLUE +value)); + }catch (Exception e){ + sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED+"Invalid Integer "+args[0])); + } + }else{ + sender.addChatMessage(new ChatComponentText(getCommandUsage(sender))); + } + } + } + + @Override + public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) { + return false; + } + + @Override + public List<String> getCommandAliases() { + return aliases; + } + + @Override + public String getCommandName() { + return aliases.get(0); + } + + @Override + public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) { + return null; + } + + @Override + public String getCommandUsage(ICommandSender p_71518_1_) { + return "c_i Integer"; + } + + @Override + public int compareTo(Object o) { + if(o instanceof ICommand){ + return getCommandName().compareTo(((ICommand) o).getCommandName()); + } + return 0; + } + + @Override + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return true; + } +} diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java index 8c9f27e03b..ad8d1ad8c8 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java @@ -34,6 +34,7 @@ public class GiveEM implements ICommand { public GiveEM(){ aliases.add("em_give"); aliases.add("give_em"); + aliases.add("gib_em"); } @Override @@ -140,7 +141,7 @@ public class GiveEM implements ICommand { @Override public String getCommandUsage(ICommandSender p_71518_1_) { - return "em_give energy count classOrId (count classOrId , ... <) if complex"; + return "em_give Energy Count ClassOrId (Count ClassOrId ... <)"; } @Override |