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
207d9f6124
Item Config + Machine Gun Fixes
2025-03-12 05:00:21 -04:00
Kam
7d37670494
Rename to NPC AI to NPC AIs
2025-02-10 21:32:55 -05: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
fb496ce1e2
SyncController
2025-01-30 09:26:10 -05:00
Kam
ee8527f261
SyncController Fixes
2025-01-30 09:26:04 -05:00
Kam
5d308b1f56
Sync Recipes
2025-01-30 09:22:43 -05:00
Kam
d91d4668d6
WHEN WILL THIS END!
2025-01-29 21:50:55 -05:00
Kam
de56032118
Syncing and Large Packet Completion
2025-01-29 18:25:34 -05:00
Kam
82e54b5982
Optimize Imports
2024-03-17 23:15:11 -04:00
Kam
fd1500b7ed
Fix Quest / Dialog Sync in Single player
2024-03-08 02:50:51 -05:00
Kam
90106ec453
More Update Clients for PlayerData Syncing
2024-03-08 00:01:15 -05: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
3507cb85c5
Multithread Market Saving + Record History for Markets
2024-02-20 20:29:49 -05:00
Kam
444703b3f2
Fix Market Config Command
2024-02-20 02:08:46 -05:00
Kam
3e48773940
Convert Market to Dat File Command / Config Support
...
Faster Loading Speeds for LARGE Markets
2024-02-20 02:07:38 -05: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
Kam
5e1fdce39b
Add Warning to Noppes commands
2023-06-05 22:23:55 -04: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
221f00ccf4
Make Save PlayerData within PlayerData. More multithreaded saving
2023-05-15 23:06:21 -04:00
Kam
78978bda92
Reorganize File System Commands
2023-05-12 20:32:44 -04:00
KAMKEEL
bc6cc35fd6
Automatic Legacy Config Converter
2023-01-07 18:07:23 -05:00
KAMKEEL
6e92f08851
Config Overhaul
2023-01-07 00:21:08 -05:00
Luis C.M
3d498814f9
Implemented custom commands.
2022-12-18 15:54:14 -06:00
KAMKEEL
c264c7c9d0
Merge branch 'master' into dev
2022-11-15 00:10:32 -05:00
Pétrus Pradella
79e20b07db
Properly save PlayerData on json only on 'PlayerEvent.SaveToFile'
2022-11-11 15:15:42 -03:00
Luis C.M
3fd962289c
NpcAPI:
...
-Added getPlayer() function
-Added getChunkLoadingNPCs function
-Added getCurrentPlayerCount, getMaxPlayers, and kickAllPlayers, isHardcore, getFile(path), and getServerOwner functions
2022-11-06 01:59:34 -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
cf33b90b26
Used interfaces in implementations instead of the real classes for most scripted classes.
2022-05-11 22:08:31 -05:00
KAMKEEL
d6cd41946c
Remove ZSTD Compression
2022-04-20 17:49:20 -04:00
Kamron Vaswani
32f89f8e92
Merge pull request #45 from c0508383/master
...
Important script hook fix, additions to dialog and dialog closed hooks for NPCs
2022-04-09 01:20:53 -04:00
Luis C.M
65bb3b5939
Important fix to some NPC hook scripts crashing, added option and dialog object fields to local NPC dialog and NPC dialog closed scripts
2022-04-09 00:17:16 -05:00
KAMKEEL
5aa5fb335c
Remove ME
2022-04-05 20:01:27 -04:00
KAMKEEL
df5c6afd2e
Update Version
2022-03-14 02:24:43 -04:00
KAMKEEL
08fb12f716
Fixed Compressor Messages
2022-03-14 00:26:19 -04:00
luiz-otavio
7b0a6b7497
feat: add some utilities messages on each case of compressor command
2022-02-27 08:11:48 -03:00
luiz-otavio
3ac531a49d
feat: add compressor command to convert data files to zstd or json
2022-02-27 06:59:24 -03:00
luisc
04def38b63
Added dialog events to scripted player events
2022-01-12 22:59:03 -06:00
luisc
d50f51e208
Added handler support to NPC API.
2022-01-10 15:21:48 -06:00
KAMKEEL
a31efb2dc3
1.7.10 Files
...
Files added
2018-09-13 12:03:28 -04:00
bigguy345