diff options
Diffstat (limited to 'src/main/java/rosegoldaddons/commands')
7 files changed, 18 insertions, 13 deletions
diff --git a/src/main/java/rosegoldaddons/commands/AllEntities.java b/src/main/java/rosegoldaddons/commands/AllEntities.java index 0da86ec..016b4dc 100644 --- a/src/main/java/rosegoldaddons/commands/AllEntities.java +++ b/src/main/java/rosegoldaddons/commands/AllEntities.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemSkull; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import org.jetbrains.annotations.NotNull; +import rosegoldaddons.Main; import rosegoldaddons.utils.ChatUtils; import rosegoldaddons.utils.RenderUtils; @@ -36,7 +37,7 @@ public class AllEntities implements ICommand { @Override public void processCommand(ICommandSender sender, String[] args) throws CommandException { - for (Entity entity1 : (Minecraft.getMinecraft().theWorld.loadedEntityList)) { + for (Entity entity1 : (Main.mc.theWorld.loadedEntityList)) { ChatUtils.sendMessage(""+entity1); if(entity1 instanceof EntityArmorStand) { ItemStack itemStack = ((EntityArmorStand) entity1).getCurrentArmor(3); diff --git a/src/main/java/rosegoldaddons/commands/Backpack.java b/src/main/java/rosegoldaddons/commands/Backpack.java index 24b7563..015913d 100644 --- a/src/main/java/rosegoldaddons/commands/Backpack.java +++ b/src/main/java/rosegoldaddons/commands/Backpack.java @@ -44,10 +44,10 @@ public class Backpack implements ICommand { @Override public void processCommand(ICommandSender sender, String[] args) throws CommandException { if (args.length == 0) { - Minecraft.getMinecraft().thePlayer.sendChatMessage("/storage"); + Main.mc.thePlayer.sendChatMessage("/storage"); } else { if (isNumeric(args[0])) { - Minecraft.getMinecraft().thePlayer.sendChatMessage("/storage"); + Main.mc.thePlayer.sendChatMessage("/storage"); openBP = true; bpSlot = Integer.parseInt(args[0]); } else { diff --git a/src/main/java/rosegoldaddons/commands/LobbySwap.java b/src/main/java/rosegoldaddons/commands/LobbySwap.java index 517354b..8fd5312 100644 --- a/src/main/java/rosegoldaddons/commands/LobbySwap.java +++ b/src/main/java/rosegoldaddons/commands/LobbySwap.java @@ -6,6 +6,7 @@ import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.util.BlockPos; import org.jetbrains.annotations.NotNull; +import rosegoldaddons.Main; import java.util.ArrayList; import java.util.List; @@ -31,7 +32,7 @@ public class LobbySwap implements ICommand { @Override public void processCommand(ICommandSender sender, String[] args) throws CommandException { swapLobby = true; - Minecraft.getMinecraft().thePlayer.sendChatMessage("/sbmenu"); + Main.mc.thePlayer.sendChatMessage("/sbmenu"); } diff --git a/src/main/java/rosegoldaddons/commands/Rosedrobe.java b/src/main/java/rosegoldaddons/commands/Rosedrobe.java index 55024df..5ba23b4 100644 --- a/src/main/java/rosegoldaddons/commands/Rosedrobe.java +++ b/src/main/java/rosegoldaddons/commands/Rosedrobe.java @@ -44,12 +44,12 @@ public class Rosedrobe implements ICommand { @Override public void processCommand(ICommandSender sender, String[] args) throws CommandException { if (args.length == 0) { - Minecraft.getMinecraft().thePlayer.sendChatMessage("/pets"); + Main.mc.thePlayer.sendChatMessage("/pets"); slot = 0; openWardrobe = true; } else { if (isNumeric(args[0])) { - Minecraft.getMinecraft().thePlayer.sendChatMessage("/pets"); + Main.mc.thePlayer.sendChatMessage("/pets"); openWardrobe = true; slot = Integer.parseInt(args[0]); } else { diff --git a/src/main/java/rosegoldaddons/commands/Rosepet.java b/src/main/java/rosegoldaddons/commands/Rosepet.java index cf7fb34..25c869f 100644 --- a/src/main/java/rosegoldaddons/commands/Rosepet.java +++ b/src/main/java/rosegoldaddons/commands/Rosepet.java @@ -6,6 +6,7 @@ import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.util.BlockPos; import org.jetbrains.annotations.NotNull; +import rosegoldaddons.Main; import rosegoldaddons.utils.ChatUtils; import java.util.ArrayList; @@ -34,7 +35,7 @@ public class Rosepet implements ICommand { @Override public void processCommand(ICommandSender sender, String[] args) throws CommandException { if (args.length == 1) { - Minecraft.getMinecraft().thePlayer.sendChatMessage("/pets"); + Main.mc.thePlayer.sendChatMessage("/pets"); openPetS = true; if(isNumeric(args[0])) { petSlot = Integer.parseInt(args[0]); diff --git a/src/main/java/rosegoldaddons/commands/SexPlayer.java b/src/main/java/rosegoldaddons/commands/SexPlayer.java index d7fcbe9..3083ea2 100644 --- a/src/main/java/rosegoldaddons/commands/SexPlayer.java +++ b/src/main/java/rosegoldaddons/commands/SexPlayer.java @@ -6,6 +6,7 @@ import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.util.BlockPos; import org.jetbrains.annotations.NotNull; +import rosegoldaddons.Main; import rosegoldaddons.utils.ChatUtils; import java.util.ArrayList; @@ -30,7 +31,7 @@ public class SexPlayer implements ICommand { @Override public void processCommand(ICommandSender sender, String[] args) throws CommandException { if (args.length == 0) { - Minecraft.getMinecraft().thePlayer.sendChatMessage("/pc !SXAURA!"); + Main.mc.thePlayer.sendChatMessage("/pc !SXAURA!"); ChatUtils.sendMessage("Successfully sex-arua'd party chat"); return; } @@ -38,7 +39,7 @@ public class SexPlayer implements ICommand { ChatUtils.sendMessage("Invalid Arguments"); return; } - Minecraft.getMinecraft().thePlayer.sendChatMessage("/msg "+args[0]+" !SXAURA!"); + Main.mc.thePlayer.sendChatMessage("/msg "+args[0]+" !SXAURA!"); ChatUtils.sendMessage("Successfully sex-arua'd "+args[0]); } diff --git a/src/main/java/rosegoldaddons/commands/UseCooldown.java b/src/main/java/rosegoldaddons/commands/UseCooldown.java index 351df9a..a234c50 100644 --- a/src/main/java/rosegoldaddons/commands/UseCooldown.java +++ b/src/main/java/rosegoldaddons/commands/UseCooldown.java @@ -9,6 +9,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import org.jetbrains.annotations.NotNull; +import rosegoldaddons.Main; import rosegoldaddons.utils.ChatUtils; import java.io.BufferedWriter; @@ -55,9 +56,9 @@ public class UseCooldown implements ICommand { return; } if (args.length == 1 && isNumeric(args[0])) { - InventoryPlayer inv = Minecraft.getMinecraft().thePlayer.inventory; + InventoryPlayer inv = Main.mc.thePlayer.inventory; - ItemStack curStack = inv.getStackInSlot(Minecraft.getMinecraft().thePlayer.inventory.currentItem); + ItemStack curStack = inv.getStackInSlot(Main.mc.thePlayer.inventory.currentItem); if (curStack != null) { int cd = Integer.parseInt(args[0]); if (cd == 0) { @@ -78,9 +79,9 @@ public class UseCooldown implements ICommand { ChatUtils.sendMessage("§cError getting current held item."); } } else if (args.length == 2 && isNumeric(args[0]) && args[1].equalsIgnoreCase("left")) { - InventoryPlayer inv = Minecraft.getMinecraft().thePlayer.inventory; + InventoryPlayer inv = Main.mc.thePlayer.inventory; - ItemStack curStack = inv.getStackInSlot(Minecraft.getMinecraft().thePlayer.inventory.currentItem); + ItemStack curStack = inv.getStackInSlot(Main.mc.thePlayer.inventory.currentItem); if (curStack != null) { int cd = Integer.parseInt(args[0]); if (cd == 0) { |