Minor class changes to fix / refactor for GTNH Gradle

This commit is contained in:
Kam committed 2024-02-13 01:25:55 -05:00
1 parent fd7db84eb7
commit 8a4e4760bb
8 files changed
+34 -46

No files matched your search

+20 -22
View File
@@ -2,10 +2,8 @@ package foxz.command;
import java.util.List;
import scala.actors.threadpool.Arrays;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.PlayerSelector;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.server.MinecraftServer;
@@ -33,10 +31,10 @@ public class CmdNpc extends ChMcLogger {
CmdNpc(Object ctorParm) {
super (ctorParm);
}
public EntityNPCInterface selectedNpc;
@SubCommand(
desc="Set Home (respawn place)",
usage=""
@@ -45,16 +43,16 @@ public class CmdNpc extends ChMcLogger {
double posX = pcParam.getPlayerCoordinates().posX;
double posY = pcParam.getPlayerCoordinates().posY;
double posZ = pcParam.getPlayerCoordinates().posZ;
if(args.length == 3){
posX = CommandBase.func_110666_a(pcParam, selectedNpc.posX, args[0]);
posY = CommandBase.func_110665_a(pcParam, selectedNpc.posY, args[1].trim(), 0, 0);
posZ = CommandBase.func_110666_a(pcParam, selectedNpc.posZ, args[2]);
}
selectedNpc.ai.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
}
@SubCommand(
desc="Set npc visibility",
usage=""
@@ -64,7 +62,7 @@ public class CmdNpc extends ChMcLogger {
return;
boolean bo = args[0].equalsIgnoreCase("true");
boolean semi = args[0].equalsIgnoreCase("semi");
int current = selectedNpc.display.visible;
if(semi)
selectedNpc.display.visible = 2;
@@ -72,12 +70,12 @@ public class CmdNpc extends ChMcLogger {
selectedNpc.display.visible = 0;
else
selectedNpc.display.visible = 1;
if(current != selectedNpc.display.visible)
selectedNpc.updateClient = true;
}
@SubCommand(
desc="Delete an NPC",
usage=""
@@ -85,7 +83,7 @@ public class CmdNpc extends ChMcLogger {
public void delete(String[] args){
selectedNpc.delete();
}
@SubCommand(
desc="Owner",
usage=""
@@ -95,10 +93,10 @@ public class CmdNpc extends ChMcLogger {
EntityPlayer player = null;
if(selectedNpc.roleInterface instanceof RoleFollower)
player = ((RoleFollower)selectedNpc.roleInterface).owner;
if(selectedNpc.roleInterface instanceof RoleCompanion)
player = ((RoleCompanion)selectedNpc.roleInterface).owner;
if(player == null)
sendmessage("No owner");
else
@@ -108,13 +106,13 @@ public class CmdNpc extends ChMcLogger {
EntityPlayerMP player = CommandBase.getPlayer(pcParam, args[0]);
if(selectedNpc.roleInterface instanceof RoleFollower)
((RoleFollower)selectedNpc.roleInterface).setOwner(player);
if(selectedNpc.roleInterface instanceof RoleCompanion)
((RoleCompanion)selectedNpc.roleInterface).setOwner(player);
}
}
@SubCommand(
desc="Set npc name",
usage=""
@@ -122,18 +120,18 @@ public class CmdNpc extends ChMcLogger {
public void name(String[] args){
if(args.length < 1)
return;
String name = args[0];
for(int i = 1; i < args.length; i++){
name += " " + args[i];
}
if(!selectedNpc.display.name.equals(name)){
selectedNpc.display.name = name;
selectedNpc.updateClient = true;
}
}
@SubCommand(
desc = "Creates an NPC",
usage = "[name]",
@@ -151,7 +149,7 @@ public class CmdNpc extends ChMcLogger {
npc.setHealth(npc.getMaxHealth());
NoppesUtilServer.sendOpenGui(player, EnumGuiType.MainMenuDisplay, npc);
}
@Override
public List addTabCompletion(ICommandSender par1, String[] args) {
if(args.length == 2){
@@ -160,7 +158,7 @@ public class CmdNpc extends ChMcLogger {
if(args.length == 3 && args[1].equalsIgnoreCase("owner")){
return CommandBase.getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
}
return super.addTabCompletion(par1, args);
}
}