Proper Reformating

This commit is contained in:
Kam committed 2025-03-13 17:14:45 -04:00
1 parent ce75880aba
commit 180d257024
1179 files changed
+59847 -61583

No files matched your search

+75 -76
View File
@@ -22,29 +22,29 @@ import noppes.npcs.roles.RoleFollower;
import java.util.List;
@Command(
name="npc",
desc="NPC manipulation",
usage="<name> <command>"
name = "npc",
desc = "NPC manipulation",
usage = "<name> <command>"
)
public class CmdNpc extends ChMcLogger {
CmdNpc(Object ctorParm) {
super (ctorParm);
super(ctorParm);
}
public EntityNPCInterface selectedNpc;
@SubCommand(
desc="Set Home (respawn place)",
usage=""
desc = "Set Home (respawn place)",
usage = ""
)
public void home(String[] args){
public void home(String[] args) {
double posX = pcParam.getPlayerCoordinates().posX;
double posY = pcParam.getPlayerCoordinates().posY;
double posZ = pcParam.getPlayerCoordinates().posZ;
if(args.length == 3){
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]);
@@ -54,111 +54,110 @@ public class CmdNpc extends ChMcLogger {
}
@SubCommand(
desc="Set npc visibility",
usage=""
desc = "Set npc visibility",
usage = ""
)
public void visible(String[] args){
if(args.length < 1)
return;
boolean bo = args[0].equalsIgnoreCase("true");
boolean semi = args[0].equalsIgnoreCase("semi");
public void visible(String[] args) {
if (args.length < 1)
return;
boolean bo = args[0].equalsIgnoreCase("true");
boolean semi = args[0].equalsIgnoreCase("semi");
int current = selectedNpc.display.visible;
if(semi)
selectedNpc.display.visible = 2;
else if(bo)
selectedNpc.display.visible = 0;
else
selectedNpc.display.visible = 1;
int current = selectedNpc.display.visible;
if (semi)
selectedNpc.display.visible = 2;
else if (bo)
selectedNpc.display.visible = 0;
else
selectedNpc.display.visible = 1;
if(current != selectedNpc.display.visible)
selectedNpc.updateClient = true;
if (current != selectedNpc.display.visible)
selectedNpc.updateClient = true;
}
@SubCommand(
desc="Delete an NPC",
usage=""
desc = "Delete an NPC",
usage = ""
)
public void delete(String[] args){
selectedNpc.delete();
public void delete(String[] args) {
selectedNpc.delete();
}
@SubCommand(
desc="Owner",
usage=""
desc = "Owner",
usage = ""
)
public void owner(String[] args){
if(args.length < 1){
EntityPlayer player = null;
if(selectedNpc.roleInterface instanceof RoleFollower)
player = ((RoleFollower)selectedNpc.roleInterface).owner;
public void owner(String[] args) {
if (args.length < 1) {
EntityPlayer player = null;
if (selectedNpc.roleInterface instanceof RoleFollower)
player = ((RoleFollower) selectedNpc.roleInterface).owner;
if(selectedNpc.roleInterface instanceof RoleCompanion)
player = ((RoleCompanion)selectedNpc.roleInterface).owner;
if (selectedNpc.roleInterface instanceof RoleCompanion)
player = ((RoleCompanion) selectedNpc.roleInterface).owner;
if(player == null)
sendmessage("No owner");
else
sendmessage("Owner is: " + player.getCommandSenderName());
}
else{
EntityPlayerMP player = CommandBase.getPlayer(pcParam, args[0]);
if(selectedNpc.roleInterface instanceof RoleFollower)
((RoleFollower)selectedNpc.roleInterface).setOwner(player);
if (player == null)
sendmessage("No owner");
else
sendmessage("Owner is: " + player.getCommandSenderName());
} else {
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);
}
if (selectedNpc.roleInterface instanceof RoleCompanion)
((RoleCompanion) selectedNpc.roleInterface).setOwner(player);
}
}
@SubCommand(
desc="Set npc name",
usage=""
desc = "Set npc name",
usage = ""
)
public void name(String[] args){
if(args.length < 1)
return;
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];
}
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;
}
if (!selectedNpc.display.name.equals(name)) {
selectedNpc.display.name = name;
selectedNpc.updateClient = true;
}
}
@SubCommand(
desc = "Creates an NPC",
usage = "[name]",
permissions = {PlayerOnly.class, OpOnly.class}
desc = "Creates an NPC",
usage = "[name]",
permissions = {PlayerOnly.class, OpOnly.class}
)
public void create(String[] args) {
EntityPlayerMP player = (EntityPlayerMP) pcParam;
World pw = player.getEntityWorld();
EntityCustomNpc npc = new EntityCustomNpc(pw);
if(args.length > 0)
npc.display.name = args[0];
if (args.length > 0)
npc.display.name = args[0];
npc.setPositionAndRotation(player.posX, player.posY, player.posZ, player.cameraYaw, player.cameraPitch);
npc.ais.startPos = new int[]{MathHelper.floor_double(player.posX),MathHelper.floor_double(player.posY),MathHelper.floor_double(player.posZ)};
npc.ais.startPos = new int[]{MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ)};
pw.spawnEntityInWorld(npc);
npc.setHealth(npc.getMaxHealth());
NoppesUtilServer.sendOpenGui(player, EnumGuiType.MainMenuDisplay, npc);
}
@Override
public List addTabCompletion(ICommandSender par1, String[] args) {
if(args.length == 2){
return CommandBase.getListOfStringsMatchingLastWord(args, new String[]{"create", "home", "visible", "delete", "owner", "name"});
}
if(args.length == 3 && args[1].equalsIgnoreCase("owner")){
return CommandBase.getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
}
public List addTabCompletion(ICommandSender par1, String[] args) {
if (args.length == 2) {
return CommandBase.getListOfStringsMatchingLastWord(args, new String[]{"create", "home", "visible", "delete", "owner", "name"});
}
if (args.length == 3 && args[1].equalsIgnoreCase("owner")) {
return CommandBase.getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
}
return super.addTabCompletion(par1, args);
return super.addTabCompletion(par1, args);
}
}