Optimize Imports

This commit is contained in:
Kam committed 2024-02-15 17:54:28 -05:00
1 parent ec78673fa2
commit e46b78ff71
149 files changed
+931 -1029

No files matched your search

+46 -46
View File
@@ -1,7 +1,12 @@
package foxz.command;
import java.util.List;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.ParamCheck;
import foxz.commandhelper.permissions.PlayerOnly;
import foxz.utils.Utils;
import net.minecraft.block.Block;
import net.minecraft.command.CommandBase;
import net.minecraft.entity.Entity;
@@ -12,13 +17,8 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import noppes.npcs.controllers.ServerCloneController;
import noppes.npcs.entity.EntityNPCInterface;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.ParamCheck;
import foxz.commandhelper.permissions.PlayerOnly;
import foxz.utils.Utils;
import java.util.List;
@Command(
name = "clone",
@@ -42,7 +42,7 @@ public class CmdClone extends ChMcLogger {
tab = Integer.parseInt(args[1]);
}
catch(NumberFormatException ex){
}
List<EntityNPCInterface> list = Utils.getNearbeEntityFromPlayer(EntityNPCInterface.class, player, 80);
for (EntityNPCInterface npc : list) {
@@ -69,7 +69,7 @@ public class CmdClone extends ChMcLogger {
tab = Integer.parseInt(args[0]);
}
catch(NumberFormatException ex){
}
for (String name : ServerCloneController.Instance.getClones(tab)) {
sendmessage(name);
@@ -78,15 +78,15 @@ public class CmdClone extends ChMcLogger {
return true;
}
@SubCommand(desc = "Remove NPC from clone storage", usage = "<name> <tab>", permissions={OpOnly.class ,ParamCheck.class})
public Boolean del(String[] args) {
@SubCommand(desc = "Remove NPC from clone storage", usage = "<name> <tab>", permissions={OpOnly.class ,ParamCheck.class})
public Boolean del(String[] args) {
String nametodel = args[0];
int tab = 0;
try{
tab = Integer.parseInt(args[1]);
}
catch(NumberFormatException ex){
}
boolean deleted = false;
for(String name : ServerCloneController.Instance.getClones(tab)){
@@ -95,7 +95,7 @@ public class CmdClone extends ChMcLogger {
deleted = true;
break;
}
}
}
if (!ServerCloneController.Instance.removeClone(nametodel, tab)) {
sendmessage(String.format("Npc '%s' wasn't found", nametodel));
return false;
@@ -105,8 +105,8 @@ public class CmdClone extends ChMcLogger {
}
@SubCommand(
desc = "Spawn cloned NPC",
usage = "<name> <tab> [[world:]x,y,z]] [newname]",
desc = "Spawn cloned NPC",
usage = "<name> <tab> [[world:]x,y,z]] [newname]",
permissions={OpOnly.class ,ParamCheck.class})
public boolean spawn(String[] args) {
String name = args[0].replaceAll("%", " "); // if name of npc separed by space, user must use % in place of space
@@ -115,8 +115,8 @@ public class CmdClone extends ChMcLogger {
tab = Integer.parseInt(args[1]);
}
catch(NumberFormatException ex){
}
}
String newname=null;
NBTTagCompound compound = ServerCloneController.Instance.getCloneData(this.pcParam, name, tab);
if(compound == null){
@@ -127,10 +127,10 @@ public class CmdClone extends ChMcLogger {
double posX = pcParam.getPlayerCoordinates().posX;
double posY = pcParam.getPlayerCoordinates().posY;
double posZ = pcParam.getPlayerCoordinates().posZ;
if(args.length > 2){
String location = args[2];
String[] par;
String[] par;
if (location.contains(":")){
par = location.split(":");
location = par[1];
@@ -139,7 +139,7 @@ public class CmdClone extends ChMcLogger {
sendmessage (String.format("'%s' is an unknown world",par[0]));
return false;
}
}
}
if (location.contains(",")){
par = location.split(",");
@@ -154,35 +154,35 @@ public class CmdClone extends ChMcLogger {
} catch(NumberFormatException ex){
sendmessage("Location should be in numbers");
return false;
}
}
if (args.length > 3){
newname = args[3];
}
} else {
newname = location;
newname = location;
}
}
if (posX == 0 && posY == 0 && posZ == 0){//incase it was called from the console and not pos was given
sendmessage ("Location needed");
return false;
return false;
}
Entity entity = EntityList.createEntityFromNBT(compound, world);
entity.setPosition(posX + 0.5, posY + 1, posZ + 0.5);
if(entity instanceof EntityNPCInterface){
EntityNPCInterface npc = (EntityNPCInterface) entity;
npc.ai.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)};
if(newname != null && !newname.isEmpty())
npc.display.name = newname.replaceAll("%", " "); // like name, newname must use % in place of space to keep a logical way
npc.display.name = newname.replaceAll("%", " "); // like name, newname must use % in place of space to keep a logical way
}
world.spawnEntityInWorld(entity);
return true;
}
@SubCommand(
desc = "Spawn cloned NPC",
usage = "<name> <tab> <lenght> <width> [[world:]x,y,z]] [newname]",
desc = "Spawn cloned NPC",
usage = "<name> <tab> <lenght> <width> [[world:]x,y,z]] [newname]",
permissions={OpOnly.class ,ParamCheck.class})
public boolean grid(String[] args) {
String name = args[0].replaceAll("%", " "); // if name of npc separed by space, user must use % in place of space
@@ -191,9 +191,9 @@ public class CmdClone extends ChMcLogger {
tab = Integer.parseInt(args[1]);
}
catch(NumberFormatException ex){
}
}
int width, height;
try{
width = Integer.parseInt(args[2]);
@@ -202,9 +202,9 @@ public class CmdClone extends ChMcLogger {
catch(NumberFormatException ex){
sendmessage("lenght or width wasnt a number");
return false;
}
}
String newname=null;
NBTTagCompound compound = ServerCloneController.Instance.getCloneData(this.pcParam, name, tab);
if(compound == null){
@@ -215,10 +215,10 @@ public class CmdClone extends ChMcLogger {
double posX = pcParam.getPlayerCoordinates().posX;
double posY = pcParam.getPlayerCoordinates().posY;
double posZ = pcParam.getPlayerCoordinates().posZ;
if(args.length > 4){
String location = args[4];
String[] par;
String[] par;
if (location.contains(":")){
par = location.split(":");
location = par[1];
@@ -227,7 +227,7 @@ public class CmdClone extends ChMcLogger {
sendmessage (String.format("'%s' is an unknown world",par[0]));
return false;
}
}
}
if (location.contains(",")){
par = location.split(",");
@@ -242,27 +242,27 @@ public class CmdClone extends ChMcLogger {
} catch(NumberFormatException ex){
sendmessage("Location should be in numbers");
return false;
}
}
if (args.length > 5){
newname = args[5];
}
} else {
newname = location;
newname = location;
}
}
if (posX == 0 && posY == 0 && posZ == 0){//incase it was called from the console and not pos was given
sendmessage ("Location needed");
return false;
return false;
}
for(int x = 0; x < width; x++){
for(int z = 0; z < height; z++){
Entity entity = EntityList.createEntityFromNBT(compound, world);
int xx = MathHelper.floor_double(posX) + x;
int yy = Math.max(MathHelper.floor_double(posY) - 2, 1);
int zz = MathHelper.floor_double(posZ) + z;
for(int y = 0; y < 10; y++){
Block b = world.getBlock(xx, yy + y, zz);
Block b2 = world.getBlock(xx, yy + y + 1, zz);
@@ -276,7 +276,7 @@ public class CmdClone extends ChMcLogger {
EntityNPCInterface npc = (EntityNPCInterface) entity;
npc.ai.startPos = new int[]{xx, yy, zz};
if(newname != null && !newname.isEmpty())
npc.display.name = newname.replaceAll("%", " "); // like name, newname must use % in place of space to keep a logical way
npc.display.name = newname.replaceAll("%", " "); // like name, newname must use % in place of space to keep a logical way
}
world.spawnEntityInWorld(entity);
}
+16 -16
View File
@@ -1,8 +1,10 @@
package foxz.command;
import java.util.Arrays;
import java.util.Set;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.PlayerOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockIce;
import net.minecraft.block.BlockLeavesBase;
@@ -13,11 +15,9 @@ import noppes.npcs.Server;
import noppes.npcs.config.ConfigMain;
import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.controllers.ChunkController;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.PlayerOnly;
import java.util.Arrays;
import java.util.Set;
@Command(
name="config",
@@ -28,8 +28,8 @@ public class CmdConfig extends ChMcLogger {
public CmdConfig(Object sender) {
super (sender);
}
}
@SubCommand(
desc="Disable/Enable the natural leaves decay",
usage="<true/false>",
@@ -57,7 +57,7 @@ public class CmdConfig extends ChMcLogger {
}
return true;
}
@SubCommand(
desc="Disable/Enable the vines growing",
usage="<true/false>",
@@ -85,7 +85,7 @@ public class CmdConfig extends ChMcLogger {
}
return true;
}
@SubCommand(
desc="Disable/Enable the ice melting",
usage="<true/false>",
@@ -134,7 +134,7 @@ public class CmdConfig extends ChMcLogger {
}
return true;
}
@SubCommand(
desc="Freezes/Unfreezes npcs",
usage="<true/false>",
@@ -151,7 +151,7 @@ public class CmdConfig extends ChMcLogger {
}
return true;
}
@SubCommand(
desc="Set how many active chunkloaders you can have",
usage="<number>",
@@ -185,7 +185,7 @@ public class CmdConfig extends ChMcLogger {
return true;
}
@SubCommand(
desc="Get/Set font",
usage="[type] [size]",
@@ -200,7 +200,7 @@ public class CmdConfig extends ChMcLogger {
args = Arrays.copyOfRange(args, 0, args.length - 1);
}
catch(Exception e){
}
}
String font = "";
+22 -22
View File
@@ -1,21 +1,21 @@
package foxz.command;
import java.util.List;
import net.minecraft.command.CommandBase;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.client.EntityUtil;
import noppes.npcs.controllers.data.Dialog;
import noppes.npcs.controllers.DialogController;
import noppes.npcs.controllers.data.DialogOption;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.entity.EntityDialogNpc;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.ParamCheck;
import net.minecraft.command.CommandBase;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.client.EntityUtil;
import noppes.npcs.controllers.DialogController;
import noppes.npcs.controllers.data.Dialog;
import noppes.npcs.controllers.data.DialogOption;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.entity.EntityDialogNpc;
import java.util.List;
@Command(
name="dialog",
@@ -27,8 +27,8 @@ public class CmdDialog extends ChMcLogger {
public CmdDialog(Object sender) {
super(sender);
}
@SubCommand(
desc="force read",
usage="<player> <dialog>",
@@ -48,18 +48,18 @@ public class CmdDialog extends ChMcLogger {
sendmessage(String.format("Unknow player '%s'", playername));
return false;
}
for(PlayerData playerdata : data){
for(PlayerData playerdata : data){
playerdata.dialogData.dialogsRead.add(diagid);
playerdata.save();
}
return true;
}
@SubCommand(
desc="force unread dialog",
usage="<player> <dialog>",
permissions={OpOnly.class, ParamCheck.class}
)
)
public boolean unread(String args[]){
String playername=args[0];
int diagid;
@@ -74,7 +74,7 @@ public class CmdDialog extends ChMcLogger {
sendmessage(String.format("Unknow player '%s'", playername));
return false;
}
for(PlayerData playerdata : data){
for(PlayerData playerdata : data){
playerdata.dialogData.dialogsRead.remove(diagid);
playerdata.save();
}
@@ -83,25 +83,25 @@ public class CmdDialog extends ChMcLogger {
@SubCommand(
desc="reload dialogs from disk",
permissions={OpOnly.class}
)
)
public boolean reload(String args[]){
new DialogController();
return true;
}
@SubCommand(
desc="show dialog",
usage="<player> <dialog> <name>",
permissions={OpOnly.class}
)
)
public void show(String args[]){
EntityPlayer player = CommandBase.getPlayer(pcParam, args[0]);
if(player == null){
sendmessage(String.format("Unknow player '%s'", args[0]));
return;
}
int diagid;
try {
diagid = Integer.parseInt(args[1]);
@@ -114,7 +114,7 @@ public class CmdDialog extends ChMcLogger {
sendmessage("Unknown dialog id: " + args[1]);
return;
}
EntityDialogNpc npc = new EntityDialogNpc(this.pcParam.getEntityWorld());
npc.display.name = args[2];
EntityUtil.Copy(player, npc);
+7 -7
View File
@@ -1,15 +1,15 @@
package foxz.command;
import java.util.List;
import noppes.npcs.controllers.data.Faction;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.controllers.data.PlayerFactionData;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.ParamCheck;
import noppes.npcs.controllers.data.Faction;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.controllers.data.PlayerFactionData;
import java.util.List;
@Command(
name = "faction",
@@ -96,11 +96,11 @@ public class CmdFaction extends ChMcLogger {
}
for(PlayerData playerdata : data){
PlayerFactionData playerfactiondata = playerdata.factionData;
playerfactiondata.factionData.put(this.selectedFaction.id,points);
playerfactiondata.factionData.put(this.selectedFaction.id,points);
}
return true;
}
@SubCommand(
desc="Drop relationship",
usage="",
+9 -14
View File
@@ -1,12 +1,11 @@
package foxz.command;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.ParamCheck;
import foxz.commandhelper.permissions.PlayerOnly;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.Entity;
@@ -27,12 +26,8 @@ import net.minecraft.util.ChatComponentTranslation;
import noppes.npcs.controllers.FactionController;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.entity.EntityNPCInterface;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.ParamCheck;
import foxz.commandhelper.permissions.PlayerOnly;
import java.util.*;
@Command(
name = "noppes",
@@ -225,4 +220,4 @@ public class CmdNoppes extends ChMcLogger {
}
return super.addTabCompletion(par1, args);
}
}
}
+7 -7
View File
@@ -1,7 +1,10 @@
package foxz.command;
import java.util.List;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.PlayerOnly;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
@@ -15,11 +18,8 @@ import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.RoleCompanion;
import noppes.npcs.roles.RoleFollower;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.PlayerOnly;
import java.util.List;
@Command(
name="npc",
+24 -24
View File
@@ -1,20 +1,20 @@
package foxz.command;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.Server;
import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.controllers.DialogController;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.controllers.data.Quest;
import noppes.npcs.controllers.QuestController;
import noppes.npcs.controllers.data.QuestData;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.ParamCheck;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.Server;
import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.controllers.DialogController;
import noppes.npcs.controllers.QuestController;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.controllers.data.Quest;
import noppes.npcs.controllers.data.QuestData;
import java.util.List;
@Command(
name = "quest",
@@ -51,10 +51,10 @@ public class CmdQuest extends ChMcLogger{
sendmessage("Unknown QuestID");
return false;
}
for(PlayerData playerdata : data){
for(PlayerData playerdata : data){
if(playerdata.questData.activeQuests.containsKey(questid))
continue;
QuestData questdata = new QuestData(quest);
QuestData questdata = new QuestData(quest);
playerdata.questData.activeQuests.put(questid, questdata);
playerdata.save();
if(playerdata.player != null){
@@ -64,7 +64,7 @@ public class CmdQuest extends ChMcLogger{
}
return true;
}
@SubCommand(
desc = "Finish a quest",
usage = "<player> <quest>",
@@ -75,7 +75,7 @@ public class CmdQuest extends ChMcLogger{
int questid;
try {
questid = Integer.parseInt(args[1]);
}
}
catch (NumberFormatException ex) {
sendmessage("QuestID must be an integer");
return false;
@@ -85,14 +85,14 @@ public class CmdQuest extends ChMcLogger{
sendmessage(String.format("Unknow player '%s'", playername));
return false;
}
Quest quest = QuestController.Instance.quests.get(questid);
if (quest == null){
sendmessage("Unknown QuestID");
return false;
}
for(PlayerData playerdata : data){
playerdata.questData.finishedQuests.put(questid, System.currentTimeMillis());
}
for(PlayerData playerdata : data){
playerdata.questData.finishedQuests.put(questid, System.currentTimeMillis());
playerdata.save();
}
return true;
@@ -121,14 +121,14 @@ public class CmdQuest extends ChMcLogger{
if (quest == null){
sendmessage("Unknown QuestID");
return false;
}
for(PlayerData playerdata : data){
}
for(PlayerData playerdata : data){
playerdata.questData.activeQuests.remove(questid);
playerdata.save();
}
return true;
}
@SubCommand(
desc = "Removes a quest from finished and active quests",
usage = "<player> <quest>",
@@ -152,8 +152,8 @@ public class CmdQuest extends ChMcLogger{
if (quest == null){
sendmessage("Unknown QuestID");
return false;
}
for(PlayerData playerdata : data){
}
for(PlayerData playerdata : data){
playerdata.questData.activeQuests.remove(questid);
playerdata.questData.finishedQuests.remove(questid);
playerdata.save();
@@ -163,7 +163,7 @@ public class CmdQuest extends ChMcLogger{
@SubCommand(
desc="reload quests from disk",
permissions={OpOnly.class}
)
)
public boolean reload(String args[]){
new DialogController();
return true;
+1 -1
View File
@@ -1,10 +1,10 @@
package foxz.command;
import noppes.npcs.controllers.ScriptController;
import foxz.commandhelper.ChMcLogger;
import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import noppes.npcs.controllers.ScriptController;
@Command(
name = "script",
@@ -1,10 +1,10 @@
package foxz.command;
import java.util.List;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import java.util.List;
public class CommandNoppes extends CommandBase {
public CmdNoppes noppes = new CmdNoppes(this);