Commit Graph
41 Commits
Author SHA1 Message Date
bigguy345 a0026e1d59 Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	build.gradle
#	src/main/java/foxz/command/CmdClone.java
#	src/main/java/foxz/command/CmdDialog.java
#	src/main/java/foxz/command/CmdNoppes.java
#	src/main/java/foxz/command/CmdNpc.java
#	src/main/java/foxz/command/CmdQuest.java
#	src/main/java/foxz/command/CmdScript.java
#	src/main/java/foxz/commandhelper/AbstractCommandHelper.java
#	src/main/java/kamkeel/npcs/CustomAttributes.java
#	src/main/java/kamkeel/npcs/addon/client/DBCClient.java
#	src/main/java/kamkeel/npcs/command/AnimationCommand.java
#	src/main/java/kamkeel/npcs/command/CloneCommand.java
#	src/main/java/kamkeel/npcs/command/DialogCategoryCommand.java
#	src/main/java/kamkeel/npcs/command/DialogCommand.java
#	src/main/java/kamkeel/npcs/command/FactionCommand.java
#	src/main/java/kamkeel/npcs/command/HelpCommand.java
#	src/main/java/kamkeel/npcs/command/NpcCommand.java
#	src/main/java/kamkeel/npcs/command/OverlayCommand.java
#	src/main/java/kamkeel/npcs/command/QuestCategoryCommand.java
#	src/main/java/kamkeel/npcs/command/QuestCommand.java
#	src/main/java/kamkeel/npcs/command/ScriptCommand.java
#	src/main/java/kamkeel/npcs/controllers/AttributeController.java
#	src/main/java/kamkeel/npcs/controllers/ProfileController.java
#	src/main/java/kamkeel/npcs/controllers/SyncController.java
#	src/main/java/kamkeel/npcs/controllers/data/attribute/ICustomAttribute.java
#	src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerAttributeTracker.java
#	src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerEquipmentTracker.java
#	src/main/java/kamkeel/npcs/network/PacketHandler.java
#	src/main/java/kamkeel/npcs/network/packets/data/large/SyncEffectPacket.java
#	src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java
#	src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java
#	src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java
#	src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java
#	src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java
#	src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java
#	src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java
#	src/main/java/nikedemos/markovnames/Main.java
#	src/main/java/nikedemos/markovnames/MarkovDictionary.java
#	src/main/java/nikedemos/markovnames/MarkovDictionarySPA.java
#	src/main/java/nikedemos/markovnames/generators/MarkovAncientGreek.java
#	src/main/java/nikedemos/markovnames/generators/MarkovJapanese.java
#	src/main/java/nikedemos/markovnames/generators/MarkovRoman.java
#	src/main/java/nikedemos/markovnames/generators/MarkovSlavic.java
#	src/main/java/nikedemos/markovnames/generators/MarkovSpanish.java
#	src/main/java/nikedemos/markovnames/generators/MarkovWelsh.java
#	src/main/java/noppes/npcs/AnimationMixinFunctions.java
#	src/main/java/noppes/npcs/CustomNpcsPermissions.java
#	src/main/java/noppes/npcs/DataInventory.java
#	src/main/java/noppes/npcs/DataStats.java
#	src/main/java/noppes/npcs/EventHooks.java
#	src/main/java/noppes/npcs/IChatMessages.java
#	src/main/java/noppes/npcs/ICompatibilty.java
#	src/main/java/noppes/npcs/LogWriter.java
#	src/main/java/noppes/npcs/NBTTags.java
#	src/main/java/noppes/npcs/NPCSpawning.java
#	src/main/java/noppes/npcs/NoppesStringUtils.java
#	src/main/java/noppes/npcs/NoppesUtilPlayer.java
#	src/main/java/noppes/npcs/NoppesUtilServer.java
#	src/main/java/noppes/npcs/QuestLogData.java
#	src/main/java/noppes/npcs/ScriptForgeEventHandler.java
#	src/main/java/noppes/npcs/ScriptItemEventHandler.java
#	src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
#	src/main/java/noppes/npcs/ServerEventsHandler.java
#	src/main/java/noppes/npcs/ServerTickHandler.java
#	src/main/java/noppes/npcs/VersionCompatibility.java
#	src/main/java/noppes/npcs/ai/CombatHandler.java
#	src/main/java/noppes/npcs/ai/EntityAIAmbushTarget.java
#	src/main/java/noppes/npcs/ai/EntityAIAnimation.java
#	src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java
#	src/main/java/noppes/npcs/ai/EntityAIAvoidTarget.java
#	src/main/java/noppes/npcs/ai/EntityAIBustDoor.java
#	src/main/java/noppes/npcs/ai/EntityAIDodgeShoot.java
#	src/main/java/noppes/npcs/ai/EntityAIFindShade.java
#	src/main/java/noppes/npcs/ai/EntityAIFollow.java
#	src/main/java/noppes/npcs/ai/EntityAIJob.java
#	src/main/java/noppes/npcs/ai/EntityAIMoveIndoors.java
#	src/main/java/noppes/npcs/ai/EntityAIMovingPath.java
#	src/main/java/noppes/npcs/ai/EntityAIOrbitTarget.java
#	src/main/java/noppes/npcs/ai/EntityAIPanic.java
#	src/main/java/noppes/npcs/ai/EntityAIPounceTarget.java
#	src/main/java/noppes/npcs/ai/EntityAIRangedAttack.java
#	src/main/java/noppes/npcs/ai/EntityAIRole.java
#	src/main/java/noppes/npcs/ai/EntityAISprintToTarget.java
#	src/main/java/noppes/npcs/ai/EntityAIStalkTarget.java
#	src/main/java/noppes/npcs/ai/EntityAITransform.java
#	src/main/java/noppes/npcs/ai/EntityAIWander.java
#	src/main/java/noppes/npcs/ai/EntityAIWatchClosest.java
#	src/main/java/noppes/npcs/ai/EntityAIWaterNav.java
#	src/main/java/noppes/npcs/ai/EntityAIZigZagTarget.java
#	src/main/java/noppes/npcs/ai/RandomPositionGeneratorAlt.java
#	src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java
#	src/main/java/noppes/npcs/ai/pathfinder/NPCPath.java
#	src/main/java/noppes/npcs/ai/pathfinder/PathNavigateFlying.java
#	src/main/java/noppes/npcs/ai/pathfinder/PathNodeType.java
#	src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java
#	src/main/java/noppes/npcs/ai/selector/NPCInteractSelector.java
#	src/main/java/noppes/npcs/ai/target/EntityAIClearTarget.java
#	src/main/java/noppes/npcs/ai/target/EntityAIClosestTarget.java
#	src/main/java/noppes/npcs/blocks/BlockCampfire.java
#	src/main/java/noppes/npcs/blocks/BlockCandle.java
#	src/main/java/noppes/npcs/blocks/BlockPlaceholder.java
#	src/main/java/noppes/npcs/blocks/BlockRotated.java
#	src/main/java/noppes/npcs/blocks/tiles/TileNpcContainer.java
#	src/main/java/noppes/npcs/blocks/tiles/TileRedstoneBlock.java
#	src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java
#	src/main/java/noppes/npcs/client/AssetsBrowser.java
#	src/main/java/noppes/npcs/client/ClientEventHandler.java
#	src/main/java/noppes/npcs/client/ClientProxy.java
#	src/main/java/noppes/npcs/client/ClientTickHandler.java
#	src/main/java/noppes/npcs/client/ImageDownloadAlt.java
#	src/main/java/noppes/npcs/client/MessageAchievement.java
#	src/main/java/noppes/npcs/client/NoppesUtil.java
#	src/main/java/noppes/npcs/client/RenderChatMessages.java
#	src/main/java/noppes/npcs/client/TextBlockClient.java
#	src/main/java/noppes/npcs/client/TranslateUtil.java
#	src/main/java/noppes/npcs/client/VersionChecker.java
#	src/main/java/noppes/npcs/client/controllers/PresetController.java
#	src/main/java/noppes/npcs/client/fx/EntityRainbowFX.java
#	src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java
#	src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java
#	src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java
#	src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java
#	src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java
#	src/main/java/noppes/npcs/client/gui/GuiNPCTransportCategoryEdit.java
#	src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java
#	src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java
#	src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java
#	src/main/java/noppes/npcs/client/gui/GuiNpcRedstoneBlock.java
#	src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java
#	src/main/java/noppes/npcs/client/gui/GuiNpcWaypoint.java
#	src/main/java/noppes/npcs/client/gui/GuiScript.java
#	src/main/java/noppes/npcs/client/gui/GuiScriptList.java
#	src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java
#	src/main/java/noppes/npcs/client/gui/SubGuiMagic.java
#	src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java
#	src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOptions.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java
#	src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java
#	src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java
#	src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java
#	src/main/java/noppes/npcs/client/gui/advanced/GuiNPCNightSetup.java
#	src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java
#	src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java
#	src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java
#	src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java
#	src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java
#	src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java
#	src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
#	src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
#	src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java
#	src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java
#	src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java
#	src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java
#	src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java
#	src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java
#	src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java
#	src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java
#	src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java
#	src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java
#	src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java
#	src/main/java/noppes/npcs/client/gui/model/GuiModelArms.java
#	src/main/java/noppes/npcs/client/gui/model/GuiModelBody.java
#	src/main/java/noppes/npcs/client/gui/model/GuiModelColor.java
#	src/main/java/noppes/npcs/client/gui/model/GuiModelHead.java
#	src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java
#	src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java
#	src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java
#	src/main/java/noppes/npcs/client/gui/model/GuiPresetSave.java
#	src/main/java/noppes/npcs/client/gui/model/GuiPresetSelection.java
#	src/main/java/noppes/npcs/client/gui/player/GuiBook.java
#	src/main/java/noppes/npcs/client/gui/player/GuiCrate.java
#	src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java
#	src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java
#	src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java
#	src/main/java/noppes/npcs/client/gui/player/GuiNPCTrader.java
#	src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java
#	src/main/java/noppes/npcs/client/gui/player/GuiNpcFollower.java
#	src/main/java/noppes/npcs/client/gui/player/GuiNpcFollowerHire.java
#	src/main/java/noppes/npcs/client/gui/player/GuiQuestCompletion.java
#	src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionInv.java
#	src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java
#	src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionTalents.java
#	src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java
#	src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeDialog.java
#	src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java
#	src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java
#	src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java
#	src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcGuard.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java
#	src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java
#	src/main/java/noppes/npcs/client/gui/script/EventGuiScriptList.java
#	src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java
#	src/main/java/noppes/npcs/client/gui/script/GuiScriptGlobal.java
#	src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
#	src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java
#	src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java
#	src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java
#	src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java
#	src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java
#	src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface2.java
#	src/main/java/noppes/npcs/client/gui/util/GuiCustomScrollCloner.java
#	src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java
#	src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java
#	src/main/java/noppes/npcs/client/gui/util/GuiMenuTopIconButton.java
#	src/main/java/noppes/npcs/client/gui/util/GuiModelInterface2.java
#	src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java
#	src/main/java/noppes/npcs/client/gui/util/GuiNpcLabel.java
#	src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java
#	src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java
#	src/main/java/noppes/npcs/client/gui/util/GuiSelectionListener.java
#	src/main/java/noppes/npcs/client/gui/util/GuiTexturedButton.java
#	src/main/java/noppes/npcs/client/gui/util/IButtonListener.java
#	src/main/java/noppes/npcs/client/gui/util/IGuiClose.java
#	src/main/java/noppes/npcs/client/gui/util/IGuiData.java
#	src/main/java/noppes/npcs/client/gui/util/IGuiError.java
#	src/main/java/noppes/npcs/client/gui/util/IJTextAreaListener.java
#	src/main/java/noppes/npcs/client/gui/util/IPartyData.java
#	src/main/java/noppes/npcs/client/gui/util/IScrollData.java
#	src/main/java/noppes/npcs/client/gui/util/ISubGuiListener.java
#	src/main/java/noppes/npcs/client/gui/util/TextContainer.java
#	src/main/java/noppes/npcs/client/model/ModelMPM.java
#	src/main/java/noppes/npcs/client/model/ModelNpcCrystal.java
#	src/main/java/noppes/npcs/client/model/ModelNpcDragon.java
#	src/main/java/noppes/npcs/client/model/ModelPony.java
#	src/main/java/noppes/npcs/client/model/ModelSkirtArmor.java
#	src/main/java/noppes/npcs/client/model/part/ModelBeard.java
#	src/main/java/noppes/npcs/client/model/part/ModelBreasts.java
#	src/main/java/noppes/npcs/client/model/part/ModelClaws.java
#	src/main/java/noppes/npcs/client/model/part/ModelEars.java
#	src/main/java/noppes/npcs/client/model/part/ModelFin.java
#	src/main/java/noppes/npcs/client/model/part/ModelHair.java
#	src/main/java/noppes/npcs/client/model/part/ModelHorns.java
#	src/main/java/noppes/npcs/client/model/part/ModelLegs.java
#	src/main/java/noppes/npcs/client/model/part/ModelMohawk.java
#	src/main/java/noppes/npcs/client/model/part/ModelSkirt.java
#	src/main/java/noppes/npcs/client/model/part/ModelSnout.java
#	src/main/java/noppes/npcs/client/model/part/ModelTail.java
#	src/main/java/noppes/npcs/client/model/part/ModelWings.java
#	src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java
#	src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java
#	src/main/java/noppes/npcs/client/model/part/tails/ModelSquirrelTail.java
#	src/main/java/noppes/npcs/client/model/util/Model2DRenderer.java
#	src/main/java/noppes/npcs/client/renderer/NpcItemRenderer.java
#	src/main/java/noppes/npcs/client/renderer/RenderCNPCHand.java
#	src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java
#	src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java
#	src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java
#	src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
#	src/main/java/noppes/npcs/client/renderer/RenderNpcSlime.java
#	src/main/java/noppes/npcs/client/renderer/RenderProjectile.java
#	src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java
#	src/main/java/noppes/npcs/client/renderer/items/ItemCustomRenderer.java
#	src/main/java/noppes/npcs/client/renderer/items/ItemToolRenderer.java
#	src/main/java/noppes/npcs/compat/PixelmonHelper.java
#	src/main/java/noppes/npcs/config/ConfigScript.java
#	src/main/java/noppes/npcs/config/GlyphCache.java
#	src/main/java/noppes/npcs/config/StringCache.java
#	src/main/java/noppes/npcs/config/legacy/LegacyLoader.java
#	src/main/java/noppes/npcs/constants/EnumAnimationPart.java
#	src/main/java/noppes/npcs/constants/EnumCompanionTalent.java
#	src/main/java/noppes/npcs/constants/EnumDiagramLayout.java
#	src/main/java/noppes/npcs/constants/EnumGuiType.java
#	src/main/java/noppes/npcs/constants/EnumNpcToolMaterial.java
#	src/main/java/noppes/npcs/constants/EnumOptionType.java
#	src/main/java/noppes/npcs/constants/EnumParticleType.java
#	src/main/java/noppes/npcs/constants/EnumPotionType.java
#	src/main/java/noppes/npcs/constants/EnumQuestCompletion.java
#	src/main/java/noppes/npcs/constants/EnumQuestRepeat.java
#	src/main/java/noppes/npcs/constants/EnumQuestType.java
#	src/main/java/noppes/npcs/constants/EnumScriptType.java
#	src/main/java/noppes/npcs/constants/EnumTextureType.java
#	src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java
#	src/main/java/noppes/npcs/containers/ContainerCrate.java
#	src/main/java/noppes/npcs/containers/ContainerMail.java
#	src/main/java/noppes/npcs/containers/ContainerManageRecipes.java
#	src/main/java/noppes/npcs/containers/ContainerMerchantAdd.java
#	src/main/java/noppes/npcs/containers/ContainerNPCFollowerSetup.java
#	src/main/java/noppes/npcs/containers/ContainerNPCTrader.java
#	src/main/java/noppes/npcs/containers/ContainerNpcInterface.java
#	src/main/java/noppes/npcs/containers/ContainerNpcItemGiver.java
#	src/main/java/noppes/npcs/containers/SlotNpcBankCurrency.java
#	src/main/java/noppes/npcs/controllers/BankController.java
#	src/main/java/noppes/npcs/controllers/CustomGuiController.java
#	src/main/java/noppes/npcs/controllers/DialogController.java
#	src/main/java/noppes/npcs/controllers/FactionController.java
#	src/main/java/noppes/npcs/controllers/LinkedItemController.java
#	src/main/java/noppes/npcs/controllers/LinkedNpcController.java
#	src/main/java/noppes/npcs/controllers/MagicController.java
#	src/main/java/noppes/npcs/controllers/PartyController.java
#	src/main/java/noppes/npcs/controllers/PlayerDataController.java
#	src/main/java/noppes/npcs/controllers/QuestController.java
#	src/main/java/noppes/npcs/controllers/ScriptContainer.java
#	src/main/java/noppes/npcs/controllers/ScriptController.java
#	src/main/java/noppes/npcs/controllers/ServerCloneController.java
#	src/main/java/noppes/npcs/controllers/TagController.java
#	src/main/java/noppes/npcs/controllers/data/Availability.java
#	src/main/java/noppes/npcs/controllers/data/DataScript.java
#	src/main/java/noppes/npcs/controllers/data/DataTransform.java
#	src/main/java/noppes/npcs/controllers/data/Dialog.java
#	src/main/java/noppes/npcs/controllers/data/EffectScript.java
#	src/main/java/noppes/npcs/controllers/data/Faction.java
#	src/main/java/noppes/npcs/controllers/data/FactionOptions.java
#	src/main/java/noppes/npcs/controllers/data/FramePart.java
#	src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java
#	src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java
#	src/main/java/noppes/npcs/controllers/data/PlayerData.java
#	src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java
#	src/main/java/noppes/npcs/controllers/data/PlayerFactionData.java
#	src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java
#	src/main/java/noppes/npcs/controllers/data/Quest.java
#	src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java
#	src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java
#	src/main/java/noppes/npcs/controllers/data/TransportCategory.java
#	src/main/java/noppes/npcs/enchants/EnchantInterface.java
#	src/main/java/noppes/npcs/entity/EntityCustomNpc.java
#	src/main/java/noppes/npcs/entity/EntityNpcDragon.java
#	src/main/java/noppes/npcs/entity/EntityProjectile.java
#	src/main/java/noppes/npcs/entity/data/ModelData.java
#	src/main/java/noppes/npcs/items/ItemBullet.java
#	src/main/java/noppes/npcs/items/ItemCrossbow.java
#	src/main/java/noppes/npcs/items/ItemDaggerReversed.java
#	src/main/java/noppes/npcs/items/ItemGun.java
#	src/main/java/noppes/npcs/items/ItemMusket.java
#	src/main/java/noppes/npcs/items/ItemNpcArmor.java
#	src/main/java/noppes/npcs/items/ItemNpcArmorColorable.java
#	src/main/java/noppes/npcs/items/ItemNpcCloner.java
#	src/main/java/noppes/npcs/items/ItemNpcInterface.java
#	src/main/java/noppes/npcs/items/ItemNpcMovingPath.java
#	src/main/java/noppes/npcs/items/ItemNpcTool.java
#	src/main/java/noppes/npcs/items/ItemRenderInterface.java
#	src/main/java/noppes/npcs/items/ItemSkirt.java
#	src/main/java/noppes/npcs/items/ItemSoulstoneEmpty.java
#	src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java
#	src/main/java/noppes/npcs/items/ItemStaff.java
#	src/main/java/noppes/npcs/items/ItemTeleporter.java
#	src/main/java/noppes/npcs/items/ItemThrowingWeapon.java
#	src/main/java/noppes/npcs/items/MoneyBagContents.java
#	src/main/java/noppes/npcs/mixin/MixinItemRenderer.java
#	src/main/java/noppes/npcs/quests/QuestDialog.java
#	src/main/java/noppes/npcs/quests/QuestInterface.java
#	src/main/java/noppes/npcs/quests/QuestItem.java
#	src/main/java/noppes/npcs/quests/QuestKill.java
#	src/main/java/noppes/npcs/quests/QuestLocation.java
#	src/main/java/noppes/npcs/quests/QuestManual.java
#	src/main/java/noppes/npcs/roles/JobConversation.java
#	src/main/java/noppes/npcs/roles/JobFollower.java
#	src/main/java/noppes/npcs/roles/JobGuard.java
#	src/main/java/noppes/npcs/roles/JobHealer.java
#	src/main/java/noppes/npcs/roles/JobInterface.java
#	src/main/java/noppes/npcs/roles/JobItemGiver.java
#	src/main/java/noppes/npcs/roles/JobSpawner.java
#	src/main/java/noppes/npcs/roles/RoleCompanion.java
#	src/main/java/noppes/npcs/roles/RoleFollower.java
#	src/main/java/noppes/npcs/roles/RoleInterface.java
#	src/main/java/noppes/npcs/roles/RolePostman.java
#	src/main/java/noppes/npcs/roles/RoleTransporter.java
#	src/main/java/noppes/npcs/roles/companion/CompanionGuard.java
#	src/main/java/noppes/npcs/scripted/NpcAPI.java
#	src/main/java/noppes/npcs/scripted/ScriptBlock.java
#	src/main/java/noppes/npcs/scripted/ScriptNbt.java
#	src/main/java/noppes/npcs/scripted/ScriptPixelmonPlayerData.java
#	src/main/java/noppes/npcs/scripted/ScriptWorld.java
#	src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptMonster.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptProjectile.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptVillager.java
#	src/main/java/noppes/npcs/scripted/event/ForgeEvent.java
#	src/main/java/noppes/npcs/scripted/event/NpcEvent.java
#	src/main/java/noppes/npcs/scripted/event/player/DialogEvent.java
#	src/main/java/noppes/npcs/scripted/event/player/FactionEvent.java
#	src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java
#	src/main/java/noppes/npcs/scripted/item/ScriptItemBook.java
#	src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java
#	src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java
#	src/main/java/noppes/npcs/scripted/roles/ScriptJobBard.java
#	src/main/java/noppes/npcs/scripted/roles/ScriptJobConversation.java
#	src/main/java/noppes/npcs/scripted/roles/ScriptJobFollower.java
#	src/main/java/noppes/npcs/scripted/roles/ScriptJobGuard.java
#	src/main/java/noppes/npcs/scripted/roles/ScriptJobHealer.java
#	src/main/java/noppes/npcs/scripted/roles/ScriptJobItemGiver.java
#	src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java
#	src/main/java/noppes/npcs/scripted/roles/ScriptRoleTrader.java
#	src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java
#	src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboardObjective.java
#	src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboardTeam.java
#	src/main/java/noppes/npcs/util/NBTJsonUtil.java
#	src/main/java/tconstruct/client/tabs/TabRegistry.java
#	src/main/resources/mcmod.info
#	todo.txt
2025-04-27 04:15:30 +03:00
Kam cc148c02d7 Convert all getPlayerData() to PlayerData.get() 2025-04-08 22:48:32 -04:00
Kam 180d257024 Proper Reformating 2025-03-13 17:14:45 -04:00
Kam 6815f579a7 Full Imports and Code Format Optimization 2025-03-12 20:12:01 -04:00
Kam c3538836be Optimize Imports 2025-02-20 21:40:39 -05:00
Kam d45e550321 Availability Options for Recipe & Anvil Recipes 2025-02-10 13:59:59 -05:00
Kam 48dd7bedea New Anvil Recipe System 2025-02-10 02:44:28 -05:00
Kam 9cda5503ed Anvil Recipes Beginning 2025-02-09 20:49:45 -05:00
Kam bc98642b95 Better Null checks for Crate Containers 2024-03-29 13:54:03 -04:00
Kam 2fd7594720 Remove Fernflower References 2024-03-17 23:17:36 -04:00
Kam 0e9bbdcdac Move Inventory Slots 2024-03-17 17:07:04 -04:00
Kam a872bc7035 Fix Item Slot not registering changes properly 2024-03-16 16:21:44 -04:00
Kam 6f3b8f0a77 Fix Shift Clicking in Carpentry Bench not showing proper results! 2024-03-16 14:49:32 -04:00
Kam e46b78ff71 Optimize Imports 2024-02-15 17:54:28 -05:00
Kam 8a4e4760bb Minor class changes to fix / refactor for GTNH Gradle 2024-02-13 01:25:55 -05:00
Goodbird 79a15fe1e8 Fixed custom gui with slot update synchronisation 2024-01-03 17:57:26 +03:00
Kam 491e377a3e CAPITAL I cause it looks cool 2023-06-05 22:12:48 -04:00
Kam 54b46129a9 Capital "I" for Instance 2023-06-05 19:35:27 -04:00
Kam 16d02f93e1 Capital "I" for Instance 2023-06-05 19:35:06 -04:00
Luis C.M 0e9ddd75b6 Fixed index out of bounds error on custom GUI slot clicks. 2023-05-31 20:21:00 -05:00
Kam f77a2ff101 Remove more threading 2023-05-16 17:45:23 -04:00
Kam 49fab85291 Revert lots of multithreading for better threaded saving and data synchronization 2023-05-16 17:43:54 -04:00
Kam cf82314181 Final & Synchronized Data sending with slight delays to heavily improve server performance 2023-05-15 20:03:52 -04:00
Luis C.M 80352741b9 Fixed custom gui slot behavior 2023-03-18 15:52:50 -05:00
Luis C.M e3405d22e9 Fixed null pointer exceptions from new custom gui slot commit. 2023-03-18 03:47:24 -05:00
Luis C.M 586c451f06 ICustomGui:
-Added IDs to custom GUI slots.
2023-03-18 03:04:46 -05:00
KAMKEEL bda76bafe6 Optimize Imports 2023-01-12 21:33:06 -05:00
KAMKEEL be9ae94163 Start API Branch 2022-11-15 15:25:53 -05:00
Luis C.M b45cad77dd Added CustomGuiEvent.SlotClickEvent. 2022-06-18 12:52:23 -05:00
1whohears 17fa6328c9 fixed crash when hovering over a trader item slot
HashMap.put doesn't work the way I thought it did
2022-06-06 14:38:33 -05:00
Luis C.M ec5fc71413 Merge branch 'master' into dev
# Conflicts:
#	src/main/java/noppes/npcs/scripted/ScriptFaction.java
#	src/main/java/noppes/npcs/scripted/ScriptWorld.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
#	src/main/java/noppes/npcs/scripted/interfaces/IEntity.java
#	src/main/java/noppes/npcs/scripted/interfaces/IWorld.java
#	src/main/java/noppes/npcs/scripted/interfaces/entity/ICustomNpc.java
#	src/main/java/noppes/npcs/scripted/interfaces/entity/IPlayer.java
2022-05-27 15:31:02 -05:00
1whohears 3cf780d9a2 add get reset disable purchase num by slot number and IPlayer
needed to add get/setStringIntegerArrayMap to NBTTags so save the player purchases and disabled slots with a String int[] hashmap
2022-05-26 15:57:24 -05:00
1whohears 422dd3fc90 added trader.slotdisabled to trader gui
I just copied what was done to display the trader.insufficient and added trader.slotdisabled to en_US.lang
2022-05-26 01:43:17 -05:00
1whohears a4361b8420 Added various things to the API and other small changes
This adds some useful functions to the api and a few other changes.
I had been creating a custom build of this mod while working on stuff because I couldn't figure out how to do certain things without changing the mod. So this is a collection api features that I think everyone would find useful.

