Large Cleanup to Code Imports and Formatting

This commit is contained in:
Kam committed 2026-01-22 23:07:36 -05:00
1 parent 64fe8794e7
commit a6b4a131c8
65 files changed
+606 -409

No files matched your search

+6 -2
View File
@@ -6,7 +6,11 @@ import noppes.npcs.api.ITimers;
import noppes.npcs.api.entity.data.IModelData;
import noppes.npcs.api.handler.IActionManager;
import noppes.npcs.api.handler.IOverlayHandler;
import noppes.npcs.api.handler.data.*;
import noppes.npcs.api.handler.data.IAnimationData;
import noppes.npcs.api.handler.data.IDialog;
import noppes.npcs.api.handler.data.IFaction;
import noppes.npcs.api.handler.data.ILines;
import noppes.npcs.api.handler.data.IMagicData;
import noppes.npcs.api.item.IItemStack;
import noppes.npcs.api.jobs.IJob;
import noppes.npcs.api.roles.IRole;
@@ -494,7 +498,7 @@ public interface ICustomNpc<T extends EntityCreature> extends IEntityLiving<T>,
/**
* Gets the Aim Type for an NPC
*
* @return 0: No, 1: Yes, 2: On Shot
* @return 0: No, 1: Yes, 2: On Shot
*/
byte getAimType();
+3 -2
View File
@@ -541,19 +541,20 @@ public interface IEntity<T extends Entity> {
IEntity<?>[] getCapturedDrops();
/**
* @since 1.7.10c
* @return Whether the entity is sneaking.
* @since 1.7.10c
*/
boolean isSneaking();
/**
* @since 1.7.10c
* @return Whether the entity is sprinting.
* @since 1.7.10c
*/
boolean isSprinting();
/**
* Expert users only.
*
* @return The underlying Minecraft entity.
*/
T getMCEntity();
@@ -1,7 +1,6 @@
package noppes.npcs.api.entity;
import net.minecraft.entity.EntityLiving;
import noppes.npcs.api.entity.IEntityLivingBase;
/**
* Represents a living entity (mob, NPC, etc.) that extends the base living functionality.
+3 -3
View File
@@ -1,7 +1,6 @@
package noppes.npcs.api.entity;
import net.minecraft.entity.passive.EntityTameable;
import noppes.npcs.api.item.IItemStack;
/**
* Represents a Pixelmon (a tameable creature) with additional attributes
@@ -37,6 +36,7 @@ public interface IPixelmon<T extends EntityTameable> extends IAnimal<T> {
/**
* Gets the Individual Value (IV) for the specified stat.
*
* @param type 0: HP, 1: Attack, 2: Defense, 3: SpAttack, 4: SpDefense, 5: Speed
* @return the IV value, or -1 if invalid.
*/
@@ -84,7 +84,7 @@ public interface IPixelmon<T extends EntityTameable> extends IAnimal<T> {
/**
* @return The Pixelmon's size type (0: Pygmy, 1: Runt, 2: Small, 3: Normal, 4: Huge, 5: Giant,
* 6: Enormous, 7: Ginormous, 8: Microscopic).
* 6: Enormous, 7: Ginormous, 8: Microscopic).
*/
int getSize();
@@ -121,7 +121,7 @@ public interface IPixelmon<T extends EntityTameable> extends IAnimal<T> {
/**
* @return The type of Poké Ball in which the Pixelmon is contained
* (-1: Uncaught, 0: Pokéball, 1: Great Ball, etc.).
* (-1: Uncaught, 0: Pokéball, 1: Great Ball, etc.).
*/
int getPokeball();
+20 -10
View File
@@ -2,12 +2,23 @@ package noppes.npcs.api.entity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.api.*;
import noppes.npcs.api.IBlock;
import noppes.npcs.api.IContainer;
import noppes.npcs.api.IPixelmonPlayerData;
import noppes.npcs.api.IPos;
import noppes.npcs.api.IScreenSize;
import noppes.npcs.api.ITimers;
import noppes.npcs.api.IWorld;
import noppes.npcs.api.gui.ICustomGui;
import noppes.npcs.api.handler.IActionManager;
import noppes.npcs.api.handler.IOverlayHandler;
import noppes.npcs.api.handler.IPlayerData;
import noppes.npcs.api.handler.data.*;
import noppes.npcs.api.handler.data.IAnimationData;
import noppes.npcs.api.handler.data.IDialog;
import noppes.npcs.api.handler.data.IMagicData;
import noppes.npcs.api.handler.data.IPlayerAttributes;
import noppes.npcs.api.handler.data.IQuest;
import noppes.npcs.api.handler.data.ISound;
import noppes.npcs.api.item.IItemStack;
import noppes.npcs.api.overlay.ICustomOverlay;
@@ -313,8 +324,8 @@ public interface IPlayer<T extends EntityPlayerMP> extends IEntityLivingBase<T>,
void setMode(int type);
/**
* @since 1.7.10d
* @return Returns an IItemStack array of size 36 representing the player's inventory.
* @since 1.7.10d
*/
IItemStack[] getInventory();
@@ -327,11 +338,11 @@ public interface IPlayer<T extends EntityPlayerMP> extends IEntityLivingBase<T>,
int inventoryItemCount(IItemStack item, boolean ignoreNBT, boolean ignoreDamage);
/**
* @since 1.7.10c
* @param id The item's name.
* @param damage The damage value.
* @param amount How many items will be removed.
* @return True if the items were removed successfully, false if the amount exceeds what the player has or the item doesn't exist.
* @since 1.7.10c
*/
boolean removeItem(String id, int damage, int amount);
@@ -353,19 +364,19 @@ public interface IPlayer<T extends EntityPlayerMP> extends IEntityLivingBase<T>,
int removeAllItems(IItemStack item, boolean ignoreNBT, boolean ignoreDamage);
/**
* @since 1.7.10c
* @param item The item to be added.
* @param amount The number of items to add.
* @return True if the item was given successfully, false otherwise.
* @since 1.7.10c
*/
boolean giveItem(IItemStack item, int amount);
/**
* @since 1.7.10c
* @param id The item's name.
* @param damage The damage value.
* @param amount The number of items to add.
* @return True if the item was given successfully, false otherwise.
* @since 1.7.10c
*/
boolean giveItem(String id, int damage, int amount);
@@ -511,22 +522,22 @@ public interface IPlayer<T extends EntityPlayerMP> extends IEntityLivingBase<T>,
boolean hasBukkitPermission(String permission);
/**
* @since 1.7.10c
* @return Returns the player's experience level.
* @since 1.7.10c
*/
int getExpLevel();
/**
* @since 1.7.10c
* @param level The new experience level to set.
* @since 1.7.10c
*/
void setExpLevel(int level);
/**
* Requires Pixelmon to be installed.
*
* @since 1.7.10d
* @return Returns the player's Pixelmon data, or null if Pixelmon is not enabled.
* @since 1.7.10d
*/
IPixelmonPlayerData getPixelmonData();
@@ -673,7 +684,6 @@ public interface IPlayer<T extends EntityPlayerMP> extends IEntityLivingBase<T>,
IActionManager getActionManager();
IPlayer[] getPartyMembers();
// =========================================
@@ -1,7 +1,6 @@
package noppes.npcs.api.entity;
import net.minecraft.entity.passive.EntityVillager;
import noppes.npcs.api.entity.IEntityLivingBase;
/**
* Represents a villager entity with additional trading-related methods.