2.5.1-pre1

3 files changed, 91 insertions, 5 deletions

diff --git a/src/main/java/rosegoldaddons/commands/AllEntities.java b/src/main/java/rosegoldaddons/commands/AllEntities.java
index ce0117b..0da86ec 100644
--- a/src/main/java/rosegoldaddons/commands/AllEntities.java
+++ b/src/main/java/rosegoldaddons/commands/AllEntities.java
@@ -6,10 +6,15 @@ import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.item.ItemSkull;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import org.jetbrains.annotations.NotNull;
 import rosegoldaddons.utils.ChatUtils;
+import rosegoldaddons.utils.RenderUtils;
 
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,6 +38,12 @@ public class AllEntities implements ICommand {
     public void processCommand(ICommandSender sender, String[] args) throws CommandException {
         for (Entity entity1 : (Minecraft.getMinecraft().theWorld.loadedEntityList)) {
             ChatUtils.sendMessage(""+entity1);
+            if(entity1 instanceof EntityArmorStand) {
+                ItemStack itemStack = ((EntityArmorStand) entity1).getCurrentArmor(3);
+                if (itemStack != null && itemStack.getItem() instanceof ItemSkull) {
+                    ChatUtils.sendMessage("§aEntity is wearing: "+itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString());
+                }
+            }
         }
     }
 
diff --git a/src/main/java/rosegoldaddons/commands/Rosepet.java b/src/main/java/rosegoldaddons/commands/Rosepet.java
index 800098f..cf7fb34 100644
--- a/src/main/java/rosegoldaddons/commands/Rosepet.java
+++ b/src/main/java/rosegoldaddons/commands/Rosepet.java
@@ -14,6 +14,7 @@ import java.util.List;
 public class Rosepet implements ICommand {
     public static boolean openPetS = false;
     public static String name = "";
+    public static int petSlot = 0;
 
     @Override
     public String getCommandName() {
@@ -32,14 +33,15 @@ public class Rosepet implements ICommand {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) throws CommandException {
-        if (args.length == 0) {
-            Minecraft.getMinecraft().thePlayer.sendChatMessage("/pets");
-            openPetS = true;
-        } else {
+        if (args.length == 1) {
             Minecraft.getMinecraft().thePlayer.sendChatMessage("/pets");
             openPetS = true;
+            if(isNumeric(args[0])) {
+                petSlot = Integer.parseInt(args[0]);
+            }
             name = args[0];
-
+        } else {
+            ChatUtils.sendMessage("Invalid Arguments");
         }
     }
 
@@ -62,4 +64,13 @@ public class Rosepet implements ICommand {
     public int compareTo(@NotNull ICommand o) {
         return 0;
     }
+
+    private boolean isNumeric(String str) {
+        try {
+            Double.parseDouble(str);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
 }
diff --git a/src/main/java/rosegoldaddons/commands/SexPlayer.java b/src/main/java/rosegoldaddons/commands/SexPlayer.java
new file mode 100644
index 0000000..d7fcbe9
--- /dev/null
+++ b/src/main/java/rosegoldaddons/commands/SexPlayer.java
@@ -0,0 +1,64 @@
+package rosegoldaddons.commands;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.BlockPos;
+import org.jetbrains.annotations.NotNull;
+import rosegoldaddons.utils.ChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SexPlayer implements ICommand {
+    @Override
+    public String getCommandName() {
+        return "sexplayer";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName();
+    }
+
+    @Override
+    public List<String> getCommandAliases() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if (args.length == 0) {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/pc !SXAURA!");
+            ChatUtils.sendMessage("Successfully sex-arua'd party chat");
+            return;
+        }
+        if(args.length != 1) {
+            ChatUtils.sendMessage("Invalid Arguments");
+            return;
+        }
+        Minecraft.getMinecraft().thePlayer.sendChatMessage("/msg "+args[0]+" !SXAURA!");
+        ChatUtils.sendMessage("Successfully sex-arua'd "+args[0]);
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public boolean isUsernameIndex(String[] args, int index) {
+        return false;
+    }
+
+    @Override
+    public int compareTo(@NotNull ICommand o) {
+        return 0;
+    }
+}