Api additions:
-purchase counting, and disabling trades for the trader role. (if a trade is disabled the gui still says insufficient funds, maybe allow a custom message to appear) added get the traders currency items and sell items.
-if an npc's projectile does explosive damage, you can disable it destroying blocks even if mob griefing is on
-int arrays as stored data for entities
-entity.playSound(...)
-get set if npcs can drown
-player read and unread dialog
-player set faction points
-extra player.sendMessage functions to add custom colors/bold/underline
-player clear inventory
-get set if a follower npc is following a player or waiting
-a bunch of stuff to script faction
-is an item food and how many food points?
-get scoreboard team by it's name
-get and create factions from the script world
-world.rayCastBlockPos is used for getting what block a player is looking at.
-world.getNearestAir is meant to get the block of air above or around the result of world.rayCastBlockPos, or at least that's how I've been using it.

Changes:
-in NoppesUtilServer I feel like if an npc is cloned it's ticksExisted or age should bee zero
-follower npcs should have the canDespawn field automatically set to false...? maybe make it an option
2022-05-24 03:06:16 -05:00
Luis C.M 33bb0307e9 Separated data objects and data controller objects in the noppes.npcs.controllers package. 2022-05-24 01:07:50 -05:00
Luis C.M 6dea5a1cbc Interfaces have a file strucutre resembling the file structure of their implementing classes. 2022-05-11 16:43:14 -05:00
luisc 989effb5c5 Added more a full inventory to NPCs, selectable on two tabs and double-point values for NPC droprates. 2022-01-27 03:50:36 -06:00
luisc 6b9cfb9d25 Implemented custom GUIs. 2022-01-12 04:44:08 -06:00
luisc 72f2c3c60a Implemented global Forge events. Reorganized NPC API files. 2021-10-18 06:33:39 -05:00
luisc 95d2814651 Backported GUI features and necessary classes from 1.12. 2021-09-30 21:44:30 -05:00
KAMKEEL a31efb2dc3 1.7.10 Files
Files added
2018-09-13 12:03:28 -04:00