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
ada1409f58
get to Set for Max Hurt Time
2025-04-06 22:13:42 -04:00
Kam
ef389da110
Fix Player Rotation
2025-03-31 22:46:20 -04:00
Kam
cac5a53997
Add a new Aim While Shooting Type
2025-03-19 17:38:06 -04:00
Kam
9691c90ffc
Scripting for Attribute Handling on Players, Items, Totals, etc
2025-03-14 05:35:23 -04:00
Kam
3dc08696f7
Fix Inventory Script for DBC Players
2025-03-14 04:22:31 -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
43c940f7ed
Merge branch 'dev' into dev
2025-03-06 02:19:17 -05:00
Kam
7a16cdf520
Magic for PlayerData and NPCs
2025-03-05 19:40:55 -05:00
Kam
c2fa74c541
Scheduled Actions
2025-03-03 20:05:19 -05:00
bigguy345
0033413235
Added Scheduled Tasks system for NPC scripting.
...
Allows for scripting the scheduling of runnable methods in sequence within the NPC's AI
An example sequence of tasks:
1. Dashes towards player (might take 3-5 seconds, doesn't matter, task durations are dynamic so it can take as long as it needs).
2. Punches player away
3. Waits 10 ticks - Fires a ki blast
4. Teleports behind player
5. Knocks player out
2025-03-03 23:59:49 +02:00
Kam
40154f9c53
Quest Profile Options
2025-02-21 06:19:24 -05:00
Kam
c3538836be
Optimize Imports
2025-02-20 21:40:39 -05:00
Kam
7d37670494
Rename to NPC AI to NPC AIs
2025-02-10 21:32:55 -05:00
Kam
a35db3f9e5
Fix Rotation Get / Set for NPCs
2025-02-10 21:01:53 -05:00
Mark Zharkov
e963ead882
fix the comparison with yourself
2025-02-06 22:39:43 +03:00
Kam
db2144116f
Reorg -- Data Packets designed to send to Client
2025-01-30 13:54:49 -05:00
Kam
db7473fd57
Delete more
2025-01-30 12:45:10 -05:00
Kam
c3179b36f2
Remove PacketHandlerClient
2025-01-30 12:44:39 -05:00
Kam
fb496ce1e2
SyncController
2025-01-30 09:26:10 -05:00
Kam
d91d4668d6
WHEN WILL THIS END!
2025-01-29 21:50:55 -05:00
luisc
d57571ea0d
Made API return a DBC player object if a player is a DBC player. Deprecated old getDBCPlayer() function.
2024-10-24 17:12:00 -05:00
Kam
48baa6de5f
Move Collisions to Stats
2024-04-09 20:35:29 -04:00
Kam
c8d62f0c72
Fix Setting Item Stack to Null
2024-04-04 18:20:19 -04:00
Kam
3e1075691b
set Skin URL does not change from URL 64
2024-03-29 17:02:54 -04:00
Kam
96560034cc
Fix Remove Item not taking into account ignoreNBT and ignoreDamage
2024-03-28 01:32:45 -04:00
Kam
22b067930d
getLeftItem Typo Fix
2024-03-20 13:23:26 -04:00
Kam
dd7a0b7f12
Add Insane Sync Data Control from BACK in the BROKEN 1.9 BETA >:D
2024-03-07 22:22:39 -05:00
Kam
bf6a77d183
Quest Location Party Complete
2024-03-03 20:19:08 -05:00
Kam
4a58702d16
Implement IVillager Scripting (removed duplicate entity variable)
2024-02-20 21:08:48 -05:00
Kam
e46b78ff71
Optimize Imports
2024-02-15 17:54:28 -05:00
Kam
76000ecf55
Change attackDelay variable to be called SwingWarmup | Better Naming
2024-02-12 03:14:23 -05:00
Kam
eb01579f4a
SwingWarmup Time, CobwebAI Change, Change GUI Layout
2024-02-12 02:58:34 -05:00
Kam
68ac475bbe
Knockback/MeleeRange/AggroRange Functions
2024-02-10 18:23:16 -05:00
Kam
52cdf91670
Initial Push for new Combat Policy Types [WIP]
2024-01-30 21:50:19 -05:00
Kam
75ba7a792b
Fixed IRole.getType returning out of order types for scripting.
2024-01-25 14:27:02 -05:00
Kam
a9f511f873
Merge branch 'dev' into experimental
2024-01-18 16:09:51 -05:00
Kam
e1f5c912e7
Change to Wiki
2024-01-18 16:05:38 -05:00
Kam
f3e162dafe
Merge pull request #111 from Goodbird-git/screen-size
...
Implemented the ability to get the screen size from server
2024-01-18 15:06:44 -05:00
Kam
3e43855128
Merge Dev into PR 110
2024-01-18 14:45:08 -05:00
Goodbird
c3b134b5ae
Implemented the ability to get the screen size from server
2024-01-05 16:31:57 +03:00
Kam
24d12e25a9
Fix IProjectile Events
...
Thank you @somehussar
2023-12-31 16:10:38 -05:00
Goodbird
21c16e5341
Implemented a better synchronisation system for left hand item and projectile item, similar to main hand and armor items system for vanilla
2023-12-08 09:47:18 +03:00
Luis C.M
eed9dbb92e
Added line support for ICustomNpc
2023-12-03 20:48:37 -06:00
luisc
8fe2bb89ea
Merge remote-tracking branch 'origin/dev' into dev
2023-11-30 15:31:46 -06:00
luisc
156a976cdd
Implemented get/setDialog functions for ICustomNpc.
2023-11-30 15:29:35 -06:00
Kam
debd00c1c2
updateEntity
2023-11-22 17:12:30 -05:00
Luis C.M
f33260cf2d
ScriptEntity:
...
-Fixed setDimension() not properly teleporting entities, sometimes causing duplicates.
2023-07-27 22:53:37 -05:00
bigguy345