mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-20 18:09:44 +00:00
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
This commit is contained in:
commit
a0026e1d59
610 files changed
+6689
-3233
No files matched your search
@@ -97,6 +97,7 @@ public class CmdClone extends ChMcLogger {
|
||||
sendmessage(String.format("Npc '%s' wasn't found", nametodel));
|
||||
return false;
|
||||
}
|
||||
;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ public class CmdDialog extends ChMcLogger {
|
||||
usage = "<player> <dialog>",
|
||||
permissions = {OpOnly.class, ParamCheck.class}
|
||||
)
|
||||
public boolean read(String[] args) {
|
||||
public boolean read(String args[]) {
|
||||
String playername = args[0];
|
||||
int diagid;
|
||||
try {
|
||||
@@ -62,7 +62,7 @@ public class CmdDialog extends ChMcLogger {
|
||||
usage = "<player> <dialog>",
|
||||
permissions = {OpOnly.class, ParamCheck.class}
|
||||
)
|
||||
public boolean unread(String[] args) {
|
||||
public boolean unread(String args[]) {
|
||||
String playername = args[0];
|
||||
int diagid;
|
||||
try {
|
||||
@@ -88,7 +88,7 @@ public class CmdDialog extends ChMcLogger {
|
||||
desc = "reload dialogs from disk",
|
||||
permissions = {OpOnly.class}
|
||||
)
|
||||
public boolean reload(String[] args) {
|
||||
public boolean reload(String args[]) {
|
||||
new DialogController().load();
|
||||
SyncController.syncAllDialogs();
|
||||
return true;
|
||||
@@ -100,7 +100,7 @@ public class CmdDialog extends ChMcLogger {
|
||||
usage = "<player> <dialog> <name>",
|
||||
permissions = {OpOnly.class}
|
||||
)
|
||||
public void show(String[] args) {
|
||||
public void show(String args[]) {
|
||||
EntityPlayer player = CommandBase.getPlayer(pcParam, args[0]);
|
||||
if (player == null) {
|
||||
sendmessage(String.format("Unknow player '%s'", args[0]));
|
||||
|
||||
@@ -216,7 +216,7 @@ public class CmdNoppes extends ChMcLogger {
|
||||
return cmdnpc.addTabCompletion(par1, Arrays.copyOfRange(args, 1, args.length));
|
||||
}
|
||||
if (args[0].equalsIgnoreCase("faction") && args.length == 4) {
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, "add", "subtract", "set", "reset", "drop", "create");
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, new String[]{"add", "subtract", "set", "reset", "drop", "create"});
|
||||
}
|
||||
return super.addTabCompletion(par1, args);
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ public class CmdNpc extends ChMcLogger {
|
||||
@Override
|
||||
public List addTabCompletion(ICommandSender par1, String[] args) {
|
||||
if (args.length == 2) {
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, "create", "home", "visible", "delete", "owner", "name");
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, new String[]{"create", "home", "visible", "delete", "owner", "name"});
|
||||
}
|
||||
if (args.length == 3 && args[1].equalsIgnoreCase("owner")) {
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
|
||||
|
||||
@@ -71,7 +71,7 @@ public class CmdQuest extends ChMcLogger {
|
||||
usage = "<player> <quest>",
|
||||
permissions = {OpOnly.class, ParamCheck.class}
|
||||
)
|
||||
public Boolean finish(String[] args) {
|
||||
public Boolean finish(String args[]) {
|
||||
String playername = args[0];
|
||||
int questid;
|
||||
try {
|
||||
@@ -168,7 +168,7 @@ public class CmdQuest extends ChMcLogger {
|
||||
desc = "reload quests from disk",
|
||||
permissions = {OpOnly.class}
|
||||
)
|
||||
public boolean reload(String[] args) {
|
||||
public boolean reload(String args[]) {
|
||||
new QuestController().load();
|
||||
SyncController.syncAllQuests();
|
||||
return true;
|
||||
|
||||
@@ -20,7 +20,7 @@ public class CmdScript extends ChMcLogger {
|
||||
desc = "Reload scripts and saved data from disks script folder.",
|
||||
permissions = {OpOnly.class}
|
||||
)
|
||||
public Boolean reload(String[] args) {
|
||||
public Boolean reload(String args[]) {
|
||||
if (ScriptController.Instance.loadStoredData())
|
||||
sendmessage("Reload succesful");
|
||||
else
|
||||
|
||||
@@ -37,16 +37,16 @@ public abstract class AbstractCommandHelper extends CommandHelper {
|
||||
}
|
||||
|
||||
public void ctor() {
|
||||
this.commandHelper.name = this.getClass().getAnnotation(Command.class).name();
|
||||
this.commandHelper.usage = this.getClass().getAnnotation(Command.class).usage();
|
||||
this.commandHelper.desc = this.getClass().getAnnotation(Command.class).desc();
|
||||
this.commandHelper.name = ((Command) this.getClass().getAnnotation(Command.class)).name();
|
||||
this.commandHelper.usage = ((Command) this.getClass().getAnnotation(Command.class)).usage();
|
||||
this.commandHelper.desc = ((Command) this.getClass().getAnnotation(Command.class)).desc();
|
||||
// sub
|
||||
for (Class c : this.getClass().getAnnotation(Command.class).sub()) {
|
||||
try {
|
||||
String name = ((Command) c.getAnnotation(Command.class)).name().toUpperCase();
|
||||
Constructor<AbstractCommandHelper> ctor = c.getConstructor(Object.class);
|
||||
ctor.setAccessible(true);
|
||||
AbstractCommandHelper sc = ctor.newInstance(ctorParm);
|
||||
AbstractCommandHelper sc = (AbstractCommandHelper) ctor.newInstance(ctorParm);
|
||||
commands.put(name, sc);
|
||||
} catch (Exception ex) {
|
||||
Logger.getLogger(AbstractCommandHelper.class.getName()).log(Level.SEVERE, null, ex);
|
||||
@@ -120,12 +120,12 @@ public abstract class AbstractCommandHelper extends CommandHelper {
|
||||
for (CommandHelper cur : commands.values()) {
|
||||
help(cur.commandHelper.name, cur.commandHelper.desc, "");
|
||||
}
|
||||
sendMsg("\u00A74noppes cmds are no longer supported |\u00A76 use /kamkeel");
|
||||
sendMsg("\u00A77All bugs and issues will not be patched or maintained");
|
||||
sendMsg(String.format("\u00A74noppes cmds are no longer supported |\u00A76 use /kamkeel"));
|
||||
sendMsg(String.format("\u00A77All bugs and issues will not be patched or maintained"));
|
||||
}
|
||||
|
||||
public void sendMsg(String msg) {
|
||||
ICommandSender sender = pcParam;
|
||||
ICommandSender sender = (ICommandSender) pcParam;
|
||||
sender.addChatMessage(new ChatComponentText(msg));
|
||||
}
|
||||
|
||||
@@ -191,7 +191,7 @@ public abstract class AbstractCommandHelper extends CommandHelper {
|
||||
if (ch instanceof AbstractCommandHelper) {
|
||||
((AbstractCommandHelper) ch).pcParam = param;
|
||||
((AbstractCommandHelper) ch).allHelp();
|
||||
} else if (ch instanceof MethodSubCmd && ch.commandHelper.usage.isEmpty())
|
||||
} else if (ch instanceof MethodSubCmd && ((MethodSubCmd) ch).commandHelper.usage.isEmpty())
|
||||
return false;
|
||||
else
|
||||
help(ch.commandHelper.name, ch.commandHelper.desc, ch.commandHelper.usage);
|
||||
@@ -226,7 +226,7 @@ public abstract class AbstractCommandHelper extends CommandHelper {
|
||||
list.add(data);
|
||||
} else {
|
||||
for (EntityPlayer player : players) {
|
||||
list.add(PlayerDataController.Instance.getPlayerData(player));
|
||||
list.add(PlayerData.get(player));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,14 +4,17 @@ import kamkeel.npcs.controllers.AttributeController;
|
||||
import kamkeel.npcs.controllers.data.attribute.AttributeDefinition;
|
||||
import kamkeel.npcs.controllers.data.attribute.AttributeValueType;
|
||||
import kamkeel.npcs.controllers.data.attribute.requirement.RequirementCheckerRegistry;
|
||||
import kamkeel.npcs.controllers.data.attribute.requirement.types.ProfileSlotRequirement;
|
||||
import kamkeel.npcs.controllers.data.attribute.requirement.types.QuestActiveRequirement;
|
||||
import kamkeel.npcs.controllers.data.attribute.requirement.types.QuestCompletedRequirement;
|
||||
import kamkeel.npcs.controllers.data.attribute.requirement.types.SoulbindRequirement;
|
||||
|
||||
/**
|
||||
* ModAttributes registers the core attributes (both non–magic and magic–based).
|
||||
*/
|
||||
public class CustomAttributes {
|
||||
public static final String HEALTH_KEY = "health";
|
||||
public static final String HEALTH_BOOST_KEY = "health_boost";
|
||||
public static final String MAIN_ATTACK_KEY = "main_attack";
|
||||
public static final String MAIN_ATTACK_BOOST_KEY = "main_attack_boost";
|
||||
public static final String NEUTRAL_KEY = "neutral";
|
||||
@@ -22,24 +25,28 @@ public class CustomAttributes {
|
||||
public static final String MAGIC_BOOST_KEY = "magic_boost";
|
||||
public static final String MAGIC_DEFENSE_KEY = "magic_defense";
|
||||
public static final String MAGIC_RESISTANCE_KEY = "magic_resistance";
|
||||
public static final String MOVEMENT_SPEED_KEY = "movement_speed";
|
||||
public static final String KNOCKBACK_RES_KEY = "knockback_res";
|
||||
|
||||
|
||||
public static AttributeDefinition HEALTH;
|
||||
public static AttributeDefinition HEALTH_BOOST;
|
||||
public static AttributeDefinition MAIN_ATTACK;
|
||||
public static AttributeDefinition MAIN_BOOST;
|
||||
public static AttributeDefinition NEUTRAL_ATTACK;
|
||||
public static AttributeDefinition NEUTRAL_BOOST;
|
||||
|
||||
public static AttributeDefinition HEALTH;
|
||||
public static AttributeDefinition CRITICAL_CHANCE;
|
||||
public static AttributeDefinition CRITICAL_DAMAGE;
|
||||
|
||||
public static AttributeDefinition MAGIC_DAMAGE;
|
||||
public static AttributeDefinition MAGIC_BOOST;
|
||||
public static AttributeDefinition MAGIC_DEFENSE;
|
||||
public static AttributeDefinition MAGIC_RESISTANCE;
|
||||
public static AttributeDefinition MOVEMENT_SPEED;
|
||||
public static AttributeDefinition KNOCKBACK_RES;
|
||||
|
||||
public CustomAttributes() {
|
||||
HEALTH = AttributeController.registerAttribute(HEALTH_KEY, "Health", 'c', AttributeValueType.FLAT, AttributeDefinition.AttributeSection.BASE);
|
||||
HEALTH_BOOST = AttributeController.registerAttribute(HEALTH_BOOST_KEY, "Health Boost", 'c', AttributeValueType.PERCENT, AttributeDefinition.AttributeSection.MODIFIER);
|
||||
HEALTH_BOOST.setTranslationKey("attribute.name.generic.maxHealth");
|
||||
|
||||
MAIN_ATTACK = AttributeController.registerAttribute(MAIN_ATTACK_KEY, "Main Attack Damage", '4', AttributeValueType.FLAT, AttributeDefinition.AttributeSection.BASE);
|
||||
MAIN_BOOST = AttributeController.registerAttribute(MAIN_ATTACK_BOOST_KEY, "Main Attack Damage", '4', AttributeValueType.PERCENT, AttributeDefinition.AttributeSection.MODIFIER);
|
||||
@@ -56,6 +63,11 @@ public class CustomAttributes {
|
||||
MAGIC_DEFENSE = AttributeController.registerAttribute(MAGIC_DEFENSE_KEY, "Magic Defense", 'b', AttributeValueType.MAGIC, AttributeDefinition.AttributeSection.BASE);
|
||||
MAGIC_RESISTANCE = AttributeController.registerAttribute(MAGIC_RESISTANCE_KEY, "Magic Resistance", 'b', AttributeValueType.MAGIC, AttributeDefinition.AttributeSection.MODIFIER);
|
||||
|
||||
MOVEMENT_SPEED = AttributeController.registerAttribute(MOVEMENT_SPEED_KEY, "Movement Speed", 'a', AttributeValueType.PERCENT, AttributeDefinition.AttributeSection.MODIFIER);
|
||||
MOVEMENT_SPEED.setTranslationKey("attribute.name.generic.movementSpeed");
|
||||
|
||||
KNOCKBACK_RES = AttributeController.registerAttribute(KNOCKBACK_RES_KEY, "Knockback Resistance", 'b', AttributeValueType.PERCENT, AttributeDefinition.AttributeSection.MODIFIER);
|
||||
KNOCKBACK_RES.setTranslationKey("attribute.name.generic.knockbackResistance");
|
||||
|
||||
// TODO: Attributes
|
||||
// Durability Attribute
|
||||
@@ -64,9 +76,7 @@ public class CustomAttributes {
|
||||
// Requirement
|
||||
RequirementCheckerRegistry.registerChecker(new QuestCompletedRequirement());
|
||||
RequirementCheckerRegistry.registerChecker(new QuestActiveRequirement());
|
||||
|
||||
// TODO: Requirements
|
||||
// Player Requirement : Soulbound UUID
|
||||
// Profile Requirement : Slot Number
|
||||
RequirementCheckerRegistry.registerChecker(new ProfileSlotRequirement());
|
||||
RequirementCheckerRegistry.registerChecker(new SoulbindRequirement());
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,11 @@
|
||||
package kamkeel.npcs.addon.client;
|
||||
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import noppes.npcs.client.gui.mainmenu.GuiNpcStats;
|
||||
import noppes.npcs.client.gui.util.GuiNPCInterface2;
|
||||
import noppes.npcs.client.gui.util.GuiNpcButton;
|
||||
@@ -42,4 +47,9 @@ public class DBCClient {
|
||||
public GuiNPCInterface2 manageCustomAuras(EntityNPCInterface npcInterface) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Animation Render Helper
|
||||
public boolean applyRenderModel(ModelRenderer renderer) { return false; }
|
||||
public boolean firstPersonAnimation(float partialRenderTick, EntityPlayer player, ModelBiped model, RenderBlocks renderBlocksIr, ResourceLocation resItemGlint) { return false; }
|
||||
|
||||
}
|
||||
@@ -0,0 +1,642 @@
|
||||
package kamkeel.npcs.addon.client;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityClientPlayerMP;
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.client.renderer.entity.RenderBiped;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.entity.RenderPlayer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import noppes.npcs.AnimationMixinFunctions;
|
||||
import noppes.npcs.client.ClientEventHandler;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
public class DBCClientAnimations {
|
||||
|
||||
public static void doDBCRender(EntityPlayer par1EntityPlayer) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
Class<?> JBRAH = Class.forName("JinRyuu.JBRA.JBRAH");
|
||||
Class<?> JRMCoreHDBC = Class.forName("JinRyuu.JRMCore.JRMCoreHDBC");
|
||||
Class<?> JRMCoreH = Class.forName("JinRyuu.JRMCore.JRMCoreH");
|
||||
Class<?> ExtendedPlayer = Class.forName("JinRyuu.JRMCore.i.ExtendedPlayer");
|
||||
Class<?> JGConfigClientSettings = Class.forName("JinRyuu.JRMCore.client.config.jrmc.JGConfigClientSettings");
|
||||
Class<?> RenderPlayerJBRA = Class.forName("JinRyuu.JBRA.RenderPlayerJBRA");
|
||||
Class<?> JGConfigRaces = Class.forName("JinRyuu.JRMCore.server.config.dbc.JGConfigRaces");
|
||||
|
||||
Method func_aam = RenderPlayerJBRA.getDeclaredMethod("func_aam", int.class, boolean.class, boolean.class);
|
||||
func_aam.setAccessible(true);
|
||||
|
||||
boolean jhdsBool = (boolean) JBRAH.getMethod("JHDS").invoke(null);
|
||||
boolean dbcBool = (boolean) JRMCoreH.getMethod("DBC").invoke(null);
|
||||
|
||||
RenderPlayer renderPlayer = (RenderPlayer) RenderManager.instance.getEntityRenderObject(par1EntityPlayer);
|
||||
ModelBiped modelMain = (ModelBiped) RenderPlayerJBRA.getField("modelMain").get(renderPlayer);
|
||||
|
||||
EntityClientPlayerMP acp = mc.thePlayer;
|
||||
|
||||
Object data = null;
|
||||
if (jhdsBool) {
|
||||
data = JBRAH.getMethod("skinData", EntityPlayer.class).invoke(null, acp);
|
||||
}
|
||||
|
||||
float f = 1.0F;
|
||||
GL11.glColor3f(f + getR(), f + getG(), f + getB());
|
||||
GL11.glPushMatrix();
|
||||
//modelMain.field_78095_p = 0.0F;
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
String dns = (String) JRMCoreH.getField("dns").get(null);
|
||||
if (dns.length() > 3) {
|
||||
int State = (byte) JRMCoreH.getField("State").get(null);
|
||||
int race = (int) JRMCoreH.getMethod("dnsRace", String.class).invoke(null, dns);
|
||||
boolean saiOozar = (boolean) JRMCoreH.getMethod("rSai", int.class).invoke(null, race) && (State == 7 || State == 8);
|
||||
int gen = (int) JRMCoreH.getMethod("dnsGender", String.class).invoke(null, dns);
|
||||
int skintype = (int) JRMCoreH.getMethod("dnsSkinT", String.class).invoke(null, dns);
|
||||
boolean lg = (boolean) JRMCoreH.getMethod("lgndb", EntityPlayer.class, int.class, int.class).invoke(null, par1EntityPlayer, race, State);
|
||||
boolean iau = (boolean) JRMCoreH.getMethod("rc_arc", int.class).invoke(null, race) && State == 6;
|
||||
String dnsau = (String) JRMCoreH.getMethod("data", int.class, String.class).invoke(null, 16, "");
|
||||
dnsau = dnsau.contains(";") ? dnsau.substring(1) : (par1EntityPlayer.getCommandSenderName().equals(mc.thePlayer.getCommandSenderName()) ? dnsau : "");
|
||||
int bodytype = skintype == 0 ? (int) JRMCoreH.getMethod("dnsBodyC1_0", String.class).invoke(null, dns) : (int) JRMCoreH.getMethod("dnsBodyT", String.class).invoke(null, dns);
|
||||
int bodycm = skintype == 0 ? 0 : (iau ? (int) JRMCoreH.getMethod("dnsauCM", String.class).invoke(null, dns) : (int) JRMCoreH.getMethod("dnsBodyCM", String.class).invoke(null, dns));
|
||||
int bodyc1 = skintype == 0 ? 0 : (iau ? (int) JRMCoreH.getMethod("dnsauC1", String.class).invoke(null, dns) : (int) JRMCoreH.getMethod("dnsBodyC1", String.class).invoke(null, dns));
|
||||
int bodyc2 = skintype == 0 ? 0 : (iau ? (int) JRMCoreH.getMethod("dnsauC2", String.class).invoke(null, dns) : (int) JRMCoreH.getMethod("dnsBodyC2", String.class).invoke(null, dns));
|
||||
int bodyc3 = skintype == 0 ? 0 : (iau ? (int) JRMCoreH.getMethod("dnsauC3", String.class).invoke(null, dns) : (int) JRMCoreH.getMethod("dnsBodyC3", String.class).invoke(null, dns));
|
||||
|
||||
int plyrSpc = skintype == 0 ? 0 : (((int[]) JRMCoreH.getField("RaceCustomSkin").get(null))[race] == 0 ? 0 : (bodytype >= ((int[]) JRMCoreH.getField("Specials").get(null))[race] ? ((int[]) JRMCoreH.getField("Specials").get(null))[race] - 1 : bodytype));
|
||||
int[] an = new int[]{1, 0, 2, 0, 0, 3, 0, 1, 1};
|
||||
|
||||
Object ep = ExtendedPlayer.getMethod("get", EntityPlayer.class).invoke(null, acp);
|
||||
int animKiShoot = (int) ExtendedPlayer.getMethod("getAnimKiShoot").invoke(ep);
|
||||
int blocking = (int) ExtendedPlayer.getMethod("getBlocking").invoke(ep);
|
||||
|
||||
boolean instantTransmission = blocking == 2;
|
||||
int id = blocking != 0 ? (instantTransmission ? 6 : 0) : (animKiShoot != 0 ? an[animKiShoot - 1] + 2 : -1);
|
||||
if (!(boolean) JGConfigClientSettings.getField("CLIENT_DA4").get(null)) {
|
||||
id = -1;
|
||||
}
|
||||
|
||||
int tailCol;
|
||||
|
||||
int jx;
|
||||
int j;
|
||||
if (dbcBool) {
|
||||
String[] s = ((String) JRMCoreH.getMethod("data", String.class, int.class, String.class).invoke(null, acp.getCommandSenderName(), 1, "0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0")).split(";");
|
||||
tailCol = Integer.parseInt(s[2]);
|
||||
if (tailCol == 1) {
|
||||
String[] PlyrSkills = (String[]) JRMCoreH.getMethod("PlyrSkills", EntityPlayer.class).invoke(null, acp);
|
||||
jx = (int) JRMCoreH.getMethod("SklLvl", int.class, String[].class).invoke(null, 12, PlyrSkills);
|
||||
j = (int) JRMCoreH.getMethod("SklLvl", int.class, String[].class).invoke(null, 15, PlyrSkills);
|
||||
String ss = s[17];
|
||||
boolean v = dbcBool && !ss.equals("-1");
|
||||
GL11.glPushMatrix();
|
||||
if (v && (jx > 0 || j > 0)) {
|
||||
if (id > -1) {
|
||||
func_aam.invoke(renderPlayer, id, false, true);
|
||||
}
|
||||
|
||||
GL11.glRotatef(6.0F, 0.0F, 0.0F, 1.0F);
|
||||
GL11.glTranslatef(-0.29F, 0.15F, 0.0F);
|
||||
RenderPlayerJBRA.getMethod("kss", Entity.class, boolean.class, int.class, int.class, int.class).invoke(
|
||||
null, acp, false, Integer.parseInt(ss), jx, j);
|
||||
}
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
float h1 = 1.0F;
|
||||
ResourceLocation bdyskn;
|
||||
boolean ssg;
|
||||
boolean v;
|
||||
if (race == 5 && dbcBool) {
|
||||
v = State == 1;
|
||||
ssg = State == 3 && (boolean) JGConfigRaces.getField("CONFIG_MAJIN_PURE_PINK_SKIN").get(null);
|
||||
if (v) {
|
||||
bodycm = 12561588;
|
||||
} else if (ssg) {
|
||||
bodycm = 16757199;
|
||||
}
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/majin/" + (gen == 1 ? "f" : "") + "majin.png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodycm);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
String[] playerData13 = ((String) JRMCoreH.getMethod("data", String.class, int.class, String.class).invoke(null,
|
||||
par1EntityPlayer.getCommandSenderName(), 13, "0;0;0;0,0,0+0")).split(";");
|
||||
String[] absorptionData;
|
||||
if (playerData13.length > 3) {
|
||||
absorptionData = playerData13[3].split(",");
|
||||
} else {
|
||||
absorptionData = "0;0;0;0,0,0+0".split(",");
|
||||
}
|
||||
|
||||
String[] absorptionVisuals = absorptionData[1].contains("+") ? absorptionData[1].split("\\+") : new String[]{absorptionData[1]};
|
||||
int absorbedRace = Integer.parseInt(absorptionVisuals[0]);
|
||||
if ((boolean) JRMCoreH.getMethod("isRaceArcosian", int.class).invoke(null, absorbedRace)
|
||||
|| (boolean) JRMCoreH.getMethod("isRaceNamekian", int.class).invoke(null, absorbedRace)) {
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/majin/" + (gen == 1 ? "f" : "") + "majin_" + ((boolean) JRMCoreH.getMethod("isRaceArcosian", int.class).invoke(null, absorbedRace) ? "arco" : "namek") + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodycm);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (!saiOozar) {
|
||||
if (skintype == 0) {
|
||||
bdyskn = acp.getLocationSkin().equals(ClientEventHandler.steveTextures) ? (gen >= 1 ? ClientEventHandler.fem : ClientEventHandler.steveTextures) : acp.getLocationSkin();
|
||||
if (jhdsBool && (boolean) JBRAH.getMethod("getSkinHas", Object.class).invoke(null, data)) {
|
||||
mc.getTextureManager().bindTexture((ResourceLocation) JBRAH.getMethod("getSkinLoc", Object.class).invoke(null, data));
|
||||
} else {
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
}
|
||||
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else if (jhdsBool && (boolean) JBRAH.getMethod("getSkinHas", Object.class).invoke(null, data) && skintype == 0) {
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
mc.getTextureManager().bindTexture((ResourceLocation) JBRAH.getMethod("getSkinLoc", Object.class).invoke(null, data));
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
}
|
||||
} else if (race == 3 && dbcBool) {
|
||||
v = (boolean) JRMCoreH.getMethod("StusEfctsMe", int.class).invoke(null, 17);
|
||||
ssg = (boolean) JRMCoreHDBC.getMethod("godKiUserBase", int.class, int.class).invoke(null, race, State);
|
||||
if (ssg && v) {
|
||||
bodycm = 16744999;
|
||||
bodyc1 = 15524763;
|
||||
bodyc2 = 12854822;
|
||||
bodyc3 = 0;
|
||||
}
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/nam/0nam" + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodycm);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/nam/1nam" + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc1);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/nam/2nam" + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc2);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/nam/3nam" + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else if (race == 4 && dbcBool) {
|
||||
v = (boolean) JRMCoreH.getMethod("StusEfctsMe", int.class).invoke(null, 17);
|
||||
ssg = (boolean) JRMCoreHDBC.getMethod("godKiUserBase", int.class, int.class).invoke(null, race, State);
|
||||
if (ssg && v) {
|
||||
State = 6;
|
||||
bodycm = 5526612;
|
||||
bodyc1 = 12829635;
|
||||
bodyc3 = 1513239;
|
||||
}
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/0A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodycm);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/1A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc1);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/2A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc2);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/3A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc3);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/4A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else {
|
||||
if (saiOozar) {
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/oozaru1.png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(skintype != 0 ? bodycm : 11374471);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
tailCol = race != 2 && bodytype == 0 ? 6498048 : bodytype;
|
||||
jx = State != 0 && State != 7 ? (lg ? 10092390 : 16574610) : (skintype == 1 ? bodyc1 : tailCol);
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/oozaru2.png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(jx);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else if (skintype != 0) {
|
||||
bdyskn = new ResourceLocation("jinryuumodscore:cc/" + (gen == 1 ? "f" : "") + "hum.png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodycm);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (!saiOozar) {
|
||||
if (skintype == 0) {
|
||||
bdyskn = acp.getLocationSkin().equals(ClientEventHandler.steveTextures) ? (gen >= 1 ? ClientEventHandler.fem : ClientEventHandler.steveTextures) : acp.getLocationSkin();
|
||||
if (jhdsBool && (boolean) JBRAH.getMethod("getSkinHas", Object.class).invoke(null, data)) {
|
||||
mc.getTextureManager().bindTexture((ResourceLocation) JBRAH.getMethod("getSkinLoc", Object.class).invoke(null, data));
|
||||
} else {
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
}
|
||||
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else if (jhdsBool && (boolean) JBRAH.getMethod("getSkinHas", Object.class).invoke(null, data) && skintype == 0) {
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
mc.getTextureManager().bindTexture((ResourceLocation) JBRAH.getMethod("getSkinLoc", Object.class).invoke(null, data));
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (State == 14) {
|
||||
tailCol = race != 2 && bodytype == 0 ? 6498048 : bodytype;
|
||||
tailCol = (boolean) JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null) ? 13292516 : tailCol;
|
||||
tailCol = skintype == 1 ? bodyc1 : tailCol;
|
||||
if ((boolean) JRMCoreH.getMethod("rSai", int.class).invoke(null, race) && tailCol == 6498048 && State == 14) {
|
||||
if ((boolean) JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null)) {
|
||||
tailCol = 13292516;
|
||||
} else {
|
||||
tailCol = 14292268;
|
||||
}
|
||||
}
|
||||
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuudragonbc:cc/ss4" + (skintype == 0 ? "a" : "b") + ".png"));
|
||||
glColor3f(tailCol);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((boolean) JGConfigClientSettings.getField("CLIENT_DA19").get(null) && (dbcBool || (boolean) JRMCoreH.getMethod("NC").invoke(null))) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glEnable(3042);
|
||||
GL11.glDisable(2896);
|
||||
GL11.glBlendFunc(770, 771);
|
||||
GL11.glAlphaFunc(516, 0.003921569F);
|
||||
GL11.glDepthMask(false);
|
||||
tailCol = Integer.parseInt((String) JRMCoreH.getMethod("data", String.class, int.class, String.class
|
||||
).invoke(null, par1EntityPlayer.getCommandSenderName(), 8, "200"));
|
||||
float one = (float) tailCol / 100.0F;
|
||||
j = (int) ((float) tailCol / one);
|
||||
if (j < 70) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises1.png"));
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (j < 55) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises2.png"));
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (j < 35) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises3.png"));
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (j < 20) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises4.png"));
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
GL11.glDepthMask(true);
|
||||
GL11.glEnable(2896);
|
||||
GL11.glDisable(3042);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
ItemStack itemstack = par1EntityPlayer.inventory.armorItemInSlot(2);
|
||||
String dbcarmor;
|
||||
Item item;
|
||||
ResourceLocation mcarmor;
|
||||
ResourceLocation armor;
|
||||
ItemArmor itemarmor;
|
||||
if (itemstack != null) {
|
||||
item = itemstack.getItem();
|
||||
if (item instanceof ItemArmor) {
|
||||
itemarmor = (ItemArmor) item;
|
||||
GL11.glPushMatrix();
|
||||
dbcarmor = itemarmor.getArmorTexture(itemstack, par1EntityPlayer, 2, null);
|
||||
mcarmor = RenderBiped.getArmorResource(par1EntityPlayer, itemstack, 1, null);
|
||||
if (dbcarmor != null) {
|
||||
dbcarmor = dbcarmor.replace("jbra", "").replace("_dam", "");
|
||||
}
|
||||
|
||||
armor = dbcarmor != null ? new ResourceLocation(dbcarmor) : mcarmor;
|
||||
mc.getTextureManager().bindTexture(armor);
|
||||
GL11.glPushMatrix();
|
||||
if (id > -1) {
|
||||
func_aam.invoke(renderPlayer, id, false, true);
|
||||
}
|
||||
|
||||
GL11.glColor3f(1.0F + getR(), 1.0F + getG(), 1.0F + getB());
|
||||
GL11.glScalef(1.0001F, 1.0001F, 1.0001F);
|
||||
if (dbcarmor != null) {
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
modelMain.textureHeight = 64;
|
||||
modelMain.textureWidth = 128;
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else {
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
GL11.glPopMatrix();
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
if (race == 3 && dbcBool) {
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/nam/0nam" + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodycm);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/nam/1nam" + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc1);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/nam/2nam" + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc2);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/nam/3nam" + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else if (race == 4 && dbcBool) {
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/0A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodycm);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/1A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc1);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/2A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc2);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/3A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodyc3);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/arc/" + (gen == 1 ? "f" : "m") + "/4A" + ((short[]) JRMCoreH.getField("TransFrSkn").get(null))[State] + plyrSpc + ".png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else {
|
||||
if (saiOozar) {
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/oozaru1.png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(skintype != 0 ? bodycm : 11374471);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
|
||||
jx = race != 2 && bodytype == 0 ? 6498048 : bodytype;
|
||||
j = State != 0 && State != 7 ? (lg ? 10092390 : 16574610) : (skintype == 1 ? bodyc1 : jx);
|
||||
bdyskn = new ResourceLocation("jinryuudragonbc:cc/oozaru2.png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(j);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else if (skintype != 0) {
|
||||
bdyskn = new ResourceLocation("jinryuumodscore:cc/" + (gen == 1 ? "f" : "") + "hum.png");
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
glColor3f(bodycm);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (!saiOozar) {
|
||||
if (skintype == 0) {
|
||||
bdyskn = acp.getLocationSkin().equals(ClientEventHandler.steveTextures) ? (gen >= 1 ? ClientEventHandler.fem : ClientEventHandler.steveTextures) : acp.getLocationSkin();
|
||||
if (jhdsBool && (boolean) JBRAH.getMethod("getSkinHas", Object.class).invoke(null, data)) {
|
||||
mc.getTextureManager().bindTexture((ResourceLocation) JBRAH.getMethod("getSkinLoc", Object.class).invoke(null, data));
|
||||
} else {
|
||||
mc.getTextureManager().bindTexture(bdyskn);
|
||||
}
|
||||
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else if (jhdsBool && (boolean) JBRAH.getMethod("getSkinHas", Object.class).invoke(null, data) && skintype == 0) {
|
||||
GL11.glColor3f(h1 + getR(), h1 + getG(), h1 + getB());
|
||||
mc.getTextureManager().bindTexture((ResourceLocation) JBRAH.getMethod("getSkinLoc", Object.class).invoke(null, data));
|
||||
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (State == 14) {
|
||||
tailCol = race != 2 && bodytype == 0 ? 6498048 : bodytype;
|
||||
tailCol = (boolean) JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null) ? 13292516 : tailCol;
|
||||
jx = skintype == 1 ? bodyc1 : tailCol;
|
||||
if ((boolean) JRMCoreH.getMethod("rSai", int.class).invoke(null, race) && jx == 6498048 && State == 14) {
|
||||
if ((boolean) JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null)) {
|
||||
jx = 13292516;
|
||||
} else {
|
||||
jx = 14292268;
|
||||
}
|
||||
}
|
||||
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuudragonbc:cc/ss4" + (skintype == 0 ? "a" : "b") + ".png"));
|
||||
glColor3f(jx);
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((boolean) JGConfigClientSettings.getField("CLIENT_DA19").get(null)) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glEnable(3042);
|
||||
GL11.glDisable(2896);
|
||||
GL11.glBlendFunc(770, 771);
|
||||
GL11.glAlphaFunc(516, 0.003921569F);
|
||||
GL11.glDepthMask(false);
|
||||
tailCol = (int) JRMCoreH.getMethod(
|
||||
"stat", Entity.class, int.class, int.class, int.class, int.class, int.class, int.class, float.class).invoke(null,
|
||||
par1EntityPlayer, 2,
|
||||
JRMCoreH.getField("Pwrtyp").get(null), 2,
|
||||
((int[]) JRMCoreH.getField("PlyrAttrbts").get(null))[2], race,
|
||||
JRMCoreH.getField("Class").get(null), 0.0F);
|
||||
jx = Integer.parseInt((String) JRMCoreH.getMethod("data", String.class, int.class, String.class).invoke(null, par1EntityPlayer.getCommandSenderName(), 8, "200"));
|
||||
float one = (float) tailCol / 100.0F;
|
||||
int perc = (int) ((float) jx / one);
|
||||
if (perc < 70) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises1.png"));
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (perc < 55) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises2.png"));
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (perc < 35) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises3.png"));
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
if (perc < 20) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises4.png"));
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
GL11.glDepthMask(true);
|
||||
GL11.glEnable(2896);
|
||||
GL11.glDisable(3042);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
if (itemstack != null) {
|
||||
item = itemstack.getItem();
|
||||
if (item instanceof ItemArmor) {
|
||||
itemarmor = (ItemArmor) item;
|
||||
GL11.glPushMatrix();
|
||||
dbcarmor = itemarmor.getArmorTexture(itemstack, par1EntityPlayer, 2, null);
|
||||
mcarmor = RenderBiped.getArmorResource(par1EntityPlayer, itemstack, 1, null);
|
||||
if (dbcarmor != null) {
|
||||
dbcarmor = dbcarmor.replace("jbra", "").replace("_dam", "");
|
||||
}
|
||||
|
||||
armor = dbcarmor != null ? new ResourceLocation(dbcarmor) : mcarmor;
|
||||
mc.getTextureManager().bindTexture(armor);
|
||||
if (id == 0 || id == 3 || id == 5) {
|
||||
if (id == 0) {
|
||||
if ((boolean) JGConfigClientSettings.getField("CLIENT_DA18").get(null)) {
|
||||
GL11.glPushMatrix();
|
||||
func_aam.invoke(renderPlayer, id, false, true);
|
||||
GL11.glColor3f(1.0F + getR(), 1.0F + getG(), 1.0F + getB());
|
||||
GL11.glScalef(1.0001F, 1.0001F, 1.0001F);
|
||||
if (dbcarmor != null) {
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
modelMain.textureHeight = 64;
|
||||
modelMain.textureWidth = 128;
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else {
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
} else {
|
||||
GL11.glPushMatrix();
|
||||
func_aam.invoke(renderPlayer, id, false, true);
|
||||
GL11.glColor3f(1.0F + getR(), 1.0F + getG(), 1.0F + getB());
|
||||
GL11.glScalef(1.0001F, 1.0001F, 1.0001F);
|
||||
if (dbcarmor != null) {
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
modelMain.textureHeight = 64;
|
||||
modelMain.textureWidth = 128;
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
} else {
|
||||
modelMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer);
|
||||
AnimationMixinFunctions.renderLimbs();
|
||||
}
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
private static float getR() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
|
||||
Class<?> RenderPlayerJBRA = Class.forName("JinRyuu.JBRA.RenderPlayerJBRA");
|
||||
Method method = RenderPlayerJBRA.getDeclaredMethod("getR");
|
||||
method.setAccessible(true);
|
||||
return (float) method.invoke(null);
|
||||
}
|
||||
|
||||
private static float getB() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
|
||||
Class<?> RenderPlayerJBRA = Class.forName("JinRyuu.JBRA.RenderPlayerJBRA");
|
||||
Method method = RenderPlayerJBRA.getDeclaredMethod("getB");
|
||||
method.setAccessible(true);
|
||||
return (float) method.invoke(null);
|
||||
}
|
||||
|
||||
private static float getG() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
|
||||
Class<?> RenderPlayerJBRA = Class.forName("JinRyuu.JBRA.RenderPlayerJBRA");
|
||||
Method method = RenderPlayerJBRA.getDeclaredMethod("getG");
|
||||
method.setAccessible(true);
|
||||
return (float) method.invoke(null);
|
||||
}
|
||||
|
||||
private static void glColor3f(int c) throws ClassNotFoundException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
|
||||
float h2 = (float) (c >> 16 & 255) / 255.0F;
|
||||
float h3 = (float) (c >> 8 & 255) / 255.0F;
|
||||
float h4 = (float) (c & 255) / 255.0F;
|
||||
float h1 = 1.0F;
|
||||
float r = h1 * h2;
|
||||
float g = h1 * h3;
|
||||
float b = h1 * h4;
|
||||
GL11.glColor3f(r + getR(), g + getG(), b + getB());
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@ public class AnimationCommand extends CommandKamkeelBase {
|
||||
desc = "set an animation to a player",
|
||||
usage = "<player> <num>"
|
||||
)
|
||||
public void set(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void set(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int animationId;
|
||||
try {
|
||||
@@ -63,7 +63,7 @@ public class AnimationCommand extends CommandKamkeelBase {
|
||||
desc = "clear an animation from a player",
|
||||
usage = "<player>"
|
||||
)
|
||||
public void clear(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void clear(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
|
||||
if (data.isEmpty()) {
|
||||
@@ -85,7 +85,7 @@ public class AnimationCommand extends CommandKamkeelBase {
|
||||
desc = "enable an animation on a player",
|
||||
usage = "<player>"
|
||||
)
|
||||
public void enable(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void enable(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
|
||||
if (data.isEmpty()) {
|
||||
@@ -111,7 +111,7 @@ public class AnimationCommand extends CommandKamkeelBase {
|
||||
desc = "disable an animation on a player",
|
||||
usage = "<player>"
|
||||
)
|
||||
public void disable(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void disable(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
|
||||
if (data.isEmpty()) {
|
||||
@@ -136,7 +136,7 @@ public class AnimationCommand extends CommandKamkeelBase {
|
||||
@SubCommand(
|
||||
desc = "reload animations"
|
||||
)
|
||||
public void reload(ICommandSender sender, String[] args) {
|
||||
public void reload(ICommandSender sender, String args[]) {
|
||||
AnimationController.Instance.load();
|
||||
sendResult(sender, "Animations Reloaded");
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@ public class CloneCommand extends CommandKamkeelBase {
|
||||
try {
|
||||
tab = Integer.parseInt(args[1]);
|
||||
if (tab < 0 || tab > 15) {
|
||||
sendError(sender, "Tab must be within 1-15");
|
||||
sendError(sender, String.format("Tab must be within 1-15"));
|
||||
return;
|
||||
}
|
||||
} catch (NumberFormatException ex) {
|
||||
@@ -138,7 +138,7 @@ public class CloneCommand extends CommandKamkeelBase {
|
||||
try {
|
||||
tab = Integer.parseInt(args[1]);
|
||||
if (tab < 0 || tab > 15) {
|
||||
sendError(sender, "Tab must be within 1-15");
|
||||
sendError(sender, String.format("Tab must be within 1-15"));
|
||||
return;
|
||||
}
|
||||
} catch (NumberFormatException ex) {
|
||||
@@ -219,7 +219,7 @@ public class CloneCommand extends CommandKamkeelBase {
|
||||
try {
|
||||
tab = Integer.parseInt(args[1]);
|
||||
if (tab < 0 || tab > 15) {
|
||||
sendError(sender, "Tab must be within 1-15");
|
||||
sendError(sender, String.format("Tab must be within 1-15"));
|
||||
return;
|
||||
}
|
||||
} catch (NumberFormatException ex) {
|
||||
@@ -312,6 +312,7 @@ public class CloneCommand extends CommandKamkeelBase {
|
||||
world.spawnEntityInWorld(entity);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
public World getWorld(String t) {
|
||||
|
||||
@@ -2,6 +2,8 @@ package kamkeel.npcs.command;
|
||||
|
||||
import net.minecraft.command.CommandException;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import noppes.npcs.EventHooks;
|
||||
@@ -42,11 +44,13 @@ public class CommandCommand extends CommandKamkeelBase {
|
||||
ChunkCoordinates senderCoords = sender.getPlayerCoordinates();
|
||||
IPos senderPos = NpcAPI.Instance().getIPos(new BlockPos(senderCoords.posX, senderCoords.posY, senderCoords.posZ));
|
||||
|
||||
CustomNPCsEvent.ScriptedCommandEvent event = new CustomNPCsEvent.ScriptedCommandEvent(senderWorld, senderPos, sender.getCommandSenderName(), commandId, commandArgs);
|
||||
EventHooks.onScriptedCommand(event);
|
||||
if(sender instanceof EntityPlayer) {
|
||||
CustomNPCsEvent.ScriptedCommandEvent event = new CustomNPCsEvent.ScriptedCommandEvent(senderWorld, senderPos, sender.getCommandSenderName(), commandId, commandArgs);
|
||||
EventHooks.onScriptedCommand((EntityPlayer) sender, event);
|
||||
|
||||
if (!event.replyMessage.isEmpty()) {
|
||||
sendMessage(sender, event.replyMessage);
|
||||
if (!event.replyMessage.isEmpty()) {
|
||||
sendMessage(sender, event.replyMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -30,7 +30,7 @@ public class DialogCategoryCommand extends CommandKamkeelBase {
|
||||
desc = "Find dialog category id number by its name",
|
||||
usage = "<dialog cat name>"
|
||||
)
|
||||
public void id(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void id(ICommandSender sender, String args[]) throws CommandException {
|
||||
if (args.length == 0) {
|
||||
sendError(sender, "Please provide a name for the dialog category");
|
||||
return;
|
||||
@@ -55,7 +55,7 @@ public class DialogCategoryCommand extends CommandKamkeelBase {
|
||||
desc = "Read a dialog category for a player",
|
||||
usage = "<player> <dialogcatid>"
|
||||
)
|
||||
public void read(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void read(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int dialogCatId;
|
||||
try {
|
||||
@@ -96,7 +96,7 @@ public class DialogCategoryCommand extends CommandKamkeelBase {
|
||||
desc = "Unread a dialog category for a player",
|
||||
usage = "<player> <dialogcatid>"
|
||||
)
|
||||
public void unread(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void unread(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int dialogCatId;
|
||||
try {
|
||||
|
||||
@@ -39,7 +39,7 @@ public class DialogCommand extends CommandKamkeelBase {
|
||||
desc = "force read",
|
||||
usage = "<player> <dialog>"
|
||||
)
|
||||
public void read(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void read(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int diagid;
|
||||
try {
|
||||
@@ -65,7 +65,7 @@ public class DialogCommand extends CommandKamkeelBase {
|
||||
desc = "force unread dialog",
|
||||
usage = "<player> <dialog>"
|
||||
)
|
||||
public void unread(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void unread(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int diagid;
|
||||
try {
|
||||
@@ -91,7 +91,7 @@ public class DialogCommand extends CommandKamkeelBase {
|
||||
desc = "reload dialogs from disk",
|
||||
permission = 4
|
||||
)
|
||||
public void reload(ICommandSender sender, String[] args) {
|
||||
public void reload(ICommandSender sender, String args[]) {
|
||||
new DialogController().load();
|
||||
SyncController.syncAllDialogs();
|
||||
sendResult(sender, "Dialogs Reloaded");
|
||||
@@ -101,7 +101,7 @@ public class DialogCommand extends CommandKamkeelBase {
|
||||
desc = "show dialog",
|
||||
usage = "<player> <dialog> <name>"
|
||||
)
|
||||
public void show(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void show(ICommandSender sender, String args[]) throws CommandException {
|
||||
EntityPlayer player = CommandBase.getPlayer(sender, args[0]);
|
||||
if (player == null) {
|
||||
sendError(sender, "Unknown player: " + args[0]);
|
||||
@@ -136,7 +136,7 @@ public class DialogCommand extends CommandKamkeelBase {
|
||||
desc = "Find dialog id number by its name",
|
||||
usage = "<dialogName>"
|
||||
)
|
||||
public void id(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void id(ICommandSender sender, String args[]) throws CommandException {
|
||||
if (args.length == 0) {
|
||||
sendError(sender, "Please provide a name for the dialog");
|
||||
return;
|
||||
@@ -160,7 +160,7 @@ public class DialogCommand extends CommandKamkeelBase {
|
||||
desc = "List a dialogs availability options",
|
||||
usage = "<dialogId>"
|
||||
)
|
||||
public void availability(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void availability(ICommandSender sender, String args[]) throws CommandException {
|
||||
if (args.length == 0) {
|
||||
sendError(sender, "Please provide an id for the dialog");
|
||||
return;
|
||||
@@ -234,7 +234,7 @@ public class DialogCommand extends CommandKamkeelBase {
|
||||
desc = "Quick info on a dialog",
|
||||
usage = "<dialogId>"
|
||||
)
|
||||
public void info(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void info(ICommandSender sender, String args[]) throws CommandException {
|
||||
if (args.length == 0) {
|
||||
sendError(sender, "Please provide an id for the quest");
|
||||
return;
|
||||
|
||||
@@ -6,7 +6,7 @@ import noppes.npcs.controllers.CustomEffectController;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
import noppes.npcs.controllers.data.CustomEffect;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
import noppes.npcs.scripted.event.PlayerEvent.EffectEvent.ExpirationType;
|
||||
import noppes.npcs.scripted.event.player.PlayerEvent.EffectEvent.ExpirationType;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
|
||||
@@ -154,7 +154,7 @@ public class FactionCommand extends CommandKamkeelBase {
|
||||
@Override
|
||||
public List addTabCompletionOptions(ICommandSender par1, String[] args) {
|
||||
if (args.length == 3) {
|
||||
return getListOfStringsMatchingLastWord(args, "add", "subtract", "set", "reset", "drop", "create");
|
||||
return getListOfStringsMatchingLastWord(args, new String[]{"add", "subtract", "set", "reset", "drop", "create"});
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import static kamkeel.npcs.util.ColorUtil.sendError;
|
||||
import static kamkeel.npcs.util.ColorUtil.sendMessage;
|
||||
|
||||
public class HelpCommand extends CommandKamkeelBase {
|
||||
private final CommandKamkeel parent;
|
||||
private CommandKamkeel parent;
|
||||
|
||||
public HelpCommand(CommandKamkeel parent) {
|
||||
this.parent = parent;
|
||||
|
||||
@@ -210,7 +210,7 @@ public class NpcCommand extends CommandKamkeelBase {
|
||||
@Override
|
||||
public List addTabCompletionOptions(ICommandSender par1, String[] args) {
|
||||
if (args.length == 2) {
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, "create", "home", "visible", "delete", "owner", "name");
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, new String[]{"create", "home", "visible", "delete", "owner", "name"});
|
||||
}
|
||||
if (args.length == 3 && args[1].equalsIgnoreCase("owner")) {
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
|
||||
|
||||
@@ -28,7 +28,7 @@ public class OverlayCommand extends CommandKamkeelBase {
|
||||
desc = "set an overlay to a player",
|
||||
usage = "<player> <num> <texture>"
|
||||
)
|
||||
public void set(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void set(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int overlayID;
|
||||
try {
|
||||
@@ -55,7 +55,7 @@ public class OverlayCommand extends CommandKamkeelBase {
|
||||
desc = "remove an overlay from a player",
|
||||
usage = "<player> <num>"
|
||||
)
|
||||
public void remove(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void remove(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int overlayID;
|
||||
try {
|
||||
@@ -85,7 +85,7 @@ public class OverlayCommand extends CommandKamkeelBase {
|
||||
desc = "modify an overlay for a player",
|
||||
usage = "<player> <num> <blend/glow> <true/false>"
|
||||
)
|
||||
public void modify(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void modify(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int overlayID;
|
||||
try {
|
||||
@@ -141,7 +141,7 @@ public class OverlayCommand extends CommandKamkeelBase {
|
||||
desc = "clears all overlays from a player",
|
||||
usage = "<player>"
|
||||
)
|
||||
public void clear(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void clear(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
|
||||
if (data.isEmpty()) {
|
||||
@@ -160,7 +160,7 @@ public class OverlayCommand extends CommandKamkeelBase {
|
||||
desc = "List all overlays on a player",
|
||||
usage = "<player>"
|
||||
)
|
||||
public void info(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void info(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
|
||||
List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
|
||||
|
||||
@@ -38,7 +38,7 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
|
||||
desc = "Find quest category id number by its name",
|
||||
usage = "<quest cat name>"
|
||||
)
|
||||
public void id(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void id(ICommandSender sender, String args[]) throws CommandException {
|
||||
if (args.length == 0) {
|
||||
sendError(sender, "Please provide a name for the quest category");
|
||||
return;
|
||||
@@ -63,7 +63,7 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
|
||||
desc = "Finish a quest category for a player",
|
||||
usage = "<player> <questcatid>"
|
||||
)
|
||||
public void finish(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void finish(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int questcatid;
|
||||
try {
|
||||
@@ -101,6 +101,7 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
|
||||
|
||||
if (ConfigMain.ProfilesEnabled && playerdata.player != null && quest.profileOptions.enableOptions && quest.profileOptions.completeControl == EnumProfileSync.Shared)
|
||||
ProfileController.Instance.shareQuestCompletion(playerdata.player, quest.id, completeTime);
|
||||
;
|
||||
|
||||
if (playerdata.player != null) {
|
||||
AchievementPacket.sendAchievement((EntityPlayerMP) playerdata.player, false, "quest.completed", quest.title);
|
||||
@@ -120,7 +121,7 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
|
||||
desc = "Stop a quest category for a players active quests",
|
||||
usage = "<player> <questcatid>"
|
||||
)
|
||||
public void stop(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void stop(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int questcatid;
|
||||
try {
|
||||
@@ -162,7 +163,7 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
|
||||
desc = "Start a quest category for a player",
|
||||
usage = "<player> <questcatid>"
|
||||
)
|
||||
public void start(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void start(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int questcatid;
|
||||
try {
|
||||
@@ -211,7 +212,7 @@ public class QuestCategoryCommand extends CommandKamkeelBase {
|
||||
desc = "Remove a quest cat from active/finished",
|
||||
usage = "<player> <questcatid>"
|
||||
)
|
||||
public void remove(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void remove(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int questcatid;
|
||||
try {
|
||||
|
||||
@@ -83,7 +83,7 @@ public class QuestCommand extends CommandKamkeelBase {
|
||||
desc = "Finish a quest",
|
||||
usage = "<player> <quest>"
|
||||
)
|
||||
public void finish(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void finish(ICommandSender sender, String args[]) throws CommandException {
|
||||
String playername = args[0];
|
||||
int questid;
|
||||
try {
|
||||
@@ -214,7 +214,7 @@ public class QuestCommand extends CommandKamkeelBase {
|
||||
return;
|
||||
}
|
||||
|
||||
PlayerData data = PlayerDataController.Instance.getPlayerData(player);
|
||||
PlayerData data = PlayerData.get(player);
|
||||
if (data == null) {
|
||||
sendError(sender, "No PlayerData found for:" + player);
|
||||
return;
|
||||
@@ -286,7 +286,7 @@ public class QuestCommand extends CommandKamkeelBase {
|
||||
desc = "Find quest id number by its name",
|
||||
usage = "<questName>"
|
||||
)
|
||||
public void id(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void id(ICommandSender sender, String args[]) throws CommandException {
|
||||
if (args.length == 0) {
|
||||
sendError(sender, "Please provide a name for the quest");
|
||||
return;
|
||||
@@ -310,7 +310,7 @@ public class QuestCommand extends CommandKamkeelBase {
|
||||
desc = "Find prerequisite quests for an id",
|
||||
usage = "<questId>"
|
||||
)
|
||||
public void prereq(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void prereq(ICommandSender sender, String args[]) throws CommandException {
|
||||
if (args.length == 0) {
|
||||
sendError(sender, "Please provide an id for the quest");
|
||||
return;
|
||||
@@ -350,7 +350,7 @@ public class QuestCommand extends CommandKamkeelBase {
|
||||
desc = "Quick info on a quest",
|
||||
usage = "<questId>"
|
||||
)
|
||||
public void info(ICommandSender sender, String[] args) throws CommandException {
|
||||
public void info(ICommandSender sender, String args[]) throws CommandException {
|
||||
if (args.length == 0) {
|
||||
sendError(sender, "Please provide an id for the quest");
|
||||
return;
|
||||
@@ -389,7 +389,7 @@ public class QuestCommand extends CommandKamkeelBase {
|
||||
desc = "reload quests from disk",
|
||||
permission = 4
|
||||
)
|
||||
public void reload(ICommandSender sender, String[] args) {
|
||||
public void reload(ICommandSender sender, String args[]) {
|
||||
new QuestController().load();
|
||||
SyncController.syncAllQuests();
|
||||
sendResult(sender, "Quests Reloaded");
|
||||
|
||||
@@ -10,7 +10,7 @@ import static kamkeel.npcs.util.ColorUtil.sendResult;
|
||||
public class ScriptCommand extends CommandKamkeelBase {
|
||||
|
||||
@SubCommand(desc = "Reload scripts data and folders.")
|
||||
public Boolean reload(ICommandSender sender, String[] args) {
|
||||
public Boolean reload(ICommandSender sender, String args[]) {
|
||||
ScriptController.Instance.loadCategories();
|
||||
|
||||
if (ScriptController.Instance.loadPlayerScripts())
|
||||
|
||||
@@ -5,6 +5,10 @@ import kamkeel.npcs.controllers.data.attribute.AttributeDefinition;
|
||||
import kamkeel.npcs.controllers.data.attribute.AttributeValueType;
|
||||
import kamkeel.npcs.controllers.data.attribute.tracker.PlayerAttributeTracker;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import noppes.npcs.api.entity.IPlayer;
|
||||
import noppes.npcs.api.handler.IAttributeHandler;
|
||||
import noppes.npcs.api.handler.data.IAttributeDefinition;
|
||||
import noppes.npcs.api.handler.data.IPlayerAttributes;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
@@ -15,9 +19,9 @@ import java.util.UUID;
|
||||
* AttributeController is the central registry for attribute definitions.
|
||||
* It ensures that keys are unique.
|
||||
*/
|
||||
public class AttributeController {
|
||||
public class AttributeController implements IAttributeHandler {
|
||||
|
||||
public AttributeController Instance;
|
||||
public static AttributeController Instance;
|
||||
public CustomAttributes attributes;
|
||||
|
||||
// Tracking Player Attributes
|
||||
@@ -25,7 +29,7 @@ public class AttributeController {
|
||||
private static final Map<String, AttributeDefinition> definitions = new HashMap<>();
|
||||
|
||||
public AttributeController() {
|
||||
this.Instance = this;
|
||||
Instance = this;
|
||||
definitions.clear();
|
||||
trackers.clear();
|
||||
attributes = new CustomAttributes();
|
||||
@@ -75,4 +79,20 @@ public class AttributeController {
|
||||
tracker.updateIfChanged(player);
|
||||
}
|
||||
}
|
||||
|
||||
public IPlayerAttributes getPlayerAttributes(IPlayer player) {
|
||||
if(player == null || player.getMCEntity() == null)
|
||||
return null;
|
||||
|
||||
EntityPlayer entityPlayer = (EntityPlayer) player.getMCEntity();
|
||||
return trackers.computeIfAbsent(entityPlayer.getUniqueID(), id -> new PlayerAttributeTracker(id));
|
||||
}
|
||||
|
||||
public IAttributeDefinition getAttributeDefinition(String key) {
|
||||
return definitions.get(key);
|
||||
}
|
||||
|
||||
public IAttributeDefinition[] getAllAttributesArray() {
|
||||
return definitions.values().toArray(new AttributeDefinition[definitions.size()]);
|
||||
}
|
||||
}
|
||||
@@ -221,8 +221,8 @@ public class ProfileController implements IProfileHandler {
|
||||
try (FileInputStream fis = new FileInputStream(backupFile)) {
|
||||
NBTTagCompound compound = CompressedStreamTools.readCompressed(fis);
|
||||
File saveDir = getProfileDir();
|
||||
File mainFile = new File(saveDir, uuid + ".dat");
|
||||
File fileNew = new File(saveDir, uuid + "_new");
|
||||
File mainFile = new File(saveDir, uuid.toString() + ".dat");
|
||||
File fileNew = new File(saveDir, uuid.toString() + "_new");
|
||||
CompressedStreamTools.writeCompressed(compound, new FileOutputStream(fileNew));
|
||||
if (mainFile.exists()) {
|
||||
mainFile.delete();
|
||||
@@ -364,8 +364,8 @@ public class ProfileController implements IProfileHandler {
|
||||
return ProfileOperation.error(MSG_SLOT_NOT_EXIST);
|
||||
}
|
||||
|
||||
PlayerDataScript handler = ScriptController.Instance.playerScripts;
|
||||
if (profile.player != null) {
|
||||
PlayerDataScript handler = ScriptController.Instance.getPlayerScripts(profile.player);
|
||||
IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(profile.player);
|
||||
if (EventHooks.onProfileRemove(handler, scriptPlayer, profile, slotId, false))
|
||||
return ProfileOperation.error(MSG_CANCELLED);
|
||||
@@ -374,6 +374,7 @@ public class ProfileController implements IProfileHandler {
|
||||
profile.getSlots().remove(slotId);
|
||||
|
||||
if (profile.player != null) {
|
||||
PlayerDataScript handler = ScriptController.Instance.getPlayerScripts(profile.player);
|
||||
IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(profile.player);
|
||||
EventHooks.onProfileRemove(handler, scriptPlayer, profile, slotId, true);
|
||||
}
|
||||
@@ -402,8 +403,8 @@ public class ProfileController implements IProfileHandler {
|
||||
}
|
||||
}
|
||||
|
||||
PlayerDataScript handler = ScriptController.Instance.playerScripts;
|
||||
if (profile.player != null) {
|
||||
PlayerDataScript handler = ScriptController.Instance.getPlayerScripts(profile.player);
|
||||
IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(profile.player);
|
||||
if (EventHooks.onProfileCreate(handler, scriptPlayer, profile, newSlotId, false))
|
||||
return ProfileOperation.error(MSG_CANCELLED);
|
||||
@@ -413,6 +414,7 @@ public class ProfileController implements IProfileHandler {
|
||||
newSlot.setLastLoaded(System.currentTimeMillis());
|
||||
profile.getSlots().put(newSlotId, newSlot);
|
||||
if (profile.player != null) {
|
||||
PlayerDataScript handler = ScriptController.Instance.getPlayerScripts(profile.player);
|
||||
verifySlotQuests(profile.player);
|
||||
save(profile.player, profile);
|
||||
|
||||
@@ -434,7 +436,7 @@ public class ProfileController implements IProfileHandler {
|
||||
}
|
||||
if (profile.player != null) {
|
||||
if (ConfigMain.RegionProfileSwitching) {
|
||||
boolean allowed = hasPermission(profile.player, PROFILE_REGION_BYPASS);
|
||||
boolean allowed = hasCustomPermission(profile.player, PROFILE_REGION_BYPASS.name);
|
||||
if (!allowed) {
|
||||
int playerDim = profile.player.dimension;
|
||||
int playerX = (int) profile.player.posX;
|
||||
@@ -474,7 +476,7 @@ public class ProfileController implements IProfileHandler {
|
||||
|
||||
int prevSlot = profile.getCurrentSlotId();
|
||||
|
||||
PlayerDataScript handler = ScriptController.Instance.playerScripts;
|
||||
PlayerDataScript handler = ScriptController.Instance.getPlayerScripts(profile.player);
|
||||
IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(profile.player);
|
||||
if (EventHooks.onProfileChange(handler, scriptPlayer, profile, newSlotId, prevSlot, false))
|
||||
return ProfileOperation.error(MSG_CANCELLED);
|
||||
@@ -676,8 +678,8 @@ public class ProfileController implements IProfileHandler {
|
||||
highestAllowed = i;
|
||||
}
|
||||
}
|
||||
if (highestAllowed == 0) {
|
||||
highestAllowed = 1;
|
||||
if (highestAllowed == 0 || highestAllowed < ConfigMain.DefaultProfileSlots) {
|
||||
highestAllowed = ConfigMain.DefaultProfileSlots;
|
||||
}
|
||||
return currentSlots < highestAllowed;
|
||||
}
|
||||
|
||||
@@ -167,6 +167,7 @@ public class SyncController {
|
||||
NBTTagList categoryList = new NBTTagList();
|
||||
for (QuestCategory category : QuestController.Instance.categories.values()) {
|
||||
NBTTagCompound questCompound = new NBTTagCompound();
|
||||
;
|
||||
NBTTagList questList = new NBTTagList();
|
||||
for (int questID : category.quests.keySet()) {
|
||||
Quest quest = category.quests.get(questID);
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package kamkeel.npcs.controllers.data.attribute;
|
||||
|
||||
public class AttributeDefinition {
|
||||
import noppes.npcs.api.handler.data.IAttributeDefinition;
|
||||
|
||||
public class AttributeDefinition implements IAttributeDefinition {
|
||||
private final String key;
|
||||
private String translationKey;// e.g., "main_attack_flat"
|
||||
private final String displayName; // Human‑readable name
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
package kamkeel.npcs.controllers.data.attribute;
|
||||
|
||||
/**
|
||||
* IAttributeInstance represents an instance of an attribute (with a base value and applied modifiers).
|
||||
*/
|
||||
public interface ICustomAttribute {
|
||||
AttributeDefinition getAttribute();
|
||||
|
||||
float getValue();
|
||||
|
||||
void setValue(float value);
|
||||
}
|
||||
@@ -1,13 +1,15 @@
|
||||
package kamkeel.npcs.controllers.data.attribute;
|
||||
|
||||
|
||||
import noppes.npcs.api.handler.data.ICustomAttribute;
|
||||
|
||||
public class PlayerAttribute implements ICustomAttribute {
|
||||
private final AttributeDefinition attribute;
|
||||
private float baseValue;
|
||||
public float value;
|
||||
|
||||
public PlayerAttribute(AttributeDefinition attribute, float baseValue) {
|
||||
public PlayerAttribute(AttributeDefinition attribute, float value) {
|
||||
this.attribute = attribute;
|
||||
this.baseValue = baseValue;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -17,11 +19,6 @@ public class PlayerAttribute implements ICustomAttribute {
|
||||
|
||||
@Override
|
||||
public float getValue() {
|
||||
return baseValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setValue(float value) {
|
||||
this.baseValue = value;
|
||||
return value;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
package kamkeel.npcs.controllers.data.attribute;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -8,22 +7,18 @@ import java.util.Map;
|
||||
* CustomAttributeMap holds a set of attribute instances for an entity (or item).
|
||||
*/
|
||||
public class PlayerAttributeMap {
|
||||
private final Map<AttributeDefinition, ICustomAttribute> map = new HashMap<>();
|
||||
public final Map<AttributeDefinition, PlayerAttribute> map = new HashMap<>();
|
||||
|
||||
public ICustomAttribute registerAttribute(AttributeDefinition attribute, float baseValue) {
|
||||
public PlayerAttribute registerAttribute(AttributeDefinition attribute, float baseValue) {
|
||||
if (map.containsKey(attribute)) {
|
||||
throw new IllegalArgumentException("Attribute already registered: " + attribute.getKey());
|
||||
}
|
||||
ICustomAttribute instance = new PlayerAttribute(attribute, baseValue);
|
||||
PlayerAttribute instance = new PlayerAttribute(attribute, baseValue);
|
||||
map.put(attribute, instance);
|
||||
return instance;
|
||||
}
|
||||
|
||||
public ICustomAttribute getAttributeInstance(AttributeDefinition attribute) {
|
||||
public PlayerAttribute getAttributeInstance(AttributeDefinition attribute) {
|
||||
return map.get(attribute);
|
||||
}
|
||||
|
||||
public Collection<ICustomAttribute> getAllAttributes() {
|
||||
return map.values();
|
||||
}
|
||||
}
|
||||
+2
@@ -11,6 +11,8 @@ public interface IRequirementChecker {
|
||||
|
||||
String getTooltipValue(NBTTagCompound nbt);
|
||||
|
||||
Object getValue(NBTTagCompound nbt);
|
||||
|
||||
void apply(NBTTagCompound nbt, Object value);
|
||||
|
||||
/**
|
||||
|
||||
+52
@@ -0,0 +1,52 @@
|
||||
package kamkeel.npcs.controllers.data.attribute.requirement.types;
|
||||
|
||||
import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
|
||||
public class ProfileSlotRequirement implements IRequirementChecker {
|
||||
|
||||
@Override
|
||||
public String getKey() {
|
||||
return "cnpc_profile_slot";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTranslation() {
|
||||
return "profile.slot";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTooltipValue(NBTTagCompound nbt) {
|
||||
if (nbt.hasKey(getKey())) {
|
||||
int profileSlot = nbt.getInteger(getKey());
|
||||
return String.valueOf(profileSlot);
|
||||
}
|
||||
return "null";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void apply(NBTTagCompound nbt, Object value) {
|
||||
if (value instanceof Integer) {
|
||||
nbt.setInteger(getKey(), (Integer) value);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getValue(NBTTagCompound nbt) {
|
||||
if (nbt.hasKey(getKey())) {
|
||||
return nbt.getInteger(getKey());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean check(EntityPlayer player, NBTTagCompound nbt) {
|
||||
if (nbt.hasKey(getKey())) {
|
||||
int profileSlot = nbt.getInteger(getKey());
|
||||
return PlayerData.get(player).profileSlot == profileSlot;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+8
@@ -29,6 +29,14 @@ public class QuestActiveRequirement implements IRequirementChecker {
|
||||
return "null";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getValue(NBTTagCompound nbt) {
|
||||
if (nbt.hasKey(getKey())) {
|
||||
return nbt.getInteger(getKey());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void apply(NBTTagCompound nbt, Object value) {
|
||||
if (value instanceof Integer) {
|
||||
|
||||
+8
@@ -36,6 +36,14 @@ public class QuestCompletedRequirement implements IRequirementChecker {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getValue(NBTTagCompound nbt) {
|
||||
if (nbt.hasKey(getKey())) {
|
||||
return nbt.getInteger(getKey());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean check(EntityPlayer player, NBTTagCompound nbt) {
|
||||
if (nbt.hasKey(getKey())) {
|
||||
|
||||
+106
@@ -0,0 +1,106 @@
|
||||
package kamkeel.npcs.controllers.data.attribute.requirement.types;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.HashMap;
|
||||
import java.util.UUID;
|
||||
|
||||
public class SoulbindRequirement implements IRequirementChecker {
|
||||
|
||||
public static HashMap<String, String> uuidToUsername = new HashMap<>();
|
||||
|
||||
@Override
|
||||
public String getKey() {
|
||||
return "cnpc_soulbind";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTranslation() {
|
||||
return "requirement.soulbind";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTooltipValue(NBTTagCompound nbt) {
|
||||
if (nbt.hasKey(getKey())) {
|
||||
String uuid = nbt.getString(getKey());
|
||||
if (uuid != null && !uuid.isEmpty()) {
|
||||
return getUsernameFromUUID(uuid);
|
||||
}
|
||||
}
|
||||
return "null";
|
||||
}
|
||||
|
||||
private String getUsernameFromUUID(String uuid) {
|
||||
if(uuidToUsername.containsKey(uuid)){
|
||||
if(!uuidToUsername.get(uuid).equals("null")){
|
||||
return uuidToUsername.get(uuid);
|
||||
}
|
||||
}
|
||||
try {
|
||||
String strippedUUID = uuid.replace("-", "");
|
||||
String urlStr = "https://sessionserver.mojang.com/session/minecraft/profile/" + strippedUUID;
|
||||
HttpURLConnection connection = (HttpURLConnection) new URL(urlStr).openConnection();
|
||||
connection.setConnectTimeout(5000);
|
||||
connection.setReadTimeout(5000);
|
||||
connection.setRequestMethod("GET");
|
||||
connection.connect();
|
||||
|
||||
InputStream stream = connection.getInputStream();
|
||||
InputStreamReader reader = new InputStreamReader(stream, "UTF-8");
|
||||
|
||||
JsonElement element = new JsonParser().parse(reader);
|
||||
JsonObject jsonObj = element.getAsJsonObject();
|
||||
|
||||
if (jsonObj.has("name")) {
|
||||
String name = jsonObj.get("name").getAsString();
|
||||
uuidToUsername.put(uuid, name);
|
||||
return name;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return "null";
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Object getValue(NBTTagCompound nbt) {
|
||||
if (nbt.hasKey(getKey())) {
|
||||
return nbt.getString(getKey());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void apply(NBTTagCompound nbt, Object value) {
|
||||
if (value instanceof String) {
|
||||
nbt.setString(getKey(), (String) value);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean check(EntityPlayer player, NBTTagCompound nbt) {
|
||||
if (nbt.hasKey(getKey())) {
|
||||
String uuidString = nbt.getString(getKey());
|
||||
if(uuidString != null && !uuidString.isEmpty()){
|
||||
UUID convert = null;
|
||||
try {
|
||||
convert = UUID.fromString(uuidString);
|
||||
} catch (Exception ignored){}
|
||||
if(convert != null)
|
||||
return player.getUniqueID().equals(convert);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+24
-16
@@ -5,24 +5,32 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class AttributeRecalcEvent {
|
||||
private static final List<IAttributeRecalcListener> listeners = new ArrayList<>();
|
||||
|
||||
/**
|
||||
* Allows other mods to register a listener that is called after attribute recalculation.
|
||||
*/
|
||||
public static void registerListener(IAttributeRecalcListener listener) {
|
||||
if (listener != null && !listeners.contains(listener)) {
|
||||
listeners.add(listener);
|
||||
}
|
||||
public final class AttributeRecalcEvent {
|
||||
@FunctionalInterface
|
||||
public interface PreListener {
|
||||
void onPre(EntityPlayer player, PlayerAttributeTracker tracker);
|
||||
}
|
||||
|
||||
/**
|
||||
* Posts an event to all registered listeners.
|
||||
*/
|
||||
private static final List<PreListener> preListeners = new ArrayList<>();
|
||||
private static final List<Listener> postListeners = new ArrayList<>();
|
||||
|
||||
public static void pre(EntityPlayer player, PlayerAttributeTracker tracker) {
|
||||
for (PreListener l : preListeners) l.onPre(player, tracker);
|
||||
}
|
||||
|
||||
@FunctionalInterface
|
||||
public interface Listener {
|
||||
void onPost(EntityPlayer player, PlayerAttributeTracker tracker);
|
||||
}
|
||||
|
||||
public static void registerListener(Listener l) {
|
||||
postListeners.add(l);
|
||||
}
|
||||
public static void post(EntityPlayer player, PlayerAttributeTracker tracker) {
|
||||
for (IAttributeRecalcListener listener : listeners) {
|
||||
listener.onAttributesRecalculated(player, tracker);
|
||||
}
|
||||
for (Listener l : postListeners) l.onPost(player, tracker);
|
||||
}
|
||||
|
||||
public static void registerPreListener(PreListener l) {
|
||||
preListeners.add(l);
|
||||
}
|
||||
}
|
||||
+112
-20
@@ -3,7 +3,7 @@ package kamkeel.npcs.controllers.data.attribute.tracker;
|
||||
import kamkeel.npcs.CustomAttributes;
|
||||
import kamkeel.npcs.controllers.AttributeController;
|
||||
import kamkeel.npcs.controllers.data.attribute.AttributeDefinition;
|
||||
import kamkeel.npcs.controllers.data.attribute.ICustomAttribute;
|
||||
import kamkeel.npcs.controllers.data.attribute.PlayerAttribute;
|
||||
import kamkeel.npcs.controllers.data.attribute.PlayerAttributeMap;
|
||||
import kamkeel.npcs.controllers.data.attribute.requirement.RequirementCheckerRegistry;
|
||||
import kamkeel.npcs.util.AttributeAttackUtil;
|
||||
@@ -14,21 +14,30 @@ import net.minecraft.entity.ai.attributes.IAttributeInstance;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.api.entity.IPlayer;
|
||||
import noppes.npcs.api.handler.data.ICustomAttribute;
|
||||
import noppes.npcs.api.handler.data.IPlayerAttributes;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.UUID;
|
||||
|
||||
public class PlayerAttributeTracker {
|
||||
public class PlayerAttributeTracker implements IPlayerAttributes {
|
||||
|
||||
public static UUID healthUUID = UUID.fromString("48a0ad75-2cf8-4838-ad2f-9a0aadc57dfe");
|
||||
|
||||
public static UUID healthBoostUUID = UUID.fromString("93cfba41-294a-4e6b-a98b-bee76a9f813b");
|
||||
public static UUID movementSpeedUUID = UUID.fromString("e7e0dd10-8ed5-42fb-8167-e71f8de4ea0c");
|
||||
public static UUID knockbackResUUID = UUID.fromString("b2f261e8-34f0-4140-9828-b56c1f6e0ff2");
|
||||
|
||||
private final UUID playerId;
|
||||
private PlayerAttributeMap playerAttributes = new PlayerAttributeMap();
|
||||
public PlayerAttributeMap playerAttributes = new PlayerAttributeMap();
|
||||
|
||||
public float extraHealth = 0;
|
||||
public float extraHealthBoost = 0;
|
||||
public float movementSpeed = 0;
|
||||
public float knockbackRes = 0;
|
||||
|
||||
public float gearOutput = 0.0f;
|
||||
|
||||
public final Map<Integer, Float> magicDamage = new HashMap<>();
|
||||
@@ -44,10 +53,6 @@ public class PlayerAttributeTracker {
|
||||
recalcAttributes(null);
|
||||
}
|
||||
|
||||
public PlayerAttributeMap getPlayerAttributes() {
|
||||
return playerAttributes;
|
||||
}
|
||||
|
||||
public void recalcAttributes(EntityPlayer player) {
|
||||
// Reset aggregated attributes and magic maps.
|
||||
playerAttributes = new PlayerAttributeMap();
|
||||
@@ -56,6 +61,9 @@ public class PlayerAttributeTracker {
|
||||
magicDefense.clear();
|
||||
magicResistance.clear();
|
||||
if (player != null) {
|
||||
// Pre Event Listener
|
||||
AttributeRecalcEvent.pre(player, this);
|
||||
|
||||
// Update equipment tracker.
|
||||
PlayerEquipmentTracker currentEquip = new PlayerEquipmentTracker();
|
||||
currentEquip.updateFrom(player);
|
||||
@@ -77,11 +85,11 @@ public class PlayerAttributeTracker {
|
||||
float value = entry.getValue();
|
||||
AttributeDefinition def = AttributeController.getAttribute(key);
|
||||
if (def != null) {
|
||||
ICustomAttribute inst = playerAttributes.getAttributeInstance(def);
|
||||
PlayerAttribute inst = playerAttributes.getAttributeInstance(def);
|
||||
if (inst == null) {
|
||||
inst = playerAttributes.registerAttribute(def, 0.0f);
|
||||
}
|
||||
inst.setValue(inst.getValue() + value);
|
||||
inst.value = (inst.getValue() + value);
|
||||
}
|
||||
}
|
||||
// Process Magic
|
||||
@@ -117,9 +125,16 @@ public class PlayerAttributeTracker {
|
||||
}
|
||||
equipmentTracker = currentEquip;
|
||||
gearOutput = AttributeAttackUtil.calculateGearOutput(this);
|
||||
extraHealth = getAttributeValue(CustomAttributes.HEALTH);
|
||||
|
||||
extraHealth = getAttributeValue(CustomAttributes.HEALTH);
|
||||
extraHealthBoost = getAttributeValue(CustomAttributes.HEALTH_BOOST);
|
||||
movementSpeed = getAttributeValue(CustomAttributes.MOVEMENT_SPEED);
|
||||
knockbackRes = getAttributeValue(CustomAttributes.KNOCKBACK_RES);
|
||||
|
||||
// Update vanilla attributes with our aggregated values.
|
||||
updatePlayerMaxHealth(player);
|
||||
updatePlayerMovementSpeed(player);
|
||||
updatePlayerKnockbackRes(player);
|
||||
|
||||
// Post Recalculation Event to Listeners
|
||||
AttributeRecalcEvent.post(player, this);
|
||||
@@ -134,32 +149,70 @@ public class PlayerAttributeTracker {
|
||||
*/
|
||||
public void updatePlayerMaxHealth(EntityPlayer player) {
|
||||
float bonusHealth = extraHealth;
|
||||
float healthBoostPercent = extraHealthBoost / 100;
|
||||
IAttributeInstance maxHealthAttr = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth);
|
||||
try {
|
||||
AttributeModifier old = maxHealthAttr.getModifier(healthUUID);
|
||||
if (old != null) {
|
||||
maxHealthAttr.removeModifier(old);
|
||||
AttributeModifier oldFlat = maxHealthAttr.getModifier(healthUUID);
|
||||
if (oldFlat != null) {
|
||||
maxHealthAttr.removeModifier(oldFlat);
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
AttributeModifier oldBoost = maxHealthAttr.getModifier(healthBoostUUID);
|
||||
if (oldBoost != null) {
|
||||
maxHealthAttr.removeModifier(oldBoost);
|
||||
}
|
||||
} catch (Exception ignored) { }
|
||||
// Apply the flat bonus (operation 0)
|
||||
if (bonusHealth != 0) {
|
||||
maxHealthAttr.applyModifier(new AttributeModifier(healthUUID, "RPGCoreHealthBonus", bonusHealth, 0));
|
||||
}
|
||||
// Ensure the player's current health does not exceed the new maximum.
|
||||
// Apply the percent boost (operation 1 multiplies the base health, here assumed to be 20)
|
||||
if (healthBoostPercent != 0) {
|
||||
maxHealthAttr.applyModifier(new AttributeModifier(healthBoostUUID, "RPGCoreHealthBoost", healthBoostPercent, 1));
|
||||
}
|
||||
// Ensure current health is within the new maximum.
|
||||
float currentHealth = player.getHealth();
|
||||
if (currentHealth > maxHealthAttr.getAttributeValue()) {
|
||||
player.setHealth((float) maxHealthAttr.getAttributeValue());
|
||||
}
|
||||
}
|
||||
|
||||
public void updatePlayerMovementSpeed(EntityPlayer player) {
|
||||
float extraSpeed = movementSpeed / 100;
|
||||
IAttributeInstance speedAttr = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.movementSpeed);
|
||||
try {
|
||||
AttributeModifier old = speedAttr.getModifier(movementSpeedUUID);
|
||||
if (old != null) {
|
||||
speedAttr.removeModifier(old);
|
||||
}
|
||||
} catch (Exception ignored) { }
|
||||
if (extraSpeed != 0) {
|
||||
speedAttr.applyModifier(new AttributeModifier(movementSpeedUUID, "RPGCoreMovementSpeed", extraSpeed, 1));
|
||||
}
|
||||
}
|
||||
|
||||
public void updatePlayerKnockbackRes(EntityPlayer player) {
|
||||
float extraRes = knockbackRes / 100;
|
||||
IAttributeInstance knockResAttr = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.knockbackResistance);
|
||||
try {
|
||||
AttributeModifier old = knockResAttr.getModifier(knockbackResUUID);
|
||||
if (old != null) {
|
||||
knockResAttr.removeModifier(old);
|
||||
}
|
||||
} catch (Exception ignored) { }
|
||||
if (extraRes != 0) {
|
||||
knockResAttr.applyModifier(new AttributeModifier(knockbackResUUID, "RPGCoreKnockbackRes", extraRes, 1));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if the player's equipment has changed and recalculates attributes if needed.
|
||||
*/
|
||||
public void updateIfChanged(EntityPlayer player) {
|
||||
PlayerEquipmentTracker currentEquip = new PlayerEquipmentTracker();
|
||||
currentEquip.updateFrom(player);
|
||||
if (!equipmentTracker.equals(player)) {
|
||||
PlayerEquipmentTracker current = new PlayerEquipmentTracker();
|
||||
current.updateFrom(player);
|
||||
if (!equipmentTracker.equals(current)) {
|
||||
recalcAttributes(player);
|
||||
equipmentTracker = current;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,4 +220,43 @@ public class PlayerAttributeTracker {
|
||||
ICustomAttribute inst = playerAttributes.getAttributeInstance(def);
|
||||
return inst != null ? inst.getValue() : 0.0f;
|
||||
}
|
||||
|
||||
public void recalculate(IPlayer player) {
|
||||
if(player == null || player.getMCEntity() == null)
|
||||
return;
|
||||
|
||||
recalcAttributes((EntityPlayer) player.getMCEntity());
|
||||
}
|
||||
|
||||
public ICustomAttribute[] getAttributes() {
|
||||
return playerAttributes.map.values().toArray(new ICustomAttribute[playerAttributes.map.size()]);
|
||||
}
|
||||
|
||||
public float getAttributeValue(String key) {
|
||||
for (ICustomAttribute inst : getAttributes()) {
|
||||
if (inst.getAttribute().getKey().equalsIgnoreCase(key)) {
|
||||
return inst.getValue();
|
||||
}
|
||||
}
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
|
||||
public boolean hasAttribute(String key) {
|
||||
for (ICustomAttribute inst : getAttributes()) {
|
||||
if (inst.getAttribute().getKey().equalsIgnoreCase(key)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public ICustomAttribute getAttribute(String key) {
|
||||
for (ICustomAttribute inst : getAttributes()) {
|
||||
if (inst.getAttribute().getKey().equalsIgnoreCase(key)) {
|
||||
return inst;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+44
-19
@@ -5,6 +5,10 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import static kamkeel.npcs.util.AttributeItemUtil.TAG_RPGCORE;
|
||||
|
||||
public class PlayerEquipmentTracker {
|
||||
public ItemStack heldItem;
|
||||
public ItemStack helmet;
|
||||
@@ -25,18 +29,35 @@ public class PlayerEquipmentTracker {
|
||||
helmet = copyIfNotNull(armor[3]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Compares the stored equipment with the player's current equipment.
|
||||
* Ignores changes like durability by comparing the item and the CNPCAttributes NBT only.
|
||||
*/
|
||||
public boolean equals(EntityPlayer player) {
|
||||
if (player == null) return false;
|
||||
if (!areItemStacksEquivalent(heldItem, player.getHeldItem())) return false;
|
||||
ItemStack[] armor = player.inventory.armorInventory;
|
||||
if (!areItemStacksEquivalent(boots, armor[0])) return false;
|
||||
if (!areItemStacksEquivalent(leggings, armor[1])) return false;
|
||||
if (!areItemStacksEquivalent(chestplate, armor[2])) return false;
|
||||
return areItemStacksEquivalent(helmet, armor[3]);
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (!(o instanceof PlayerEquipmentTracker)) return false;
|
||||
PlayerEquipmentTracker other = (PlayerEquipmentTracker)o;
|
||||
return areItemStacksEquivalent(heldItem, other.heldItem)
|
||||
&& areItemStacksEquivalent(boots, other.boots)
|
||||
&& areItemStacksEquivalent(leggings, other.leggings)
|
||||
&& areItemStacksEquivalent(chestplate, other.chestplate)
|
||||
&& areItemStacksEquivalent(helmet, other.helmet);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(
|
||||
itemHash(heldItem),
|
||||
itemHash(boots),
|
||||
itemHash(leggings),
|
||||
itemHash(chestplate),
|
||||
itemHash(helmet)
|
||||
);
|
||||
}
|
||||
|
||||
private int itemHash(ItemStack s) {
|
||||
if (s == null) return 0;
|
||||
NBTTagCompound root = s.stackTagCompound;
|
||||
if (root == null || !root.hasKey(TAG_RPGCORE)) return 0;
|
||||
NBTTagCompound tag = root.getCompoundTag(TAG_RPGCORE);
|
||||
return Objects.hash(s.getItem(), tag);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -54,12 +75,16 @@ public class PlayerEquipmentTracker {
|
||||
if (a == b) return true;
|
||||
if (a == null || b == null) return false;
|
||||
if (a.getItem() != b.getItem()) return false;
|
||||
NBTTagCompound tagA = a.stackTagCompound;
|
||||
NBTTagCompound tagB = b.stackTagCompound;
|
||||
String attrA = (tagA != null && tagA.hasKey(AttributeItemUtil.TAG_RPGCORE))
|
||||
? tagA.getCompoundTag(AttributeItemUtil.TAG_RPGCORE).toString() : "";
|
||||
String attrB = (tagB != null && tagB.hasKey(AttributeItemUtil.TAG_RPGCORE))
|
||||
? tagB.getCompoundTag(AttributeItemUtil.TAG_RPGCORE).toString() : "";
|
||||
return attrA.equals(attrB);
|
||||
|
||||
NBTTagCompound tagA = a.stackTagCompound != null
|
||||
? a.stackTagCompound.getCompoundTag(TAG_RPGCORE)
|
||||
: null;
|
||||
NBTTagCompound tagB = b.stackTagCompound != null
|
||||
? b.stackTagCompound.getCompoundTag(TAG_RPGCORE)
|
||||
: null;
|
||||
if (tagA == null ^ tagB == null) return false;
|
||||
if (tagA != null && !tagA.equals(tagB)) return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,9 @@ import kamkeel.npcs.network.packets.player.customgui.CustomGuiButtonPacket;
|
||||
import kamkeel.npcs.network.packets.player.customgui.CustomGuiClosePacket;
|
||||
import kamkeel.npcs.network.packets.player.customgui.CustomGuiUnfocusedPacket;
|
||||
import kamkeel.npcs.network.packets.player.customgui.CustomScrollClickPacket;
|
||||
import kamkeel.npcs.network.packets.player.item.GuiMagicBookPacket;
|
||||
import kamkeel.npcs.network.packets.player.item.GuiPaintbrushPacket;
|
||||
import kamkeel.npcs.network.packets.player.item.MagicCyclesPacket;
|
||||
import kamkeel.npcs.network.packets.player.profile.*;
|
||||
import kamkeel.npcs.network.packets.request.*;
|
||||
import kamkeel.npcs.network.packets.request.animation.AnimationGetPacket;
|
||||
@@ -429,6 +432,11 @@ public class PacketHandler {
|
||||
PLAYER_PACKET.registerPacket(new CustomGuiUnfocusedPacket());
|
||||
PLAYER_PACKET.registerPacket(new CustomScrollClickPacket());
|
||||
|
||||
// Item Gui Packets
|
||||
PLAYER_PACKET.registerPacket(new GuiPaintbrushPacket());
|
||||
PLAYER_PACKET.registerPacket(new GuiMagicBookPacket());
|
||||
PLAYER_PACKET.registerPacket(new MagicCyclesPacket());
|
||||
|
||||
// Profile Packets
|
||||
PLAYER_PACKET.registerPacket(new ProfileCreatePacket());
|
||||
PLAYER_PACKET.registerPacket(new ProfileRemovePacket());
|
||||
|
||||
@@ -15,6 +15,7 @@ import noppes.npcs.NBTTags;
|
||||
import noppes.npcs.controllers.ScriptContainer;
|
||||
import noppes.npcs.controllers.ScriptController;
|
||||
import noppes.npcs.controllers.data.IScriptHandler;
|
||||
import noppes.npcs.items.ItemNpcTool;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.LinkedHashSet;
|
||||
@@ -23,14 +24,14 @@ import java.util.Set;
|
||||
|
||||
public class PacketUtil {
|
||||
|
||||
public static boolean verifyItemPacket(EnumItemPacketType type, EntityPlayer player) {
|
||||
public static boolean verifyItemPacket(String name, EnumItemPacketType type, EntityPlayer player) {
|
||||
if (player == null)
|
||||
return false;
|
||||
|
||||
ItemStack item = player.inventory.getCurrentItem();
|
||||
if (item == null) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without an item, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without an item, they could be a hacker",
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -38,42 +39,42 @@ public class PacketUtil {
|
||||
case WAND:
|
||||
if (item.getItem() != CustomItems.wand) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Wand, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case MOUNTER:
|
||||
if (item.getItem() != CustomItems.mount) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Mounter, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case CLONER:
|
||||
if (item.getItem() != CustomItems.cloner) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Cloner, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Cloner, they could be a hacker",
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case TELEPORTER:
|
||||
if (item.getItem() != CustomItems.teleporter) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Teleporter, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Teleporter, they could be a hacker",
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case SCRIPTER:
|
||||
if (item.getItem() != CustomItems.scripter) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Scripter, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Scripter, they could be a hacker",
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case PATHER:
|
||||
if (item.getItem() != CustomItems.moving) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Pather, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Pather, they could be a hacker",
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
@@ -81,22 +82,29 @@ public class PacketUtil {
|
||||
if (item.getItem() == Item.getItemFromBlock(CustomItems.waypoint)
|
||||
|| item.getItem() == Item.getItemFromBlock(CustomItems.border)
|
||||
|| item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock)) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without a valid Block, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a valid Block, they could be a hacker",
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case BRUSH:
|
||||
if (item.getItem() != CustomItems.tool || item.getItemDamage() != 1) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Pather, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Pather, they could be a hacker",
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case HAMMER:
|
||||
if (item.getItem() != CustomItems.tool || item.getItemDamage() != 0) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Pather, they could be a hacker",
|
||||
player.getCommandSenderName(), type));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Hammer, they could be a hacker",
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case MAGIC_BOOK:
|
||||
if (item.getItem() != CustomItems.tool || item.getItemDamage() != 2) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s %s Packet without a Magic Book, they could be a hacker",
|
||||
player.getCommandSenderName(), type, name));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
@@ -109,14 +117,14 @@ public class PacketUtil {
|
||||
* It returns true if any one of the provided types is valid.
|
||||
* If none are valid, a merged error message is logged.
|
||||
*/
|
||||
public static boolean verifyItemPacket(EntityPlayer player, EnumItemPacketType... types) {
|
||||
public static boolean verifyItemPacket(String name, EntityPlayer player, EnumItemPacketType... types) {
|
||||
if (player == null)
|
||||
return false;
|
||||
|
||||
ItemStack item = player.inventory.getCurrentItem();
|
||||
if (item == null) {
|
||||
LogWriter.error(String.format("%s attempted to utilize a Packet without an item. Expected one of: %s, they could be a hacker",
|
||||
player.getCommandSenderName(), getExpectedItemNames(types)));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s without an item. Expected one of: %s, they could be a hacker",
|
||||
player.getCommandSenderName(), name, getExpectedItemNames(types)));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -127,8 +135,8 @@ public class PacketUtil {
|
||||
}
|
||||
|
||||
// None passed; log one merged error message listing all expected items.
|
||||
LogWriter.error(String.format("%s attempted to utilize a Packet without a valid item. Expected one of: %s, they could be a hacker",
|
||||
player.getCommandSenderName(), getExpectedItemNames(types)));
|
||||
LogWriter.error(String.format("%s attempted to utilize a %s without a valid item. Expected one of: %s, they could be a hacker",
|
||||
player.getCommandSenderName(), name, getExpectedItemNames(types)));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -155,9 +163,11 @@ public class PacketUtil {
|
||||
|| item.getItem() == Item.getItemFromBlock(CustomItems.border)
|
||||
|| item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock));
|
||||
case BRUSH:
|
||||
return item.getItem() == CustomItems.tool && item.getItemDamage() == 1;
|
||||
return item.getItem() instanceof ItemNpcTool && item.getItemDamage() == 1;
|
||||
case HAMMER:
|
||||
return item.getItem() == CustomItems.tool && item.getItemDamage() == 0;
|
||||
return item.getItem() instanceof ItemNpcTool && item.getItemDamage() == 0;
|
||||
case MAGIC_BOOK:
|
||||
return item.getItem() instanceof ItemNpcTool && item.getItemDamage() == 2;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
@@ -197,6 +207,8 @@ public class PacketUtil {
|
||||
return "Paintbrush";
|
||||
case HAMMER:
|
||||
return "Hammer";
|
||||
case MAGIC_BOOK:
|
||||
return "Magic Book";
|
||||
default:
|
||||
return type.toString();
|
||||
}
|
||||
|
||||
@@ -9,5 +9,6 @@ public enum EnumItemPacketType {
|
||||
PATHER,
|
||||
BLOCK,
|
||||
BRUSH,
|
||||
HAMMER
|
||||
HAMMER,
|
||||
MAGIC_BOOK
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package kamkeel.npcs.network.enums;
|
||||
|
||||
|
||||
public enum EnumPlayerPacket {
|
||||
FollowerAction,
|
||||
Transport,
|
||||
@@ -14,12 +15,16 @@ public enum EnumPlayerPacket {
|
||||
GetRole,
|
||||
InputDevice,
|
||||
ScreenSize,
|
||||
MagicCycles,
|
||||
|
||||
CustomGuiButton,
|
||||
CustomGuiScrollClick,
|
||||
CustomGuiClose,
|
||||
CustomGuiUnfocused,
|
||||
|
||||
GuiPaintbrush,
|
||||
GuiMagicBook,
|
||||
|
||||
ProfileCreate,
|
||||
ProfileRemove,
|
||||
ProfileRename,
|
||||
|
||||
@@ -56,7 +56,7 @@ public final class SyncEffectPacket extends LargeAbstractPacket {
|
||||
NBTTagCompound tag = ByteBufUtils.readBigNBT(data);
|
||||
SyncController.clientSyncEffects(tag);
|
||||
} catch (RuntimeException e) {
|
||||
LogWriter.error("Attempted to Sync Effects but it was too big");
|
||||
LogWriter.error(String.format("Attempted to Sync Effects but it was too big"));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import noppes.npcs.NoppesUtilPlayer;
|
||||
import noppes.npcs.controllers.PartyController;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
import noppes.npcs.controllers.data.Party;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
import noppes.npcs.controllers.data.PlayerFactionData;
|
||||
@@ -56,7 +55,7 @@ public class CheckPlayerValue extends AbstractPacket {
|
||||
Type type = Type.values()[in.readInt()];
|
||||
switch (type) {
|
||||
case Faction:
|
||||
PlayerFactionData data = PlayerDataController.Instance.getPlayerData(playerMP).factionData;
|
||||
PlayerFactionData data = PlayerData.get(playerMP).factionData;
|
||||
GuiDataPacket.sendGuiData(playerMP, data.getPlayerGuiData());
|
||||
break;
|
||||
case QuestLog:
|
||||
@@ -66,8 +65,8 @@ public class CheckPlayerValue extends AbstractPacket {
|
||||
NoppesUtilPlayer.sendTrackedQuest(playerMP);
|
||||
break;
|
||||
case CheckQuestCompletion:
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP);
|
||||
PlayerQuestData questData = PlayerDataController.Instance.getPlayerData(playerMP).questData;
|
||||
PlayerData playerData = PlayerData.get(playerMP);
|
||||
PlayerQuestData questData = PlayerData.get(playerMP).questData;
|
||||
Party playerParty = playerData.getPlayerParty();
|
||||
if (playerParty != null)
|
||||
PartyController.Instance().checkQuestCompletion(playerParty, null);
|
||||
|
||||
@@ -17,6 +17,7 @@ import noppes.npcs.constants.EnumGuiType;
|
||||
import noppes.npcs.containers.ContainerMail;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
import noppes.npcs.controllers.PlayerQuestController;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
import noppes.npcs.controllers.data.PlayerMail;
|
||||
import noppes.npcs.controllers.data.PlayerMailData;
|
||||
import noppes.npcs.controllers.data.QuestData;
|
||||
@@ -97,7 +98,7 @@ public class MailActionPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
EntityPlayerMP playerMP = (EntityPlayerMP) player;
|
||||
PlayerMailData data = PlayerDataController.Instance.getPlayerData(playerMP).mailData;
|
||||
PlayerMailData data = PlayerData.get(playerMP).mailData;
|
||||
|
||||
if (type == Action.GET) {
|
||||
GuiDataPacket.sendGuiData(playerMP, data.saveNBTData(new NBTTagCompound()));
|
||||
|
||||
@@ -8,7 +8,7 @@ import kamkeel.npcs.network.PacketChannel;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.enums.EnumPlayerPacket;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@@ -44,6 +44,6 @@ public class ScreenSizePacket extends AbstractPacket {
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
int width = in.readInt(), height = in.readInt();
|
||||
PlayerDataController.Instance.getPlayerData(player).screenSize.setSize(width, height);
|
||||
PlayerData.get(player).screenSize.setSize(width, height);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
package kamkeel.npcs.network.packets.player.item;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.AbstractPacket;
|
||||
import kamkeel.npcs.network.PacketChannel;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import kamkeel.npcs.network.enums.EnumItemPacketType;
|
||||
import kamkeel.npcs.network.enums.EnumPlayerPacket;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import noppes.npcs.NoppesUtilServer;
|
||||
import noppes.npcs.constants.EnumGuiType;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class GuiMagicBookPacket extends AbstractPacket {
|
||||
public static String packetName = "Player|GuiMagicBook";
|
||||
|
||||
private int guiIndex, posX, posY, posZ;
|
||||
|
||||
public GuiMagicBookPacket(int guiIndex, int posX, int posY, int posZ) {
|
||||
this.guiIndex = guiIndex;
|
||||
this.posX = posX;
|
||||
this.posY = posY;
|
||||
this.posZ = posZ;
|
||||
}
|
||||
|
||||
public GuiMagicBookPacket() {}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumPlayerPacket.GuiMagicBook;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketChannel getChannel() {
|
||||
return PacketHandler.PLAYER_PACKET;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
out.writeInt(guiIndex);
|
||||
out.writeInt(posX);
|
||||
out.writeInt(posY);
|
||||
out.writeInt(posZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.MAGIC_BOOK))
|
||||
return;
|
||||
|
||||
int index = in.readInt();
|
||||
int x = in.readInt();
|
||||
int y = in.readInt();
|
||||
int z = in.readInt();
|
||||
EnumGuiType gui = EnumGuiType.values()[index];
|
||||
NoppesUtilServer.sendOpenGui(player, gui, null, x, y, z);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
package kamkeel.npcs.network.packets.player.item;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.AbstractPacket;
|
||||
import kamkeel.npcs.network.PacketChannel;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.PacketUtil;
|
||||
import kamkeel.npcs.network.enums.EnumItemPacketType;
|
||||
import kamkeel.npcs.network.enums.EnumPlayerPacket;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import noppes.npcs.NoppesUtilServer;
|
||||
import noppes.npcs.constants.EnumGuiType;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class GuiPaintbrushPacket extends AbstractPacket {
|
||||
public static String packetName = "Player|GuiPaintbrush";
|
||||
|
||||
private int guiIndex, posX, posY, posZ;
|
||||
|
||||
public GuiPaintbrushPacket(int guiIndex, int posX, int posY, int posZ) {
|
||||
this.guiIndex = guiIndex;
|
||||
this.posX = posX;
|
||||
this.posY = posY;
|
||||
this.posZ = posZ;
|
||||
}
|
||||
|
||||
public GuiPaintbrushPacket() {}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumPlayerPacket.GuiPaintbrush;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketChannel getChannel() {
|
||||
return PacketHandler.PLAYER_PACKET;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
out.writeInt(guiIndex);
|
||||
out.writeInt(posX);
|
||||
out.writeInt(posY);
|
||||
out.writeInt(posZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.BRUSH))
|
||||
return;
|
||||
|
||||
int index = in.readInt();
|
||||
int x = in.readInt();
|
||||
int y = in.readInt();
|
||||
int z = in.readInt();
|
||||
EnumGuiType gui = EnumGuiType.values()[index];
|
||||
NoppesUtilServer.sendOpenGui(player, gui, null, x, y, z);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
package kamkeel.npcs.network.packets.player.item;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.*;
|
||||
import kamkeel.npcs.network.enums.EnumItemPacketType;
|
||||
import kamkeel.npcs.network.enums.EnumPlayerPacket;
|
||||
import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.constants.EnumScrollData;
|
||||
import noppes.npcs.controllers.MagicController;
|
||||
import noppes.npcs.controllers.data.MagicCycle;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
|
||||
import static kamkeel.npcs.network.packets.data.large.ScrollDataPacket.sendScrollData;
|
||||
|
||||
public class MagicCyclesPacket extends AbstractPacket {
|
||||
public static String packetName = "Player|MagicCycles";
|
||||
|
||||
private int id;
|
||||
|
||||
public MagicCyclesPacket() {}
|
||||
|
||||
public MagicCyclesPacket(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enum getType() {
|
||||
return EnumPlayerPacket.MagicCycles;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketChannel getChannel() {
|
||||
return PacketHandler.PLAYER_PACKET;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
out.writeInt(this.id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.MAGIC_BOOK))
|
||||
return;
|
||||
|
||||
int id = in.readInt();
|
||||
if(id == -1){
|
||||
HashMap<String, Integer> map = new HashMap<>();
|
||||
for (MagicCycle magicCycle : MagicController.getInstance().cycles.values()) {
|
||||
map.put(magicCycle.displayName.replace("&", "\u00A7"), magicCycle.id);
|
||||
}
|
||||
sendScrollData((EntityPlayerMP) player, map, EnumScrollData.MAGIC_CYCLES);
|
||||
} else {
|
||||
MagicCycle cycle = MagicController.getInstance().getCycle(id);
|
||||
if(cycle == null)
|
||||
return;
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
NBTTagCompound magicCompound = new NBTTagCompound();
|
||||
cycle.writeNBT(magicCompound);
|
||||
compound.setTag("MagicCycle", magicCompound);
|
||||
GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
|
||||
}
|
||||
}
|
||||
|
||||
public static void GetAll() {
|
||||
PacketClient.sendClient(new MagicCyclesPacket(-1));
|
||||
}
|
||||
|
||||
public static void GetCycle(int id) {
|
||||
PacketClient.sendClient(new MagicCyclesPacket(id));
|
||||
}
|
||||
}
|
||||
@@ -54,7 +54,7 @@ public final class GuiRequestPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER, EnumItemPacketType.BRUSH))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.CLONER, EnumItemPacketType.BRUSH, EnumItemPacketType.MAGIC_BOOK))
|
||||
return;
|
||||
int index = in.readInt();
|
||||
int x = in.readInt();
|
||||
|
||||
@@ -8,7 +8,6 @@ import kamkeel.npcs.network.PacketChannel;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.network.enums.EnumRequestPacket;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -44,7 +43,7 @@ public final class IsGuiOpenInform extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
PlayerData playerdata = PlayerDataController.Instance.getPlayerData(player);
|
||||
PlayerData playerdata = PlayerData.get(player);
|
||||
boolean isGUIOpen = in.readBoolean();
|
||||
playerdata.setGUIOpen(isGUIOpen);
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ public final class MailOpenSetupPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
PlayerMail mail = new PlayerMail();
|
||||
|
||||
@@ -60,7 +60,7 @@ public final class MerchantUpdatePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int entityId = in.readInt();
|
||||
|
||||
@@ -61,7 +61,7 @@ public final class MountPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.MOUNTER, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.MOUNTER, player))
|
||||
return;
|
||||
|
||||
MountPacket.Action requestedAction = MountPacket.Action.values()[in.readInt()];
|
||||
|
||||
@@ -57,7 +57,7 @@ public final class TileEntityGetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
return;
|
||||
|
||||
TileEntity tile = player.worldObj.getTileEntity(in.readInt(), in.readInt(), in.readInt());
|
||||
|
||||
@@ -50,7 +50,7 @@ public final class TileEntitySavePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
return;
|
||||
|
||||
NoppesUtilServer.saveTileEntity((EntityPlayerMP) player, ByteBufUtils.readNBT(in));
|
||||
|
||||
@@ -44,7 +44,7 @@ public final class TraderMarketSavePacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public CustomNpcsPermissions.Permission getPermission() {
|
||||
return CustomNpcsPermissions.NPC_ADVANCED;
|
||||
return CustomNpcsPermissions.NPC_ADVANCED_TRADER;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -64,7 +64,7 @@ public final class TraderMarketSavePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
String market = ByteBufUtils.readString(in);
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ public final class AnimationGetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int id = in.readInt();
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@ public final class AnimationRemovePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int id = in.readInt();
|
||||
|
||||
+1
-1
@@ -59,7 +59,7 @@ public final class AnimationSavePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(in);
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ public final class AnimationsGetPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
NoppesUtilServer.sendAnimationDataAll((EntityPlayerMP) player);
|
||||
|
||||
@@ -49,7 +49,7 @@ public final class BankGetPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
int id = in.readInt();
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ public final class BankRemovePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int id = in.readInt();
|
||||
|
||||
@@ -57,7 +57,7 @@ public final class BankSavePacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(in);
|
||||
|
||||
@@ -42,7 +42,7 @@ public final class BanksGetPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
NoppesUtilServer.sendBankDataAll((EntityPlayerMP) player);
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ public final class CloneAllTagsPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
|
||||
return;
|
||||
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ public final class CloneAllTagsShortPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
|
||||
return;
|
||||
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
|
||||
@@ -51,7 +51,7 @@ public final class CloneListPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.MOUNTER, EnumItemPacketType.CLONER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.MOUNTER, EnumItemPacketType.CLONER))
|
||||
return;
|
||||
|
||||
NBTTagList list = new NBTTagList();
|
||||
|
||||
@@ -59,7 +59,7 @@ public final class ClonePreSavePacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
|
||||
return;
|
||||
|
||||
boolean bo = ServerCloneController.Instance.getCloneData(null, ByteBufUtils.readString(in), in.readInt()) != null;
|
||||
|
||||
@@ -61,7 +61,7 @@ public final class CloneRemovePacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
|
||||
return;
|
||||
|
||||
int tab = in.readInt();
|
||||
|
||||
@@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import noppes.npcs.CustomNpcsPermissions;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
import noppes.npcs.controllers.ServerCloneController;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
|
||||
@@ -67,10 +66,10 @@ public final class CloneSavePacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
|
||||
return;
|
||||
|
||||
PlayerData data = PlayerDataController.Instance.getPlayerData(player);
|
||||
PlayerData data = PlayerData.get(player);
|
||||
if (data.cloned == null)
|
||||
return;
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ public final class CloneTagListPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
|
||||
return;
|
||||
|
||||
int tab = in.readInt();
|
||||
|
||||
@@ -94,7 +94,7 @@ public class MobSpawnerPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
|
||||
return;
|
||||
|
||||
Action requestedAction = Action.values()[in.readInt()];
|
||||
|
||||
@@ -100,7 +100,7 @@ public class SpawnMobPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.CLONER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER))
|
||||
return;
|
||||
|
||||
Action requestedAction = Action.values()[in.readInt()];
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ public final class DialogCategoriesGetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
return;
|
||||
|
||||
ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll(), EnumScrollData.OPTIONAL);
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ public final class DialogCategoryGetPacket extends AbstractPacket {
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP)) return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return;
|
||||
int id = in.readInt();
|
||||
DialogCategory category = DialogController.Instance.categories.get(id);
|
||||
if (category != null) {
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ public final class DialogCategoryRemovePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
int id = in.readInt();
|
||||
DialogController.Instance.removeCategory(id);
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ public final class DialogCategorySavePacket extends AbstractPacket {
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP)) return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return;
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(in);
|
||||
DialogCategory category = new DialogCategory();
|
||||
category.readNBT(compound);
|
||||
|
||||
@@ -50,7 +50,7 @@ public final class DialogGetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
return;
|
||||
|
||||
Dialog dialog = DialogController.Instance.dialogs.get(in.readInt());
|
||||
|
||||
@@ -41,7 +41,7 @@ public final class DialogNpcGetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
NoppesUtilServer.sendNpcDialogs(player);
|
||||
|
||||
+2
-2
@@ -39,7 +39,7 @@ public final class DialogNpcRemovePacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public CustomNpcsPermissions.Permission getPermission() {
|
||||
return CustomNpcsPermissions.NPC_ADVANCED;
|
||||
return CustomNpcsPermissions.NPC_ADVANCED_DIALOG;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -58,7 +58,7 @@ public final class DialogNpcRemovePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int idx = in.readInt();
|
||||
|
||||
@@ -45,7 +45,7 @@ public final class DialogNpcSetPacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public CustomNpcsPermissions.Permission getPermission() {
|
||||
return CustomNpcsPermissions.NPC_ADVANCED;
|
||||
return CustomNpcsPermissions.NPC_ADVANCED_DIALOG;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -63,7 +63,7 @@ public final class DialogNpcSetPacket extends AbstractPacket {
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP)) return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return;
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player)) return;
|
||||
int s = in.readInt();
|
||||
int d = in.readInt();
|
||||
DialogOption option = NoppesUtilServer.setNpcDialog(s, d, player);
|
||||
|
||||
@@ -58,7 +58,7 @@ public final class DialogRemovePacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
int diagId = in.readInt();
|
||||
boolean sendGroup = in.readBoolean();
|
||||
|
||||
@@ -64,7 +64,7 @@ public final class DialogSavePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int cat = in.readInt();
|
||||
|
||||
@@ -52,7 +52,7 @@ public final class DialogsGetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
return;
|
||||
|
||||
int catID = in.readInt();
|
||||
|
||||
@@ -46,7 +46,7 @@ public final class EffectGetPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int effectID = in.readInt();
|
||||
|
||||
@@ -54,7 +54,7 @@ public class EffectRemovePacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int effectID = in.readInt();
|
||||
|
||||
@@ -57,7 +57,7 @@ public class EffectSavePacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
String prevName = ByteBufUtils.readString(in);
|
||||
|
||||
@@ -47,7 +47,7 @@ public final class EffectsGetPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int effectID = in.readInt();
|
||||
|
||||
@@ -48,7 +48,7 @@ public final class FactionGetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
return;
|
||||
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
|
||||
@@ -48,10 +48,6 @@ public final class FactionRemovePacket extends AbstractPacket {
|
||||
return CustomNpcsPermissions.GLOBAL_FACTION;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean needsNPC() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
@@ -63,7 +59,7 @@ public final class FactionRemovePacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int id = in.readInt();
|
||||
|
||||
@@ -48,11 +48,6 @@ public final class FactionSavePacket extends AbstractPacket {
|
||||
return CustomNpcsPermissions.GLOBAL_FACTION;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean needsNPC() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void sendData(ByteBuf out) throws IOException {
|
||||
@@ -64,7 +59,7 @@ public final class FactionSavePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
NBTTagCompound compound = ByteBufUtils.readNBT(in);
|
||||
|
||||
@@ -39,7 +39,7 @@ public final class FactionSetPacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public CustomNpcsPermissions.Permission getPermission() {
|
||||
return CustomNpcsPermissions.NPC_ADVANCED;
|
||||
return CustomNpcsPermissions.NPC_ADVANCED_FACTION;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -58,7 +58,7 @@ public final class FactionSetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
int factionId = in.readInt();
|
||||
|
||||
@@ -42,7 +42,7 @@ public final class FactionsGetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK))
|
||||
return;
|
||||
|
||||
NoppesUtilServer.sendFactionDataAll((EntityPlayerMP) player);
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ public final class DimensionTeleportPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.TELEPORTER))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.TELEPORTER))
|
||||
return;
|
||||
|
||||
int dimension = in.readInt();
|
||||
|
||||
@@ -56,7 +56,7 @@ public final class ColorBrushPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.BRUSH, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.BRUSH, player))
|
||||
return;
|
||||
|
||||
int color = in.readInt();
|
||||
|
||||
@@ -65,7 +65,7 @@ public final class ColorSetPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.BRUSH, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.BRUSH, player))
|
||||
return;
|
||||
|
||||
int x = in.readInt();
|
||||
|
||||
@@ -61,7 +61,7 @@ public final class HammerPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.HAMMER, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.HAMMER, player))
|
||||
return;
|
||||
|
||||
int x = in.readInt();
|
||||
|
||||
@@ -37,7 +37,7 @@ public final class JobGetPacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public CustomNpcsPermissions.Permission getPermission() {
|
||||
return CustomNpcsPermissions.NPC_ADVANCED;
|
||||
return CustomNpcsPermissions.NPC_ADVANCED_JOB;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -55,7 +55,7 @@ public final class JobGetPacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
if (npc.jobInterface == null)
|
||||
|
||||
@@ -40,7 +40,7 @@ public final class JobSavePacket extends AbstractPacket {
|
||||
|
||||
@Override
|
||||
public CustomNpcsPermissions.Permission getPermission() {
|
||||
return CustomNpcsPermissions.NPC_ADVANCED;
|
||||
return CustomNpcsPermissions.NPC_ADVANCED_JOB;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -59,7 +59,7 @@ public final class JobSavePacket extends AbstractPacket {
|
||||
if (!(player instanceof EntityPlayerMP))
|
||||
return;
|
||||
|
||||
if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player))
|
||||
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
|
||||
return;
|
||||
|
||||
NBTTagCompound original = npc.jobInterface.writeToNBT(new NBTTagCompound());
|
||||
|
||||
Loaded 100 of 610 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user