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
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
81b4f7a0ef
Campfire Model Completed + Particles
2025-01-26 16:48:53 -05:00
Luis C.M.
5c68da6f51
Made some fields in CustomFX protected instead of private.
2024-04-19 01:16:49 -05:00
Luis C.M.
391d57198c
Made some fields in CustomFX protected instead of private.
2024-04-19 01:16:42 -05:00
Luis C.M.
a3addd3f86
Made some fields in CustomFX protected instead of private.
2024-04-19 01:06:08 -05:00
Kam
e46b78ff71
Optimize Imports
2024-02-15 17:54:28 -05:00
Luis C.M
e750a7595f
CustomFX:
...
-Fixed players viewing particles rendered on themselves differently than from other players on the server.
2023-07-27 23:24:56 -05:00
Luis C.M
a21ce47a60
CustomFX:
...
-Now uses image caching
2023-06-01 17:26:42 -05:00
Luis C.M
f0b33cf913
Moved model scale parts into a single ModelScale class, similar to ModelRotate.
...
Added NPC model data interfaces to the API.
2023-03-17 02:36:28 -05:00
Luis C.M
cacb4ebf85
Added X & Y scale functions for particles, replaces overall scale.
2023-02-16 18:43:22 -06:00
KAMKEEL
bda76bafe6
Optimize Imports
2023-01-12 21:33:06 -05:00
c0508383
bad6c3e9e4
CustomFX:
...
-Added compatibility for images with uneven widths & heights.
2022-07-22 03:56:04 -05:00
Luis C.M
79a703429c
ISkinOverlay:
...
-Removed set/getLocation, only supposed to be used during rendering.
2022-07-02 06:22:43 -05:00
Luis C.M
f3f209820c
IParticle:
...
-Added glow option.
2022-07-02 03:10:11 -05:00
Luis C.M
5520fc5f2b
ScriptParticle:
...
-Added HEXColor2, HEXColorRate, and HEXColorRateStart fields, and respective setters and getters, allowing for changes in HEX color over time.
Marked plenty of old ScriptEntityParticle functions as deprecated. This includes any functions referring to scripted particles as "Entity Particles" and functions outside the API or ScriptParticle class used to spawn or create particles.
2022-05-07 03:46:37 -05:00
Luis C.M
a825d885f5
Removed "move" variable from CustomFX.
2022-05-06 03:43:53 -05:00
Luis C.M
c3b9096295
Scripted particles can now spawn anywhere in the world, not just attached to an entity.
...
ScriptEntityParticle renamed to ScriptParticle, and EntityCustomFX renamed to CustomFX.
Re-enabled OpenGL blending for custom particles.
2022-05-06 03:38:24 -05:00
Luis C.M
dbc9754b43
Re-enabled OpenGL blending for custom particles
2022-05-06 03:15:18 -05:00
Luis C.M
2d2933e873
ScriptEntityParticle:
...
-Particles can now start or end at a certain tick, and loop or not loop.
-Added setSize(), getWidth() and getHeight() functions.
-Added setOffset(), getOffsetX(), and getOffsetY() functions.
-Added setAnimRate() and getAnimRate() functions.
2022-05-06 01:22:48 -05:00
Luis C.M
728269ff87
ScriptEntityParticle:
...
-Added width, offset, and animation rate attributes to particles.
-Added setSize(), getWidth() and getHeight() functions.
-Added setOffset(), getOffsetX(), and getOffsetY() functions.
-Added setAnimRate() and getAnimRate() functions.
2022-05-06 00:22:28 -05:00
Luis C.M
d6c46158f5
TexturedRect classes for GUIs & overlays, and Custom GUI buttons now support textures of all sizes when using URLs.
...
EntityCustomFX:
-Added URL support
2022-05-04 23:08:30 -05:00
Luis C.M
034707abd3
ScriptEntityParticle:
...
-Fixed rotations with scripted particles
2022-05-04 21:41:32 -05:00
Luis C.M
f16e2402a6
ScriptEntityParticle:
...
-Added scripted particles which can not face the player, having their angles be absolute in the world instead of relative to the camera.
-set/getFacePlayer() functions added.
2022-05-04 18:08:54 -05:00
luisc
1cb27a9e7a
Implemented XYZ rotations correctly, now clearly rotate around an axis respective to the player's camera.
2022-03-04 18:08:05 -06:00
luisc
f1741b4660
Removed some unnecessary lines of OpenGL code
2022-03-02 19:35:24 -06:00
luisc
7f8246e04e
PARTICLE ROTATION
2022-03-02 18:18:03 -06:00
luisc
0788b2750f
Quick fix for custom GUI textured rectangles, now with working x and y offsets.
2022-01-20 00:15:21 -06:00
luisc
d5c13ae65f
Fixed scripted particle texture replacing in-world vanilla particle effects while alive.
2021-11-20 13:12:21 -06:00
luisc
b43d89f91e
Removed redundant/unused imports from EntityCustomFX
2021-09-06 13:36:28 -05:00
luisc
1c2534bfc4
Removed ModelPartData parameter from EntityCustomFX. Reverted ModelPartData to its original version, no longer storing particle attributes.
2021-09-06 13:33:09 -05:00
luisc
61ad3dc849
Removed ModelPartData parameter from EntityCustomFX. Reverted ModelPartData to its original version, no longer storing particle attributes.
2021-09-06 12:47:51 -05:00
luisc
2a378190ae
Added EntityCustomFX class, used for spawning custom particles on entities.
2021-09-05 21:53:58 -05:00
KAMKEEL
a31efb2dc3
1.7.10 Files
...
Files added
2018-09-13 12:03:28 -04:00