From 6dea5a1cbc64440c55dd7c87c14542d3b5da9261 Mon Sep 17 00:00:00 2001 From: "Luis C.M" Date: Wed, 11 May 2022 16:43:14 -0500 Subject: [PATCH] Interfaces have a file strucutre resembling the file structure of their implementing classes. --- src/main/java/noppes/npcs/DataScript.java | 3 +- src/main/java/noppes/npcs/EventHooks.java | 6 +- .../java/noppes/npcs/NoppesUtilPlayer.java | 3 +- .../noppes/npcs/ScriptItemEventHandler.java | 6 +- .../npcs/client/gui/custom/GuiCustom.java | 3 +- .../custom/components/CustomGuiButton.java | 3 +- .../gui/custom/components/CustomGuiLabel.java | 2 +- .../gui/custom/components/CustomGuiLine.java | 5 +- .../components/CustomGuiScrollComponent.java | 2 +- .../custom/components/CustomGuiTextField.java | 4 +- .../components/CustomGuiTexturedRect.java | 6 +- .../gui/custom/interfaces/IGuiComponent.java | 2 +- .../gui/customoverlay/OverlayCustom.java | 3 +- .../components/CustomOverlayLabel.java | 2 +- .../components/CustomOverlayLine.java | 6 +- .../components/CustomOverlayTexturedRect.java | 7 +- .../npcs/containers/ContainerCustomGui.java | 2 +- .../noppes/npcs/controllers/Availability.java | 4 +- .../npcs/controllers/CustomGuiController.java | 2 +- .../java/noppes/npcs/controllers/Dialog.java | 2 +- .../npcs/controllers/DialogCategory.java | 4 +- .../npcs/controllers/DialogController.java | 6 +- .../java/noppes/npcs/controllers/Faction.java | 6 +- .../npcs/controllers/FactionController.java | 6 +- .../java/noppes/npcs/controllers/Quest.java | 10 +- .../npcs/controllers/QuestCategory.java | 4 +- .../npcs/controllers/QuestController.java | 6 +- .../npcs/controllers/RecipeCarpentry.java | 5 +- .../npcs/controllers/RecipeController.java | 4 +- .../controllers/ServerCloneController.java | 12 +- .../npcs/controllers/data/NPCDataScript.java | 3 +- .../controllers/data/PlayerDataScript.java | 11 +- .../npcs/entity/EntityNPCInterface.java | 3 +- .../java/noppes/npcs/items/ItemScripted.java | 4 +- .../java/noppes/npcs/quests/QuestDialog.java | 4 +- .../noppes/npcs/quests/QuestInterface.java | 4 +- .../java/noppes/npcs/quests/QuestItem.java | 4 +- .../java/noppes/npcs/quests/QuestKill.java | 7 +- .../noppes/npcs/quests/QuestLocation.java | 4 +- .../java/noppes/npcs/scripted/NpcAPI.java | 4 +- .../noppes/npcs/scripted/ScriptContainer.java | 2 +- .../noppes/npcs/scripted/ScriptParticle.java | 93 ++++++------ .../noppes/npcs/scripted/ScriptWorld.java | 8 +- .../npcs/scripted/entity/ScriptAnimal.java | 2 +- .../npcs/scripted/entity/ScriptDBCPlayer.java | 2 +- .../npcs/scripted/entity/ScriptEntity.java | 2 +- .../npcs/scripted/entity/ScriptLiving.java | 2 +- .../scripted/entity/ScriptLivingBase.java | 5 +- .../npcs/scripted/entity/ScriptMonster.java | 2 +- .../npcs/scripted/entity/ScriptNpc.java | 5 +- .../npcs/scripted/entity/ScriptPixelmon.java | 2 +- .../npcs/scripted/entity/ScriptPlayer.java | 6 +- .../npcs/scripted/event/CustomGuiEvent.java | 6 +- .../npcs/scripted/event/DialogEvent.java | 4 +- .../npcs/scripted/event/FactionEvent.java | 4 +- .../npcs/scripted/event/ForgeEvent.java | 2 +- .../noppes/npcs/scripted/event/ItemEvent.java | 10 +- .../noppes/npcs/scripted/event/NpcEvent.java | 5 + .../npcs/scripted/event/PlayerEvent.java | 4 + .../npcs/scripted/event/QuestEvent.java | 6 +- .../scripted/event/ScriptEventDialog.java | 3 +- .../noppes/npcs/scripted/gui/ScriptGui.java | 7 +- .../npcs/scripted/gui/ScriptGuiButton.java | 4 +- .../npcs/scripted/gui/ScriptGuiComponent.java | 3 +- .../npcs/scripted/gui/ScriptGuiItemSlot.java | 4 +- .../npcs/scripted/gui/ScriptGuiLabel.java | 2 +- .../npcs/scripted/gui/ScriptGuiLine.java | 2 +- .../npcs/scripted/gui/ScriptGuiScroll.java | 2 +- .../npcs/scripted/gui/ScriptGuiTextField.java | 2 +- .../scripted/gui/ScriptGuiTexturedRect.java | 2 +- .../handler/data/IQuestInterface.java | 4 - .../npcs/scripted/interfaces/IContainer.java | 1 + .../scripted/interfaces/IDamageSource.java | 1 + .../npcs/scripted/interfaces/IParticle.java | 134 ++++++++++++++++++ .../npcs/scripted/interfaces/IWorld.java | 2 + .../interfaces/{ => entity}/IAnimal.java | 2 +- .../interfaces/{ => entity}/ICustomNpc.java | 4 +- .../interfaces/{ => entity}/IEntity.java | 4 +- .../{ => entity}/IEntityLiving.java | 2 +- .../{ => entity}/IEntityLivingBase.java | 5 +- .../interfaces/{ => entity}/IMonster.java | 2 +- .../interfaces/{ => entity}/IPixelmon.java | 4 +- .../interfaces/{ => entity}/IPlayer.java | 21 +-- .../interfaces/{ => gui}/IButton.java | 2 +- .../interfaces/{ => gui}/ICustomGui.java | 4 +- .../{ => gui}/ICustomGuiComponent.java | 2 +- .../interfaces/{ => gui}/IItemSlot.java | 3 +- .../scripted/interfaces/{ => gui}/ILabel.java | 2 +- .../scripted/interfaces/{ => gui}/ILine.java | 2 +- .../interfaces/{ => gui}/IScroll.java | 2 +- .../interfaces/{ => gui}/ITextField.java | 2 +- .../interfaces/{ => gui}/ITexturedRect.java | 2 +- .../handler/ICloneHandler.java | 4 +- .../handler/IDialogHandler.java | 6 +- .../handler/IFactionHandler.java | 4 +- .../handler/IQuestHandler.java | 6 +- .../handler/IRecipeHandler.java | 4 +- .../handler/data/IAvailability.java | 4 +- .../handler/data/IDialog.java | 2 +- .../handler/data/IDialogCategory.java | 2 +- .../handler/data/IDialogOption.java | 2 +- .../handler/data/IFaction.java | 6 +- .../{ => interfaces}/handler/data/IQuest.java | 4 +- .../handler/data/IQuestCategory.java | 2 +- .../handler/data/IQuestDialog.java | 2 +- .../handler/data/IQuestInterface.java | 4 + .../handler/data/IQuestItem.java | 2 +- .../handler/data/IQuestKill.java | 2 +- .../handler/data/IQuestLocation.java | 2 +- .../handler/data/IQuestObjective.java | 2 +- .../handler/data/IRecipe.java | 2 +- .../interfaces/{ => item}/ICustomItem.java | 4 +- .../interfaces/{ => item}/IItemStack.java | 3 +- .../{ => overlay}/ICustomOverlay.java | 4 +- .../ICustomOverlayComponent.java | 2 +- .../{ => overlay}/IOverlayLabel.java | 2 +- .../{ => overlay}/IOverlayLine.java | 4 +- .../{ => overlay}/IOverlayTexturedRect.java | 2 +- .../npcs/scripted/item/ScriptCustomItem.java | 2 +- .../npcs/scripted/item/ScriptItemStack.java | 2 +- .../npcs/scripted/overlay/ScriptOverlay.java | 9 +- .../overlay/ScriptOverlayComponent.java | 7 +- .../scripted/overlay/ScriptOverlayLabel.java | 4 +- .../scripted/overlay/ScriptOverlayLine.java | 3 +- .../overlay/ScriptOverlayTexturedRect.java | 5 +- .../scripted/wrapper/ScriptDamageSource.java | 3 +- .../scripted/wrapper/WrapperEntityData.java | 2 +- .../npcs/scripted/wrapper/WrapperNpcAPI.java | 8 +- 128 files changed, 401 insertions(+), 321 deletions(-) delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IQuestInterface.java create mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IParticle.java rename src/main/java/noppes/npcs/scripted/interfaces/{ => entity}/IAnimal.java (83%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => entity}/ICustomNpc.java (99%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => entity}/IEntity.java (98%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => entity}/IEntityLiving.java (89%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => entity}/IEntityLivingBase.java (95%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => entity}/IMonster.java (82%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => entity}/IPixelmon.java (96%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => entity}/IPlayer.java (91%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => gui}/IButton.java (91%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => gui}/ICustomGui.java (92%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => gui}/ICustomGuiComponent.java (94%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => gui}/IItemSlot.java (76%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => gui}/ILabel.java (90%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => gui}/ILine.java (86%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => gui}/IScroll.java (91%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => gui}/ITextField.java (87%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => gui}/ITexturedRect.java (91%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/ICloneHandler.java (80%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/IDialogHandler.java (56%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/IFactionHandler.java (73%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/IQuestHandler.java (56%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/IRecipeHandler.java (81%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IAvailability.java (85%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IDialog.java (94%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IDialogCategory.java (81%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IDialogOption.java (79%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IFaction.java (80%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IQuest.java (87%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IQuestCategory.java (81%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IQuestDialog.java (52%) create mode 100644 src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestInterface.java rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IQuestItem.java (83%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IQuestKill.java (68%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IQuestLocation.java (82%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IQuestObjective.java (83%) rename src/main/java/noppes/npcs/scripted/{ => interfaces}/handler/data/IRecipe.java (90%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => item}/ICustomItem.java (95%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => item}/IItemStack.java (97%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => overlay}/ICustomOverlay.java (91%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => overlay}/ICustomOverlayComponent.java (93%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => overlay}/IOverlayLabel.java (87%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => overlay}/IOverlayLine.java (75%) rename src/main/java/noppes/npcs/scripted/interfaces/{ => overlay}/IOverlayTexturedRect.java (89%) diff --git a/src/main/java/noppes/npcs/DataScript.java b/src/main/java/noppes/npcs/DataScript.java index 90b435332..8e8c70cc3 100644 --- a/src/main/java/noppes/npcs/DataScript.java +++ b/src/main/java/noppes/npcs/DataScript.java @@ -14,7 +14,6 @@ import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.IScriptHandler; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.ScriptEvent; @@ -23,7 +22,7 @@ import noppes.npcs.scripted.ScriptWorld; import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.scripted.constants.JobType; import noppes.npcs.scripted.constants.RoleType; -import noppes.npcs.scripted.interfaces.ICustomNpc; +import noppes.npcs.scripted.interfaces.entity.ICustomNpc; import noppes.npcs.scripted.interfaces.IWorld; import noppes.npcs.scripted.wrapper.WrapperNpcAPI; diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index d9c755ee3..407b33acb 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -7,7 +7,6 @@ package noppes.npcs; import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; @@ -25,7 +24,6 @@ import noppes.npcs.controllers.data.ForgeDataScript; import noppes.npcs.controllers.data.PlayerDataScript; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.*; -import noppes.npcs.scripted.entity.ScriptEntity; import noppes.npcs.scripted.entity.ScriptPlayer; import noppes.npcs.scripted.event.*; import noppes.npcs.scripted.event.PlayerEvent.ChatEvent; @@ -37,6 +35,10 @@ import noppes.npcs.scripted.event.PlayerEvent.LogoutEvent; import noppes.npcs.scripted.event.PlayerEvent.PickUpEvent; import noppes.npcs.scripted.event.PlayerEvent.DropEvent; import noppes.npcs.scripted.interfaces.*; +import noppes.npcs.scripted.interfaces.entity.IEntity; +import noppes.npcs.scripted.interfaces.entity.IPlayer; +import noppes.npcs.scripted.interfaces.gui.ICustomGui; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptCustomItem; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.wrapper.WrapperNpcAPI; diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index 47145ef70..6e5101f6e 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -22,7 +22,6 @@ import noppes.npcs.constants.EnumOptionType; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.constants.EnumScriptType; import noppes.npcs.containers.ContainerNPCBankInterface; import noppes.npcs.containers.ContainerNPCFollower; import noppes.npcs.containers.ContainerNPCFollowerHire; @@ -34,7 +33,7 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.entity.ScriptPlayer; import noppes.npcs.scripted.event.DialogEvent; import noppes.npcs.scripted.event.QuestEvent; -import noppes.npcs.scripted.interfaces.IItemStack; +import noppes.npcs.scripted.interfaces.item.IItemStack; public class NoppesUtilPlayer { diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java index c5de605c2..23d56811a 100644 --- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java @@ -10,18 +10,16 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.EntityInteractEvent; import net.minecraftforge.event.entity.player.PlayerUseItemEvent; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.PlayerDataScript; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.items.ItemScripted; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.entity.ScriptPlayer; import noppes.npcs.scripted.event.ItemEvent; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.item.IItemStack; +import noppes.npcs.scripted.interfaces.entity.IPlayer; import noppes.npcs.scripted.item.ScriptCustomItem; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java index 544465490..83cda2522 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java +++ b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java @@ -5,7 +5,6 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureMap; @@ -31,7 +30,7 @@ import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.scripted.gui.*; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java index a51ce5f45..ca93e04d0 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java @@ -10,14 +10,13 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.SkinManager; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ImageDownloadAlt; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.renderer.ImageBufferDownloadAlt; import noppes.npcs.scripted.gui.ScriptGuiButton; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; public class CustomGuiButton extends GuiButton implements IClickListener { diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java index f98ec1411..7d99a4a87 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java @@ -15,7 +15,7 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; import noppes.npcs.scripted.gui.ScriptGuiLabel; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; import javax.imageio.ImageIO; diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java index 5a1b2804e..a28fe8f4e 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java @@ -6,12 +6,9 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; import noppes.npcs.scripted.gui.ScriptGuiLine; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; - public class CustomGuiLine extends Gui implements IGuiComponent { int id; GuiCustom parent; diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java index 26f626ad9..c809331e8 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java @@ -17,7 +17,7 @@ import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.gui.custom.interfaces.IDataHolder; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.scripted.gui.ScriptGuiScroll; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; public class CustomGuiScrollComponent extends GuiCustomScroll implements IDataHolder, IClickListener { diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java index 876eccd41..1d02d405e 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java @@ -8,14 +8,12 @@ package noppes.npcs.client.gui.custom.components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.Client; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.gui.custom.interfaces.IDataHolder; import noppes.npcs.client.gui.custom.interfaces.IKeyListener; -import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.scripted.gui.ScriptGuiTextField; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; public class CustomGuiTextField extends GuiTextField implements IKeyListener, IDataHolder, IClickListener { diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java index 163ed6b37..e11759649 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java @@ -10,19 +10,15 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.SkinManager; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ImageDownloadAlt; import noppes.npcs.client.gui.custom.GuiCustom; import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; import noppes.npcs.client.renderer.ImageBufferDownloadAlt; import noppes.npcs.scripted.gui.ScriptGuiTexturedRect; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; import org.lwjgl.opengl.GL11; -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; - public class CustomGuiTexturedRect extends Gui implements IGuiComponent { GuiCustom parent; ResourceLocation texture; diff --git a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IGuiComponent.java b/src/main/java/noppes/npcs/client/gui/custom/interfaces/IGuiComponent.java index af8f1d248..76f6c142b 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IGuiComponent.java +++ b/src/main/java/noppes/npcs/client/gui/custom/interfaces/IGuiComponent.java @@ -6,7 +6,7 @@ package noppes.npcs.client.gui.custom.interfaces; import net.minecraft.client.Minecraft; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; public interface IGuiComponent { int getID(); diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java index dea871e62..503ef6373 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java @@ -5,12 +5,11 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLabel; import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLine; import noppes.npcs.client.gui.customoverlay.components.CustomOverlayTexturedRect; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; +import noppes.npcs.scripted.interfaces.overlay.ICustomOverlayComponent; import noppes.npcs.scripted.overlay.*; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java index ec7212a2a..3c84d6b48 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java @@ -9,7 +9,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; +import noppes.npcs.scripted.interfaces.overlay.ICustomOverlayComponent; import noppes.npcs.scripted.overlay.ScriptOverlayLabel; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java index be019ee22..4018b71b9 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java @@ -2,18 +2,14 @@ package noppes.npcs.client.gui.customoverlay.components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; +import noppes.npcs.scripted.interfaces.overlay.ICustomOverlayComponent; import noppes.npcs.scripted.overlay.ScriptOverlayLine; import org.lwjgl.opengl.GL11; -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; - public class CustomOverlayLine extends Gui implements IOverlayComponent { OverlayCustom parent; int alignment; diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java index 2a6367815..b1402308f 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java @@ -2,23 +2,18 @@ package noppes.npcs.client.gui.customoverlay.components; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.SkinManager; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ImageDownloadAlt; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; import noppes.npcs.client.renderer.ImageBufferDownloadAlt; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; +import noppes.npcs.scripted.interfaces.overlay.ICustomOverlayComponent; import noppes.npcs.scripted.overlay.ScriptOverlayTexturedRect; import org.lwjgl.opengl.GL11; -import static org.lwjgl.opengl.GL11.*; -import static org.lwjgl.opengl.GL14.glBlendFuncSeparate; - public class CustomOverlayTexturedRect extends Gui implements IOverlayComponent { OverlayCustom parent; int alignment; diff --git a/src/main/java/noppes/npcs/containers/ContainerCustomGui.java b/src/main/java/noppes/npcs/containers/ContainerCustomGui.java index c16a4cc91..a23de67b7 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCustomGui.java +++ b/src/main/java/noppes/npcs/containers/ContainerCustomGui.java @@ -11,7 +11,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import noppes.npcs.scripted.interfaces.IItemSlot; +import noppes.npcs.scripted.interfaces.gui.IItemSlot; import noppes.npcs.scripted.gui.ScriptGui; import noppes.npcs.client.gui.custom.components.CustomGuiSlot; diff --git a/src/main/java/noppes/npcs/controllers/Availability.java b/src/main/java/noppes/npcs/controllers/Availability.java index e378717dd..f20c0ed33 100644 --- a/src/main/java/noppes/npcs/controllers/Availability.java +++ b/src/main/java/noppes/npcs/controllers/Availability.java @@ -11,8 +11,8 @@ import noppes.npcs.constants.EnumAvailabilityFactionType; import noppes.npcs.constants.EnumAvailabilityQuest; import noppes.npcs.constants.EnumDayTime; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IAvailability; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.handler.data.IAvailability; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public class Availability implements ICompatibilty, IAvailability { public int version = VersionCompatibility.ModRev; diff --git a/src/main/java/noppes/npcs/controllers/CustomGuiController.java b/src/main/java/noppes/npcs/controllers/CustomGuiController.java index 53cbc932d..1849561e0 100644 --- a/src/main/java/noppes/npcs/controllers/CustomGuiController.java +++ b/src/main/java/noppes/npcs/controllers/CustomGuiController.java @@ -14,7 +14,7 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.entity.ScriptPlayer; import noppes.npcs.scripted.event.CustomGuiEvent; import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.interfaces.IItemStack; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.overlay.ScriptOverlay; import noppes.npcs.scripted.wrapper.WrapperNpcAPI; diff --git a/src/main/java/noppes/npcs/controllers/Dialog.java b/src/main/java/noppes/npcs/controllers/Dialog.java index 1a332473e..6632f8433 100644 --- a/src/main/java/noppes/npcs/controllers/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/Dialog.java @@ -11,7 +11,7 @@ import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.*; +import noppes.npcs.scripted.interfaces.handler.data.*; public class Dialog implements ICompatibilty, IDialog { public int version = VersionCompatibility.ModRev; diff --git a/src/main/java/noppes/npcs/controllers/DialogCategory.java b/src/main/java/noppes/npcs/controllers/DialogCategory.java index d6314ad88..20c1fb0b1 100644 --- a/src/main/java/noppes/npcs/controllers/DialogCategory.java +++ b/src/main/java/noppes/npcs/controllers/DialogCategory.java @@ -6,8 +6,8 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.scripted.handler.data.IDialog; -import noppes.npcs.scripted.handler.data.IDialogCategory; +import noppes.npcs.scripted.interfaces.handler.data.IDialog; +import noppes.npcs.scripted.interfaces.handler.data.IDialogCategory; public class DialogCategory implements IDialogCategory { diff --git a/src/main/java/noppes/npcs/controllers/DialogController.java b/src/main/java/noppes/npcs/controllers/DialogController.java index 69156b429..9791ca720 100644 --- a/src/main/java/noppes/npcs/controllers/DialogController.java +++ b/src/main/java/noppes/npcs/controllers/DialogController.java @@ -11,9 +11,9 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesStringUtils; import noppes.npcs.constants.EnumOptionType; -import noppes.npcs.scripted.handler.IDialogHandler; -import noppes.npcs.scripted.handler.data.IDialog; -import noppes.npcs.scripted.handler.data.IDialogCategory; +import noppes.npcs.scripted.interfaces.handler.IDialogHandler; +import noppes.npcs.scripted.interfaces.handler.data.IDialog; +import noppes.npcs.scripted.interfaces.handler.data.IDialogCategory; import noppes.npcs.util.NBTJsonUtil; public class DialogController implements IDialogHandler { diff --git a/src/main/java/noppes/npcs/controllers/Faction.java b/src/main/java/noppes/npcs/controllers/Faction.java index 7a7ace55e..03a6a44d2 100644 --- a/src/main/java/noppes/npcs/controllers/Faction.java +++ b/src/main/java/noppes/npcs/controllers/Faction.java @@ -8,9 +8,9 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IFaction; -import noppes.npcs.scripted.interfaces.ICustomNpc; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.handler.data.IFaction; +import noppes.npcs.scripted.interfaces.entity.ICustomNpc; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public class Faction implements IFaction { public String name = ""; diff --git a/src/main/java/noppes/npcs/controllers/FactionController.java b/src/main/java/noppes/npcs/controllers/FactionController.java index 36b2db79c..5b59d349a 100644 --- a/src/main/java/noppes/npcs/controllers/FactionController.java +++ b/src/main/java/noppes/npcs/controllers/FactionController.java @@ -17,10 +17,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; -import noppes.npcs.Server; -import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.scripted.handler.IFactionHandler; -import noppes.npcs.scripted.handler.data.IFaction; +import noppes.npcs.scripted.interfaces.handler.IFactionHandler; +import noppes.npcs.scripted.interfaces.handler.data.IFaction; public class FactionController implements IFactionHandler { public HashMap factions; diff --git a/src/main/java/noppes/npcs/controllers/Quest.java b/src/main/java/noppes/npcs/controllers/Quest.java index 3205d3073..739b32010 100644 --- a/src/main/java/noppes/npcs/controllers/Quest.java +++ b/src/main/java/noppes/npcs/controllers/Quest.java @@ -18,12 +18,12 @@ import noppes.npcs.quests.QuestKill; import noppes.npcs.quests.QuestLocation; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.handler.data.IQuestCategory; -import noppes.npcs.scripted.handler.data.IQuestInterface; -import noppes.npcs.scripted.handler.data.IQuestObjective; +import noppes.npcs.scripted.interfaces.handler.data.IQuest; +import noppes.npcs.scripted.interfaces.handler.data.IQuestCategory; +import noppes.npcs.scripted.interfaces.handler.data.IQuestInterface; +import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; import noppes.npcs.scripted.interfaces.IContainer; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public class Quest implements ICompatibilty, IQuest { public int version = VersionCompatibility.ModRev; diff --git a/src/main/java/noppes/npcs/controllers/QuestCategory.java b/src/main/java/noppes/npcs/controllers/QuestCategory.java index c4dac8490..10da9533b 100644 --- a/src/main/java/noppes/npcs/controllers/QuestCategory.java +++ b/src/main/java/noppes/npcs/controllers/QuestCategory.java @@ -6,8 +6,8 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.handler.data.IQuestCategory; +import noppes.npcs.scripted.interfaces.handler.data.IQuest; +import noppes.npcs.scripted.interfaces.handler.data.IQuestCategory; public class QuestCategory implements IQuestCategory { public HashMap quests; diff --git a/src/main/java/noppes/npcs/controllers/QuestController.java b/src/main/java/noppes/npcs/controllers/QuestController.java index 2e8c664d9..70a28819f 100644 --- a/src/main/java/noppes/npcs/controllers/QuestController.java +++ b/src/main/java/noppes/npcs/controllers/QuestController.java @@ -10,9 +10,9 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesStringUtils; -import noppes.npcs.scripted.handler.IQuestHandler; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.handler.data.IQuestCategory; +import noppes.npcs.scripted.interfaces.handler.IQuestHandler; +import noppes.npcs.scripted.interfaces.handler.data.IQuest; +import noppes.npcs.scripted.interfaces.handler.data.IQuestCategory; import noppes.npcs.util.NBTJsonUtil; public class QuestController implements IQuestHandler { diff --git a/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java b/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java index 58089d2eb..44ae912bc 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java +++ b/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java @@ -1,10 +1,7 @@ package noppes.npcs.controllers; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; @@ -16,7 +13,7 @@ import net.minecraft.world.World; import noppes.npcs.NBTTags; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.scripted.handler.data.IRecipe; +import noppes.npcs.scripted.interfaces.handler.data.IRecipe; public class RecipeCarpentry extends ShapedRecipes implements IRecipe { public int id = -1; diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index a028f938f..b503490fd 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -13,8 +13,8 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; -import noppes.npcs.scripted.handler.IRecipeHandler; -import noppes.npcs.scripted.handler.data.IRecipe; +import noppes.npcs.scripted.interfaces.handler.IRecipeHandler; +import noppes.npcs.scripted.interfaces.handler.data.IRecipe; public class RecipeController implements IRecipeHandler { private static Collection prevRecipes; diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java index 4dcb0ebcf..0462de388 100644 --- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java +++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java @@ -2,11 +2,7 @@ package noppes.npcs.controllers; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -14,7 +10,6 @@ import java.util.Map; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -22,13 +17,10 @@ import net.minecraft.util.ChatComponentText; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.controllers.LinkedNpcController.LinkedData; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.handler.ICloneHandler; -import noppes.npcs.scripted.interfaces.IEntity; +import noppes.npcs.scripted.interfaces.handler.ICloneHandler; +import noppes.npcs.scripted.interfaces.entity.IEntity; import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.util.JsonException; import noppes.npcs.util.NBTJsonUtil; public class ServerCloneController implements ICloneHandler { diff --git a/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java b/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java index 44ea2681d..bf291a73a 100644 --- a/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java @@ -11,8 +11,7 @@ import noppes.npcs.controllers.IScriptHandler; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.interfaces.ICustomNpc; +import noppes.npcs.scripted.interfaces.entity.ICustomNpc; import javax.annotation.CheckForNull; import java.lang.reflect.Array; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java index ab3e95477..60c916293 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java @@ -7,27 +7,22 @@ import java.lang.reflect.Array; import java.util.*; import java.util.Map.Entry; import com.google.common.base.Preconditions; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import cpw.mods.fml.common.eventhandler.Event; -import net.minecraft.world.WorldServer; import noppes.npcs.CustomNpcs; import noppes.npcs.EventHooks; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.NBTTags; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.IScriptHandler; import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.PlayerEvent; -import noppes.npcs.scripted.interfaces.IPlayer; -import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.scripted.wrapper.WrapperNpcAPI; +import noppes.npcs.scripted.interfaces.entity.IPlayer; + import javax.annotation.CheckForNull; -import javax.script.ScriptEngine; + public class PlayerDataScript implements IScriptHandler { public List scripts = new ArrayList(); public String scriptLanguage = "ECMAScript"; diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 872cf6b74..b6481e015 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -61,7 +61,6 @@ import noppes.npcs.constants.EnumNavType; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumPotionType; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.constants.EnumScriptType; import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.Dialog; import noppes.npcs.controllers.DialogOption; @@ -86,7 +85,7 @@ import noppes.npcs.scripted.event.ScriptEventAttack; import noppes.npcs.scripted.event.ScriptEventDamaged; import noppes.npcs.scripted.event.ScriptEventKilled; import noppes.npcs.scripted.event.ScriptEventTarget; -import noppes.npcs.scripted.interfaces.ICustomNpc; +import noppes.npcs.scripted.interfaces.entity.ICustomNpc; import noppes.npcs.util.GameProfileAlt; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; diff --git a/src/main/java/noppes/npcs/items/ItemScripted.java b/src/main/java/noppes/npcs/items/ItemScripted.java index 510c8fbbc..7438a5660 100644 --- a/src/main/java/noppes/npcs/items/ItemScripted.java +++ b/src/main/java/noppes/npcs/items/ItemScripted.java @@ -4,7 +4,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -22,8 +21,7 @@ import noppes.npcs.constants.EnumGuiType; import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.ItemEvent; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptCustomItem; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index 0ce52a2f8..aee27eabe 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -14,8 +14,8 @@ import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.PlayerData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IQuestDialog; -import noppes.npcs.scripted.handler.data.IQuestObjective; +import noppes.npcs.scripted.interfaces.handler.data.IQuestDialog; +import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; public class QuestDialog extends QuestInterface implements IQuestDialog { diff --git a/src/main/java/noppes/npcs/quests/QuestInterface.java b/src/main/java/noppes/npcs/quests/QuestInterface.java index 3f7ceb87e..b385471fc 100644 --- a/src/main/java/noppes/npcs/quests/QuestInterface.java +++ b/src/main/java/noppes/npcs/quests/QuestInterface.java @@ -5,8 +5,8 @@ import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.controllers.PlayerData; -import noppes.npcs.scripted.handler.data.IQuestInterface; -import noppes.npcs.scripted.handler.data.IQuestObjective; +import noppes.npcs.scripted.interfaces.handler.data.IQuestInterface; +import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; public abstract class QuestInterface implements IQuestInterface { public int questId; diff --git a/src/main/java/noppes/npcs/quests/QuestItem.java b/src/main/java/noppes/npcs/quests/QuestItem.java index a8817b28d..dc6be0aa6 100644 --- a/src/main/java/noppes/npcs/quests/QuestItem.java +++ b/src/main/java/noppes/npcs/quests/QuestItem.java @@ -10,8 +10,8 @@ import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; import noppes.npcs.controllers.PlayerData; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IQuestItem; -import noppes.npcs.scripted.handler.data.IQuestObjective; +import noppes.npcs.scripted.interfaces.handler.data.IQuestItem; +import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; import noppes.npcs.util.ValueUtil; public class QuestItem extends QuestInterface implements IQuestItem { diff --git a/src/main/java/noppes/npcs/quests/QuestKill.java b/src/main/java/noppes/npcs/quests/QuestKill.java index b5f6b84a3..08be78a53 100644 --- a/src/main/java/noppes/npcs/quests/QuestKill.java +++ b/src/main/java/noppes/npcs/quests/QuestKill.java @@ -2,9 +2,6 @@ package noppes.npcs.quests; import java.util.*; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; @@ -14,8 +11,8 @@ import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestData; import noppes.npcs.controllers.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IQuestKill; -import noppes.npcs.scripted.handler.data.IQuestObjective; +import noppes.npcs.scripted.interfaces.handler.data.IQuestKill; +import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; public class QuestKill extends QuestInterface implements IQuestKill { public HashMap targets = new HashMap(); diff --git a/src/main/java/noppes/npcs/quests/QuestLocation.java b/src/main/java/noppes/npcs/quests/QuestLocation.java index 15c04fdc5..5b9f7d84c 100644 --- a/src/main/java/noppes/npcs/quests/QuestLocation.java +++ b/src/main/java/noppes/npcs/quests/QuestLocation.java @@ -13,8 +13,8 @@ import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestData; import noppes.npcs.controllers.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IQuestLocation; -import noppes.npcs.scripted.handler.data.IQuestObjective; +import noppes.npcs.scripted.interfaces.handler.data.IQuestLocation; +import noppes.npcs.scripted.interfaces.handler.data.IQuestObjective; public class QuestLocation extends QuestInterface implements IQuestLocation { public String location = ""; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index db93c27f7..0280d43b2 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -20,7 +20,9 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import noppes.npcs.scripted.entity.ScriptPlayer; import noppes.npcs.scripted.interfaces.*; -import noppes.npcs.scripted.item.ScriptItemStack; +import noppes.npcs.scripted.interfaces.entity.ICustomNpc; +import noppes.npcs.scripted.interfaces.entity.IEntity; +import noppes.npcs.scripted.interfaces.item.IItemStack; public abstract class NpcAPI { private static NpcAPI instance = null; diff --git a/src/main/java/noppes/npcs/scripted/ScriptContainer.java b/src/main/java/noppes/npcs/scripted/ScriptContainer.java index d0197fcd2..a607d1431 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptContainer.java +++ b/src/main/java/noppes/npcs/scripted/ScriptContainer.java @@ -14,7 +14,7 @@ import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.scripted.entity.ScriptPlayer; import noppes.npcs.scripted.interfaces.IContainer; -import noppes.npcs.scripted.interfaces.IItemStack; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptItemStack; public class ScriptContainer implements IContainer { diff --git a/src/main/java/noppes/npcs/scripted/ScriptParticle.java b/src/main/java/noppes/npcs/scripted/ScriptParticle.java index 9fc33a4dd..04ba712ce 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptParticle.java +++ b/src/main/java/noppes/npcs/scripted/ScriptParticle.java @@ -2,11 +2,12 @@ package noppes.npcs.scripted; import noppes.npcs.NoppesUtilServer; import noppes.npcs.scripted.entity.ScriptEntity; +import noppes.npcs.scripted.interfaces.IParticle; /** * Created by luisc on 9/8/2021. */ -public class ScriptParticle { +public class ScriptParticle implements IParticle { private String directory; private int HEXColor = 0xFFFFFF; @@ -139,42 +140,14 @@ public class ScriptParticle { return directory; } + @Deprecated public void setHEXColor(int HEXColor) { this.HEXColor = HEXColor; } + @Deprecated public int getHEXColor() { return HEXColor; } - public void setHEXColor(int HEXColor, int HEXColor2, float HEXColorRate, int HEXColorStart) { - this.HEXColor = HEXColor; - this.HEXColor2 = HEXColor2; - this.HEXColorRate = HEXColorRate; - this.HEXColorStart = HEXColorStart; - } - public int getHEXColor1() { - return HEXColor; - } - public int getHEXColor2() { - return HEXColor2; - } - public float getHEXColorRate() { - return HEXColorRate; - } - public int getHEXColorStart() { - return HEXColorStart; - } - public void setHEXColor1(int HEXColor) { - this.HEXColor = HEXColor; - } - public void setHEXColor2(int HEXColor2) { - this.HEXColor2 = HEXColor2; - } - public void setHEXColorRate(float HEXColorRate) { - this.HEXColorRate = HEXColorRate; - } - public void setHEXColorStart(int HEXColorStart) { - this.HEXColorStart = HEXColorStart; - } public int getAmount() { return amount; @@ -207,6 +180,19 @@ public class ScriptParticle { return gravity; } + public int getHEXColor1() { + return HEXColor; + } + public int getHEXColor2() { + return HEXColor2; + } + public float getHEXColorRate() { + return HEXColorRate; + } + public int getHEXColorStart() { + return HEXColorStart; + } + public float getAlpha1() { return alpha1; } @@ -294,23 +280,23 @@ public class ScriptParticle { this.gravity = gravity; } - public void setScale(float scale1, float scale2, float scaleRate, int scaleRateStart){ - this.scale1 = scale1; - this.scale2 = scale2; - this.scaleRate = scaleRate; - this.scaleRateStart = scaleRateStart; + public void setHEXColor(int HEXColor, int HEXColor2, float HEXColorRate, int HEXColorStart) { + this.HEXColor = HEXColor; + this.HEXColor2 = HEXColor2; + this.HEXColorRate = HEXColorRate; + this.HEXColorStart = HEXColorStart; } - public void setScale1(float scale1) { - this.scale1 = scale1; + public void setHEXColor1(int HEXColor) { + this.HEXColor = HEXColor; } - public void setScale2(float scale2) { - this.scale2 = scale2; + public void setHEXColor2(int HEXColor2) { + this.HEXColor2 = HEXColor2; } - public void setScaleRate(float scaleRate) { - this.scaleRate = scaleRate; + public void setHEXColorRate(float HEXColorRate) { + this.HEXColorRate = HEXColorRate; } - public void setScaleRateStart(int scaleRateStart) { - this.scaleRateStart = scaleRateStart; + public void setHEXColorStart(int HEXColorStart) { + this.HEXColorStart = HEXColorStart; } public void setAlpha(float alpha1, float alpha2, float alphaRate, int alphaRateStart){ @@ -332,6 +318,25 @@ public class ScriptParticle { this.alphaRateStart = alphaRateStart; } + public void setScale(float scale1, float scale2, float scaleRate, int scaleRateStart){ + this.scale1 = scale1; + this.scale2 = scale2; + this.scaleRate = scaleRate; + this.scaleRateStart = scaleRateStart; + } + public void setScale1(float scale1) { + this.scale1 = scale1; + } + public void setScale2(float scale2) { + this.scale2 = scale2; + } + public void setScaleRate(float scaleRate) { + this.scaleRate = scaleRate; + } + public void setScaleRateStart(int scaleRateStart) { + this.scaleRateStart = scaleRateStart; + } + public void setRotationX(float rotationX1, float rotationX2, float rotationXRate, int rotationXRateStart){ this.rotationX1 = rotationX1; this.rotationX2 = rotationX2; diff --git a/src/main/java/noppes/npcs/scripted/ScriptWorld.java b/src/main/java/noppes/npcs/scripted/ScriptWorld.java index a25c9ad21..61af7f4d7 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptWorld.java +++ b/src/main/java/noppes/npcs/scripted/ScriptWorld.java @@ -11,8 +11,6 @@ import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase.NBTPrimitive; import net.minecraft.nbt.NBTTagCompound; @@ -26,14 +24,12 @@ import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileBigSign; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.ServerCloneController; -import noppes.npcs.items.ItemScripted; import noppes.npcs.scripted.entity.ScriptEntity; import noppes.npcs.scripted.entity.ScriptPlayer; import noppes.npcs.scripted.interfaces.IBlock; -import noppes.npcs.scripted.interfaces.IEntity; -import noppes.npcs.scripted.interfaces.IItemStack; +import noppes.npcs.scripted.interfaces.entity.IEntity; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.scripted.item.ScriptCustomItem; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.wrapper.WrapperNpcAPI; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java b/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java index e1217aedb..33f0b28d5 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java @@ -2,7 +2,7 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.passive.EntityAnimal; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.interfaces.IAnimal; +import noppes.npcs.scripted.interfaces.entity.IAnimal; public class ScriptAnimal extends ScriptLiving implements IAnimal { diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java index 0a61009c2..5752053c6 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.interfaces.IItemStack; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptItemStack; public class ScriptDBCPlayer extends ScriptPlayer{ diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java index 8b6cf2339..461825c64 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java @@ -25,7 +25,7 @@ import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.*; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.interfaces.IEntity; +import noppes.npcs.scripted.interfaces.entity.IEntity; import noppes.npcs.scripted.interfaces.INbt; import noppes.npcs.scripted.interfaces.IPos; import noppes.npcs.scripted.item.ScriptItemStack; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java index 9b06e5625..d175e78fd 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java @@ -2,7 +2,7 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.EntityLiving; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.interfaces.IEntityLiving; +import noppes.npcs.scripted.interfaces.entity.IEntityLiving; public class ScriptLiving extends ScriptLivingBase implements IEntityLiving { diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java index eef846d2b..8f41c8971 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java @@ -2,16 +2,15 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.interfaces.IItemStack; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.interfaces.IEntityLivingBase; +import noppes.npcs.scripted.interfaces.entity.IEntityLivingBase; import noppes.npcs.scripted.wrapper.ScriptDamageSource; import noppes.npcs.scripted.wrapper.WrapperNpcAPI; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptMonster.java b/src/main/java/noppes/npcs/scripted/entity/ScriptMonster.java index 8e7afdd8e..16dcc71c6 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptMonster.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptMonster.java @@ -2,7 +2,7 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.monster.EntityMob; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.interfaces.IMonster; +import noppes.npcs.scripted.interfaces.entity.IMonster; public class ScriptMonster extends ScriptLiving implements IMonster { diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index cbfccf986..631cbaf3b 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -1,6 +1,5 @@ package noppes.npcs.scripted.entity; -import net.minecraft.item.ItemStack; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; import noppes.npcs.constants.*; @@ -8,11 +7,11 @@ import noppes.npcs.controllers.Line; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.ScriptFaction; -import noppes.npcs.scripted.interfaces.IItemStack; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.constants.AnimationType; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.interfaces.ICustomNpc; +import noppes.npcs.scripted.interfaces.entity.ICustomNpc; import noppes.npcs.scripted.interfaces.ITimers; import noppes.npcs.scripted.roles.ScriptJobBard; import noppes.npcs.scripted.roles.ScriptJobConversation; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java index 727ca20e8..ab845e2a0 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java @@ -3,7 +3,7 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.passive.EntityTameable; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.controllers.PixelmonHelper; -import noppes.npcs.scripted.interfaces.IPixelmon; +import noppes.npcs.scripted.interfaces.entity.IPixelmon; import noppes.npcs.util.ValueUtil; public class ScriptPixelmon extends ScriptAnimal implements IPixelmon { diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 1aa268b86..9ceb1083b 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -20,8 +20,12 @@ import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.scripted.*; import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.handler.data.IQuest; +import noppes.npcs.scripted.interfaces.handler.data.IQuest; import noppes.npcs.scripted.interfaces.*; +import noppes.npcs.scripted.interfaces.entity.IPlayer; +import noppes.npcs.scripted.interfaces.gui.ICustomGui; +import noppes.npcs.scripted.interfaces.item.IItemStack; +import noppes.npcs.scripted.interfaces.overlay.ICustomOverlay; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.overlay.ScriptOverlay; import noppes.npcs.scripted.wrapper.WrapperNpcAPI; diff --git a/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java b/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java index 6c20658d0..2fa0b09eb 100644 --- a/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java @@ -1,9 +1,9 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Event; -import noppes.npcs.scripted.interfaces.ICustomGui; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.gui.ICustomGui; +import noppes.npcs.scripted.interfaces.item.IItemStack; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public class CustomGuiEvent extends Event { public final IPlayer player; diff --git a/src/main/java/noppes/npcs/scripted/event/DialogEvent.java b/src/main/java/noppes/npcs/scripted/event/DialogEvent.java index 8e9f9b34f..00a8913e9 100644 --- a/src/main/java/noppes/npcs/scripted/event/DialogEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/DialogEvent.java @@ -1,7 +1,7 @@ package noppes.npcs.scripted.event; -import noppes.npcs.scripted.handler.data.IDialog; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.handler.data.IDialog; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public class DialogEvent extends CustomNPCsEvent { public final IDialog dialog; diff --git a/src/main/java/noppes/npcs/scripted/event/FactionEvent.java b/src/main/java/noppes/npcs/scripted/event/FactionEvent.java index 34e56d692..4f9d59217 100644 --- a/src/main/java/noppes/npcs/scripted/event/FactionEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/FactionEvent.java @@ -1,7 +1,7 @@ package noppes.npcs.scripted.event; -import noppes.npcs.scripted.handler.data.IFaction; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.handler.data.IFaction; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public class FactionEvent extends CustomNPCsEvent { public final IFaction faction; diff --git a/src/main/java/noppes/npcs/scripted/event/ForgeEvent.java b/src/main/java/noppes/npcs/scripted/event/ForgeEvent.java index 29c03b5a8..20eece91b 100644 --- a/src/main/java/noppes/npcs/scripted/event/ForgeEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/ForgeEvent.java @@ -8,7 +8,7 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Event; import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.scripted.interfaces.IEntity; +import noppes.npcs.scripted.interfaces.entity.IEntity; @Cancelable public class ForgeEvent extends CustomNPCsEvent { diff --git a/src/main/java/noppes/npcs/scripted/event/ItemEvent.java b/src/main/java/noppes/npcs/scripted/event/ItemEvent.java index 87663eada..679db5203 100644 --- a/src/main/java/noppes/npcs/scripted/event/ItemEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/ItemEvent.java @@ -1,13 +1,9 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; -import net.minecraft.item.ItemStack; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.interfaces.ICustomItem; -import noppes.npcs.scripted.interfaces.IEntity; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.interfaces.IPlayer; -import noppes.npcs.scripted.item.ScriptCustomItem; +import noppes.npcs.scripted.interfaces.item.ICustomItem; +import noppes.npcs.scripted.interfaces.entity.IEntity; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public class ItemEvent extends CustomNPCsEvent { public ICustomItem item; diff --git a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java b/src/main/java/noppes/npcs/scripted/event/NpcEvent.java index 2407cd8c7..e0ffe6a8c 100644 --- a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/NpcEvent.java @@ -14,6 +14,11 @@ import noppes.npcs.controllers.Dialog; import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.interfaces.*; +import noppes.npcs.scripted.interfaces.entity.ICustomNpc; +import noppes.npcs.scripted.interfaces.entity.IEntity; +import noppes.npcs.scripted.interfaces.entity.IEntityLivingBase; +import noppes.npcs.scripted.interfaces.entity.IPlayer; +import noppes.npcs.scripted.interfaces.item.IItemStack; public class NpcEvent extends CustomNPCsEvent { public final ICustomNpc npc; diff --git a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java b/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java index 0f1dbfb3c..f702353a2 100644 --- a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java @@ -16,6 +16,10 @@ import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.*; import noppes.npcs.scripted.entity.ScriptLivingBase; import noppes.npcs.scripted.interfaces.*; +import noppes.npcs.scripted.interfaces.entity.IEntity; +import noppes.npcs.scripted.interfaces.entity.IEntityLivingBase; +import noppes.npcs.scripted.interfaces.entity.IPlayer; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptItemStack; public class PlayerEvent extends CustomNPCsEvent { diff --git a/src/main/java/noppes/npcs/scripted/event/QuestEvent.java b/src/main/java/noppes/npcs/scripted/event/QuestEvent.java index 24ae2eaaf..717842057 100644 --- a/src/main/java/noppes/npcs/scripted/event/QuestEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/QuestEvent.java @@ -1,9 +1,9 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.handler.data.IQuest; +import noppes.npcs.scripted.interfaces.item.IItemStack; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public class QuestEvent extends CustomNPCsEvent { public final IQuest quest; diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java b/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java index fd73d1fcc..06189f348 100644 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java +++ b/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java @@ -3,8 +3,7 @@ package noppes.npcs.scripted.event; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.controllers.Dialog; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public class ScriptEventDialog extends ScriptEvent{ public IPlayer player; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java index c840cff66..893ef2dc6 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java @@ -13,12 +13,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.PlayerDataScript; -import noppes.npcs.scripted.interfaces.*; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.*; import noppes.npcs.scripted.entity.ScriptPlayer; import noppes.npcs.controllers.CustomGuiController; -import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.scripted.interfaces.ICustomGui; +import noppes.npcs.scripted.interfaces.entity.IPlayer; +import noppes.npcs.scripted.interfaces.item.IItemStack; public class ScriptGui implements ICustomGui { int id; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiButton.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiButton.java index 1ac8418ab..d6f1e16cb 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiButton.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiButton.java @@ -1,8 +1,8 @@ package noppes.npcs.scripted.gui; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.interfaces.IButton; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; +import noppes.npcs.scripted.interfaces.gui.IButton; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; public class ScriptGuiButton extends ScriptGuiComponent implements IButton { int width; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiComponent.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiComponent.java index 7d7f8d405..9b26a30c5 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiComponent.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiComponent.java @@ -3,8 +3,7 @@ package noppes.npcs.scripted.gui; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; +import noppes.npcs.scripted.interfaces.gui.ICustomGuiComponent; public abstract class ScriptGuiComponent implements ICustomGuiComponent { int id; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java index 68c81abdf..9bd829d73 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java @@ -4,8 +4,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.interfaces.IItemSlot; -import noppes.npcs.scripted.interfaces.IItemStack; +import noppes.npcs.scripted.interfaces.gui.IItemSlot; +import noppes.npcs.scripted.interfaces.item.IItemStack; public class ScriptGuiItemSlot extends ScriptGuiComponent implements IItemSlot { IItemStack stack; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLabel.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLabel.java index 53ade2d95..5e6abcab7 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLabel.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLabel.java @@ -1,7 +1,7 @@ package noppes.npcs.scripted.gui; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.interfaces.ILabel; +import noppes.npcs.scripted.interfaces.gui.ILabel; public class ScriptGuiLabel extends ScriptGuiComponent implements ILabel { String label; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLine.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLine.java index c59a425c0..3ba59b0c9 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLine.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLine.java @@ -1,7 +1,7 @@ package noppes.npcs.scripted.gui; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.interfaces.ILine; +import noppes.npcs.scripted.interfaces.gui.ILine; public class ScriptGuiLine extends ScriptGuiComponent implements ILine { int x1; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiScroll.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiScroll.java index d06b0bcae..58604653e 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiScroll.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiScroll.java @@ -3,7 +3,7 @@ package noppes.npcs.scripted.gui; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import noppes.npcs.scripted.interfaces.IScroll; +import noppes.npcs.scripted.interfaces.gui.IScroll; public class ScriptGuiScroll extends ScriptGuiComponent implements IScroll { int width; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTextField.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTextField.java index a492047cc..aea2a50ee 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTextField.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTextField.java @@ -1,7 +1,7 @@ package noppes.npcs.scripted.gui; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.interfaces.ITextField; +import noppes.npcs.scripted.interfaces.gui.ITextField; public class ScriptGuiTextField extends ScriptGuiComponent implements ITextField { int width; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTexturedRect.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTexturedRect.java index 051ef6592..3fc98a3c2 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTexturedRect.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTexturedRect.java @@ -1,7 +1,7 @@ package noppes.npcs.scripted.gui; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.interfaces.ITexturedRect; +import noppes.npcs.scripted.interfaces.gui.ITexturedRect; public class ScriptGuiTexturedRect extends ScriptGuiComponent implements ITexturedRect { int width; diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestInterface.java b/src/main/java/noppes/npcs/scripted/handler/data/IQuestInterface.java deleted file mode 100644 index 5edc4f1e0..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestInterface.java +++ /dev/null @@ -1,4 +0,0 @@ -package noppes.npcs.scripted.handler.data; - -public interface IQuestInterface { -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java b/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java index e874fe901..15a474c8d 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java @@ -7,6 +7,7 @@ package noppes.npcs.scripted.interfaces; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.entity.ScriptPlayer; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IDamageSource.java b/src/main/java/noppes/npcs/scripted/interfaces/IDamageSource.java index 8008559d4..529db409c 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IDamageSource.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/IDamageSource.java @@ -6,6 +6,7 @@ package noppes.npcs.scripted.interfaces; import net.minecraft.util.DamageSource; +import noppes.npcs.scripted.interfaces.entity.IEntity; public interface IDamageSource { String getType(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IParticle.java b/src/main/java/noppes/npcs/scripted/interfaces/IParticle.java new file mode 100644 index 000000000..e3b3c4cd2 --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/interfaces/IParticle.java @@ -0,0 +1,134 @@ +package noppes.npcs.scripted.interfaces; + +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.scripted.ScriptWorld; +import noppes.npcs.scripted.entity.ScriptEntity; + +public interface IParticle { + + void spawnOnEntity(ScriptEntity entity); + + void spawnInWorld(ScriptWorld world); + + void spawnInWorld(ScriptWorld world, double x, double y, double z); + + void setSize(int width, int height); + int getWidth(); + int getHeight(); + + void setOffset(int offsetX, int offsetY); + int getOffsetX(); + int getOffsetY(); + + void setAnim(int animRate, boolean animLoop, int animStart, int animEnd); + void setAnimRate(int animRate); + int getAnimRate(); + void setAnimLoop(boolean animLoop); + boolean getAnimLoop(); + void setAnimStart(int animStart); + int getAnimStart(); + void setAnimEnd(int animEnd); + int getAnimEnd(); + + boolean getFacePlayer(); + void setFacePlayer(boolean facePlayer); + + String getDirectory(); + + int getAmount(); + + int getMaxAge(); + + double getX(); + double getY(); + double getZ(); + + double getMotionX(); + double getMotionY(); + double getMotionZ(); + float getGravity(); + + int getHEXColor1(); + int getHEXColor2(); + float getHEXColorRate(); + int getHEXColorStart(); + + float getAlpha1(); + float getAlpha2(); + float getAlphaRate(); + int getAlphaRateStart(); + + float getScale1(); + float getScale2(); + float getScaleRate(); + int getScaleRateStart(); + + float getRotationX1(); + float getRotationX2(); + float getRotationXRate(); + int getRotationXRateStart(); + + float getRotationY1(); + float getRotationY2(); + float getRotationYRate(); + int getRotationYRateStart(); + + float getRotationZ1(); + float getRotationZ2(); + float getRotationZRate(); + int getRotationZRateStart(); + + void setDirectory(String directory); + + void setAmount(int amount); + + void setMaxAge(int maxAge); + + void setPosition(double x, double y, double z); + void setX(double x); + void setY(double y); + void setZ(double z); + + void setMotion(double motionX, double motionY, double motionZ, float gravity); + void setMotionX(double motionX); + void setMotionY(double motionY); + void setMotionZ(double motionZ); + void setGravity(float gravity); + + void setHEXColor(int HEXColor, int HEXColor2, float HEXColorRate, int HEXColorStart); + void setHEXColor1(int HEXColor); + void setHEXColor2(int HEXColor2); + void setHEXColorRate(float HEXColorRate); + void setHEXColorStart(int HEXColorStart); + + void setAlpha(float alpha1, float alpha2, float alphaRate, int alphaRateStart); + void setAlpha1(float alpha1); + void setAlpha2(float alpha2); + void setAlphaRate(float alphaRate); + void setAlphaRateStart(int alphaRateStart); + + void setScale(float scale1, float scale2, float scaleRate, int scaleRateStart); + void setScale1(float scale1); + void setScale2(float scale2); + void setScaleRate(float scaleRate); + void setScaleRateStart(int scaleRateStart); + + void setRotationX(float rotationX1, float rotationX2, float rotationXRate, int rotationXRateStart); + void setRotationX1(float rotationX1); + void setRotationX2(float rotationX2); + void setRotationXRate(float rotationXRate); + void setRotationXRateStart(int rotationXRateStart); + + void setRotationY(float rotationY1, float rotationY2, float rotationYRate, int rotationYRateStart); + void setRotationY1(float rotationY1); + void setRotationY2(float rotationY2); + void setRotationYRate(float rotationYRate); + void setRotationYRateStart(int rotationYRateStart); + + void setRotationZ(float rotationZ1, float rotationZ2, float rotationZRate, int rotationZRateStart); + void setRotationZ1(float rotationZ1); + void setRotationZ2(float rotationZ2); + void setRotationZRate(float rotationZRate); + void setRotationZRateStart(int rotationZRateStart); + +} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java b/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java index 2366be675..cf18f8088 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java @@ -5,6 +5,8 @@ import net.minecraft.world.WorldServer; import noppes.npcs.scripted.*; import noppes.npcs.scripted.entity.ScriptEntity; import noppes.npcs.scripted.entity.ScriptPlayer; +import noppes.npcs.scripted.interfaces.entity.IEntity; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptItemStack; public interface IWorld { diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IAnimal.java b/src/main/java/noppes/npcs/scripted/interfaces/entity/IAnimal.java similarity index 83% rename from src/main/java/noppes/npcs/scripted/interfaces/IAnimal.java rename to src/main/java/noppes/npcs/scripted/interfaces/entity/IAnimal.java index 4bf435547..28a74b2ae 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IAnimal.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/entity/IAnimal.java @@ -3,7 +3,7 @@ // (powered by Fernflower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.entity; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java b/src/main/java/noppes/npcs/scripted/interfaces/entity/ICustomNpc.java similarity index 99% rename from src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java rename to src/main/java/noppes/npcs/scripted/interfaces/entity/ICustomNpc.java index 1e2b0596e..e46ccd53f 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/entity/ICustomNpc.java @@ -3,10 +3,12 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.entity; import net.minecraft.entity.EntityCreature; import noppes.npcs.scripted.ScriptFaction; +import noppes.npcs.scripted.interfaces.item.IItemStack; +import noppes.npcs.scripted.interfaces.ITimers; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.entity.ScriptLivingBase; import noppes.npcs.scripted.entity.ScriptPlayer; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IEntity.java b/src/main/java/noppes/npcs/scripted/interfaces/entity/IEntity.java similarity index 98% rename from src/main/java/noppes/npcs/scripted/interfaces/IEntity.java rename to src/main/java/noppes/npcs/scripted/interfaces/entity/IEntity.java index 8e9708095..69f2bbbe3 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IEntity.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/entity/IEntity.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.entity; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; @@ -13,6 +13,8 @@ import noppes.npcs.scripted.ScriptBlockPos; import noppes.npcs.scripted.ScriptParticle; import noppes.npcs.scripted.ScriptWorld; import noppes.npcs.scripted.entity.ScriptEntity; +import noppes.npcs.scripted.interfaces.INbt; +import noppes.npcs.scripted.interfaces.IPos; import noppes.npcs.scripted.item.ScriptItemStack; public interface IEntity { diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IEntityLiving.java b/src/main/java/noppes/npcs/scripted/interfaces/entity/IEntityLiving.java similarity index 89% rename from src/main/java/noppes/npcs/scripted/interfaces/IEntityLiving.java rename to src/main/java/noppes/npcs/scripted/interfaces/entity/IEntityLiving.java index 4fda07e84..6adef4fe3 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IEntityLiving.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/entity/IEntityLiving.java @@ -3,7 +3,7 @@ // (powered by Fernflower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.entity; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IEntityLivingBase.java b/src/main/java/noppes/npcs/scripted/interfaces/entity/IEntityLivingBase.java similarity index 95% rename from src/main/java/noppes/npcs/scripted/interfaces/IEntityLivingBase.java rename to src/main/java/noppes/npcs/scripted/interfaces/entity/IEntityLivingBase.java index e9eba3c39..f4c000eb1 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IEntityLivingBase.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/entity/IEntityLivingBase.java @@ -1,9 +1,8 @@ -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSource; import noppes.npcs.scripted.entity.ScriptEntity; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.entity.ScriptLivingBase; import noppes.npcs.scripted.wrapper.ScriptDamageSource; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IMonster.java b/src/main/java/noppes/npcs/scripted/interfaces/entity/IMonster.java similarity index 82% rename from src/main/java/noppes/npcs/scripted/interfaces/IMonster.java rename to src/main/java/noppes/npcs/scripted/interfaces/entity/IMonster.java index 99baf9350..0ab8598f0 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IMonster.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/entity/IMonster.java @@ -3,7 +3,7 @@ // (powered by Fernflower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.entity; import net.minecraft.entity.monster.EntityMob; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IPixelmon.java b/src/main/java/noppes/npcs/scripted/interfaces/entity/IPixelmon.java similarity index 96% rename from src/main/java/noppes/npcs/scripted/interfaces/IPixelmon.java rename to src/main/java/noppes/npcs/scripted/interfaces/entity/IPixelmon.java index fb521efc4..7390887c1 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IPixelmon.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/entity/IPixelmon.java @@ -3,11 +3,9 @@ // (powered by Fernflower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.entity; import net.minecraft.entity.passive.EntityTameable; -import noppes.npcs.controllers.PixelmonHelper; -import noppes.npcs.util.ValueUtil; public interface IPixelmon extends IAnimal { boolean getIsShiny(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java b/src/main/java/noppes/npcs/scripted/interfaces/entity/IPlayer.java similarity index 91% rename from src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java rename to src/main/java/noppes/npcs/scripted/interfaces/entity/IPlayer.java index 18d6cf552..9539c928b 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/entity/IPlayer.java @@ -1,26 +1,17 @@ -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.Server; -import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.controllers.*; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptBlock; import noppes.npcs.scripted.entity.ScriptDBCPlayer; import noppes.npcs.scripted.entity.ScriptEntity; -import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.handler.data.IQuest; +import noppes.npcs.scripted.interfaces.handler.data.IQuest; +import noppes.npcs.scripted.interfaces.*; +import noppes.npcs.scripted.interfaces.gui.ICustomGui; +import noppes.npcs.scripted.interfaces.item.IItemStack; +import noppes.npcs.scripted.interfaces.overlay.ICustomOverlay; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.ScriptPixelmonPlayerData; -import noppes.npcs.scripted.overlay.ScriptOverlay; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Set; public interface IPlayer extends IEntityLivingBase { /** diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IButton.java b/src/main/java/noppes/npcs/scripted/interfaces/gui/IButton.java similarity index 91% rename from src/main/java/noppes/npcs/scripted/interfaces/IButton.java rename to src/main/java/noppes/npcs/scripted/interfaces/gui/IButton.java index 06252a0a8..d7d420fc4 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IButton.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/gui/IButton.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.gui; public interface IButton extends ICustomGuiComponent { int getWidth(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomGui.java b/src/main/java/noppes/npcs/scripted/interfaces/gui/ICustomGui.java similarity index 92% rename from src/main/java/noppes/npcs/scripted/interfaces/ICustomGui.java rename to src/main/java/noppes/npcs/scripted/interfaces/gui/ICustomGui.java index bb927e68d..3622f16ce 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomGui.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/gui/ICustomGui.java @@ -3,9 +3,11 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.gui; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.scripted.interfaces.item.IItemStack; +import noppes.npcs.scripted.interfaces.entity.IPlayer; import java.util.List; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomGuiComponent.java b/src/main/java/noppes/npcs/scripted/interfaces/gui/ICustomGuiComponent.java similarity index 94% rename from src/main/java/noppes/npcs/scripted/interfaces/ICustomGuiComponent.java rename to src/main/java/noppes/npcs/scripted/interfaces/gui/ICustomGuiComponent.java index d0294878f..b321851fc 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomGuiComponent.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/gui/ICustomGuiComponent.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.gui; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.scripted.gui.ScriptGuiComponent; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IItemSlot.java b/src/main/java/noppes/npcs/scripted/interfaces/gui/IItemSlot.java similarity index 76% rename from src/main/java/noppes/npcs/scripted/interfaces/IItemSlot.java rename to src/main/java/noppes/npcs/scripted/interfaces/gui/IItemSlot.java index 8fbca6779..7a7030a9c 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IItemSlot.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/gui/IItemSlot.java @@ -3,9 +3,10 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.gui; import net.minecraft.inventory.Slot; +import noppes.npcs.scripted.interfaces.item.IItemStack; public interface IItemSlot extends ICustomGuiComponent { boolean hasStack(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ILabel.java b/src/main/java/noppes/npcs/scripted/interfaces/gui/ILabel.java similarity index 90% rename from src/main/java/noppes/npcs/scripted/interfaces/ILabel.java rename to src/main/java/noppes/npcs/scripted/interfaces/gui/ILabel.java index 7fab012d7..bbee120ab 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ILabel.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/gui/ILabel.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.gui; public interface ILabel extends ICustomGuiComponent { String getText(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ILine.java b/src/main/java/noppes/npcs/scripted/interfaces/gui/ILine.java similarity index 86% rename from src/main/java/noppes/npcs/scripted/interfaces/ILine.java rename to src/main/java/noppes/npcs/scripted/interfaces/gui/ILine.java index 2ea987d5c..9fd13c47b 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ILine.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/gui/ILine.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.gui; public interface ILine extends ICustomGuiComponent { int getX1(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IScroll.java b/src/main/java/noppes/npcs/scripted/interfaces/gui/IScroll.java similarity index 91% rename from src/main/java/noppes/npcs/scripted/interfaces/IScroll.java rename to src/main/java/noppes/npcs/scripted/interfaces/gui/IScroll.java index 3f1a76fd2..76951d23b 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IScroll.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/gui/IScroll.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.gui; public interface IScroll extends ICustomGuiComponent { int getWidth(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ITextField.java b/src/main/java/noppes/npcs/scripted/interfaces/gui/ITextField.java similarity index 87% rename from src/main/java/noppes/npcs/scripted/interfaces/ITextField.java rename to src/main/java/noppes/npcs/scripted/interfaces/gui/ITextField.java index 88c3cca63..1ffb6e1a2 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ITextField.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/gui/ITextField.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.gui; public interface ITextField extends ICustomGuiComponent { int getWidth(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ITexturedRect.java b/src/main/java/noppes/npcs/scripted/interfaces/gui/ITexturedRect.java similarity index 91% rename from src/main/java/noppes/npcs/scripted/interfaces/ITexturedRect.java rename to src/main/java/noppes/npcs/scripted/interfaces/gui/ITexturedRect.java index 2d4c88cba..19b51c6dd 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ITexturedRect.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/gui/ITexturedRect.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.gui; public interface ITexturedRect extends ICustomGuiComponent { String getTexture(); diff --git a/src/main/java/noppes/npcs/scripted/handler/ICloneHandler.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/ICloneHandler.java similarity index 80% rename from src/main/java/noppes/npcs/scripted/handler/ICloneHandler.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/ICloneHandler.java index 177d1af2a..bd8c38683 100644 --- a/src/main/java/noppes/npcs/scripted/handler/ICloneHandler.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/ICloneHandler.java @@ -3,10 +3,10 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler; +package noppes.npcs.scripted.interfaces.handler; import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.scripted.interfaces.IEntity; +import noppes.npcs.scripted.interfaces.entity.IEntity; public interface ICloneHandler { IEntity spawn(double var1, double var3, double var5, int var7, String var8, IWorld var9); diff --git a/src/main/java/noppes/npcs/scripted/handler/IDialogHandler.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/IDialogHandler.java similarity index 56% rename from src/main/java/noppes/npcs/scripted/handler/IDialogHandler.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/IDialogHandler.java index e7df6bd60..4df7c9e97 100644 --- a/src/main/java/noppes/npcs/scripted/handler/IDialogHandler.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/IDialogHandler.java @@ -3,10 +3,10 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler; +package noppes.npcs.scripted.interfaces.handler; -import noppes.npcs.scripted.handler.data.IDialog; -import noppes.npcs.scripted.handler.data.IDialogCategory; +import noppes.npcs.scripted.interfaces.handler.data.IDialog; +import noppes.npcs.scripted.interfaces.handler.data.IDialogCategory; import java.util.List; diff --git a/src/main/java/noppes/npcs/scripted/handler/IFactionHandler.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/IFactionHandler.java similarity index 73% rename from src/main/java/noppes/npcs/scripted/handler/IFactionHandler.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/IFactionHandler.java index fededa2c0..1cbc59619 100644 --- a/src/main/java/noppes/npcs/scripted/handler/IFactionHandler.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/IFactionHandler.java @@ -3,9 +3,9 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler; +package noppes.npcs.scripted.interfaces.handler; -import noppes.npcs.scripted.handler.data.IFaction; +import noppes.npcs.scripted.interfaces.handler.data.IFaction; import java.util.List; diff --git a/src/main/java/noppes/npcs/scripted/handler/IQuestHandler.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/IQuestHandler.java similarity index 56% rename from src/main/java/noppes/npcs/scripted/handler/IQuestHandler.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/IQuestHandler.java index f10c53174..0fc4fae94 100644 --- a/src/main/java/noppes/npcs/scripted/handler/IQuestHandler.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/IQuestHandler.java @@ -3,10 +3,10 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler; +package noppes.npcs.scripted.interfaces.handler; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.handler.data.IQuestCategory; +import noppes.npcs.scripted.interfaces.handler.data.IQuest; +import noppes.npcs.scripted.interfaces.handler.data.IQuestCategory; import java.util.List; diff --git a/src/main/java/noppes/npcs/scripted/handler/IRecipeHandler.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/IRecipeHandler.java similarity index 81% rename from src/main/java/noppes/npcs/scripted/handler/IRecipeHandler.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/IRecipeHandler.java index 6c13bed57..fad5ca5e9 100644 --- a/src/main/java/noppes/npcs/scripted/handler/IRecipeHandler.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/IRecipeHandler.java @@ -3,11 +3,11 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler; +package noppes.npcs.scripted.interfaces.handler; import java.util.List; import net.minecraft.item.ItemStack; -import noppes.npcs.scripted.handler.data.IRecipe; +import noppes.npcs.scripted.interfaces.handler.data.IRecipe; public interface IRecipeHandler { List getGlobalList(); diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IAvailability.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IAvailability.java similarity index 85% rename from src/main/java/noppes/npcs/scripted/handler/data/IAvailability.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IAvailability.java index 3bcb99b07..9408d5326 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IAvailability.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IAvailability.java @@ -3,9 +3,9 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public interface IAvailability { boolean isAvailable(IPlayer var1); diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IDialog.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IDialog.java similarity index 94% rename from src/main/java/noppes/npcs/scripted/handler/data/IDialog.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IDialog.java index e45e978aa..e7e5bb6cc 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IDialog.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IDialog.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; import java.util.List; diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IDialogCategory.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IDialogCategory.java similarity index 81% rename from src/main/java/noppes/npcs/scripted/handler/data/IDialogCategory.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IDialogCategory.java index e70ab4848..eaac2e7c3 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IDialogCategory.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IDialogCategory.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; import java.util.List; diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IDialogOption.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IDialogOption.java similarity index 79% rename from src/main/java/noppes/npcs/scripted/handler/data/IDialogOption.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IDialogOption.java index 83356b44a..2ec037413 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IDialogOption.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IDialogOption.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; public interface IDialogOption { int getSlot(); diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IFaction.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IFaction.java similarity index 80% rename from src/main/java/noppes/npcs/scripted/handler/data/IFaction.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IFaction.java index e46db9f5a..18e6f5a60 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IFaction.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IFaction.java @@ -3,10 +3,10 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; -import noppes.npcs.scripted.interfaces.ICustomNpc; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.entity.ICustomNpc; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public interface IFaction { int getId(); diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuest.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuest.java similarity index 87% rename from src/main/java/noppes/npcs/scripted/handler/data/IQuest.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuest.java index bfd640ec1..e23a2c162 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuest.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuest.java @@ -3,10 +3,10 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; import noppes.npcs.scripted.interfaces.IContainer; -import noppes.npcs.scripted.interfaces.IPlayer; +import noppes.npcs.scripted.interfaces.entity.IPlayer; public interface IQuest { int getId(); diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestCategory.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestCategory.java similarity index 81% rename from src/main/java/noppes/npcs/scripted/handler/data/IQuestCategory.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestCategory.java index 356afb758..40cf656f8 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestCategory.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestCategory.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; import java.util.List; diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestDialog.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestDialog.java similarity index 52% rename from src/main/java/noppes/npcs/scripted/handler/data/IQuestDialog.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestDialog.java index 1e285efc0..894300747 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestDialog.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestDialog.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; public interface IQuestDialog extends IQuestInterface { } diff --git a/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestInterface.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestInterface.java new file mode 100644 index 000000000..2ce6f31d4 --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestInterface.java @@ -0,0 +1,4 @@ +package noppes.npcs.scripted.interfaces.handler.data; + +public interface IQuestInterface { +} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestItem.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestItem.java similarity index 83% rename from src/main/java/noppes/npcs/scripted/handler/data/IQuestItem.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestItem.java index 7adca2254..deeb118d0 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestItem.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestItem.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; public interface IQuestItem extends IQuestInterface { void setLeaveItems(boolean leaveItems); diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestKill.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestKill.java similarity index 68% rename from src/main/java/noppes/npcs/scripted/handler/data/IQuestKill.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestKill.java index 7193f1aa8..c8e9e820f 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestKill.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestKill.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; public interface IQuestKill extends IQuestInterface { void setTargetType(int type); diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestLocation.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestLocation.java similarity index 82% rename from src/main/java/noppes/npcs/scripted/handler/data/IQuestLocation.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestLocation.java index 7496b81ba..dde45eaf9 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestLocation.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestLocation.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; public interface IQuestLocation extends IQuestInterface { void setLocation1(String loc1); diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestObjective.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestObjective.java similarity index 83% rename from src/main/java/noppes/npcs/scripted/handler/data/IQuestObjective.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestObjective.java index 5db05a027..24202df62 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestObjective.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IQuestObjective.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; public interface IQuestObjective { int getProgress(); diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IRecipe.java b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IRecipe.java similarity index 90% rename from src/main/java/noppes/npcs/scripted/handler/data/IRecipe.java rename to src/main/java/noppes/npcs/scripted/interfaces/handler/data/IRecipe.java index dd799c149..6fb1676e0 100644 --- a/src/main/java/noppes/npcs/scripted/handler/data/IRecipe.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/handler/data/IRecipe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package noppes.npcs.scripted.handler.data; +package noppes.npcs.scripted.interfaces.handler.data; import net.minecraft.item.ItemStack; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomItem.java b/src/main/java/noppes/npcs/scripted/interfaces/item/ICustomItem.java similarity index 95% rename from src/main/java/noppes/npcs/scripted/interfaces/ICustomItem.java rename to src/main/java/noppes/npcs/scripted/interfaces/item/ICustomItem.java index 188471230..9ee43e389 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomItem.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/item/ICustomItem.java @@ -1,6 +1,4 @@ -package noppes.npcs.scripted.interfaces; - -import net.minecraft.nbt.NBTTagCompound; +package noppes.npcs.scripted.interfaces.item; public interface ICustomItem extends IItemStack { String getTexture(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java b/src/main/java/noppes/npcs/scripted/interfaces/item/IItemStack.java similarity index 97% rename from src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java rename to src/main/java/noppes/npcs/scripted/interfaces/item/IItemStack.java index 0a491382e..917fd877d 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/item/IItemStack.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.item; import com.google.common.collect.Multimap; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; +import noppes.npcs.scripted.interfaces.INbt; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlay.java b/src/main/java/noppes/npcs/scripted/interfaces/overlay/ICustomOverlay.java similarity index 91% rename from src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlay.java rename to src/main/java/noppes/npcs/scripted/interfaces/overlay/ICustomOverlay.java index 05d0cf04f..b1394ddd8 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlay.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/overlay/ICustomOverlay.java @@ -1,6 +1,8 @@ -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.overlay; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.scripted.interfaces.entity.IPlayer; + import java.util.List; public interface ICustomOverlay { diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlayComponent.java b/src/main/java/noppes/npcs/scripted/interfaces/overlay/ICustomOverlayComponent.java similarity index 93% rename from src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlayComponent.java rename to src/main/java/noppes/npcs/scripted/interfaces/overlay/ICustomOverlayComponent.java index 1fe1a2cdd..d1c0a12aa 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlayComponent.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/overlay/ICustomOverlayComponent.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.overlay; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.scripted.overlay.ScriptOverlayComponent; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLabel.java b/src/main/java/noppes/npcs/scripted/interfaces/overlay/IOverlayLabel.java similarity index 87% rename from src/main/java/noppes/npcs/scripted/interfaces/IOverlayLabel.java rename to src/main/java/noppes/npcs/scripted/interfaces/overlay/IOverlayLabel.java index 1032fad5f..f44d283f5 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLabel.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/overlay/IOverlayLabel.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.overlay; public interface IOverlayLabel extends ICustomOverlayComponent { String getText(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLine.java b/src/main/java/noppes/npcs/scripted/interfaces/overlay/IOverlayLine.java similarity index 75% rename from src/main/java/noppes/npcs/scripted/interfaces/IOverlayLine.java rename to src/main/java/noppes/npcs/scripted/interfaces/overlay/IOverlayLine.java index 517eb7e51..b6b4a4f0e 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLine.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/overlay/IOverlayLine.java @@ -1,6 +1,4 @@ -package noppes.npcs.scripted.interfaces; - -import noppes.npcs.scripted.overlay.ScriptOverlayLine; +package noppes.npcs.scripted.interfaces.overlay; public interface IOverlayLine extends ICustomOverlayComponent { int getX1(); diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayTexturedRect.java b/src/main/java/noppes/npcs/scripted/interfaces/overlay/IOverlayTexturedRect.java similarity index 89% rename from src/main/java/noppes/npcs/scripted/interfaces/IOverlayTexturedRect.java rename to src/main/java/noppes/npcs/scripted/interfaces/overlay/IOverlayTexturedRect.java index bd5b6a2d6..7d2f8275a 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayTexturedRect.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/overlay/IOverlayTexturedRect.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.interfaces; +package noppes.npcs.scripted.interfaces.overlay; public interface IOverlayTexturedRect extends ICustomOverlayComponent { String getTexture(); diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java index b3233840f..721e3b694 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java @@ -10,7 +10,7 @@ import noppes.npcs.controllers.IScriptHandler; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.interfaces.ICustomItem; +import noppes.npcs.scripted.interfaces.item.ICustomItem; import java.util.*; diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java index 8c735e1b5..09909fbfa 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java @@ -21,7 +21,7 @@ import net.minecraft.nbt.NBTTagString; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptNbt; -import noppes.npcs.scripted.interfaces.IItemStack; +import noppes.npcs.scripted.interfaces.item.IItemStack; import noppes.npcs.scripted.interfaces.INbt; public class ScriptItemStack implements IItemStack { diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java index 58eb082d3..6cd2c5293 100644 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java +++ b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java @@ -4,14 +4,9 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.controllers.CustomGuiController; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.PlayerDataScript; import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.gui.ScriptGuiComponent; -import noppes.npcs.scripted.gui.ScriptGuiItemSlot; -import noppes.npcs.scripted.gui.ScriptGuiLabel; -import noppes.npcs.scripted.gui.ScriptGuiLine; -import noppes.npcs.scripted.interfaces.*; +import noppes.npcs.scripted.interfaces.entity.IPlayer; +import noppes.npcs.scripted.interfaces.overlay.*; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayComponent.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayComponent.java index 88aa3f396..737f13f52 100644 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayComponent.java +++ b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayComponent.java @@ -1,12 +1,7 @@ package noppes.npcs.scripted.overlay; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; -import noppes.npcs.scripted.gui.*; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; -import noppes.npcs.scripted.interfaces.IOverlayTexturedRect; +import noppes.npcs.scripted.interfaces.overlay.ICustomOverlayComponent; public abstract class ScriptOverlayComponent implements ICustomOverlayComponent { int id; diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLabel.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLabel.java index 3e2e041ad..cc238ae1d 100644 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLabel.java +++ b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLabel.java @@ -1,9 +1,7 @@ package noppes.npcs.scripted.overlay; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.gui.ScriptGuiComponent; -import noppes.npcs.scripted.interfaces.ILabel; -import noppes.npcs.scripted.interfaces.IOverlayLabel; +import noppes.npcs.scripted.interfaces.overlay.IOverlayLabel; public class ScriptOverlayLabel extends ScriptOverlayComponent implements IOverlayLabel { String label; diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLine.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLine.java index 07590298c..c5c24b26b 100644 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLine.java +++ b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLine.java @@ -1,8 +1,7 @@ package noppes.npcs.scripted.overlay; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.gui.ScriptGuiComponent; -import noppes.npcs.scripted.interfaces.IOverlayLine; +import noppes.npcs.scripted.interfaces.overlay.IOverlayLine; public class ScriptOverlayLine extends ScriptOverlayComponent implements IOverlayLine { int x1; diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayTexturedRect.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayTexturedRect.java index 85d0fa155..b7eaff2f0 100644 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayTexturedRect.java +++ b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayTexturedRect.java @@ -1,10 +1,7 @@ package noppes.npcs.scripted.overlay; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.gui.ScriptGuiComponent; -import noppes.npcs.scripted.interfaces.IOverlayLabel; -import noppes.npcs.scripted.interfaces.IOverlayTexturedRect; -import noppes.npcs.scripted.interfaces.ITexturedRect; +import noppes.npcs.scripted.interfaces.overlay.IOverlayTexturedRect; public class ScriptOverlayTexturedRect extends ScriptOverlayComponent implements IOverlayTexturedRect { int width; diff --git a/src/main/java/noppes/npcs/scripted/wrapper/ScriptDamageSource.java b/src/main/java/noppes/npcs/scripted/wrapper/ScriptDamageSource.java index 0f8fe38ac..15d89bb17 100644 --- a/src/main/java/noppes/npcs/scripted/wrapper/ScriptDamageSource.java +++ b/src/main/java/noppes/npcs/scripted/wrapper/ScriptDamageSource.java @@ -8,8 +8,7 @@ package noppes.npcs.scripted.wrapper; import net.minecraft.util.DamageSource; import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.interfaces.IDamageSource; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.interfaces.IEntity; +import noppes.npcs.scripted.interfaces.entity.IEntity; public class ScriptDamageSource implements IDamageSource { private DamageSource source; diff --git a/src/main/java/noppes/npcs/scripted/wrapper/WrapperEntityData.java b/src/main/java/noppes/npcs/scripted/wrapper/WrapperEntityData.java index 641e211e2..71a2a3f5e 100644 --- a/src/main/java/noppes/npcs/scripted/wrapper/WrapperEntityData.java +++ b/src/main/java/noppes/npcs/scripted/wrapper/WrapperEntityData.java @@ -15,7 +15,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ResourceLocation; import noppes.npcs.controllers.PixelmonHelper; import noppes.npcs.scripted.entity.*; -import noppes.npcs.scripted.interfaces.IEntity; +import noppes.npcs.scripted.interfaces.entity.IEntity; public class WrapperEntityData{ public IEntity base; diff --git a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java b/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java index 48ab68fc1..a83d1f353 100644 --- a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java @@ -40,8 +40,14 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.ScriptContainer; import noppes.npcs.scripted.entity.*; import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.handler.*; +import noppes.npcs.scripted.interfaces.handler.*; import noppes.npcs.scripted.interfaces.*; +import noppes.npcs.scripted.interfaces.entity.ICustomNpc; +import noppes.npcs.scripted.interfaces.entity.IEntity; +import noppes.npcs.scripted.interfaces.gui.ICustomGui; +import noppes.npcs.scripted.interfaces.item.ICustomItem; +import noppes.npcs.scripted.interfaces.item.IItemStack; +import noppes.npcs.scripted.interfaces.overlay.ICustomOverlay; import noppes.npcs.scripted.item.ScriptCustomItem; import noppes.npcs.scripted.item.ScriptItemStack; import noppes.npcs.scripted.overlay.ScriptOverlay;