From 39b7f805b3f64174c876396f1cd32c5c00751332 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Sat, 5 Feb 2022 18:02:35 -0500 Subject: [PATCH] Original CNPC Branch --- src/main/java/foxz/command/CmdFaction.java | 9 +- src/main/java/foxz/command/CmdNoppes.java | 3 +- .../minecraft/block/properties/IProperty.java | 19 - .../minecraft/block/state/IBlockState.java | 23 - src/main/java/net/minecraft/util/Vec3i.java | 123 - .../net/minecraft/util/math/BlockPos.java | 406 --- .../java/nikedemos/markovnames/HashMap2D.java | 81 - src/main/java/nikedemos/markovnames/Main.java | 53 - .../markovnames/MarkovDictionary.java | 270 -- .../markovnames/MarkovDictionarySPA.java | 41 - .../generators/MarkovAncientGreek.java | 58 - .../markovnames/generators/MarkovAztec.java | 31 - .../generators/MarkovCustomNPCsClassic.java | 40 - .../generators/MarkovGenerator.java | 46 - .../generators/MarkovJapanese.java | 51 - .../generators/MarkovOldNorse.java | 32 - .../markovnames/generators/MarkovRoman.java | 65 - .../markovnames/generators/MarkovSaami.java | 33 - .../markovnames/generators/MarkovSlavic.java | 59 - .../markovnames/generators/MarkovSpanish.java | 52 - .../markovnames/generators/MarkovWelsh.java | 50 - src/main/java/noppes/npcs/CommonProxy.java | 83 +- src/main/java/noppes/npcs/CustomItems.java | 7 +- src/main/java/noppes/npcs/CustomNpcs.java | 98 +- src/main/java/noppes/npcs/DataAI.java | 40 +- src/main/java/noppes/npcs/DataDisplay.java | 150 +- src/main/java/noppes/npcs/DataInventory.java | 20 +- src/main/java/noppes/npcs/DataScript.java | 140 +- src/main/java/noppes/npcs/DataStats.java | 46 +- src/main/java/noppes/npcs/EventHooks.java | 389 --- .../java/noppes/npcs/ModelDataShared.java | 40 +- src/main/java/noppes/npcs/ModelPartData.java | 30 +- src/main/java/noppes/npcs/NBTTags.java | 90 +- .../java/noppes/npcs/NoppesUtilPlayer.java | 149 +- .../java/noppes/npcs/NoppesUtilServer.java | 69 +- .../java/noppes/npcs/PacketHandlerPlayer.java | 67 +- .../java/noppes/npcs/PacketHandlerServer.java | 132 +- src/main/java/noppes/npcs/QuestLogData.java | 6 +- src/main/java/noppes/npcs/Resistances.java | 8 - .../noppes/npcs/ScriptForgeEventHandler.java | 126 - .../noppes/npcs/ScriptPlayerEventHandler.java | 488 ---- .../java/noppes/npcs/ServerEventsHandler.java | 179 +- .../noppes/npcs/ai/EntityAIAttackTarget.java | 4 - src/main/java/noppes/npcs/ai/EntityAIJob.java | 16 +- .../java/noppes/npcs/ai/EntityAIWander.java | 3 - .../npcs/ai/pathfinder/FlyNodeProcessor.java | 73 - .../noppes/npcs/ai/pathfinder/FlyPath.java | 173 -- .../npcs/ai/pathfinder/FlyPathEntity.java | 130 - .../npcs/ai/pathfinder/FlyPathFinder.java | 448 ---- .../npcs/ai/pathfinder/FlyPathPoint.java | 96 - .../npcs/ai/pathfinder/FlyingMoveHelper.java | 115 - .../npcs/ai/pathfinder/NPCPathFinder.java | 146 - .../npcs/ai/pathfinder/NPCPathPoint.java | 23 - .../npcs/ai/pathfinder/NodeProcessor.java | 50 - .../ai/pathfinder/PathNavigateFlying.java | 491 ---- .../ai/pathfinder/PathNavigateGround.java | 299 --- .../npcs/ai/pathfinder/PathNavigateNPC.java | 88 - .../ai/pathfinder/PathNavigateSwimmer.java | 80 - .../npcs/ai/pathfinder/SwimNodeProcessor.java | 93 - .../npcs/ai/pathfinder/WalkNodeProcessor.java | 303 --- .../npcs/ai/target/EntityAIClosestTarget.java | 6 +- .../noppes/npcs/blocks/BlockPedestal.java | 3 +- .../npcs/blocks/tiles/TileWaypoint.java | 8 +- src/main/java/noppes/npcs/client/Client.java | 3 - .../npcs/client/ClientEventHandler.java | 15 +- .../java/noppes/npcs/client/ClientProxy.java | 297 ++- .../noppes/npcs/client/ClientTickHandler.java | 56 +- .../java/noppes/npcs/client/NoppesUtil.java | 57 - .../npcs/client/PacketHandlerClient.java | 22 +- .../client/controllers/MusicController.java | 12 - .../noppes/npcs/client/fx/EntityCustomFX.java | 224 -- .../npcs/client/gui/EventGuiScriptList.java | 103 - .../npcs/client/gui/GuiBorderBlock.java | 3 +- .../npcs/client/gui/GuiNpcMobSpawner.java | 47 +- .../npcs/client/gui/GuiNpcMobSpawnerAdd.java | 9 +- .../client/gui/GuiNpcMobSpawnerMounter.java | 24 +- .../client/gui/GuiNpcMobSpawnerSelector.java | 26 +- .../npcs/client/gui/GuiNpcRedstoneBlock.java | 17 +- .../npcs/client/gui/GuiNpcWaypoint.java | 2 +- .../noppes/npcs/client/gui/GuiScript.java | 112 +- .../noppes/npcs/client/gui/GuiScriptList.java | 3 + .../client/gui/SubGuiNpcAvailability.java | 8 +- .../npcs/client/gui/SubGuiNpcDialogExtra.java | 6 - .../client/gui/SubGuiNpcFactionOptions.java | 2 +- .../client/gui/SubGuiNpcFactionPoints.java | 6 +- .../client/gui/SubGuiNpcMeleeProperties.java | 24 +- .../npcs/client/gui/SubGuiNpcMovement.java | 66 +- .../noppes/npcs/client/gui/SubGuiNpcName.java | 63 - .../npcs/client/gui/SubGuiNpcProjectiles.java | 25 +- .../client/gui/SubGuiNpcRangeProperties.java | 26 +- .../gui/SubGuiNpcResistanceProperties.java | 6 +- .../npcs/client/gui/SubGuiNpcRespawn.java | 2 +- .../npcs/client/gui/custom/GuiCustom.java | 910 ------- .../custom/components/CustomGuiButton.java | 168 -- .../gui/custom/components/CustomGuiLabel.java | 568 ---- .../gui/custom/components/CustomGuiLine.java | 79 - .../components/CustomGuiScrollComponent.java | 122 - .../gui/custom/components/CustomGuiSlot.java | 30 - .../custom/components/CustomGuiTextField.java | 103 - .../components/CustomGuiTexturedRect.java | 142 - .../gui/custom/interfaces/IClickListener.java | 12 - .../gui/custom/interfaces/IDataHolder.java | 12 - .../gui/custom/interfaces/IGuiComponent.java | 17 - .../gui/custom/interfaces/IKeyListener.java | 10 - .../gui/customoverlay/OverlayCustom.java | 97 - .../components/CustomOverlayLabel.java | 553 ---- .../components/CustomOverlayLine.java | 104 - .../components/CustomOverlayTexturedRect.java | 132 - .../interfaces/IOverlayComponent.java | 7 - .../client/gui/global/GuiNPCManageBanks.java | 5 +- .../client/gui/global/GuiNpcQuestReward.java | 4 +- .../npcs/client/gui/mainmenu/GuiNPCInv.java | 113 +- .../npcs/client/gui/mainmenu/GuiNpcAI.java | 6 +- .../client/gui/mainmenu/GuiNpcDisplay.java | 72 +- .../npcs/client/gui/mainmenu/GuiNpcStats.java | 38 +- .../client/gui/model/GuiCreationScreen.java | 31 +- .../client/gui/model/GuiEntitySelection.java | 6 +- .../npcs/client/gui/model/GuiModelArms.java | 27 +- .../npcs/client/gui/model/GuiModelBody.java | 147 +- .../npcs/client/gui/model/GuiModelHead.java | 124 +- .../npcs/client/gui/model/GuiModelLegs.java | 135 +- .../npcs/client/gui/model/GuiModelScale.java | 59 +- .../client/gui/player/GuiDialogInteract.java | 1 - .../client/gui/player/GuiMailmanWrite.java | 2 +- .../gui/questtypes/GuiNpcQuestTypeKill.java | 55 +- .../npcs/client/gui/roles/GuiNpcBard.java | 8 +- .../client/gui/roles/GuiNpcCompanion.java | 2 +- .../client/gui/roles/GuiNpcConversation.java | 10 +- .../client/gui/roles/GuiNpcFollowerSetup.java | 2 +- .../npcs/client/gui/roles/GuiNpcHealer.java | 8 +- .../client/gui/roles/GuiNpcItemGiver.java | 4 +- .../npcs/client/gui/roles/GuiNpcPuppet.java | 41 +- .../npcs/client/gui/roles/GuiNpcSpawner.java | 7 +- .../client/gui/script/EventGuiScriptList.java | 111 - .../client/gui/script/GuiScriptForge.java | 31 - .../client/gui/script/GuiScriptGlobal.java | 55 - .../client/gui/script/GuiScriptInterface.java | 452 ---- .../client/gui/script/GuiScriptPlayers.java | 37 - .../gui/util/GuiContainerNPCInterface.java | 2 +- .../npcs/client/gui/util/GuiCustomScroll.java | 5 +- .../npcs/client/gui/util/GuiNPCInterface.java | 19 +- .../npcs/client/gui/util/GuiNpcSlider.java | 8 - .../npcs/client/gui/util/GuiNpcTextArea.java | 22 +- .../npcs/client/gui/util/GuiNpcTextField.java | 93 +- .../npcs/client/gui/util/GuiTextArea.java | 473 ---- .../noppes/npcs/client/gui/util/IGui.java | 16 - .../npcs/client/gui/util/IKeyListener.java | 10 - .../npcs/client/gui/util/IMouseListener.java | 10 - .../client/gui/util/ITextChangeListener.java | 10 - .../npcs/client/gui/util/TextContainer.java | 225 -- .../noppes/npcs/client/model/ModelMPM.java | 744 ++---- .../npcs/client/model/ModelNPCMale.java | 238 +- .../npcs/client/model/part/ModelBodywear.java | 65 - .../npcs/client/model/part/ModelBreasts.java | 34 +- .../npcs/client/model/part/ModelDuckBeak.java | 85 - .../npcs/client/model/part/ModelFin.java | 2 +- .../npcs/client/model/part/ModelHeadwear.java | 71 +- .../npcs/client/model/part/ModelHorns.java | 58 - .../npcs/client/model/part/ModelLegs.java | 62 +- .../npcs/client/model/part/ModelLimbWear.java | 235 -- .../npcs/client/model/part/ModelSkirt.java | 77 - .../npcs/client/model/part/ModelSnout.java | 12 - .../npcs/client/model/part/ModelTail.java | 15 +- .../npcs/client/model/part/ModelWings.java | 4 +- .../model/part/horns/ModelAntennasBack.java | 49 - .../model/part/horns/ModelAntennasFront.java | 49 - .../model/part/horns/ModelAntlerHorns.java | 92 - .../model/part/horns/ModelBullHorns.java | 63 - .../model/part/legs/ModelDigitigradeLegs.java | 11 +- .../model/part/legs/ModelMermaidLegs.java | 94 +- .../model/part/legs/ModelMermaidLegs2.java | 122 - .../client/model/part/legs/ModelNagaLegs.java | 7 - .../model/part/tails/ModelDragonTail.java | 11 - .../model/part/tails/ModelFeatherTail.java | 66 - .../model/part/tails/ModelRodentTail.java | 35 - .../model/part/tails/ModelSquirrelTail.java | 5 - .../client/model/part/tails/ModelTailFin.java | 52 - .../renderer/ImageBufferDownloadAlt.java | 265 +- .../npcs/client/renderer/RenderCustomNpc.java | 15 +- .../client/renderer/RenderNPCHumanMale.java | 47 +- .../client/renderer/RenderNPCInterface.java | 65 +- .../npcs/client/renderer/RenderNPCPony.java | 8 +- .../java/noppes/npcs/config/GlyphCache.java | 6 + .../java/noppes/npcs/config/TrueTypeFont.java | 340 --- .../noppes/npcs/constants/EnumGuiType.java | 2 +- .../npcs/constants/EnumPacketClient.java | 2 +- .../npcs/constants/EnumPacketServer.java | 10 +- .../npcs/constants/EnumPlayerPacket.java | 2 +- .../noppes/npcs/constants/EnumScriptType.java | 88 +- .../npcs/containers/ContainerCustomGui.java | 103 - .../npcs/containers/ContainerNPCInv.java | 7 +- .../containers/ContainerNpcInterface.java | 11 - .../noppes/npcs/controllers/Availability.java | 174 +- .../npcs/controllers/CustomGuiController.java | 138 - .../java/noppes/npcs/controllers/Dialog.java | 137 +- .../npcs/controllers/DialogCategory.java | 20 +- .../npcs/controllers/DialogController.java | 17 +- .../java/noppes/npcs/controllers/Faction.java | 93 +- .../npcs/controllers/FactionController.java | 48 +- .../npcs/controllers/FactionOptions.java | 10 +- .../npcs/controllers/IScriptHandler.java | 33 - .../noppes/npcs/controllers/PlayerData.java | 116 +- .../controllers/PlayerDataController.java | 55 +- .../npcs/controllers/PlayerFactionData.java | 14 +- .../controllers/PlayerQuestController.java | 5 - .../npcs/controllers/PlayerQuestData.java | 12 +- .../java/noppes/npcs/controllers/Quest.java | 101 +- .../npcs/controllers/QuestCategory.java | 20 +- .../npcs/controllers/QuestController.java | 18 +- .../npcs/controllers/RecipeCarpentry.java | 68 +- .../npcs/controllers/RecipeController.java | 53 +- .../npcs/controllers/ScriptContainer.java | 237 +- .../npcs/controllers/ScriptController.java | 162 +- .../npcs/controllers/ScriptEntityData.java | 2 +- .../controllers/ServerCloneController.java | 44 +- .../controllers/data/ForgeDataScript.java | 138 - .../controllers/data/PlayerDataScript.java | 314 --- .../noppes/npcs/entity/EntityCustomNpc.java | 9 +- .../npcs/entity/EntityMagicProjectile.java | 22 +- .../noppes/npcs/entity/EntityNPCFlying.java | 71 - .../npcs/entity/EntityNPCInterface.java | 292 +- .../noppes/npcs/entity/data/DataTimers.java | 137 - .../noppes/npcs/items/ItemNpcScripter.java | 16 +- .../npcs/items/ItemNpcWeaponInterface.java | 1 - .../java/noppes/npcs/quests/QuestDialog.java | 78 +- .../noppes/npcs/quests/QuestInterface.java | 8 +- .../java/noppes/npcs/quests/QuestItem.java | 90 +- .../java/noppes/npcs/quests/QuestKill.java | 114 +- .../noppes/npcs/quests/QuestLocation.java | 97 +- .../java/noppes/npcs/roles/RoleCompanion.java | 2 +- .../npcs/scripted/CustomNPCsException.java | 16 - .../java/noppes/npcs/scripted/NpcAPI.java | 97 - .../scripted/{entity => }/ScriptAnimal.java | 7 +- .../noppes/npcs/scripted/ScriptBlock.java | 124 - .../noppes/npcs/scripted/ScriptBlockPos.java | 118 - .../noppes/npcs/scripted/ScriptContainer.java | 90 - .../scripted/{entity => }/ScriptEntity.java | 279 +- .../npcs/scripted/ScriptEntityParticle.java | 214 -- .../scripted/{event => }/ScriptEvent.java | 2 +- .../{event => }/ScriptEventAttack.java | 4 +- .../{event => }/ScriptEventDamaged.java | 3 +- .../npcs/scripted/ScriptEventDialog.java | 15 + .../{event => }/ScriptEventKilled.java | 3 +- .../{event => }/ScriptEventTarget.java | 6 +- .../noppes/npcs/scripted/ScriptFaction.java | 2 - .../noppes/npcs/scripted/ScriptItemStack.java | 157 +- .../scripted/{entity => }/ScriptLiving.java | 14 +- .../{entity => }/ScriptLivingBase.java | 56 +- .../scripted/{entity => }/ScriptMonster.java | 8 +- .../java/noppes/npcs/scripted/ScriptNbt.java | 215 -- .../npcs/scripted/{entity => }/ScriptNpc.java | 580 +--- .../scripted/{entity => }/ScriptPixelmon.java | 12 +- .../scripted/ScriptPixelmonPlayerData.java | 1 - .../scripted/{entity => }/ScriptPlayer.java | 200 +- .../noppes/npcs/scripted/ScriptWorld.java | 42 +- .../npcs/scripted/entity/ScriptDBCPlayer.java | 537 ---- .../npcs/scripted/event/CustomGuiEvent.java | 66 - .../npcs/scripted/event/CustomNPCsEvent.java | 16 - .../npcs/scripted/event/DialogEvent.java | 32 - .../npcs/scripted/event/FactionEvent.java | 25 - .../npcs/scripted/event/ForgeEvent.java | 46 - .../noppes/npcs/scripted/event/NpcEvent.java | 145 - .../npcs/scripted/event/PlayerEvent.java | 446 ---- .../npcs/scripted/event/QuestEvent.java | 40 - .../scripted/event/ScriptEventDialog.java | 11 - .../npcs/scripted/event/ScriptEventTimer.java | 13 - .../noppes/npcs/scripted/gui/ScriptGui.java | 301 --- .../npcs/scripted/gui/ScriptGuiButton.java | 149 -- .../npcs/scripted/gui/ScriptGuiComponent.java | 157 -- .../npcs/scripted/gui/ScriptGuiItemSlot.java | 63 - .../npcs/scripted/gui/ScriptGuiLabel.java | 92 - .../npcs/scripted/gui/ScriptGuiLine.java | 98 - .../npcs/scripted/gui/ScriptGuiScroll.java | 109 - .../npcs/scripted/gui/ScriptGuiTextField.java | 66 - .../scripted/gui/ScriptGuiTexturedRect.java | 107 - .../npcs/scripted/handler/ICloneHandler.java | 19 - .../npcs/scripted/handler/IDialogHandler.java | 17 - .../scripted/handler/IFactionHandler.java | 20 - .../npcs/scripted/handler/IQuestHandler.java | 17 - .../npcs/scripted/handler/IRecipeHandler.java | 22 - .../scripted/handler/data/IAvailability.java | 36 - .../npcs/scripted/handler/data/IDialog.java | 53 - .../handler/data/IDialogCategory.java | 16 - .../scripted/handler/data/IDialogOption.java | 14 - .../npcs/scripted/handler/data/IFaction.java | 45 - .../npcs/scripted/handler/data/IQuest.java | 49 - .../scripted/handler/data/IQuestCategory.java | 16 - .../scripted/handler/data/IQuestDialog.java | 4 - .../handler/data/IQuestInterface.java | 4 - .../scripted/handler/data/IQuestItem.java | 12 - .../scripted/handler/data/IQuestKill.java | 6 - .../scripted/handler/data/IQuestLocation.java | 12 - .../handler/data/IQuestObjective.java | 18 - .../npcs/scripted/handler/data/IRecipe.java | 36 - .../npcs/scripted/interfaces/IAnimal.java | 11 - .../npcs/scripted/interfaces/IBlock.java | 41 - .../npcs/scripted/interfaces/IButton.java | 30 - .../npcs/scripted/interfaces/IContainer.java | 27 - .../npcs/scripted/interfaces/ICustomGui.java | 64 - .../interfaces/ICustomGuiComponent.java | 26 - .../npcs/scripted/interfaces/ICustomNpc.java | 737 ------ .../scripted/interfaces/ICustomOverlay.java | 4 - .../interfaces/ICustomOverlayComponent.java | 29 - .../scripted/interfaces/IDamageSource.java | 20 - .../npcs/scripted/interfaces/IEntity.java | 311 --- .../scripted/interfaces/IEntityLiving.java | 18 - .../interfaces/IEntityLivingBase.java | 108 - .../npcs/scripted/interfaces/IItemSlot.java | 18 - .../npcs/scripted/interfaces/IItemStack.java | 115 - .../npcs/scripted/interfaces/ILabel.java | 22 - .../npcs/scripted/interfaces/ILine.java | 15 - .../npcs/scripted/interfaces/IMonster.java | 11 - .../noppes/npcs/scripted/interfaces/INbt.java | 76 - .../scripted/interfaces/IOverlayLabel.java | 17 - .../scripted/interfaces/IOverlayLine.java | 17 - .../interfaces/IOverlayTexturedRect.java | 23 - .../npcs/scripted/interfaces/IPixelmon.java | 11 - .../npcs/scripted/interfaces/IPlayer.java | 179 -- .../noppes/npcs/scripted/interfaces/IPos.java | 58 - .../npcs/scripted/interfaces/IScroll.java | 26 - .../npcs/scripted/interfaces/ITextField.java | 18 - .../scripted/interfaces/ITexturedRect.java | 28 - .../npcs/scripted/interfaces/ITimers.java | 22 - .../npcs/scripted/interfaces/IWorld.java | 215 -- .../npcs/scripted/overlay/ScriptOverlay.java | 161 -- .../overlay/ScriptOverlayComponent.java | 123 - .../scripted/overlay/ScriptOverlayLabel.java | 97 - .../scripted/overlay/ScriptOverlayLine.java | 97 - .../overlay/ScriptOverlayTexturedRect.java | 110 - .../scripted/roles/ScriptJobConversation.java | 4 + .../scripted/roles/ScriptJobFollower.java | 5 +- .../npcs/scripted/roles/ScriptJobHealer.java | 5 +- .../scripted/roles/ScriptJobItemGiver.java | 3 + .../npcs/scripted/roles/ScriptJobPuppet.java | 4 + .../npcs/scripted/roles/ScriptJobSpawner.java | 8 +- .../scripted/roles/ScriptRoleFollower.java | 6 +- .../scripted/wrapper/ScriptDamageSource.java | 43 - .../scripted/wrapper/WrapperEntityData.java | 59 - .../npcs/scripted/wrapper/WrapperNpcAPI.java | 283 -- .../noppes/npcs/util/CustomNPCsScheduler.java | 17 + .../java/noppes/npcs/util/LRUHashMap.java | 22 - src/main/java/noppes/npcs/util/Vec3NPC.java | 11 - .../assets/customnpcs/lang/de_DE.lang | 1 - .../assets/customnpcs/lang/en_US.lang | 92 +- .../markovnames/ancient_greek_female.txt | 406 --- .../markovnames/ancient_greek_male.txt | 1567 ----------- .../customnpcs/markovnames/aztec_given.txt | 133 - .../markovnames/customnpcs_classic.txt | 155 -- .../markovnames/japanese_given_female.txt | 386 --- .../markovnames/japanese_given_male.txt | 1189 --------- .../markovnames/japanese_surnames.txt | 2341 ----------------- .../markovnames/old_norse_bothgenders.txt | 1065 -------- .../markovnames/roman_cognomina.txt | 1021 ------- .../customnpcs/markovnames/roman_nomina.txt | 542 ---- .../markovnames/roman_praenomina.txt | 52 - .../markovnames/saami_bothgenders.txt | 722 ----- .../customnpcs/markovnames/slavic_given.txt | 914 ------- .../markovnames/slavic_given_alt.txt | 914 ------- .../markovnames/spanish_given_female.txt | 310 --- .../markovnames/spanish_given_male.txt | 381 --- .../markovnames/spanish_surnames.txt | 550 ---- .../customnpcs/markovnames/welsh_female.txt | 310 --- .../customnpcs/markovnames/welsh_male.txt | 272 -- .../customnpcs/textures/cloak/BugTracker.png | Bin 1213 -> 0 bytes .../customnpcs/textures/cloak/Cobalt.png | Bin 4095 -> 0 bytes .../textures/cloak/Color Capes/Black cape.png | Bin 367 -> 0 bytes .../textures/cloak/Color Capes/Blue cape.png | Bin 430 -> 0 bytes .../textures/cloak/Color Capes/Brown cape.png | Bin 333 -> 0 bytes .../cloak/Color Capes/Dark Grey cape.png | Bin 300 -> 0 bytes .../cloak/Color Capes/Dark Red cape.png | Bin 339 -> 0 bytes .../textures/cloak/Color Capes/Gold cape.png | Bin 308 -> 0 bytes .../textures/cloak/Color Capes/Grey cape.png | Bin 280 -> 0 bytes .../cloak/Color Capes/Lavender cape.png | Bin 433 -> 0 bytes .../cloak/Color Capes/Light Brown cape.png | Bin 412 -> 0 bytes .../cloak/Color Capes/Light Yellow cape.png | Bin 311 -> 0 bytes .../cloak/Color Capes/Light green cape.png | Bin 285 -> 0 bytes .../cloak/Color Capes/Orange cape.png | Bin 306 -> 0 bytes .../textures/cloak/Color Capes/Pink cape.png | Bin 426 -> 0 bytes .../textures/cloak/Color Capes/Red cape.png | Bin 503 -> 0 bytes .../textures/cloak/Color Capes/White cape.png | Bin 257 -> 0 bytes .../cloak/Color Capes/Yellow cape.png | Bin 304 -> 0 bytes .../textures/cloak/Created/CowCape.png | Bin 320 -> 0 bytes .../textures/cloak/Created/SheepCape.png | Bin 281 -> 0 bytes .../textures/cloak/Created/ShroomCape.png | Bin 320 -> 0 bytes .../textures/cloak/Created/SlimeCape.png | Bin 389 -> 0 bytes .../textures/cloak/Created/aura.png | Bin 694 -> 0 bytes .../customnpcs/textures/cloak/Created/bee.png | Bin 496 -> 0 bytes .../textures/cloak/Created/burning.png | Bin 1074 -> 0 bytes .../textures/cloak/Created/camo.png | Bin 626 -> 0 bytes .../textures/cloak/Created/candy_cane.png | Bin 513 -> 0 bytes .../textures/cloak/Created/card.png | Bin 1367 -> 0 bytes .../textures/cloak/Created/clown.png | Bin 974 -> 0 bytes .../textures/cloak/Created/dragon.png | Bin 719 -> 0 bytes .../textures/cloak/Created/dragoncape.png | Bin 465 -> 0 bytes .../textures/cloak/Created/eagle.png | Bin 748 -> 0 bytes .../textures/cloak/Created/enchant.png | Bin 364 -> 0 bytes .../textures/cloak/Created/flower.png | Bin 602 -> 0 bytes .../textures/cloak/Created/giraffe.png | Bin 497 -> 0 bytes .../textures/cloak/Created/green_royal.png | Bin 560 -> 0 bytes .../textures/cloak/Created/heat.png | Bin 610 -> 0 bytes .../customnpcs/textures/cloak/Created/ivy.png | Bin 507 -> 0 bytes .../textures/cloak/Created/magma_cape.png | Bin 4011 -> 0 bytes .../textures/cloak/Created/migrate.png | Bin 2070 -> 0 bytes .../textures/cloak/Created/minecon.png | Bin 714 -> 0 bytes .../textures/cloak/Created/neon.png | Bin 628 -> 0 bytes .../textures/cloak/Created/neon_green.png | Bin 946 -> 0 bytes .../textures/cloak/Created/neon_orange.png | Bin 674 -> 0 bytes .../textures/cloak/Created/orange_break.png | Bin 3123 -> 0 bytes .../textures/cloak/Created/phantom.png | Bin 5581 -> 0 bytes .../textures/cloak/Created/pirate.png | Bin 870 -> 0 bytes .../textures/cloak/Created/plank.png | Bin 367 -> 0 bytes .../textures/cloak/Created/purple_gold.png | Bin 610 -> 0 bytes .../textures/cloak/Created/red_design.png | Bin 710 -> 0 bytes .../textures/cloak/Created/red_dirty.png | Bin 536 -> 0 bytes .../textures/cloak/Created/red_dragon.png | Bin 431 -> 0 bytes .../textures/cloak/Created/red_leader.png | Bin 521 -> 0 bytes .../textures/cloak/Created/red_royal.png | Bin 746 -> 0 bytes .../textures/cloak/Created/ripper.png | Bin 691 -> 0 bytes .../textures/cloak/Created/skeleton.png | Bin 672 -> 0 bytes .../textures/cloak/Created/solo.png | Bin 515 -> 0 bytes .../textures/cloak/Created/spiral.png | Bin 526 -> 0 bytes .../textures/cloak/Created/tea_leaves.png | Bin 938 -> 0 bytes .../textures/cloak/Created/thread.png | Bin 450 -> 0 bytes .../textures/cloak/Created/tiger.png | Bin 448 -> 0 bytes .../textures/cloak/Created/waffle.png | Bin 546 -> 0 bytes .../textures/cloak/Created/warden.png | Bin 488 -> 0 bytes .../textures/cloak/Created/waterfall.png | Bin 1277 -> 0 bytes .../textures/cloak/Created/zebra.png | Bin 420 -> 0 bytes .../textures/cloak/Daybreak/TierI.png | Bin 24586 -> 0 bytes .../textures/cloak/Daybreak/TierII.png | Bin 9786 -> 0 bytes .../textures/cloak/Daybreak/TierIII.png | Bin 9725 -> 0 bytes .../textures/cloak/Daybreak/TierIV.png | Bin 7976 -> 0 bytes .../textures/cloak/Daybreak/TierV.png | Bin 16085 -> 0 bytes .../customnpcs/textures/cloak/Ender Cloak.png | Bin 1231 -> 0 bytes .../textures/cloak/Extras/Angel.png | Bin 891 -> 0 bytes .../textures/cloak/Extras/Black.png | Bin 585 -> 0 bytes .../textures/cloak/Extras/Blood.png | Bin 1281 -> 0 bytes .../textures/cloak/Extras/Flame.png | Bin 1114 -> 0 bytes .../textures/cloak/Extras/GoldSwirl.png | Bin 857 -> 0 bytes .../customnpcs/textures/cloak/Extras/Key.png | Bin 957 -> 0 bytes .../customnpcs/textures/cloak/Extras/Moon.png | Bin 1169 -> 0 bytes .../textures/cloak/Extras/Nightmare.png | Bin 814 -> 0 bytes .../customnpcs/textures/cloak/Extras/Pain.png | Bin 918 -> 0 bytes .../textures/cloak/Extras/PinkSwirl.png | Bin 708 -> 0 bytes .../customnpcs/textures/cloak/Extras/Pool.png | Bin 887 -> 0 bytes .../textures/cloak/Extras/Pumpkin.png | Bin 1045 -> 0 bytes .../textures/cloak/Extras/Purple.png | Bin 858 -> 0 bytes .../textures/cloak/Extras/Rainbow.png | Bin 842 -> 0 bytes .../customnpcs/textures/cloak/Extras/Red.png | Bin 641 -> 0 bytes .../textures/cloak/Extras/RedSwirl.png | Bin 15483 -> 0 bytes .../textures/cloak/Extras/Redstone.png | Bin 1069 -> 0 bytes .../textures/cloak/Extras/Skull.png | Bin 1008 -> 0 bytes .../textures/cloak/Extras/Slaxer.png | Bin 610 -> 0 bytes .../textures/cloak/Extras/Sunsent.png | Bin 1393 -> 0 bytes .../textures/cloak/Extras/Titan.png | Bin 1245 -> 0 bytes .../textures/cloak/Extras/Vines.png | Bin 837 -> 0 bytes .../textures/cloak/Extras/Waves.png | Bin 911 -> 0 bytes .../textures/cloak/Extras/Whisperer.png | Bin 16021 -> 0 bytes .../textures/cloak/Extras/WhispererBlack.png | Bin 16395 -> 0 bytes .../textures/cloak/Extras/WhispererRed.png | Bin 15999 -> 0 bytes .../customnpcs/textures/cloak/Extras/Wolf.png | Bin 15313 -> 0 bytes .../textures/cloak/Guilds/ColiMaster.png | Bin 23973 -> 0 bytes .../textures/cloak/Guilds/ColiTrain.png | Bin 23882 -> 0 bytes .../textures/cloak/Guilds/Daybreak.png | Bin 24586 -> 0 bytes .../textures/cloak/Guilds/Markus.png | Bin 22907 -> 0 bytes .../textures/cloak/Guilds/PotelMaster.png | Bin 23899 -> 0 bytes .../textures/cloak/Guilds/PotelTrain.png | Bin 23842 -> 0 bytes .../textures/cloak/Guilds/Radiance.png | Bin 20684 -> 0 bytes .../textures/cloak/Guilds/RevDaybreak.png | Bin 24709 -> 0 bytes .../textures/cloak/Guilds/RevDaybreak2.png | Bin 24267 -> 0 bytes .../cloak/Guilds/RevDaybreak2Star.png | Bin 24028 -> 0 bytes .../textures/cloak/Guilds/SavMaster.png | Bin 23999 -> 0 bytes .../textures/cloak/Guilds/SavTrain.png | Bin 23864 -> 0 bytes .../textures/cloak/Guilds/TheTierV.png | Bin 24057 -> 0 bytes .../textures/cloak/Guilds/Theives.png | Bin 23660 -> 0 bytes .../textures/cloak/Guilds/Ultramarine.png | Bin 181454 -> 0 bytes .../textures/cloak/Guilds/WhispererBlack.png | Bin 22354 -> 0 bytes .../textures/cloak/Guilds/WhispererGrey.png | Bin 22701 -> 0 bytes .../textures/cloak/Guilds/WhispererRed.png | Bin 22560 -> 0 bytes .../cloak/Guilds/WhispererRedWhite.png | Bin 22739 -> 0 bytes .../textures/cloak/Guilds/WhispererV.png | Bin 23041 -> 0 bytes .../textures/cloak/Guilds/WhispererWhite.png | Bin 22705 -> 0 bytes .../textures/cloak/Imperial Legion Cape.png | Bin 854 -> 0 bytes .../customnpcs/textures/cloak/JulianClark.png | Bin 1398 -> 0 bytes .../customnpcs/textures/cloak/NewYears.png | Bin 15518 -> 0 bytes .../customnpcs/textures/cloak/RaggedBlue.png | Bin 22009 -> 0 bytes .../textures/cloak/RaggedDarkBlue.png | Bin 21912 -> 0 bytes .../textures/cloak/RaggedDarkPurple.png | Bin 21942 -> 0 bytes .../textures/cloak/RaggedDarkRed.png | Bin 21830 -> 0 bytes .../customnpcs/textures/cloak/RaggedGreen.png | Bin 21982 -> 0 bytes .../customnpcs/textures/cloak/RaggedRed.png | Bin 21962 -> 0 bytes .../customnpcs/textures/cloak/Realms.png | Bin 1111 -> 0 bytes .../textures/cloak/Royal Guard Cape.png | Bin 834 -> 0 bytes .../customnpcs/textures/cloak/Scrolls.png | Bin 1432 -> 0 bytes .../textures/cloak/Witches Cloak.png | Bin 882 -> 0 bytes .../entity/64-Textures/Skin_Template.png | Bin 7685 -> 0 bytes .../64-Textures/dwarffemale/BlondDwarf.png | Bin 3925 -> 0 bytes .../64-Textures/dwarffemale/GingerDwarf.png | Bin 4213 -> 0 bytes .../64-Textures/dwarffemale/GingerDwarf2.png | Bin 4003 -> 0 bytes .../entity/64-Textures/dwarffemale/Simone.png | Bin 1561 -> 0 bytes .../64-Textures/dwarfmale/BeardedDwarf.png | Bin 4421 -> 0 bytes .../64-Textures/dwarfmale/Blacksmith.png | Bin 3456 -> 0 bytes .../entity/64-Textures/dwarfmale/Dwarf.png | Bin 3736 -> 0 bytes .../64-Textures/dwarfmale/DwarfKing.png | Bin 4033 -> 0 bytes .../64-Textures/dwarfmale/DwarfStatue.png | Bin 1729 -> 0 bytes .../dwarfmale/Dwarf_Blacksmith.png | Bin 4049 -> 0 bytes .../64-Textures/dwarfmale/Dwarf_Keeper.png | Bin 3347 -> 0 bytes .../64-Textures/dwarfmale/Dwarf_Leader.png | Bin 4389 -> 0 bytes .../64-Textures/dwarfmale/ElderlyDwarf.png | Bin 2791 -> 0 bytes .../64-Textures/dwarfmale/GingerKing.png | Bin 4403 -> 0 bytes .../64-Textures/dwarfmale/GingerKnight.png | Bin 2185 -> 0 bytes .../entity/64-Textures/dwarfmale/Goblin.png | Bin 5453 -> 0 bytes .../dwarfmale/High_Class_Dwarf.png | Bin 2958 -> 0 bytes .../dwarfmale/High_Class_Dwarf_2.png | Bin 6385 -> 0 bytes .../entity/64-Textures/dwarfmale/Hobbit.png | Bin 5227 -> 0 bytes .../entity/64-Textures/dwarfmale/Miner.png | Bin 4147 -> 0 bytes .../64-Textures/dwarfmale/MoustachedDwarf.png | Bin 4445 -> 0 bytes .../dwarfmale/One_Eye_blind_Dwarf.png | Bin 2446 -> 0 bytes .../entity/64-Textures/dwarfmale/Simon.png | Bin 3620 -> 0 bytes .../64-Textures/dwarfmale/SomeDwarf.png | Bin 3551 -> 0 bytes .../entity/64-Textures/dwarfmale/Viking.png | Bin 2484 -> 0 bytes .../64-Textures/elffemale/DarkElfFemale.png | Bin 4160 -> 0 bytes .../64-Textures/elffemale/ElfFemale.png | Bin 2158 -> 0 bytes .../entity/64-Textures/elffemale/ElfMage.png | Bin 2669 -> 0 bytes .../entity/64-Textures/elffemale/ElfQueen.png | Bin 1879 -> 0 bytes .../64-Textures/elffemale/ElfQueenFormal.png | Bin 1862 -> 0 bytes .../64-Textures/elffemale/ElfSoldier.png | Bin 3820 -> 0 bytes .../elffemale/ElfSoldierHelmet.png | Bin 4553 -> 0 bytes .../64-Textures/elffemale/ElfWarrior.png | Bin 3812 -> 0 bytes .../64-Textures/elffemale/WoodElfFemale.png | Bin 2602 -> 0 bytes .../entity/64-Textures/elfmale/BlondElf.png | Bin 2066 -> 0 bytes .../entity/64-Textures/elfmale/Blood_Elf.png | Bin 3976 -> 0 bytes .../64-Textures/elfmale/Blood_Elf_Mage.png | Bin 3262 -> 0 bytes .../64-Textures/elfmale/DarkElfCitizen.png | Bin 4234 -> 0 bytes .../64-Textures/elfmale/Dark_Elf Knight.png | Bin 1882 -> 0 bytes .../elfmale/Dark_Elf Librarian.png | Bin 2203 -> 0 bytes .../entity/64-Textures/elfmale/Dark_Elf.png | Bin 4344 -> 0 bytes .../entity/64-Textures/elfmale/ElfKnight.png | Bin 1923 -> 0 bytes .../entity/64-Textures/elfmale/ElfMale.png | Bin 3767 -> 0 bytes .../64-Textures/elfmale/Elf_Asassin_2.png | Bin 4432 -> 0 bytes .../64-Textures/elfmale/Engineer_Elf.png | Bin 4995 -> 0 bytes .../entity/64-Textures/elfmale/ForestElf.png | Bin 1595 -> 0 bytes .../elfmale/High_Class_Knight_Elf.png | Bin 3659 -> 0 bytes .../entity/64-Textures/elfmale/Link.png | Bin 4522 -> 0 bytes .../entity/64-Textures/elfmale/WoodElf.png | Bin 2450 -> 0 bytes .../64-Textures/enderchibi/AlbinoChibi.png | Bin 1089 -> 0 bytes .../64-Textures/enderchibi/EnderGhost.png | Bin 368 -> 0 bytes .../enderchibi/FriendlyEnderchibi.png | Bin 1166 -> 0 bytes .../64-Textures/enderchibi/IceEnderchibi.png | Bin 687 -> 0 bytes .../64-Textures/enderchibi/MrEnderchibi.png | Bin 1176 -> 0 bytes .../64-Textures/enderchibi/MsEnderchibi.png | Bin 1149 -> 0 bytes .../64-Textures/enderchibi/NetherChibi.png | Bin 1029 -> 0 bytes .../64-Textures/enderchibi/Slenderchibi.png | Bin 896 -> 0 bytes .../64-Textures/enderman/Apparation.png | Bin 269 -> 0 bytes .../64-Textures/enderman/Ender Mage.png | Bin 2979 -> 0 bytes .../64-Textures/enderman/Slenderman.png | Bin 1499 -> 0 bytes .../entity/64-Textures/enderman/enderman.png | Bin 1012 -> 0 bytes .../64-Textures/furryfemale/BunnyFemale.png | Bin 1501 -> 0 bytes .../furryfemale/Leopard Female.png | Bin 3945 -> 0 bytes .../furryfemale/Leopard Hunter Female.png | Bin 3970 -> 0 bytes .../furryfemale/Leopard Straw Hat Female.png | Bin 4536 -> 0 bytes .../furryfemale/Leopard Trader Female.png | Bin 3828 -> 0 bytes .../furryfemale/Leopard Warrior Female.png | Bin 3932 -> 0 bytes .../Snow Leopard Female Hunter.png | Bin 4369 -> 0 bytes .../Snow Leopard Female Straw Hat.png | Bin 5011 -> 0 bytes .../Snow Leopard Female Trader.png | Bin 4272 -> 0 bytes .../Snow Leopard Female Warrior.png | Bin 4323 -> 0 bytes .../furryfemale/Snow Leopard Female.png | Bin 4487 -> 0 bytes .../furryfemale/Tiger Female Hunter.png | Bin 3836 -> 0 bytes .../furryfemale/Tiger Female Straw Hat.png | Bin 4697 -> 0 bytes .../furryfemale/Tiger Female Trader.png | Bin 3704 -> 0 bytes .../furryfemale/Tiger Female Warrior.png | Bin 3825 -> 0 bytes .../64-Textures/furryfemale/Tiger Female.png | Bin 3831 -> 0 bytes .../64-Textures/furryfemale/WolfBlack.png | Bin 3541 -> 0 bytes .../furryfemale/WolfBlackHunter .png | Bin 2256 -> 0 bytes .../furryfemale/WolfBlackHunter.png | Bin 3823 -> 0 bytes .../furryfemale/WolfBlackSteampunk.png | Bin 4039 -> 0 bytes .../furryfemale/WolfBlackTrader.png | Bin 3718 -> 0 bytes .../furryfemale/WolfBlackWarrior.png | Bin 3614 -> 0 bytes .../64-Textures/furryfemale/WolfBrown.png | Bin 3673 -> 0 bytes .../furryfemale/WolfBrownHunter.png | Bin 3873 -> 0 bytes .../furryfemale/WolfBrownSteampunk.png | Bin 4061 -> 0 bytes .../furryfemale/WolfBrownTrader.png | Bin 3900 -> 0 bytes .../furryfemale/WolfBrownWarrior.png | Bin 3727 -> 0 bytes .../64-Textures/furryfemale/WolfGrey.png | Bin 4248 -> 0 bytes .../furryfemale/WolfGreyHunter.png | Bin 4363 -> 0 bytes .../furryfemale/WolfGreySteampunk.png | Bin 4385 -> 0 bytes .../furryfemale/WolfGreyTrader.png | Bin 4195 -> 0 bytes .../furryfemale/WolfGreyWarrior.png | Bin 4305 -> 0 bytes .../64-Textures/furryfemale/WolfLightGrey.png | Bin 4022 -> 0 bytes .../furryfemale/WolfLightGreyHunter.png | Bin 4287 -> 0 bytes .../furryfemale/WolfLightGreySteampunk.png | Bin 4226 -> 0 bytes .../furryfemale/WolfLightGreyTrader.png | Bin 4395 -> 0 bytes .../furryfemale/WolfLightGreyWarrior.png | Bin 4016 -> 0 bytes .../64-Textures/furryfemale/angelblonde.png | Bin 2519 -> 0 bytes .../entity/64-Textures/furrymale/Bunny.png | Bin 1091 -> 0 bytes .../64-Textures/furrymale/DragonGreen.png | Bin 3785 -> 0 bytes .../64-Textures/furrymale/Leopard Hunter.png | Bin 3958 -> 0 bytes .../furrymale/Leopard Straw Hat.png | Bin 4536 -> 0 bytes .../64-Textures/furrymale/Leopard Trader.png | Bin 3823 -> 0 bytes .../64-Textures/furrymale/Leopard Warrior.png | Bin 3926 -> 0 bytes .../entity/64-Textures/furrymale/Leopard.png | Bin 3940 -> 0 bytes .../entity/64-Textures/furrymale/Reaper.png | Bin 2472 -> 0 bytes .../furrymale/Snow Leopard Hunter.png | Bin 4362 -> 0 bytes .../furrymale/Snow Leopard Straw Hat.png | Bin 4999 -> 0 bytes .../furrymale/Snow Leopard Trader.png | Bin 4254 -> 0 bytes .../furrymale/Snow Leopard Warrior.png | Bin 4319 -> 0 bytes .../64-Textures/furrymale/SnowLeopard.png | Bin 4475 -> 0 bytes .../64-Textures/furrymale/Tiger Hunter.png | Bin 3828 -> 0 bytes .../64-Textures/furrymale/Tiger Straw Hat.png | Bin 4692 -> 0 bytes .../64-Textures/furrymale/Tiger Trader.png | Bin 3697 -> 0 bytes .../64-Textures/furrymale/Tiger Warrior.png | Bin 3813 -> 0 bytes .../entity/64-Textures/furrymale/Tiger.png | Bin 3818 -> 0 bytes .../64-Textures/furrymale/WolfBlack.png | Bin 3528 -> 0 bytes .../64-Textures/furrymale/WolfBlackHunter.png | Bin 3810 -> 0 bytes .../furrymale/WolfBlackSteamPunk.png | Bin 4029 -> 0 bytes .../64-Textures/furrymale/WolfBlackTrader.png | Bin 3710 -> 0 bytes .../furrymale/WolfBlackWarrior.png | Bin 3602 -> 0 bytes .../64-Textures/furrymale/WolfBrown.png | Bin 3660 -> 0 bytes .../64-Textures/furrymale/WolfBrownHunter.png | Bin 3859 -> 0 bytes .../furrymale/WolfBrownSteamPunk.png | Bin 4061 -> 0 bytes .../64-Textures/furrymale/WolfBrownTrader.png | Bin 3888 -> 0 bytes .../furrymale/WolfBrownWarrior.png | Bin 3713 -> 0 bytes .../entity/64-Textures/furrymale/WolfGrey.png | Bin 4247 -> 0 bytes .../64-Textures/furrymale/WolfGreyHunter.png | Bin 4357 -> 0 bytes .../furrymale/WolfGreySteampunk.png | Bin 4200 -> 0 bytes .../furrymale/WolfGreyTraderWolf.png | Bin 4305 -> 0 bytes .../64-Textures/furrymale/WolfGreyWarrior.png | Bin 4022 -> 0 bytes .../64-Textures/furrymale/WolfLightGrey.png | Bin 4281 -> 0 bytes .../furrymale/WolfLightGreyHunter.png | Bin 4381 -> 0 bytes .../furrymale/WolfLightGreyModelSteamPunk.png | Bin 4226 -> 0 bytes .../furrymale/WolfLightGreyWarrior.png | Bin 4009 -> 0 bytes .../furrymale/WolfLightGreyrader.png | Bin 4393 -> 0 bytes .../humanfemale/BodyguardStephanie.png | Bin 2777 -> 0 bytes .../humanfemale/CamoRadioStephanie.png | Bin 3065 -> 0 bytes .../64-Textures/humanfemale/ChefStephanie.png | Bin 2949 -> 0 bytes .../humanfemale/DoctorStephanie.png | Bin 3076 -> 0 bytes .../64-Textures/humanfemale/MageStephanie.png | Bin 4444 -> 0 bytes .../humanfemale/MailmanStephanie.png | Bin 3259 -> 0 bytes .../64-Textures/humanfemale/McDStephanie.png | Bin 3124 -> 0 bytes .../humanfemale/MinerStephanie.png | Bin 4215 -> 0 bytes .../humanfemale/PinstripesStephanie.png | Bin 5180 -> 0 bytes .../humanfemale/RaggedyBardStephanie.png | Bin 4289 -> 0 bytes .../humanfemale/RobesBlackStephanie.png | Bin 3545 -> 0 bytes .../humanfemale/RobesBrownStephanie.png | Bin 4403 -> 0 bytes .../humanfemale/RobesWhiteShepanie.png | Bin 4492 -> 0 bytes .../entity/64-Textures/humanfemale/Roseta.png | Bin 3919 -> 0 bytes .../humanfemale/SteampunkStephanie.png | Bin 4445 -> 0 bytes .../64-Textures/humanfemale/Stephanie.png | Bin 2762 -> 0 bytes .../humanfemale/TownsmanStephanie.png | Bin 4151 -> 0 bytes .../humanfemale/TraderStepahnie.png | Bin 3230 -> 0 bytes .../humanfemale/TribeElderWoman.png | Bin 3189 -> 0 bytes .../64-Textures/humanfemale/TribeGirl.png | Bin 3323 -> 0 bytes .../64-Textures/humanfemale/TribeWoman1.png | Bin 3488 -> 0 bytes .../64-Textures/humanfemale/TribeWoman2.png | Bin 3683 -> 0 bytes .../64-Textures/humanfemale/TribeWoman3.png | Bin 2853 -> 0 bytes .../humanfemale/WaitressStephanie.png | Bin 3194 -> 0 bytes .../humanfemale/WizardStephanie.png | Bin 2272 -> 0 bytes .../humanfemale/WoundedStephanie.png | Bin 3922 -> 0 bytes .../entity/64-Textures/humanmale/32test.png | Bin 304 -> 0 bytes .../entity/64-Textures/humanmale/64test.png | Bin 478 -> 0 bytes .../64-Textures/humanmale/ArcticSteve.png | Bin 3310 -> 0 bytes .../64-Textures/humanmale/BodyguardSteve.png | Bin 2776 -> 0 bytes .../64-Textures/humanmale/CamoRadioSteve.png | Bin 2837 -> 0 bytes .../humanmale/CamoSpecOpsSteve.png | Bin 3104 -> 0 bytes .../64-Textures/humanmale/CamoSteve.png | Bin 2846 -> 0 bytes .../64-Textures/humanmale/CasualSteve.png | Bin 3779 -> 0 bytes .../64-Textures/humanmale/ChefSteve.png | Bin 2879 -> 0 bytes .../64-Textures/humanmale/DoctorSteve.png | Bin 3056 -> 0 bytes .../64-Textures/humanmale/ElderlySteve.png | Bin 2274 -> 0 bytes .../humanmale/Evil_Gold_Knight.png | Bin 3081 -> 0 bytes .../64-Textures/humanmale/FireSteve.png | Bin 3631 -> 0 bytes .../64-Textures/humanmale/GangsterSteve.png | Bin 3829 -> 0 bytes .../64-Textures/humanmale/GuardSteve.png | Bin 3962 -> 0 bytes .../64-Textures/humanmale/GuardSteve2.png | Bin 2947 -> 0 bytes .../entity/64-Textures/humanmale/King.png | Bin 2400 -> 0 bytes .../64-Textures/humanmale/KingSteve.png | Bin 3855 -> 0 bytes .../64-Textures/humanmale/KnightSteve.png | Bin 4310 -> 0 bytes .../64-Textures/humanmale/KungFuSteve.png | Bin 2874 -> 0 bytes .../64-Textures/humanmale/LondonGuard.png | Bin 3947 -> 0 bytes .../64-Textures/humanmale/MageSteve.png | Bin 4461 -> 0 bytes .../64-Textures/humanmale/MailmanSteve.png | Bin 2833 -> 0 bytes .../entity/64-Textures/humanmale/McDSteve.png | Bin 3004 -> 0 bytes .../humanmale/MercenarySteve 2.png | Bin 1859 -> 0 bytes .../64-Textures/humanmale/MercenarySteve.png | Bin 2153 -> 0 bytes .../64-Textures/humanmale/MinerSteve.png | Bin 4124 -> 0 bytes .../64-Textures/humanmale/PinstripesSteve.png | Bin 4911 -> 0 bytes .../64-Textures/humanmale/PriestSteve.png | Bin 3684 -> 0 bytes .../64-Textures/humanmale/PrisonerSteve.png | Bin 3113 -> 0 bytes .../humanmale/RaggedyBardSteve.png | Bin 4768 -> 0 bytes .../64-Textures/humanmale/RobesBlackSteve.png | Bin 4024 -> 0 bytes .../64-Textures/humanmale/RobesBrownSteve.png | Bin 4826 -> 0 bytes .../64-Textures/humanmale/RobesWhiteSteve.png | Bin 4919 -> 0 bytes .../64-Textures/humanmale/SteampunkSteve.png | Bin 4864 -> 0 bytes .../entity/64-Textures/humanmale/Steve.png | Bin 2138 -> 0 bytes .../64-Textures/humanmale/TownsmanSteve.png | Bin 4040 -> 0 bytes .../64-Textures/humanmale/TraderSteve.png | Bin 2653 -> 0 bytes .../entity/64-Textures/humanmale/TribeBoy.png | Bin 3154 -> 0 bytes .../64-Textures/humanmale/TribeElder.png | Bin 3154 -> 0 bytes .../64-Textures/humanmale/TribeHunter1.png | Bin 3324 -> 0 bytes .../64-Textures/humanmale/TribeHunter2.png | Bin 3749 -> 0 bytes .../64-Textures/humanmale/TribeKimba.png | Bin 4402 -> 0 bytes .../entity/64-Textures/humanmale/TribeMan.png | Bin 3277 -> 0 bytes .../64-Textures/humanmale/TuxedoSteve.png | Bin 2796 -> 0 bytes .../humanmale/VillagerOldSteve.png | Bin 3023 -> 0 bytes .../64-Textures/humanmale/VillagerSteve.png | Bin 1887 -> 0 bytes .../64-Textures/humanmale/VillagerSteve2.png | Bin 2086 -> 0 bytes .../64-Textures/humanmale/WaiterSteve.png | Bin 3038 -> 0 bytes .../64-Textures/humanmale/White_Knight_2.png | Bin 3884 -> 0 bytes .../64-Textures/humanmale/White_knight.png | Bin 4545 -> 0 bytes .../64-Textures/humanmale/WizardSteve.png | Bin 2223 -> 0 bytes .../64-Textures/humanmale/WoundedSteve.png | Bin 3500 -> 0 bytes .../64-Textures/monsterfemale/Herobrine.png | Bin 2175 -> 0 bytes .../monsterfemale/ZombieStephanie.png | Bin 2142 -> 0 bytes .../64-Textures/monstermale/Classy_Zombie.png | Bin 2146 -> 0 bytes .../entity/64-Textures/monstermale/Death.png | Bin 2171 -> 0 bytes .../64-Textures/monstermale/DemonSalesman.png | Bin 1278 -> 0 bytes .../64-Textures/monstermale/DesertZombie.png | Bin 2101 -> 0 bytes .../monstermale/DisfiguredZombie.png | Bin 4819 -> 0 bytes .../64-Textures/monstermale/EnderMage.png | Bin 4223 -> 0 bytes .../entity/64-Textures/monstermale/Flesh.png | Bin 4585 -> 0 bytes .../64-Textures/monstermale/FrozenCorpse.png | Bin 3732 -> 0 bytes .../64-Textures/monstermale/Ghost King.png | Bin 3333 -> 0 bytes .../64-Textures/monstermale/GhostGrey.png | Bin 2071 -> 0 bytes .../64-Textures/monstermale/GhostRed.png | Bin 1953 -> 0 bytes .../64-Textures/monstermale/GhostYellow.png | Bin 2411 -> 0 bytes .../64-Textures/monstermale/Herobrine.png | Bin 2150 -> 0 bytes .../entity/64-Textures/monstermale/Ogre.png | Bin 1102 -> 0 bytes .../64-Textures/monstermale/SandMonster.png | Bin 2906 -> 0 bytes .../64-Textures/monstermale/Securitron.png | Bin 1211 -> 0 bytes .../64-Textures/monstermale/Skull_Mage.png | Bin 2424 -> 0 bytes .../64-Textures/monstermale/StoneGolem.png | Bin 4923 -> 0 bytes .../64-Textures/monstermale/TecZombie.png | Bin 1349 -> 0 bytes .../64-Textures/monstermale/Undead King.png | Bin 4795 -> 0 bytes .../monstermale/Undead_Monster.png | Bin 3591 -> 0 bytes .../64-Textures/monstermale/ZombieBloody.png | Bin 2671 -> 0 bytes .../64-Textures/monstermale/ZombieMage.png | Bin 3024 -> 0 bytes .../64-Textures/monstermale/ZombieSteve.png | Bin 2125 -> 0 bytes .../entity/64-Textures/nagafemale/Claire.png | Bin 4407 -> 0 bytes .../64-Textures/nagafemale/Creepsnake.png | Bin 1808 -> 0 bytes .../64-Textures/nagafemale/Ender Snake.png | Bin 1150 -> 0 bytes .../nagafemale/Naga Stephanie Pink.png | Bin 3947 -> 0 bytes .../64-Textures/nagafemale/Naga Stephanie.png | Bin 3915 -> 0 bytes .../entity/64-Textures/nagamale/Cobra.png | Bin 2930 -> 0 bytes .../64-Textures/nagamale/Creepersneeper.png | Bin 4089 -> 0 bytes .../64-Textures/nagamale/EnderSnake.png | Bin 1092 -> 0 bytes .../64-Textures/nagamale/Naga Black.png | Bin 4247 -> 0 bytes .../entity/64-Textures/nagamale/Naga Blue.png | Bin 4940 -> 0 bytes .../entity/64-Textures/nagamale/Naga Gray.png | Bin 4411 -> 0 bytes .../64-Textures/nagamale/Naga Green.png | Bin 4869 -> 0 bytes .../entity/64-Textures/nagamale/Naga Red.png | Bin 4830 -> 0 bytes .../64-Textures/nagamale/Naga Steve 1.png | Bin 4802 -> 0 bytes .../64-Textures/nagamale/Naga Steve 2.png | Bin 5118 -> 0 bytes .../64-Textures/nagamale/Naga Steve 3.png | Bin 4905 -> 0 bytes .../64-Textures/nagamale/Naga Steve 4.png | Bin 5107 -> 0 bytes .../64-Textures/nagamale/Naga Steve 5.png | Bin 5110 -> 0 bytes .../64-Textures/nagamale/Naga Steve 6.png | Bin 4901 -> 0 bytes .../64-Textures/nagamale/Naga Steve 7.png | Bin 5146 -> 0 bytes .../64-Textures/nagamale/Naga White.png | Bin 4488 -> 0 bytes .../64-Textures/nagamale/Naga Yellow.png | Bin 4900 -> 0 bytes .../entity/64-Textures/nagamale/Snake.png | Bin 4691 -> 0 bytes .../entity/64-Textures/nagamale/finsample.png | Bin 4691 -> 0 bytes .../64-Textures/newskins/boy/Bandit.png | Bin 5195 -> 0 bytes .../64-Textures/newskins/boy/Butcher.png | Bin 3433 -> 0 bytes .../64-Textures/newskins/boy/Casual_Blue.png | Bin 1825 -> 0 bytes .../64-Textures/newskins/boy/Green_Jacket.png | Bin 922 -> 0 bytes .../entity/64-Textures/newskins/boy/Guy.png | Bin 3301 -> 0 bytes .../64-Textures/newskins/boy/Hunter.png | Bin 1249 -> 0 bytes .../64-Textures/newskins/boy/Knight.png | Bin 1189 -> 0 bytes .../64-Textures/newskins/boy/Pig_Man.png | Bin 1062 -> 0 bytes .../64-Textures/newskins/boy/Samurai.png | Bin 1286 -> 0 bytes .../64-Textures/newskins/boy/Scavenger.png | Bin 1666 -> 0 bytes .../newskins/girls/Alex_Revamp.png | Bin 1806 -> 0 bytes .../64-Textures/newskins/girls/Bunny_Girl.png | Bin 1027 -> 0 bytes .../newskins/girls/Creeper_Girl.png | Bin 1304 -> 0 bytes .../64-Textures/newskins/girls/Girl_Brown.png | Bin 962 -> 0 bytes .../newskins/girls/Girl_Lavender.png | Bin 1145 -> 0 bytes .../64-Textures/newskins/girls/Neapolitan.png | Bin 1256 -> 0 bytes .../64-Textures/newskins/girls/Pastel.png | Bin 967 -> 0 bytes .../64-Textures/newskins/girls/Pink_Girl.png | Bin 1275 -> 0 bytes .../newskins/girls/Purple_Girl.png | Bin 5094 -> 0 bytes .../newskins/girls/Summer_Girl.png | Bin 1156 -> 0 bytes .../orcfemale/GenericFemaleOrc1.png | Bin 5347 -> 0 bytes .../orcfemale/GenericFemaleOrc2.png | Bin 5242 -> 0 bytes .../orcfemale/GenericFemaleOrc3.png | Bin 5241 -> 0 bytes .../64-Textures/orcfemale/GuardFemaleOrc1.png | Bin 5357 -> 0 bytes .../64-Textures/orcfemale/GuardFemaleOrc2.png | Bin 5875 -> 0 bytes .../orcfemale/LeatherArmoredFemaleOrc.png | Bin 5984 -> 0 bytes .../orcfemale/MercenaryFemaleOrc1.png | Bin 5368 -> 0 bytes .../orcfemale/MercenaryFemaleOrc2.png | Bin 5165 -> 0 bytes .../orcfemale/MercenaryFemaleOrc3.png | Bin 5466 -> 0 bytes .../orcfemale/StrandedFemaleOrc.png | Bin 5209 -> 0 bytes .../64-Textures/orcmale/GenericOrc1.png | Bin 4107 -> 0 bytes .../64-Textures/orcmale/GenericOrc2.png | Bin 4108 -> 0 bytes .../64-Textures/orcmale/GenericOrc3.png | Bin 4128 -> 0 bytes .../entity/64-Textures/orcmale/Giant.png | Bin 1776 -> 0 bytes .../entity/64-Textures/orcmale/Giant_2.png | Bin 3279 -> 0 bytes .../entity/64-Textures/orcmale/Giant_3.png | Bin 5579 -> 0 bytes .../entity/64-Textures/orcmale/GuardOrc1.png | Bin 4565 -> 0 bytes .../entity/64-Textures/orcmale/GuardOrc2.png | Bin 5097 -> 0 bytes .../64-Textures/orcmale/LeatherArmoredOrc.png | Bin 5073 -> 0 bytes .../64-Textures/orcmale/MercenaryOrc1.png | Bin 4438 -> 0 bytes .../64-Textures/orcmale/MercenaryOrc2.png | Bin 4445 -> 0 bytes .../64-Textures/orcmale/MercenaryOrc3.png | Bin 4282 -> 0 bytes .../64-Textures/orcmale/StrandedOrc.png | Bin 3942 -> 0 bytes .../64-Textures/skeleton/Ancient Skeleton.png | Bin 3765 -> 0 bytes .../64-Textures/skeleton/Bloody Skeleton.png | Bin 2489 -> 0 bytes .../64-Textures/skeleton/Golden Skeleton.png | Bin 3274 -> 0 bytes .../64-Textures/skeleton/Skeleton Archer.png | Bin 3578 -> 0 bytes .../64-Textures/skeleton/Skeleton King.png | Bin 3673 -> 0 bytes .../64-Textures/skeleton/Skeleton Mage.png | Bin 3092 -> 0 bytes .../skeleton/Skeleton Priest 2.png | Bin 2545 -> 0 bytes .../64-Textures/skeleton/Skeleton Priest.png | Bin 2398 -> 0 bytes .../skeleton/Skeleton Villager.png | Bin 2037 -> 0 bytes .../64-Textures/skeleton/Skeleton Warrior.png | Bin 3724 -> 0 bytes .../entity/64-Textures/skeleton/Skeleton.png | Bin 1329 -> 0 bytes .../textures/entity/humanmale/32test.png | Bin 304 -> 0 bytes .../textures/entity/humanmale/64test.png | Bin 478 -> 0 bytes .../textures/entity/humanmale/Steve64.png | Bin 2696 -> 0 bytes .../customnpcs/textures/gui/menubgold.png | Bin 1672 -> 0 bytes .../64-Textures/Control/TecZombie_Orange.png | Bin 338 -> 0 bytes .../64-Textures/Control/TecZombie_eyes.png | Bin 323 -> 0 bytes .../64-Textures/Control/TecZombie_pink.png | Bin 349 -> 0 bytes .../64-Textures/Control/TecZombie_teal.png | Bin 334 -> 0 bytes .../64-Textures/Control/bluecontrol.png | Bin 288 -> 0 bytes .../64-Textures/Control/orangecontrol.png | Bin 295 -> 0 bytes .../64-Textures/Control/pinkcontrol.png | Bin 294 -> 0 bytes .../64-Textures/Control/redcontrol.png | Bin 295 -> 0 bytes .../64-Textures/Control/tealcontrol.png | Bin 289 -> 0 bytes .../64-Textures/Control/turquiosecontrol.png | Bin 288 -> 0 bytes .../64-Textures/Control/yellowcontrol.png | Bin 293 -> 0 bytes .../overlays/64-Textures/Eyes/blue.png | Bin 279 -> 0 bytes .../overlays/64-Textures/Eyes/darkblue.png | Bin 277 -> 0 bytes .../overlays/64-Textures/Eyes/ender_eyes.png | Bin 285 -> 0 bytes .../overlays/64-Textures/Eyes/green.png | Bin 276 -> 0 bytes .../overlays/64-Textures/Eyes/lightpurple.png | Bin 276 -> 0 bytes .../64-Textures/Eyes/old_ender_eyes.png | Bin 282 -> 0 bytes .../overlays/64-Textures/Eyes/orange.png | Bin 271 -> 0 bytes .../overlays/64-Textures/Eyes/pink.png | Bin 276 -> 0 bytes .../overlays/64-Textures/Eyes/purp.png | Bin 295 -> 0 bytes .../overlays/64-Textures/Eyes/purple.png | Bin 276 -> 0 bytes .../overlays/64-Textures/Eyes/red.png | Bin 273 -> 0 bytes .../overlays/64-Textures/Eyes/teal.png | Bin 270 -> 0 bytes .../overlays/64-Textures/Eyes/turqoise.png | Bin 277 -> 0 bytes .../overlays/64-Textures/Eyes/white.png | Bin 268 -> 0 bytes .../overlays/64-Textures/Eyes/white_cry.png | Bin 280 -> 0 bytes .../overlays/64-Textures/Eyes/yellow.png | Bin 273 -> 0 bytes .../64-Textures/FullControl/blueFull.png | Bin 309 -> 0 bytes .../64-Textures/FullControl/darkblueFull.png | Bin 311 -> 0 bytes .../64-Textures/FullControl/greenFull.png | Bin 311 -> 0 bytes .../64-Textures/FullControl/orangeFull.png | Bin 308 -> 0 bytes .../64-Textures/FullControl/pinkfull.png | Bin 313 -> 0 bytes .../64-Textures/FullControl/purpleFull.png | Bin 310 -> 0 bytes .../64-Textures/FullControl/redFull.png | Bin 311 -> 0 bytes .../64-Textures/FullControl/tealFull.png | Bin 310 -> 0 bytes .../64-Textures/FullControl/turquiseFull.png | Bin 310 -> 0 bytes .../64-Textures/FullControl/yellowFull.png | Bin 311 -> 0 bytes .../overlays/64-Textures/FullEyes/blue.png | Bin 285 -> 0 bytes .../64-Textures/FullEyes/darkblue.png | Bin 282 -> 0 bytes .../64-Textures/FullEyes/ender_eyes.png | Bin 290 -> 0 bytes .../overlays/64-Textures/FullEyes/green.png | Bin 281 -> 0 bytes .../64-Textures/FullEyes/lightpurple.png | Bin 281 -> 0 bytes .../overlays/64-Textures/FullEyes/lime.png | Bin 277 -> 0 bytes .../64-Textures/FullEyes/old_ender_eyes.png | Bin 287 -> 0 bytes .../overlays/64-Textures/FullEyes/orange.png | Bin 277 -> 0 bytes .../overlays/64-Textures/FullEyes/pink.png | Bin 281 -> 0 bytes .../overlays/64-Textures/FullEyes/purp.png | Bin 305 -> 0 bytes .../overlays/64-Textures/FullEyes/purple.png | Bin 281 -> 0 bytes .../overlays/64-Textures/FullEyes/red.png | Bin 278 -> 0 bytes .../overlays/64-Textures/FullEyes/teal.png | Bin 276 -> 0 bytes .../64-Textures/FullEyes/turqoise.png | Bin 283 -> 0 bytes .../64-Textures/FullEyes/turquiose.png | Bin 276 -> 0 bytes .../overlays/64-Textures/FullEyes/white.png | Bin 275 -> 0 bytes .../64-Textures/FullEyes/white_cry.png | Bin 292 -> 0 bytes .../overlays/64-Textures/FullEyes/yellow.png | Bin 278 -> 0 bytes .../overlays/64-Textures/FullHigh/blue.png | Bin 290 -> 0 bytes .../64-Textures/FullHigh/darkblue.png | Bin 288 -> 0 bytes .../64-Textures/FullHigh/ender_eyes.png | Bin 292 -> 0 bytes .../overlays/64-Textures/FullHigh/green.png | Bin 287 -> 0 bytes .../64-Textures/FullHigh/lightpurple.png | Bin 287 -> 0 bytes .../64-Textures/FullHigh/old_ender_eyes.png | Bin 289 -> 0 bytes .../overlays/64-Textures/FullHigh/orange.png | Bin 283 -> 0 bytes .../overlays/64-Textures/FullHigh/pink.png | Bin 287 -> 0 bytes .../overlays/64-Textures/FullHigh/purp.png | Bin 294 -> 0 bytes .../overlays/64-Textures/FullHigh/purple.png | Bin 287 -> 0 bytes .../overlays/64-Textures/FullHigh/red.png | Bin 284 -> 0 bytes .../overlays/64-Textures/FullHigh/teal.png | Bin 281 -> 0 bytes .../64-Textures/FullHigh/turqoise.png | Bin 288 -> 0 bytes .../overlays/64-Textures/FullHigh/white.png | Bin 280 -> 0 bytes .../64-Textures/FullHigh/white_cry.png | Bin 287 -> 0 bytes .../overlays/64-Textures/FullHigh/yellow.png | Bin 284 -> 0 bytes .../overlays/64-Textures/FullLow/blue.png | Bin 289 -> 0 bytes .../overlays/64-Textures/FullLow/darkblue.png | Bin 286 -> 0 bytes .../64-Textures/FullLow/ender_eyes.png | Bin 294 -> 0 bytes .../overlays/64-Textures/FullLow/gone.png | Bin 282 -> 0 bytes .../overlays/64-Textures/FullLow/green.png | Bin 285 -> 0 bytes .../64-Textures/FullLow/lightpurple.png | Bin 285 -> 0 bytes .../overlays/64-Textures/FullLow/lime.png | Bin 281 -> 0 bytes .../64-Textures/FullLow/old_ender_eyes.png | Bin 290 -> 0 bytes .../overlays/64-Textures/FullLow/orange.png | Bin 282 -> 0 bytes .../overlays/64-Textures/FullLow/pink.png | Bin 285 -> 0 bytes .../overlays/64-Textures/FullLow/purp.png | Bin 183 -> 0 bytes .../overlays/64-Textures/FullLow/purple.png | Bin 285 -> 0 bytes .../overlays/64-Textures/FullLow/red.png | Bin 282 -> 0 bytes .../64-Textures/FullLow/redorange.png | Bin 281 -> 0 bytes .../overlays/64-Textures/FullLow/teal.png | Bin 279 -> 0 bytes .../overlays/64-Textures/FullLow/turqoise.png | Bin 287 -> 0 bytes .../64-Textures/FullLow/turquiose.png | Bin 280 -> 0 bytes .../overlays/64-Textures/FullLow/white.png | Bin 278 -> 0 bytes .../64-Textures/FullLow/white_cry.png | Bin 173 -> 0 bytes .../overlays/64-Textures/FullLow/yellow.png | Bin 283 -> 0 bytes .../overlays/64-Textures/HandOverlay/blue.png | Bin 566 -> 0 bytes .../overlays/64-Textures/HandOverlay/fire.png | Bin 555 -> 0 bytes .../64-Textures/HandOverlay/green.png | Bin 581 -> 0 bytes .../overlays/64-Textures/HandOverlay/pink.png | Bin 574 -> 0 bytes .../64-Textures/HandOverlay/purple.png | Bin 569 -> 0 bytes .../overlays/64-Textures/HandOverlay/red.png | Bin 568 -> 0 bytes .../64-Textures/HandOverlay/white.png | Bin 545 -> 0 bytes .../64-Textures/HandOverlay/yellow.png | Bin 564 -> 0 bytes .../overlays/64-Textures/HighEyes/blue.png | Bin 272 -> 0 bytes .../64-Textures/HighEyes/darkblue.png | Bin 270 -> 0 bytes .../64-Textures/HighEyes/ender_eyes.png | Bin 282 -> 0 bytes .../overlays/64-Textures/HighEyes/green.png | Bin 268 -> 0 bytes .../64-Textures/HighEyes/lightpurple.png | Bin 268 -> 0 bytes .../64-Textures/HighEyes/old_ender_eyes.png | Bin 278 -> 0 bytes .../overlays/64-Textures/HighEyes/orange.png | Bin 264 -> 0 bytes .../overlays/64-Textures/HighEyes/pink.png | Bin 268 -> 0 bytes .../overlays/64-Textures/HighEyes/purp.png | Bin 292 -> 0 bytes .../overlays/64-Textures/HighEyes/purple.png | Bin 268 -> 0 bytes .../overlays/64-Textures/HighEyes/red.png | Bin 265 -> 0 bytes .../overlays/64-Textures/HighEyes/teal.png | Bin 263 -> 0 bytes .../64-Textures/HighEyes/turqoise.png | Bin 270 -> 0 bytes .../overlays/64-Textures/HighEyes/white.png | Bin 261 -> 0 bytes .../64-Textures/HighEyes/white_cry.png | Bin 283 -> 0 bytes .../overlays/64-Textures/HighEyes/yellow.png | Bin 265 -> 0 bytes .../64-Textures/Ignite/BlueIgnite.png | Bin 483 -> 0 bytes .../64-Textures/Ignite/OrangeIgnite.png | Bin 482 -> 0 bytes .../64-Textures/Ignite/PinkIgnite.png | Bin 483 -> 0 bytes .../64-Textures/Ignite/PurpleIgnite.png | Bin 483 -> 0 bytes .../overlays/64-Textures/Ignite/RedIgnite.png | Bin 483 -> 0 bytes .../64-Textures/Ignite/TealIgnite.png | Bin 484 -> 0 bytes .../64-Textures/Ignite/TurquioseIgnite.png | Bin 483 -> 0 bytes .../64-Textures/Ignite/WhiteIgnite.png | Bin 484 -> 0 bytes .../64-Textures/Ignite/YellowIgnite.png | Bin 484 -> 0 bytes .../overlays/64-Textures/LowEyes/blue.png | Bin 278 -> 0 bytes .../overlays/64-Textures/LowEyes/darkblue.png | Bin 276 -> 0 bytes .../64-Textures/LowEyes/ender_eyes.png | Bin 283 -> 0 bytes .../overlays/64-Textures/LowEyes/green.png | Bin 274 -> 0 bytes .../64-Textures/LowEyes/lightpurple.png | Bin 274 -> 0 bytes .../64-Textures/LowEyes/old_ender_eyes.png | Bin 280 -> 0 bytes .../overlays/64-Textures/LowEyes/orange.png | Bin 271 -> 0 bytes .../overlays/64-Textures/LowEyes/pink.png | Bin 274 -> 0 bytes .../overlays/64-Textures/LowEyes/purp.png | Bin 181 -> 0 bytes .../overlays/64-Textures/LowEyes/purple.png | Bin 274 -> 0 bytes .../overlays/64-Textures/LowEyes/red.png | Bin 271 -> 0 bytes .../overlays/64-Textures/LowEyes/teal.png | Bin 269 -> 0 bytes .../overlays/64-Textures/LowEyes/tuquiose.png | Bin 276 -> 0 bytes .../overlays/64-Textures/LowEyes/turqoise.png | Bin 276 -> 0 bytes .../overlays/64-Textures/LowEyes/white.png | Bin 267 -> 0 bytes .../64-Textures/LowEyes/white_cry.png | Bin 169 -> 0 bytes .../overlays/64-Textures/LowEyes/whitecry.png | Bin 280 -> 0 bytes .../overlays/64-Textures/LowEyes/yellow.png | Bin 272 -> 0 bytes .../overlays/64-Textures/Magic/Blue.png | Bin 514 -> 0 bytes .../overlays/64-Textures/Magic/Green.png | Bin 509 -> 0 bytes .../overlays/64-Textures/Magic/Lime.png | Bin 510 -> 0 bytes .../overlays/64-Textures/Magic/Orange.png | Bin 510 -> 0 bytes .../overlays/64-Textures/Magic/Pink.png | Bin 514 -> 0 bytes .../overlays/64-Textures/Magic/Purple.png | Bin 513 -> 0 bytes .../overlays/64-Textures/Magic/Red.png | Bin 513 -> 0 bytes .../overlays/64-Textures/Magic/Teal.png | Bin 514 -> 0 bytes .../overlays/64-Textures/Magic/Yellow.png | Bin 512 -> 0 bytes .../overlays/64-Textures/Magic/transform.png | Bin 475 -> 0 bytes .../overlays/64-Textures/Magic/white.png | Bin 470 -> 0 bytes .../overlays/64-Textures/TecZombie_eyes.png | Bin 323 -> 0 bytes .../textures/overlays/64-Textures/blue.png | Bin 290 -> 0 bytes .../overlays/64-Textures/ender_eyes.png | Bin 285 -> 0 bytes .../overlays/64-Textures/evil_eyes.png | Bin 272 -> 0 bytes .../overlays/64-Textures/ghost_eyes.png | Bin 266 -> 0 bytes .../textures/overlays/64-Textures/goggles.png | Bin 300 -> 0 bytes .../textures/overlays/64-Textures/gone.png | Bin 282 -> 0 bytes .../textures/overlays/64-Textures/green.png | Bin 289 -> 0 bytes .../overlays/64-Textures/herobrine_eyes.png | Bin 268 -> 0 bytes .../overlays/64-Textures/old_ender_eyes.png | Bin 282 -> 0 bytes .../textures/overlays/64-Textures/purp.png | Bin 295 -> 0 bytes .../textures/overlays/64-Textures/taken.png | Bin 283 -> 0 bytes .../overlays/64-Textures/transform.png | Bin 509 -> 0 bytes .../textures/overlays/64-Textures/white.png | Bin 278 -> 0 bytes .../overlays/64-Textures/yellowcontrol.png | Bin 293 -> 0 bytes .../overlays/Control/TecZombie_Orange.png | Bin 15082 -> 0 bytes .../overlays/Control/TecZombie_eyes.png | Bin 319 -> 0 bytes .../overlays/Control/TecZombie_pink.png | Bin 15085 -> 0 bytes .../overlays/Control/TecZombie_teal.png | Bin 15077 -> 0 bytes .../textures/overlays/Control/bluecontrol.png | Bin 15269 -> 0 bytes .../overlays/Control/orangecontrol.png | Bin 15267 -> 0 bytes .../textures/overlays/Control/pinkcontrol.png | Bin 15267 -> 0 bytes .../textures/overlays/Control/redcontrol.png | Bin 15268 -> 0 bytes .../textures/overlays/Control/tealcontrol.png | Bin 15269 -> 0 bytes .../overlays/Control/turquiosecontrol.png | Bin 15268 -> 0 bytes .../overlays/Control/yellowcontrol.png | Bin 15052 -> 0 bytes .../textures/overlays/Eyes/blue.png | Bin 136 -> 0 bytes .../textures/overlays/Eyes/darkblue.png | Bin 15046 -> 0 bytes .../textures/overlays/Eyes/green.png | Bin 15045 -> 0 bytes .../textures/overlays/Eyes/lightpurple.png | Bin 15044 -> 0 bytes .../textures/overlays/Eyes/old_ender_eyes.png | Bin 180 -> 0 bytes .../textures/overlays/Eyes/orange.png | Bin 14587 -> 0 bytes .../textures/overlays/Eyes/pink.png | Bin 15044 -> 0 bytes .../textures/overlays/Eyes/purp.png | Bin 15057 -> 0 bytes .../textures/overlays/Eyes/purple.png | Bin 15044 -> 0 bytes .../customnpcs/textures/overlays/Eyes/red.png | Bin 15043 -> 0 bytes .../textures/overlays/Eyes/teal.png | Bin 15045 -> 0 bytes .../textures/overlays/Eyes/turqoise.png | Bin 15045 -> 0 bytes .../textures/overlays/Eyes/white.png | Bin 15255 -> 0 bytes .../textures/overlays/Eyes/white_cry.png | Bin 15259 -> 0 bytes .../textures/overlays/Eyes/yellow.png | Bin 15043 -> 0 bytes .../overlays/FullControl/blueFull.png | Bin 15512 -> 0 bytes .../overlays/FullControl/darkblueFull.png | Bin 15512 -> 0 bytes .../overlays/FullControl/greenFull.png | Bin 15516 -> 0 bytes .../overlays/FullControl/orangeFull.png | Bin 15513 -> 0 bytes .../overlays/FullControl/pinkfull.png | Bin 15515 -> 0 bytes .../overlays/FullControl/purpleFull.png | Bin 15513 -> 0 bytes .../textures/overlays/FullControl/redFull.png | Bin 15513 -> 0 bytes .../overlays/FullControl/tealFull.png | Bin 15515 -> 0 bytes .../overlays/FullControl/turquiseFull.png | Bin 15514 -> 0 bytes .../overlays/FullControl/yellowFull.png | Bin 15514 -> 0 bytes .../textures/overlays/FullEyes/blue.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/darkblue.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/ender_eyes.png | Bin 147 -> 0 bytes .../textures/overlays/FullEyes/green.png | Bin 140 -> 0 bytes .../overlays/FullEyes/lightpurple.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/lime.png | Bin 16962 -> 0 bytes .../overlays/FullEyes/old_ender_eyes.png | Bin 147 -> 0 bytes .../textures/overlays/FullEyes/orange.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/pink.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/purp.png | Bin 151 -> 0 bytes .../textures/overlays/FullEyes/purple.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/red.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/teal.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/turqoise.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/turquiose.png | Bin 16962 -> 0 bytes .../textures/overlays/FullEyes/white.png | Bin 140 -> 0 bytes .../textures/overlays/FullEyes/white_cry.png | Bin 143 -> 0 bytes .../textures/overlays/FullEyes/yellow.png | Bin 140 -> 0 bytes .../textures/overlays/FullHigh/blue.png | Bin 141 -> 0 bytes .../textures/overlays/FullHigh/darkblue.png | Bin 141 -> 0 bytes .../textures/overlays/FullHigh/ender_eyes.png | Bin 145 -> 0 bytes .../textures/overlays/FullHigh/green.png | Bin 140 -> 0 bytes .../overlays/FullHigh/lightpurple.png | Bin 139 -> 0 bytes .../overlays/FullHigh/old_ender_eyes.png | Bin 143 -> 0 bytes .../textures/overlays/FullHigh/orange.png | Bin 138 -> 0 bytes .../textures/overlays/FullHigh/pink.png | Bin 139 -> 0 bytes .../textures/overlays/FullHigh/purp.png | Bin 154 -> 0 bytes .../textures/overlays/FullHigh/purple.png | Bin 139 -> 0 bytes .../textures/overlays/FullHigh/red.png | Bin 137 -> 0 bytes .../textures/overlays/FullHigh/teal.png | Bin 136 -> 0 bytes .../textures/overlays/FullHigh/turqoise.png | Bin 140 -> 0 bytes .../textures/overlays/FullHigh/white.png | Bin 132 -> 0 bytes .../textures/overlays/FullHigh/white_cry.png | Bin 146 -> 0 bytes .../textures/overlays/FullHigh/yellow.png | Bin 138 -> 0 bytes .../textures/overlays/FullLow/blue.png | Bin 140 -> 0 bytes .../textures/overlays/FullLow/darkblue.png | Bin 140 -> 0 bytes .../textures/overlays/FullLow/ender_eyes.png | Bin 147 -> 0 bytes .../textures/overlays/FullLow/gone.png | Bin 15044 -> 0 bytes .../textures/overlays/FullLow/green.png | Bin 140 -> 0 bytes .../textures/overlays/FullLow/lightpurple.png | Bin 140 -> 0 bytes .../textures/overlays/FullLow/lime.png | Bin 15486 -> 0 bytes .../overlays/FullLow/old_ender_eyes.png | Bin 147 -> 0 bytes .../textures/overlays/FullLow/orange.png | Bin 140 -> 0 bytes .../textures/overlays/FullLow/pink.png | Bin 140 -> 0 bytes .../textures/overlays/FullLow/purp.png | Bin 150 -> 0 bytes .../textures/overlays/FullLow/purple.png | Bin 140 -> 0 bytes .../textures/overlays/FullLow/red.png | Bin 140 -> 0 bytes .../textures/overlays/FullLow/redorange.png | Bin 15485 -> 0 bytes .../textures/overlays/FullLow/teal.png | Bin 136 -> 0 bytes .../textures/overlays/FullLow/turqoise.png | Bin 140 -> 0 bytes .../textures/overlays/FullLow/turquiose.png | Bin 15485 -> 0 bytes .../textures/overlays/FullLow/white.png | Bin 132 -> 0 bytes .../textures/overlays/FullLow/white_cry.png | Bin 145 -> 0 bytes .../textures/overlays/FullLow/yellow.png | Bin 138 -> 0 bytes .../textures/overlays/HandOverlay/blue.png | Bin 244 -> 0 bytes .../textures/overlays/HandOverlay/fire.png | Bin 237 -> 0 bytes .../textures/overlays/HandOverlay/green.png | Bin 245 -> 0 bytes .../textures/overlays/HandOverlay/pink.png | Bin 245 -> 0 bytes .../textures/overlays/HandOverlay/purple.png | Bin 246 -> 0 bytes .../textures/overlays/HandOverlay/red.png | Bin 196 -> 0 bytes .../textures/overlays/HandOverlay/white.png | Bin 238 -> 0 bytes .../textures/overlays/HandOverlay/yellow.png | Bin 243 -> 0 bytes .../textures/overlays/HighEyes/blue.png | Bin 136 -> 0 bytes .../textures/overlays/HighEyes/darkblue.png | Bin 136 -> 0 bytes .../textures/overlays/HighEyes/ender_eyes.png | Bin 140 -> 0 bytes .../textures/overlays/HighEyes/green.png | Bin 134 -> 0 bytes .../overlays/HighEyes/lightpurple.png | Bin 133 -> 0 bytes .../overlays/HighEyes/old_ender_eyes.png | Bin 138 -> 0 bytes .../textures/overlays/HighEyes/orange.png | Bin 133 -> 0 bytes .../textures/overlays/HighEyes/pink.png | Bin 134 -> 0 bytes .../textures/overlays/HighEyes/purp.png | Bin 149 -> 0 bytes .../textures/overlays/HighEyes/purple.png | Bin 134 -> 0 bytes .../textures/overlays/HighEyes/red.png | Bin 133 -> 0 bytes .../textures/overlays/HighEyes/teal.png | Bin 132 -> 0 bytes .../textures/overlays/HighEyes/turqoise.png | Bin 135 -> 0 bytes .../textures/overlays/HighEyes/white.png | Bin 129 -> 0 bytes .../textures/overlays/HighEyes/white_cry.png | Bin 142 -> 0 bytes .../textures/overlays/HighEyes/yellow.png | Bin 133 -> 0 bytes .../textures/overlays/Ignite/BlueIgnite.png | Bin 15578 -> 0 bytes .../textures/overlays/Ignite/OrangeIgnite.png | Bin 15578 -> 0 bytes .../textures/overlays/Ignite/PinkIgnite.png | Bin 15583 -> 0 bytes .../textures/overlays/Ignite/PurpleIgnite.png | Bin 15579 -> 0 bytes .../textures/overlays/Ignite/RedIgnite.png | Bin 15579 -> 0 bytes .../textures/overlays/Ignite/TealIgnite.png | Bin 15579 -> 0 bytes .../overlays/Ignite/TurquioseIgnite.png | Bin 15578 -> 0 bytes .../textures/overlays/Ignite/WhiteIgnite.png | Bin 15560 -> 0 bytes .../textures/overlays/Ignite/YellowIgnite.png | Bin 15579 -> 0 bytes .../textures/overlays/LowEyes/blue.png | Bin 136 -> 0 bytes .../textures/overlays/LowEyes/darkblue.png | Bin 136 -> 0 bytes .../textures/overlays/LowEyes/ender_eyes.png | Bin 140 -> 0 bytes .../textures/overlays/LowEyes/green.png | Bin 135 -> 0 bytes .../textures/overlays/LowEyes/lightpurple.png | Bin 134 -> 0 bytes .../overlays/LowEyes/old_ender_eyes.png | Bin 138 -> 0 bytes .../textures/overlays/LowEyes/orange.png | Bin 134 -> 0 bytes .../textures/overlays/LowEyes/pink.png | Bin 135 -> 0 bytes .../textures/overlays/LowEyes/purp.png | Bin 150 -> 0 bytes .../textures/overlays/LowEyes/purple.png | Bin 135 -> 0 bytes .../textures/overlays/LowEyes/red.png | Bin 133 -> 0 bytes .../textures/overlays/LowEyes/teal.png | Bin 132 -> 0 bytes .../textures/overlays/LowEyes/tuquiose.png | Bin 16689 -> 0 bytes .../textures/overlays/LowEyes/turqoise.png | Bin 135 -> 0 bytes .../textures/overlays/LowEyes/white.png | Bin 129 -> 0 bytes .../textures/overlays/LowEyes/white_cry.png | Bin 142 -> 0 bytes .../textures/overlays/LowEyes/whitecry.png | Bin 16861 -> 0 bytes .../textures/overlays/LowEyes/yellow.png | Bin 134 -> 0 bytes .../textures/overlays/Magic/Blue.png | Bin 15809 -> 0 bytes .../textures/overlays/Magic/Green.png | Bin 15807 -> 0 bytes .../textures/overlays/Magic/Lime.png | Bin 15807 -> 0 bytes .../textures/overlays/Magic/Orange.png | Bin 15807 -> 0 bytes .../textures/overlays/Magic/Pink.png | Bin 15812 -> 0 bytes .../textures/overlays/Magic/Purple.png | Bin 15811 -> 0 bytes .../textures/overlays/Magic/Red.png | Bin 15812 -> 0 bytes .../textures/overlays/Magic/Teal.png | Bin 15809 -> 0 bytes .../textures/overlays/Magic/Yellow.png | Bin 15807 -> 0 bytes .../textures/overlays/Magic/transform.png | Bin 15792 -> 0 bytes .../textures/overlays/Magic/white.png | Bin 15846 -> 0 bytes .../customnpcs/textures/overlays/blue.png | Bin 15055 -> 0 bytes .../customnpcs/textures/overlays/gone.png | Bin 15044 -> 0 bytes .../customnpcs/textures/overlays/green.png | Bin 15047 -> 0 bytes .../customnpcs/textures/overlays/purp.png | Bin 15057 -> 0 bytes .../customnpcs/textures/overlays/taken.png | Bin 15045 -> 0 bytes .../textures/overlays/transform.png | Bin 15365 -> 0 bytes .../customnpcs/textures/overlays/white.png | Bin 15040 -> 0 bytes .../textures/overlays/yellowcontrol.png | Bin 15052 -> 0 bytes .../customnpcs/textures/parts/claws/0.png | Bin 351 -> 0 bytes .../customnpcs/textures/parts/fin/fin1.png | Bin 14707 -> 0 bytes .../customnpcs/textures/parts/fin/fin2.png | Bin 15948 -> 0 bytes .../customnpcs/textures/parts/fin/fin3.png | Bin 15158 -> 0 bytes .../customnpcs/textures/parts/fin/fin4.png | Bin 15409 -> 0 bytes .../customnpcs/textures/parts/fin/fin5.png | Bin 15857 -> 0 bytes .../customnpcs/textures/parts/fin/fin6.png | Bin 16050 -> 0 bytes .../textures/parts/hair/mohawk2.png | Bin 311 -> 0 bytes .../textures/parts/hair/mohawk3.png | Bin 15029 -> 0 bytes .../textures/parts/horns/antennas.png | Bin 242 -> 0 bytes .../textures/parts/horns/antlers.png | Bin 234 -> 0 bytes .../customnpcs/textures/parts/horns/bull.png | Bin 291 -> 0 bytes .../textures/parts/legs/mermaid1.png | Bin 464 -> 0 bytes .../customnpcs/textures/parts/legs/naga1.png | Bin 709 -> 0 bytes .../customnpcs/textures/parts/legs/naga2.png | Bin 735 -> 0 bytes .../textures/parts/legs/spider1.png | Bin 1963 -> 0 bytes .../textures/parts/particle/type1.png | Bin 238 -> 0 bytes .../textures/parts/particle/type2.png | Bin 230 -> 0 bytes .../textures/parts/particle/type3.png | Bin 234 -> 0 bytes .../textures/parts/particle/type4.png | Bin 231 -> 0 bytes .../textures/parts/particle/type5.png | Bin 234 -> 0 bytes .../textures/parts/particle/type6.png | Bin 229 -> 0 bytes .../textures/parts/particle/type7.png | Bin 213 -> 0 bytes .../textures/parts/skirt/skirt1.png | Bin 3755 -> 0 bytes .../customnpcs/textures/parts/snout/beak1.png | Bin 251 -> 0 bytes .../textures/parts/snout/bunny1.png | Bin 226 -> 0 bytes .../textures/parts/snout/large1.png | Bin 354 -> 0 bytes .../textures/parts/snout/medium1.png | Bin 279 -> 0 bytes .../textures/parts/snout/small1.png | Bin 284 -> 0 bytes .../textures/parts/tail/dragon1.png | Bin 190 -> 0 bytes .../textures/parts/tail/feather1.png | Bin 289 -> 0 bytes .../customnpcs/textures/parts/tail/fin1.png | Bin 369 -> 0 bytes .../textures/parts/tail/rodent1.png | Bin 225 -> 0 bytes .../textures/parts/tail/squirrel1.png | Bin 2794 -> 0 bytes .../customnpcs/textures/parts/tail/tail1.png | Bin 276 -> 0 bytes .../customnpcs/textures/parts/tail/tail2.png | Bin 407 -> 0 bytes .../customnpcs/textures/parts/wings/wing1.png | Bin 14726 -> 0 bytes .../textures/parts/wings/wing10.png | Bin 15734 -> 0 bytes .../textures/parts/wings/wing11.png | Bin 19415 -> 0 bytes .../textures/parts/wings/wing12.png | Bin 20147 -> 0 bytes .../textures/parts/wings/wing13.png | Bin 19545 -> 0 bytes .../customnpcs/textures/parts/wings/wing2.png | Bin 15562 -> 0 bytes .../customnpcs/textures/parts/wings/wing3.png | Bin 15599 -> 0 bytes .../customnpcs/textures/parts/wings/wing4.png | Bin 15686 -> 0 bytes .../customnpcs/textures/parts/wings/wing5.png | Bin 15651 -> 0 bytes .../customnpcs/textures/parts/wings/wing6.png | Bin 15713 -> 0 bytes .../customnpcs/textures/parts/wings/wing7.png | Bin 19647 -> 0 bytes .../customnpcs/textures/parts/wings/wing8.png | Bin 19271 -> 0 bytes .../customnpcs/textures/parts/wings/wing9.png | Bin 19604 -> 0 bytes .../textures}/beard/beard1.png | Bin .../textures}/beard/beard2.png | Bin .../textures}/beard/beard3.png | Bin .../textures}/beard/beard4.png | Bin .../textures}/ears/bunny1.png | Bin .../textures}/ears/type1.png | Bin .../moreplayermodels/textures/fin/fin1.png | Bin 0 -> 317 bytes .../textures}/hair/hair1.png | Bin .../textures}/hair/hair2.png | Bin .../textures}/hair/hair3.png | Bin .../textures}/hair/hair4.png | Bin .../textures}/hair/mohawk1.png | Bin .../textures}/legs/horse1.png | Bin .../textures/legs/mermaid1.png | Bin 0 -> 674 bytes .../moreplayermodels/textures/legs/naga1.png | Bin 0 -> 787 bytes .../textures/legs/spider1.png | Bin 0 -> 2453 bytes .../textures/particle/type1.png | Bin 0 -> 353 bytes .../textures/particle/type2.png | Bin 0 -> 349 bytes .../textures/snout/bunny1.png | Bin 0 -> 293 bytes .../textures/snout/large1.png | Bin 0 -> 403 bytes .../textures/snout/medium1.png | Bin 0 -> 329 bytes .../textures/snout/small1.png | Bin 0 -> 352 bytes .../textures/tail/dragon1.png} | Bin 1205 -> 1238 bytes .../textures}/tail/horse1.png | Bin .../textures/tail/squirrel1.png | Bin 0 -> 2713 bytes .../moreplayermodels/textures/tail/tail1.png | Bin 0 -> 347 bytes .../moreplayermodels/textures/tail/tail2.png | Bin 0 -> 450 bytes .../moreplayermodels/textures/wings/wing1.png | Bin 0 -> 362 bytes .../moreplayermodels/textures/wings/wing2.png | Bin 0 -> 448 bytes .../moreplayermodels/textures/wings/wing3.png | Bin 0 -> 454 bytes 1227 files changed, 2259 insertions(+), 39282 deletions(-) delete mode 100644 src/main/java/net/minecraft/block/properties/IProperty.java delete mode 100644 src/main/java/net/minecraft/block/state/IBlockState.java delete mode 100644 src/main/java/net/minecraft/util/Vec3i.java delete mode 100644 src/main/java/net/minecraft/util/math/BlockPos.java delete mode 100644 src/main/java/nikedemos/markovnames/HashMap2D.java delete mode 100644 src/main/java/nikedemos/markovnames/Main.java delete mode 100644 src/main/java/nikedemos/markovnames/MarkovDictionary.java delete mode 100644 src/main/java/nikedemos/markovnames/MarkovDictionarySPA.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovAncientGreek.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovAztec.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovCustomNPCsClassic.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovGenerator.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovJapanese.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovOldNorse.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovRoman.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovSaami.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovSlavic.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovSpanish.java delete mode 100644 src/main/java/nikedemos/markovnames/generators/MarkovWelsh.java delete mode 100644 src/main/java/noppes/npcs/EventHooks.java delete mode 100644 src/main/java/noppes/npcs/ScriptForgeEventHandler.java delete mode 100644 src/main/java/noppes/npcs/ScriptPlayerEventHandler.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/FlyNodeProcessor.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/FlyPath.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/FlyPathEntity.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/FlyPathPoint.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/NPCPathFinder.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/NPCPathPoint.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/NodeProcessor.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/PathNavigateFlying.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/PathNavigateGround.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/PathNavigateNPC.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/PathNavigateSwimmer.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/SwimNodeProcessor.java delete mode 100644 src/main/java/noppes/npcs/ai/pathfinder/WalkNodeProcessor.java delete mode 100644 src/main/java/noppes/npcs/client/fx/EntityCustomFX.java delete mode 100644 src/main/java/noppes/npcs/client/gui/EventGuiScriptList.java delete mode 100644 src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiSlot.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/interfaces/IClickListener.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/interfaces/IDataHolder.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/interfaces/IGuiComponent.java delete mode 100644 src/main/java/noppes/npcs/client/gui/custom/interfaces/IKeyListener.java delete mode 100644 src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java delete mode 100644 src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java delete mode 100644 src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java delete mode 100644 src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java delete mode 100644 src/main/java/noppes/npcs/client/gui/customoverlay/interfaces/IOverlayComponent.java delete mode 100644 src/main/java/noppes/npcs/client/gui/script/EventGuiScriptList.java delete mode 100644 src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java delete mode 100644 src/main/java/noppes/npcs/client/gui/script/GuiScriptGlobal.java delete mode 100644 src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java delete mode 100644 src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java delete mode 100644 src/main/java/noppes/npcs/client/gui/util/GuiTextArea.java delete mode 100644 src/main/java/noppes/npcs/client/gui/util/IGui.java delete mode 100644 src/main/java/noppes/npcs/client/gui/util/IKeyListener.java delete mode 100644 src/main/java/noppes/npcs/client/gui/util/IMouseListener.java delete mode 100644 src/main/java/noppes/npcs/client/gui/util/ITextChangeListener.java delete mode 100644 src/main/java/noppes/npcs/client/gui/util/TextContainer.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/ModelBodywear.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/ModelHorns.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/ModelLimbWear.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/ModelSkirt.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/horns/ModelBullHorns.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs2.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java delete mode 100644 src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java delete mode 100644 src/main/java/noppes/npcs/config/TrueTypeFont.java delete mode 100644 src/main/java/noppes/npcs/containers/ContainerCustomGui.java delete mode 100644 src/main/java/noppes/npcs/controllers/CustomGuiController.java delete mode 100644 src/main/java/noppes/npcs/controllers/IScriptHandler.java delete mode 100644 src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java delete mode 100644 src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java delete mode 100644 src/main/java/noppes/npcs/entity/EntityNPCFlying.java delete mode 100644 src/main/java/noppes/npcs/entity/data/DataTimers.java delete mode 100644 src/main/java/noppes/npcs/scripted/CustomNPCsException.java delete mode 100644 src/main/java/noppes/npcs/scripted/NpcAPI.java rename src/main/java/noppes/npcs/scripted/{entity => }/ScriptAnimal.java (58%) delete mode 100644 src/main/java/noppes/npcs/scripted/ScriptBlock.java delete mode 100644 src/main/java/noppes/npcs/scripted/ScriptBlockPos.java delete mode 100644 src/main/java/noppes/npcs/scripted/ScriptContainer.java rename src/main/java/noppes/npcs/scripted/{entity => }/ScriptEntity.java (63%) delete mode 100644 src/main/java/noppes/npcs/scripted/ScriptEntityParticle.java rename src/main/java/noppes/npcs/scripted/{event => }/ScriptEvent.java (84%) rename src/main/java/noppes/npcs/scripted/{event => }/ScriptEventAttack.java (90%) rename src/main/java/noppes/npcs/scripted/{event => }/ScriptEventDamaged.java (92%) create mode 100644 src/main/java/noppes/npcs/scripted/ScriptEventDialog.java rename src/main/java/noppes/npcs/scripted/{event => }/ScriptEventKilled.java (88%) rename src/main/java/noppes/npcs/scripted/{event => }/ScriptEventTarget.java (77%) rename src/main/java/noppes/npcs/scripted/{entity => }/ScriptLiving.java (79%) rename src/main/java/noppes/npcs/scripted/{entity => }/ScriptLivingBase.java (77%) rename src/main/java/noppes/npcs/scripted/{entity => }/ScriptMonster.java (58%) delete mode 100644 src/main/java/noppes/npcs/scripted/ScriptNbt.java rename src/main/java/noppes/npcs/scripted/{entity => }/ScriptNpc.java (52%) rename src/main/java/noppes/npcs/scripted/{entity => }/ScriptPixelmon.java (96%) rename src/main/java/noppes/npcs/scripted/{entity => }/ScriptPlayer.java (63%) delete mode 100644 src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/DialogEvent.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/FactionEvent.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/ForgeEvent.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/NpcEvent.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/PlayerEvent.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/QuestEvent.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java delete mode 100644 src/main/java/noppes/npcs/scripted/event/ScriptEventTimer.java delete mode 100644 src/main/java/noppes/npcs/scripted/gui/ScriptGui.java delete mode 100644 src/main/java/noppes/npcs/scripted/gui/ScriptGuiButton.java delete mode 100644 src/main/java/noppes/npcs/scripted/gui/ScriptGuiComponent.java delete mode 100644 src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java delete mode 100644 src/main/java/noppes/npcs/scripted/gui/ScriptGuiLabel.java delete mode 100644 src/main/java/noppes/npcs/scripted/gui/ScriptGuiLine.java delete mode 100644 src/main/java/noppes/npcs/scripted/gui/ScriptGuiScroll.java delete mode 100644 src/main/java/noppes/npcs/scripted/gui/ScriptGuiTextField.java delete mode 100644 src/main/java/noppes/npcs/scripted/gui/ScriptGuiTexturedRect.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/ICloneHandler.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/IDialogHandler.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/IFactionHandler.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/IQuestHandler.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/IRecipeHandler.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IAvailability.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IDialog.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IDialogCategory.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IDialogOption.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IFaction.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IQuest.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IQuestCategory.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IQuestDialog.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IQuestInterface.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IQuestItem.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IQuestKill.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IQuestLocation.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IQuestObjective.java delete mode 100644 src/main/java/noppes/npcs/scripted/handler/data/IRecipe.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IAnimal.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IBlock.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IButton.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IContainer.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ICustomGui.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ICustomGuiComponent.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlay.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlayComponent.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IDamageSource.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IEntity.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IEntityLiving.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IEntityLivingBase.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IItemSlot.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ILabel.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ILine.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IMonster.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/INbt.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IOverlayLabel.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IOverlayLine.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IOverlayTexturedRect.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IPixelmon.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IPos.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IScroll.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ITextField.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ITexturedRect.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/ITimers.java delete mode 100644 src/main/java/noppes/npcs/scripted/interfaces/IWorld.java delete mode 100644 src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java delete mode 100644 src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayComponent.java delete mode 100644 src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLabel.java delete mode 100644 src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLine.java delete mode 100644 src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayTexturedRect.java delete mode 100644 src/main/java/noppes/npcs/scripted/wrapper/ScriptDamageSource.java delete mode 100644 src/main/java/noppes/npcs/scripted/wrapper/WrapperEntityData.java delete mode 100644 src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java create mode 100644 src/main/java/noppes/npcs/util/CustomNPCsScheduler.java delete mode 100644 src/main/java/noppes/npcs/util/LRUHashMap.java delete mode 100644 src/main/java/noppes/npcs/util/Vec3NPC.java delete mode 100644 src/main/resources/assets/customnpcs/markovnames/ancient_greek_female.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/ancient_greek_male.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/aztec_given.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/customnpcs_classic.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/japanese_given_female.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/japanese_given_male.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/japanese_surnames.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/old_norse_bothgenders.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/roman_cognomina.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/roman_nomina.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/roman_praenomina.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/saami_bothgenders.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/slavic_given.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/slavic_given_alt.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/spanish_given_female.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/spanish_given_male.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/spanish_surnames.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/welsh_female.txt delete mode 100644 src/main/resources/assets/customnpcs/markovnames/welsh_male.txt delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/BugTracker.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Cobalt.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Black cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Blue cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Brown cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Dark Grey cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Dark Red cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Gold cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Grey cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Lavender cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Light Brown cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Light Yellow cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Light green cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Orange cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Pink cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Red cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/White cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Yellow cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/CowCape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/SheepCape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/ShroomCape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/SlimeCape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/aura.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/bee.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/burning.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/camo.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/candy_cane.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/card.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/clown.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/dragon.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/dragoncape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/eagle.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/enchant.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/flower.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/giraffe.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/green_royal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/heat.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/ivy.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/magma_cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/migrate.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/minecon.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/neon.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/neon_green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/neon_orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/orange_break.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/phantom.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/pirate.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/plank.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/purple_gold.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/red_design.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/red_dirty.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/red_dragon.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/red_leader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/red_royal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/ripper.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/skeleton.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/solo.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/spiral.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/tea_leaves.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/thread.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/tiger.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/waffle.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/warden.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/waterfall.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Created/zebra.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Daybreak/TierI.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Daybreak/TierII.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Daybreak/TierIII.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Daybreak/TierIV.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Daybreak/TierV.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Ender Cloak.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Angel.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Black.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Blood.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Flame.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/GoldSwirl.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Key.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Moon.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Nightmare.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Pain.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/PinkSwirl.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Pool.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Pumpkin.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Rainbow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/RedSwirl.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Redstone.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Skull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Slaxer.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Sunsent.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Titan.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Vines.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Waves.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Whisperer.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/WhispererBlack.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/WhispererRed.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Extras/Wolf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/ColiMaster.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/ColiTrain.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/Daybreak.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/Markus.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/PotelMaster.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/PotelTrain.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/Radiance.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/RevDaybreak.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/RevDaybreak2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/RevDaybreak2Star.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/SavMaster.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/SavTrain.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/TheTierV.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/Theives.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/Ultramarine.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererBlack.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererGrey.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererRed.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererRedWhite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererV.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererWhite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Imperial Legion Cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/JulianClark.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/NewYears.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/RaggedBlue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/RaggedDarkBlue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/RaggedDarkPurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/RaggedDarkRed.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/RaggedGreen.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/RaggedRed.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Realms.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Royal Guard Cape.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Scrolls.png delete mode 100644 src/main/resources/assets/customnpcs/textures/cloak/Witches Cloak.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/Skin_Template.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarffemale/BlondDwarf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarffemale/GingerDwarf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarffemale/GingerDwarf2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarffemale/Simone.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/BeardedDwarf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Blacksmith.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Dwarf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/DwarfKing.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/DwarfStatue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Dwarf_Blacksmith.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Dwarf_Keeper.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Dwarf_Leader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/ElderlyDwarf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/GingerKing.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/GingerKnight.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Goblin.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/High_Class_Dwarf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/High_Class_Dwarf_2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Hobbit.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Miner.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/MoustachedDwarf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/One_Eye_blind_Dwarf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Simon.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/SomeDwarf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Viking.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/DarkElfFemale.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfFemale.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfMage.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfQueen.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfQueenFormal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfSoldier.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfSoldierHelmet.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfWarrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/WoodElfFemale.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/BlondElf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Blood_Elf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Blood_Elf_Mage.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/DarkElfCitizen.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Dark_Elf Knight.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Dark_Elf Librarian.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Dark_Elf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/ElfKnight.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/ElfMale.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Elf_Asassin_2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Engineer_Elf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/ForestElf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/High_Class_Knight_Elf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Link.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/WoodElf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/AlbinoChibi.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/EnderGhost.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/FriendlyEnderchibi.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/IceEnderchibi.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/MrEnderchibi.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/MsEnderchibi.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/NetherChibi.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/Slenderchibi.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderman/Apparation.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderman/Ender Mage.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderman/Slenderman.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderman/enderman.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/BunnyFemale.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Leopard Female.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Leopard Hunter Female.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Leopard Straw Hat Female.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Leopard Trader Female.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Leopard Warrior Female.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Snow Leopard Female Hunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Snow Leopard Female Straw Hat.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Snow Leopard Female Trader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Snow Leopard Female Warrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Snow Leopard Female.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female Hunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female Straw Hat.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female Trader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female Warrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlack.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackHunter .png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackHunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackSteampunk.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackTrader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackWarrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrown.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrownHunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrownSteampunk.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrownTrader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrownWarrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfGrey.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfGreyHunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfGreySteampunk.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfGreyTrader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfGreyWarrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGrey.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGreyHunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGreySteampunk.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGreyTrader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGreyWarrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/angelblonde.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Bunny.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/DragonGreen.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Leopard Hunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Leopard Straw Hat.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Leopard Trader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Leopard Warrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Leopard.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Reaper.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Hunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Straw Hat.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Trader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Warrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/SnowLeopard.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Tiger Hunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Tiger Straw Hat.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Tiger Trader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Tiger Warrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Tiger.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBlack.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBlackHunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBlackSteamPunk.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBlackTrader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBlackWarrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBrown.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBrownHunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBrownSteamPunk.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBrownTrader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBrownWarrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGrey.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGreyHunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGreySteampunk.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGreyTraderWolf.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGreyWarrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfLightGrey.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfLightGreyHunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfLightGreyModelSteamPunk.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfLightGreyWarrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfLightGreyrader.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/BodyguardStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/CamoRadioStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/ChefStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/DoctorStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/MageStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/MailmanStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/McDStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/MinerStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/PinstripesStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/RaggedyBardStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/RobesBlackStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/RobesBrownStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/RobesWhiteShepanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/Roseta.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/SteampunkStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/Stephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TownsmanStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TraderStepahnie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeElderWoman.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeGirl.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeWoman1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeWoman2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeWoman3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/WaitressStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/WizardStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/WoundedStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/32test.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/64test.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/ArcticSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/BodyguardSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/CamoRadioSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/CamoSpecOpsSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/CamoSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/CasualSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/ChefSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/DoctorSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/ElderlySteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/Evil_Gold_Knight.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/FireSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/GangsterSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/GuardSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/GuardSteve2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/King.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/KingSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/KnightSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/KungFuSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/LondonGuard.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MageSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MailmanSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/McDSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MercenarySteve 2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MercenarySteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MinerSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/PinstripesSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/PriestSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/PrisonerSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/RaggedyBardSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/RobesBlackSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/RobesBrownSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/RobesWhiteSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/SteampunkSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/Steve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TownsmanSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TraderSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeBoy.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeElder.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeHunter1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeHunter2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeKimba.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeMan.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TuxedoSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/VillagerOldSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/VillagerSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/VillagerSteve2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/WaiterSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/White_Knight_2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/White_knight.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/WizardSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/WoundedSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monsterfemale/Herobrine.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monsterfemale/ZombieStephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Classy_Zombie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Death.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/DemonSalesman.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/DesertZombie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/DisfiguredZombie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/EnderMage.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Flesh.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/FrozenCorpse.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Ghost King.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/GhostGrey.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/GhostRed.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/GhostYellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Herobrine.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Ogre.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/SandMonster.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Securitron.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Skull_Mage.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/StoneGolem.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/TecZombie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Undead King.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Undead_Monster.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/ZombieBloody.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/ZombieMage.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/ZombieSteve.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagafemale/Claire.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagafemale/Creepsnake.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagafemale/Ender Snake.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagafemale/Naga Stephanie Pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagafemale/Naga Stephanie.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Cobra.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Creepersneeper.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/EnderSnake.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Black.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Gray.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 4.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 5.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 6.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 7.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga White.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Snake.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/finsample.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Bandit.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Butcher.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Casual_Blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Green_Jacket.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Guy.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Hunter.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Knight.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Pig_Man.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Samurai.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Scavenger.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Alex_Revamp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Bunny_Girl.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Creeper_Girl.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Girl_Brown.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Girl_Lavender.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Neapolitan.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Pastel.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Pink_Girl.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Purple_Girl.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Summer_Girl.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GenericFemaleOrc1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GenericFemaleOrc2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GenericFemaleOrc3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GuardFemaleOrc1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GuardFemaleOrc2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/LeatherArmoredFemaleOrc.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/MercenaryFemaleOrc1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/MercenaryFemaleOrc2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/MercenaryFemaleOrc3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/StrandedFemaleOrc.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GenericOrc1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GenericOrc2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GenericOrc3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/Giant.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/Giant_2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/Giant_3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GuardOrc1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GuardOrc2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/LeatherArmoredOrc.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/MercenaryOrc1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/MercenaryOrc2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/MercenaryOrc3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/StrandedOrc.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Ancient Skeleton.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Bloody Skeleton.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Golden Skeleton.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Archer.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton King.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Mage.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Priest 2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Priest.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Villager.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Warrior.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/humanmale/32test.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/humanmale/64test.png delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/humanmale/Steve64.png delete mode 100644 src/main/resources/assets/customnpcs/textures/gui/menubgold.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/TecZombie_Orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/TecZombie_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/TecZombie_pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/TecZombie_teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/bluecontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/orangecontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/pinkcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/redcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/tealcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/turquiosecontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/yellowcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/blueFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/darkblueFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/greenFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/orangeFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/pinkfull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/purpleFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/redFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/tealFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/turquiseFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/yellowFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/lime.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/turquiose.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/gone.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/lime.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/redorange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/turquiose.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/fire.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/BlueIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/OrangeIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/PinkIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/PurpleIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/RedIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/TealIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/TurquioseIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/WhiteIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/YellowIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/tuquiose.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/whitecry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Lime.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/transform.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/TecZombie_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/evil_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/ghost_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/goggles.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/gone.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/herobrine_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/taken.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/transform.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/64-Textures/yellowcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/TecZombie_Orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/TecZombie_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/TecZombie_pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/TecZombie_teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/bluecontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/orangecontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/pinkcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/redcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/tealcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/turquiosecontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Control/yellowcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Eyes/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/blueFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/darkblueFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/greenFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/orangeFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/pinkfull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/purpleFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/redFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/tealFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/turquiseFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullControl/yellowFull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/lime.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/turquiose.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullEyes/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullHigh/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/gone.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/lime.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/redorange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/turquiose.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/FullLow/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/fire.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/HighEyes/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Ignite/BlueIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Ignite/OrangeIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Ignite/PinkIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Ignite/PurpleIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Ignite/RedIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Ignite/TealIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Ignite/TurquioseIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Ignite/WhiteIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Ignite/YellowIgnite.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/darkblue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/lightpurple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/old_ender_eyes.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/tuquiose.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/turqoise.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/white_cry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/whitecry.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/LowEyes/yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/Blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/Green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/Lime.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/Orange.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/Pink.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/Purple.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/Red.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/Teal.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/Yellow.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/transform.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/Magic/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/blue.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/gone.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/green.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/purp.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/taken.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/transform.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/white.png delete mode 100644 src/main/resources/assets/customnpcs/textures/overlays/yellowcontrol.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/claws/0.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/fin/fin1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/fin/fin2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/fin/fin3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/fin/fin4.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/fin/fin5.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/fin/fin6.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/hair/mohawk2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/hair/mohawk3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/horns/antennas.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/horns/antlers.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/horns/bull.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/legs/mermaid1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/legs/naga1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/legs/naga2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/legs/spider1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/particle/type1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/particle/type2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/particle/type3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/particle/type4.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/particle/type5.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/particle/type6.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/particle/type7.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/skirt/skirt1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/snout/beak1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/snout/bunny1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/snout/large1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/snout/medium1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/snout/small1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/tail/dragon1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/tail/feather1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/tail/fin1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/tail/rodent1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/tail/squirrel1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/tail/tail1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/tail/tail2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing10.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing11.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing12.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing13.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing4.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing5.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing6.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing7.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing8.png delete mode 100644 src/main/resources/assets/customnpcs/textures/parts/wings/wing9.png rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/beard/beard1.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/beard/beard2.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/beard/beard3.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/beard/beard4.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/ears/bunny1.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/ears/type1.png (100%) create mode 100644 src/main/resources/assets/moreplayermodels/textures/fin/fin1.png rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/hair/hair1.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/hair/hair2.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/hair/hair3.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/hair/hair4.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/hair/mohawk1.png (100%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/legs/horse1.png (100%) create mode 100644 src/main/resources/assets/moreplayermodels/textures/legs/mermaid1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/legs/naga1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/legs/spider1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/particle/type1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/particle/type2.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/snout/bunny1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/snout/large1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/snout/medium1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/snout/small1.png rename src/main/resources/assets/{customnpcs/textures/overlays/Eyes/ender_eyes.png => moreplayermodels/textures/tail/dragon1.png} (73%) rename src/main/resources/assets/{customnpcs/textures/parts => moreplayermodels/textures}/tail/horse1.png (100%) create mode 100644 src/main/resources/assets/moreplayermodels/textures/tail/squirrel1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/tail/tail1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/tail/tail2.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/wings/wing1.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/wings/wing2.png create mode 100644 src/main/resources/assets/moreplayermodels/textures/wings/wing3.png diff --git a/src/main/java/foxz/command/CmdFaction.java b/src/main/java/foxz/command/CmdFaction.java index fbad7b91f..bd577e39b 100644 --- a/src/main/java/foxz/command/CmdFaction.java +++ b/src/main/java/foxz/command/CmdFaction.java @@ -2,10 +2,7 @@ package foxz.command; import java.util.List; -import net.minecraft.entity.player.EntityPlayerMP; -import noppes.npcs.EventHooks; import noppes.npcs.controllers.Faction; -import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.PlayerData; import noppes.npcs.controllers.PlayerFactionData; import foxz.commandhelper.ChMcLogger; @@ -13,8 +10,6 @@ import foxz.commandhelper.annotations.Command; import foxz.commandhelper.annotations.SubCommand; import foxz.commandhelper.permissions.OpOnly; import foxz.commandhelper.permissions.ParamCheck; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.FactionEvent; @Command( name = "faction", @@ -48,7 +43,7 @@ public class CmdFaction extends ChMcLogger { for(PlayerData playerdata : data){ PlayerFactionData playerfactiondata = playerdata.factionData; - playerfactiondata.increasePoints(factionid, points, playerdata.player); + playerfactiondata.increasePoints(factionid, points); } return true; } @@ -69,7 +64,7 @@ public class CmdFaction extends ChMcLogger { int factionid = this.selectedFaction.id; for(PlayerData playerdata : data){ PlayerFactionData playerfactiondata = playerdata.factionData; - playerfactiondata.increasePoints(factionid, -points, playerdata.player); + playerfactiondata.increasePoints(factionid, -points); } return true; } diff --git a/src/main/java/foxz/command/CmdNoppes.java b/src/main/java/foxz/command/CmdNoppes.java index 9e95fe665..d0ca4e546 100644 --- a/src/main/java/foxz/command/CmdNoppes.java +++ b/src/main/java/foxz/command/CmdNoppes.java @@ -33,6 +33,7 @@ import foxz.commandhelper.annotations.SubCommand; import foxz.commandhelper.permissions.OpOnly; import foxz.commandhelper.permissions.ParamCheck; import foxz.commandhelper.permissions.PlayerOnly; +import foxz.utils.Utils; @Command( name = "noppes", @@ -88,7 +89,7 @@ public class CmdNoppes extends ChMcLogger { return false; } try{ - cmdfaction.selectedFaction = FactionController.getInstance().get(Integer.parseInt(factionname)); + cmdfaction.selectedFaction = FactionController.getInstance().getFaction(Integer.parseInt(factionname)); } catch(NumberFormatException e){ cmdfaction.selectedFaction = FactionController.getInstance().getFactionFromName(factionname); // get faction data diff --git a/src/main/java/net/minecraft/block/properties/IProperty.java b/src/main/java/net/minecraft/block/properties/IProperty.java deleted file mode 100644 index 046b17e49..000000000 --- a/src/main/java/net/minecraft/block/properties/IProperty.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.minecraft.block.properties; - -import java.util.Collection; - -/** This code is owned by Minecraft */ - -public interface IProperty> -{ - String getName(); - - Collection getAllowedValues(); - - Class getValueClass(); - - /** - * Get the name for the given value. - */ - String getName(T value); -} \ No newline at end of file diff --git a/src/main/java/net/minecraft/block/state/IBlockState.java b/src/main/java/net/minecraft/block/state/IBlockState.java deleted file mode 100644 index 4dd685947..000000000 --- a/src/main/java/net/minecraft/block/state/IBlockState.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.minecraft.block.state; - -import com.google.common.collect.ImmutableMap; -import java.util.Collection; -import net.minecraft.block.Block; -import net.minecraft.block.properties.IProperty; - -/** This code is owned by Minecraft */ - -public interface IBlockState -{ - Collection getPropertyNames(); - - > T getValue(IProperty property); - - , V extends T> IBlockState withProperty(IProperty property, V value); - - > IBlockState cycleProperty(IProperty property); - - ImmutableMap getProperties(); - - Block getBlock(); -} \ No newline at end of file diff --git a/src/main/java/net/minecraft/util/Vec3i.java b/src/main/java/net/minecraft/util/Vec3i.java deleted file mode 100644 index c31a3e150..000000000 --- a/src/main/java/net/minecraft/util/Vec3i.java +++ /dev/null @@ -1,123 +0,0 @@ -package net.minecraft.util; - -import com.google.common.base.Objects; - -/** This code is owned by Minecraft */ - -public class Vec3i implements Comparable -{ - /** The Null vector constant (0, 0, 0) */ - public static final Vec3i NULL_VECTOR = new Vec3i(0, 0, 0); - /** X coordinate */ - private final int x; - /** Y coordinate */ - private final int y; - /** Z coordinate */ - private final int z; - - public Vec3i(int xIn, int yIn, int zIn) - { - this.x = xIn; - this.y = yIn; - this.z = zIn; - } - - public Vec3i(double xIn, double yIn, double zIn) - { - this(MathHelper.floor_double(xIn), MathHelper.floor_double(yIn), MathHelper.floor_double(zIn)); - } - - public boolean equals(Object p_equals_1_) - { - if (this == p_equals_1_) - { - return true; - } - else if (!(p_equals_1_ instanceof Vec3i)) - { - return false; - } - else - { - Vec3i vec3i = (Vec3i)p_equals_1_; - return this.getX() != vec3i.getX() ? false : (this.getY() != vec3i.getY() ? false : this.getZ() == vec3i.getZ()); - } - } - - public int hashCode() - { - return (this.getY() + this.getZ() * 31) * 31 + this.getX(); - } - - public int compareTo(Vec3i p_compareTo_1_) - { - return this.getY() == p_compareTo_1_.getY() ? (this.getZ() == p_compareTo_1_.getZ() ? this.getX() - p_compareTo_1_.getX() : this.getZ() - p_compareTo_1_.getZ()) : this.getY() - p_compareTo_1_.getY(); - } - - /** - * Get the X coordinate - */ - public int getX() - { - return this.x; - } - - /** - * Get the Y coordinate - */ - public int getY() - { - return this.y; - } - - /** - * Get the Z coordinate - */ - public int getZ() - { - return this.z; - } - - /** - * Calculate the cross product of this and the given Vector - */ - public Vec3i crossProduct(Vec3i vec) - { - return new Vec3i(this.getY() * vec.getZ() - this.getZ() * vec.getY(), this.getZ() * vec.getX() - this.getX() * vec.getZ(), this.getX() * vec.getY() - this.getY() * vec.getX()); - } - - /** - * Calculate squared distance to the given coordinates - */ - public double distanceSq(double toX, double toY, double toZ) - { - double d0 = (double)this.getX() - toX; - double d1 = (double)this.getY() - toY; - double d2 = (double)this.getZ() - toZ; - return d0 * d0 + d1 * d1 + d2 * d2; - } - - /** - * Compute square of distance from point x, y, z to center of this Block - */ - public double distanceSqToCenter(double xIn, double yIn, double zIn) - { - double d0 = (double)this.getX() + 0.5D - xIn; - double d1 = (double)this.getY() + 0.5D - yIn; - double d2 = (double)this.getZ() + 0.5D - zIn; - return d0 * d0 + d1 * d1 + d2 * d2; - } - - /** - * Calculate squared distance to the given Vector - */ - public double distanceSq(Vec3i to) - { - return this.distanceSq((double)to.getX(), (double)to.getY(), (double)to.getZ()); - } - - public String toString() - { - return Objects.toStringHelper(this).add("x", this.getX()).add("y", this.getY()).add("z", this.getZ()).toString(); - } -} \ No newline at end of file diff --git a/src/main/java/net/minecraft/util/math/BlockPos.java b/src/main/java/net/minecraft/util/math/BlockPos.java deleted file mode 100644 index b9aa29c1b..000000000 --- a/src/main/java/net/minecraft/util/math/BlockPos.java +++ /dev/null @@ -1,406 +0,0 @@ -package net.minecraft.util.math; - -import com.google.common.collect.AbstractIterator; -import java.util.Iterator; -import net.minecraft.entity.Entity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; -import net.minecraft.util.Vec3i; - -/** This code is owned by Minecraft */ - -public class BlockPos extends Vec3i{ - /** The BlockPos with all coordinates 0 */ - public static final BlockPos ORIGIN = new BlockPos(0, 0, 0); - private static final int NUM_X_BITS = 1 + 25;//MathHelper.calculateLogBaseTwo(MathHelper.roundUpToPowerOfTwo(30000000)); - private static final int NUM_Z_BITS = NUM_X_BITS; - private static final int NUM_Y_BITS = 64 - NUM_X_BITS - NUM_Z_BITS; - private static final int Y_SHIFT = 0 + NUM_Z_BITS; - private static final int X_SHIFT = Y_SHIFT + NUM_Y_BITS; - private static final long X_MASK = (1L << NUM_X_BITS) - 1L; - private static final long Y_MASK = (1L << NUM_Y_BITS) - 1L; - private static final long Z_MASK = (1L << NUM_Z_BITS) - 1L; - - public BlockPos(int x, int y, int z) - { - super(x, y, z); - } - - public BlockPos(double x, double y, double z) - { - super(x, y, z); - } - - public BlockPos(Entity source) - { - this(source.posX, source.posY, source.posZ); - } - - public BlockPos(Vec3 source) - { - this(source.xCoord, source.yCoord, source.zCoord); - } - - public BlockPos(Vec3i source) - { - this(source.getX(), source.getY(), source.getZ()); - } - - /** - * Add the given coordinates to the coordinates of this BlockPos - */ - public BlockPos add(double x, double y, double z) - { - return x == 0.0D && y == 0.0D && z == 0.0D ? this : new BlockPos((double)this.getX() + x, (double)this.getY() + y, (double)this.getZ() + z); - } - - /** - * Add the given coordinates to the coordinates of this BlockPos - */ - public BlockPos add(int x, int y, int z) - { - return x == 0 && y == 0 && z == 0 ? this : new BlockPos(this.getX() + x, this.getY() + y, this.getZ() + z); - } - - /** - * Add the given Vector to this BlockPos - */ - public BlockPos add(Vec3i vec) - { - return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new BlockPos(this.getX() + vec.getX(), this.getY() + vec.getY(), this.getZ() + vec.getZ()); - } - - /** - * Subtract the given Vector from this BlockPos - */ - public BlockPos subtract(Vec3i vec) - { - return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new BlockPos(this.getX() - vec.getX(), this.getY() - vec.getY(), this.getZ() - vec.getZ()); - } - - /** - * Offset this BlockPos 1 block up - */ - public BlockPos up() - { - return this.up(1); - } - - /** - * Offset this BlockPos n blocks up - */ - public BlockPos up(int n) - { - return this.offset(EnumFacing.UP, n); - } - - /** - * Offset this BlockPos 1 block down - */ - public BlockPos down() - { - return this.down(1); - } - - /** - * Offset this BlockPos n blocks down - */ - public BlockPos down(int n) - { - return this.offset(EnumFacing.DOWN, n); - } - - /** - * Offset this BlockPos 1 block in northern direction - */ - public BlockPos north() - { - return this.north(1); - } - - /** - * Offset this BlockPos n blocks in northern direction - */ - public BlockPos north(int n) - { - return this.offset(EnumFacing.NORTH, n); - } - - /** - * Offset this BlockPos 1 block in southern direction - */ - public BlockPos south() - { - return this.south(1); - } - - /** - * Offset this BlockPos n blocks in southern direction - */ - public BlockPos south(int n) - { - return this.offset(EnumFacing.SOUTH, n); - } - - /** - * Offset this BlockPos 1 block in western direction - */ - public BlockPos west() - { - return this.west(1); - } - - /** - * Offset this BlockPos n blocks in western direction - */ - public BlockPos west(int n) - { - return this.offset(EnumFacing.WEST, n); - } - - /** - * Offset this BlockPos 1 block in eastern direction - */ - public BlockPos east() - { - return this.east(1); - } - - /** - * Offset this BlockPos n blocks in eastern direction - */ - public BlockPos east(int n) - { - return this.offset(EnumFacing.EAST, n); - } - - /** - * Offset this BlockPos 1 block in the given direction - */ - public BlockPos offset(EnumFacing facing) - { - return this.offset(facing, 1); - } - - /** - * Offsets this BlockPos n blocks in the given direction - */ - public BlockPos offset(EnumFacing facing, int n) - { - return n == 0 ? this : new BlockPos(this.getX() + facing.getFrontOffsetX() * n, this.getY() + facing.getFrontOffsetY() * n, this.getZ() + facing.getFrontOffsetZ() * n); - } - - /** - * Calculate the cross product of this and the given Vector - */ - public BlockPos crossProduct(Vec3i vec) - { - return new BlockPos(this.getY() * vec.getZ() - this.getZ() * vec.getY(), this.getZ() * vec.getX() - this.getX() * vec.getZ(), this.getX() * vec.getY() - this.getY() * vec.getX()); - } - - /** - * Serialize this BlockPos into a long value - */ - public long toLong() - { - return ((long)this.getX() & X_MASK) << X_SHIFT | ((long)this.getY() & Y_MASK) << Y_SHIFT | ((long)this.getZ() & Z_MASK) << 0; - } - - /** - * Create a BlockPos from a serialized long value (created by toLong) - */ - public static BlockPos fromLong(long serialized) - { - int i = (int)(serialized << 64 - X_SHIFT - NUM_X_BITS >> 64 - NUM_X_BITS); - int j = (int)(serialized << 64 - Y_SHIFT - NUM_Y_BITS >> 64 - NUM_Y_BITS); - int k = (int)(serialized << 64 - NUM_Z_BITS >> 64 - NUM_Z_BITS); - return new BlockPos(i, j, k); - } - - public static Iterable getAllInBox(BlockPos from, BlockPos to) - { - final BlockPos blockpos = new BlockPos(Math.min(from.getX(), to.getX()), Math.min(from.getY(), to.getY()), Math.min(from.getZ(), to.getZ())); - final BlockPos blockpos1 = new BlockPos(Math.max(from.getX(), to.getX()), Math.max(from.getY(), to.getY()), Math.max(from.getZ(), to.getZ())); - return new Iterable() - { - public Iterator iterator() - { - return new AbstractIterator() - { - private BlockPos lastReturned = null; - protected BlockPos computeNext() - { - if (this.lastReturned == null) - { - this.lastReturned = blockpos; - return this.lastReturned; - } - else if (this.lastReturned.equals(blockpos1)) - { - return (BlockPos)this.endOfData(); - } - else - { - int i = this.lastReturned.getX(); - int j = this.lastReturned.getY(); - int k = this.lastReturned.getZ(); - - if (i < blockpos1.getX()) - { - ++i; - } - else if (j < blockpos1.getY()) - { - i = blockpos.getX(); - ++j; - } - else if (k < blockpos1.getZ()) - { - i = blockpos.getX(); - j = blockpos.getY(); - ++k; - } - - this.lastReturned = new BlockPos(i, j, k); - return this.lastReturned; - } - } - }; - } - }; - } - - public static Iterable getAllInBoxMutable(BlockPos from, BlockPos to) - { - final BlockPos blockpos = new BlockPos(Math.min(from.getX(), to.getX()), Math.min(from.getY(), to.getY()), Math.min(from.getZ(), to.getZ())); - final BlockPos blockpos1 = new BlockPos(Math.max(from.getX(), to.getX()), Math.max(from.getY(), to.getY()), Math.max(from.getZ(), to.getZ())); - return new Iterable() - { - public Iterator iterator() - { - return new AbstractIterator() - { - private BlockPos.MutableBlockPos theBlockPos = null; - protected BlockPos.MutableBlockPos computeNext() - { - if (this.theBlockPos == null) - { - this.theBlockPos = new BlockPos.MutableBlockPos(blockpos.getX(), blockpos.getY(), blockpos.getZ()); - return this.theBlockPos; - } - else if (this.theBlockPos.equals(blockpos1)) - { - return (BlockPos.MutableBlockPos)this.endOfData(); - } - else - { - int i = this.theBlockPos.getX(); - int j = this.theBlockPos.getY(); - int k = this.theBlockPos.getZ(); - - if (i < blockpos1.getX()) - { - ++i; - } - else if (j < blockpos1.getY()) - { - i = blockpos.getX(); - ++j; - } - else if (k < blockpos1.getZ()) - { - i = blockpos.getX(); - j = blockpos.getY(); - ++k; - } - - this.theBlockPos.x = i; - this.theBlockPos.y = j; - this.theBlockPos.z = k; - return this.theBlockPos; - } - } - }; - } - }; - } - - /** - * Returns a version of this BlockPos that is guaranteed to be Immutable. - * In most cases this will return 'this', but if 'this' is an instance of - * MutableBlockPos it will return a new instance of BlockPos with the same values. - * - * When storing a parameter given to you for an extended period of time, make sure you - * use this in case the value is changed internally. - * - * @return An immutable BlockPos. - */ - public BlockPos getImmutable() - { - return this; - } - - public static final class MutableBlockPos extends BlockPos - { - /** Mutable X Coordinate */ - private int x; - /** Mutable Y Coordinate */ - private int y; - /** Mutable Z Coordinate */ - private int z; - - public MutableBlockPos() - { - this(0, 0, 0); - } - - public MutableBlockPos(int x_, int y_, int z_) - { - super(0, 0, 0); - this.x = x_; - this.y = y_; - this.z = z_; - } - - /** - * Get the X coordinate - */ - public int getX() - { - return this.x; - } - - /** - * Get the Y coordinate - */ - public int getY() - { - return this.y; - } - - /** - * Get the Z coordinate - */ - public int getZ() - { - return this.z; - } - - /** - * Set the values - * - * @param xIn The X value - * @param yIn The Y value - * @param zIn The Z value - */ - public BlockPos.MutableBlockPos set(int xIn, int yIn, int zIn) - { - this.x = xIn; - this.y = yIn; - this.z = zIn; - return this; - } - - @Override public BlockPos getImmutable() { return new BlockPos(this); } - } -} \ No newline at end of file diff --git a/src/main/java/nikedemos/markovnames/HashMap2D.java b/src/main/java/nikedemos/markovnames/HashMap2D.java deleted file mode 100644 index 5b0ec2000..000000000 --- a/src/main/java/nikedemos/markovnames/HashMap2D.java +++ /dev/null @@ -1,81 +0,0 @@ -package nikedemos.markovnames; - -import java.util.HashMap; -import java.util.Map; - -public class HashMap2D { - -public final Map> mMap; - -/* - https://stackoverflow.com/a/10299689/9355344 - */ - -public HashMap2D() { - mMap = new HashMap>(); -} - -/** - * Associates the specified value with the specified keys in this map (optional operation). If the map previously - * contained a mapping for the key, the old value is replaced by the specified value. - * - * @param key1 - * the first key - * @param key2 - * the second key - * @param value - * the value to be set - * @return the value previously associated with (key1,key2), or null if none - * @see Map#put(Object, Object) - */ -public T3 put(T1 key1, T2 key2, T3 value) { - Map map; - if (mMap.containsKey(key1)) { - map = mMap.get(key1); - } else { - map = new HashMap(); - mMap.put(key1, map); - } - - return map.put(key2, value); -} - -/** - * Returns the value to which the specified key is mapped, or null if this map contains no mapping for - * the key. - * - * @param key1 - * the first key whose associated value is to be returned - * @param key2 - * the second key whose associated value is to be returned - * @return the value to which the specified key is mapped, or null if this map contains no mapping for - * the key - * @see Map#get(Object) - */ -public T3 get(T1 key1, T2 key2) { - if (mMap.containsKey(key1)) { - return mMap.get(key1).get(key2); - } else { - return null; - } -} - -/** - * Returns true if this map contains a mapping for the specified key - * - * @param key1 - * the first key whose presence in this map is to be tested - * @param key2 - * the second key whose presence in this map is to be tested - * @return Returns true if this map contains a mapping for the specified key - * @see Map#containsKey(Object) - */ -public boolean containsKeys(T1 key1, T2 key2) { - return mMap.containsKey(key1) && mMap.get(key1).containsKey(key2); -} - -public void clear() { - mMap.clear(); -} - -} \ No newline at end of file diff --git a/src/main/java/nikedemos/markovnames/Main.java b/src/main/java/nikedemos/markovnames/Main.java deleted file mode 100644 index ab9213842..000000000 --- a/src/main/java/nikedemos/markovnames/Main.java +++ /dev/null @@ -1,53 +0,0 @@ -package nikedemos.markovnames; - -import nikedemos.markovnames.generators.*; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map.Entry; - -public class Main { - - public static final int GENDER_RANDOM=0; - public static final int GENDER_MALE=1; - public static final int GENDER_FEMALE=2; - - public static HashMap GENERATORS = new HashMap(); - - public static void main(String[] args){ - - //all the generators neatly in one HashMap, so you can iterate or w/e - - GENERATORS.put("ROMAN", new MarkovRoman(3)); - GENERATORS.put("JAPANESE", new MarkovJapanese(4)); - GENERATORS.put("SLAVIC", new MarkovSlavic(3)); - GENERATORS.put("WELSH", new MarkovWelsh(3)); - GENERATORS.put("SAAMI", new MarkovSaami(3)); - GENERATORS.put("OLDNORSE", new MarkovOldNorse(4)); - GENERATORS.put("ANCIENTGREEK", new MarkovAncientGreek(3)); - GENERATORS.put("AZTEC", new MarkovAztec(3)); - - //iterate through generators, generate 5 male and 5 female names, move on to the next - Iterator> g = GENERATORS.entrySet().iterator(); - - while (g.hasNext()) { - Entry pair = (Entry) g.next(); - - System.out.println("==="+pair.getKey()+"==="); - - for (int i=0; i<16; i++) - { - if (i==0) - System.out.println("GENTLEMEN-----------"); - int gender = i<8 ? 1 : 2; - String random_name = pair.getValue().fetch(gender); - System.out.println(random_name); - - if (i==15) //extra padding - System.out.println("\n"); - else if (i==7) //separate genders - System.out.println("LADIES--------------"); - } - } - } -} diff --git a/src/main/java/nikedemos/markovnames/MarkovDictionary.java b/src/main/java/nikedemos/markovnames/MarkovDictionary.java deleted file mode 100644 index b9f7eeaba..000000000 --- a/src/main/java/nikedemos/markovnames/MarkovDictionary.java +++ /dev/null @@ -1,270 +0,0 @@ -package nikedemos.markovnames; - -import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; - -public class MarkovDictionary { - private Random rng; - private int sequenceLen = 3; - - private HashMap2D occurrences = new HashMap2D(); - - public MarkovDictionary(String dictionary, int seqlen, Random rng) { - this.rng = rng; - - try { - applyDictionary(dictionary, seqlen); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public MarkovDictionary(String dictionary, int seqlen) { - this(dictionary, seqlen, new Random()); - } - - public MarkovDictionary(String dictionary) { - this(dictionary, 3, new Random()); // 3 is the default, anyway - } - - public MarkovDictionary(String dictionary, Random rng) { - this(dictionary, 3, rng); // 3 is the default, anyway - } - - // Blatantly copied from EnderIO: - // https://github.com/SleepyTrousers/EnderIO/blob/master/enderio-base/src/main/java/crazypants/enderio/base/config/recipes/RecipeFactory.java#L44-L57 - // Thanks again for your help, Henry Loenwind! - - private InputStream getResource(ResourceLocation resourceLocation) { - final ModContainer container = Loader.instance().activeModContainer(); - if (container != null) { - final String resourcePath = String.format("/%s/%s/%s", "assets", resourceLocation.getResourceDomain(), - resourceLocation.getResourcePath()); - InputStream resourceAsStream = null; - - try { - resourceAsStream = container.getMod().getClass().getResourceAsStream(resourcePath); - } catch (Exception e) { - e.printStackTrace(); - } - - if (resourceAsStream != null) { - return resourceAsStream; - } else { - throw new RuntimeException("Could not find resource " + resourceLocation); - } - } else { - throw new RuntimeException("Failed to find current mod while looking for resource " + resourceLocation); - } - } - - public String getCapitalized(String str) { - if (str == null || str.isEmpty()) - return str; - char[] chars = str.toCharArray(); - chars[0] = Character.toUpperCase(chars[0]); - return new String(chars); - } - - public static String readFile(String path) throws IOException { - byte[] encoded = Files.readAllBytes(Paths.get(path)); - return new String(encoded, StandardCharsets.UTF_8); - } - - public void incrementSafe(String str1, String str2) { - // so for instance, "_DUP_AUX", "_TOTAL" will count how many "DUP" seqCurrs we have - if (occurrences.containsKeys(str1, str2)) - { - int curr = occurrences.get(str1, str2).intValue(); - occurrences.put(str1, str2, Integer.valueOf(curr + 1)); - } else { - occurrences.put(str1, str2, Integer.valueOf(1)); - } - } - - public String generateWord() { - - // let's pick the first element, from which further picking shall proceed. - // first, we need to know how many top-level sequences (sequenceLen length) - // strings - // we have. So just take into account those surrounded by "_" - and count them. - // From that we'll get the weights. - - int allEntries = 0; - - // first iteration: we count top level entries. There's just no other way. - Iterator>> i = occurrences.mMap.entrySet().iterator(); - - while (i.hasNext()) { - Entry> pair = (Entry>) i.next(); - - String k = pair.getKey(); - if (k.startsWith("_[") && k.endsWith("_")) // dealing with meta entry here - { - allEntries += occurrences.get(k, "_TOTAL_"); - } - } - if(allEntries == 0) { - return "Kamkeel"; //shouldnt happen - } - int topLevelEntries; - int randomNumber = rng.nextInt(allEntries); - - // ok, so how does this weighted random work? - // easy. Check if the randomNumber is LESS than - // topLevelEntries variable for that entry (see below). - // If it is, break the while loop - we got our first element, - // from which we will go further. Just remember to - // remove the underscores at both ends! - - Iterator>> it = occurrences.mMap.entrySet().iterator(); - - StringBuilder sequence = new StringBuilder(""); - - while (it.hasNext()) { - Entry> pair = (Entry>) it.next(); - - String k = pair.getKey(); - - if (k.startsWith("_[") && k.endsWith("_")) // dealing with meta entry here - { - topLevelEntries = occurrences.get(k, "_TOTAL_"); - - if (randomNumber < topLevelEntries) { - sequence.append(k.substring(1, sequenceLen + 1)); // removing the underscores - break; - } else { - // keep going - randomNumber -= topLevelEntries; - } - } - } - // great! now that we have the first element, time for some generic iterations. - // in a very similar manner. Basically - perform this loop till you encounter - // "]" at the end - StringBuilder word = new StringBuilder(""); - - word.append(sequence); // now we're gonna use firstElement to keep the sequence - while (sequence.charAt(sequence.length() - 1) != ']') { - // sequence is now your HashMap key for the 1st dimension. - // for that sequence: - // - get total elements that are not meta (not surrounded by underscores) - // and count their total occurrences - int subSize = 0; - - Iterator> j = occurrences.mMap.get(sequence.toString()).entrySet().iterator(); - - while (j.hasNext()) { - Entry entry = j.next(); - subSize += entry.getValue(); - } - - // and now, the last iterator, with a random, just like before - randomNumber = rng.nextInt(subSize); - - Iterator> k = occurrences.mMap.get(sequence.toString()).entrySet().iterator(); - - String chosen = ""; - - while (k.hasNext()) { - Entry entry = k.next(); - int occu = occurrences.get(sequence.toString(), entry.getKey()); - - if (randomNumber < occu) { - chosen = entry.getKey(); - break; - } else { // keep going! - randomNumber -= occu; - } - } - // now, append the word... - word.append(chosen); - - // delete the first character of the sequence, - // and also append it with chosen character. - // So if the Sequence is ABC, and chosen is D, - // it now becomes BCD. - sequence.delete(0, 1); - sequence.append(chosen); - // System.out.println("FINAL: "+sequence); - // System.out.println("CHOSEN: "+chosen); - - } - // and now remove the square brackets surrounding it. - return this.getPost(word.substring(1, word.length() - 1)); - } - - public String getPost(String str) { - return getCapitalized(str); - } - - public void applyDictionary(String dictionaryFile, int seqLen) throws IOException { - StringBuilder input = new StringBuilder(); - - ResourceLocation resource = new ResourceLocation("customnpcs:markovnames/" + dictionaryFile); - - BufferedReader readIn = new BufferedReader(new InputStreamReader(getResource(resource), "UTF-8")); - // Thread.currentThread().getContextClassLoader().getResourceAsStream("path/to/resource/file.ext"); - - for (String line = readIn.readLine(); line != null; line = readIn.readLine()) { - input.append(line).append(" "); - } - - readIn.close(); - - if (input.length() == 0) { - throw new RuntimeException("Resource was empty: + " + resource); - } - // if seqLen != this.sequenceLen, we must clear occurrences - - if (this.sequenceLen != seqLen) { - sequenceLen = seqLen; - this.occurrences.clear(); - } - - String input_str = '[' + input.toString().toLowerCase().replaceAll("[\\t\\n\\r\\s]+", "][") + ']'; - - int maxCursorPos = input_str.length() - 1 - sequenceLen; - - for (int i = 0; i <= maxCursorPos; i++) { - String seqCurr = input_str.substring(i, i + (sequenceLen)); // i plus 2 characters next to it - String seqNext = input_str.substring(i + sequenceLen, i + sequenceLen + 1); // next character after that - incrementSafe(seqCurr, seqNext); - // aux counters - - StringBuilder meta = new StringBuilder("_").append(seqCurr).append("_"); - - // String aux1="_"+seqCurr+"_"; - incrementSafe(meta.toString(), "_TOTAL_"); - // String aux2="_"+seqNext+"_"; - // incrementSafe(aux1, aux2); - - // debug, feel free to uncomment - - /* - * System.out.println("<"+seqCurr+"><"+seqNext+"> => "+occurrences.get(seqCurr, - * seqNext)); - * System.out.println("<"+aux1+"><"+"_TOTAL_"+"> => "+occurrences.get(aux1, - * "_TOTAL_")); - * System.out.println("<"+aux1+"><"+aux2+"> => "+occurrences.get(aux1, aux2)); - * System.out.println(""); - */ - - } - // by now, we should have - - } -} diff --git a/src/main/java/nikedemos/markovnames/MarkovDictionarySPA.java b/src/main/java/nikedemos/markovnames/MarkovDictionarySPA.java deleted file mode 100644 index bf7fcc61c..000000000 --- a/src/main/java/nikedemos/markovnames/MarkovDictionarySPA.java +++ /dev/null @@ -1,41 +0,0 @@ -package nikedemos.markovnames; - -import java.util.Random; - -//used exclusively by the Spanish surname dictionary - because the capitalization is a little bit different -public class MarkovDictionarySPA extends MarkovDictionary { - - public MarkovDictionarySPA(String dictionary, int seqlen, Random rng) { - super(dictionary, seqlen, rng); - // TODO Auto-generated constructor stub - } - - @Override - public String getPost(String str) { - return getCapitalizedSPA(str); - } - - public String getCapitalizedSPA(String str) { - // for spanish capitalization - - String[] parts = str.split("#"); - - StringBuilder build = new StringBuilder(""); - - for (int p = 0; p < parts.length; p++) { - // capitalize this part, but only if it's not "de", "del", "la" or "los" - if (!parts[p].equals("de") && !parts[p].equals("del") && !parts[p].equals("la") - && !parts[p].equals("los")) { - parts[p] = getCapitalized(parts[p]); - } - - if (p > 0) // don't add spaces before the first part - build.append(" "); - - build.append(parts[p]); - } - - return build.toString(); - } - -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovAncientGreek.java b/src/main/java/nikedemos/markovnames/generators/MarkovAncientGreek.java deleted file mode 100644 index 7a0753397..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovAncientGreek.java +++ /dev/null @@ -1,58 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -public class MarkovAncientGreek extends MarkovGenerator { - - public MarkovDictionary markov2; - - public MarkovAncientGreek(int seqlen, Random rng) - { - this.rng = rng; - this.markov = new MarkovDictionary("ancient_greek_male.txt",seqlen,rng); - this.markov2 = new MarkovDictionary("ancient_greek_female.txt",seqlen,rng); - } - - public MarkovAncientGreek(int seqlen) - { - this(seqlen,new Random()); - - } - - public MarkovAncientGreek() - { - this(3, new Random()); //3 seems best-suited for Welsh - } - - @Override - public String fetch(int gender) - { - - String seq1; - - //check the gender. - //0 = random gender, 1 = male, 2 = female - //if there's no gender specified (0), - //now it's time to pick it at random - // - if (gender==0) - { - gender = rng.nextBoolean()==true? 1 : 2; - } - - //now if it's 2 - a lady - feminize the 3 sequences - if (gender==2) - { - seq1 = markov2.generateWord(); - } - else - { - seq1 = markov.generateWord(); - } - - - return seq1; - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovAztec.java b/src/main/java/nikedemos/markovnames/generators/MarkovAztec.java deleted file mode 100644 index d5d62637b..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovAztec.java +++ /dev/null @@ -1,31 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -public class MarkovAztec extends MarkovGenerator { - - public MarkovAztec(int seqlen, Random rng) - { - this.rng = rng; - this.markov = new MarkovDictionary("aztec_given.txt",seqlen,rng); - } - - public MarkovAztec(int seqlen) - { - this(seqlen,new Random()); - - } - - public MarkovAztec() - { - this(3, new Random()); //3 seems best-suited for Aztec - } - - @Override - public String fetch(int gender) //Aztec names are genderless - { - return markov.generateWord(); - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovCustomNPCsClassic.java b/src/main/java/nikedemos/markovnames/generators/MarkovCustomNPCsClassic.java deleted file mode 100644 index 16aed6cf3..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovCustomNPCsClassic.java +++ /dev/null @@ -1,40 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -/* This implementation is made specifically for - * CustomNPCs, one of the best Minecraft mods ever... - * I'm a huge fan and would recommend it to anyone. - * Check it out if you haven't yet, at - * http://www.kodevelopment.nl/minecraft/category/customnpcs/ - * Minecraft 1.12.2 Java Edition + Forge required. - * Also, you have to like cats, it's in CNPCs EULA, I'm quite sure - */ - -public class MarkovCustomNPCsClassic extends MarkovGenerator { - - public MarkovCustomNPCsClassic(int seqlen, Random rng) - { - this.rng = rng; - this.markov = new MarkovDictionary("customnpcs_classic.txt",seqlen,rng); - } - - public MarkovCustomNPCsClassic(int seqlen) - { - this(seqlen,new Random()); - - } - - public MarkovCustomNPCsClassic() - { - this(3, new Random()); - } - - @Override - public String fetch(int gender) - { - return markov.generateWord(); - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovGenerator.java b/src/main/java/nikedemos/markovnames/generators/MarkovGenerator.java deleted file mode 100644 index 43ecf4825..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovGenerator.java +++ /dev/null @@ -1,46 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -public class MarkovGenerator { - - public MarkovDictionary markov; - public Random rng; - public String name; - public String symbol; - - public MarkovGenerator(int seqlen, Random rng) - { - this.rng = rng; - } - - public MarkovGenerator(int seqlen) - { - this(seqlen, new Random()); - } - - public MarkovGenerator() - { - this(3, new Random()); - } - - public String fetch(int gender) { - return stylize(markov.generateWord()); - } - - public String fetch() - { - return fetch(0); //0 = random gender, 1 = male, 2 = female - } - - public String stylize(String str) - { - return str; - } - - public String feminize(String element, boolean flag) { - return element; - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovJapanese.java b/src/main/java/nikedemos/markovnames/generators/MarkovJapanese.java deleted file mode 100644 index a610a25c8..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovJapanese.java +++ /dev/null @@ -1,51 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -public class MarkovJapanese extends MarkovGenerator { - public MarkovDictionary markov2; - public MarkovDictionary markov3; - - public MarkovJapanese(int seqlen, Random rng) { - this.rng = rng; - this.markov = new MarkovDictionary("japanese_surnames.txt", seqlen, rng); - this.markov2 = new MarkovDictionary("japanese_given_male.txt", seqlen, rng); - this.markov3 = new MarkovDictionary("japanese_given_female.txt", seqlen, rng); - } - - public MarkovJapanese(int seqlen) { - this(seqlen, new Random()); - - } - - public MarkovJapanese() { - this(4, new Random()); // 4 seems best suited for Japanese - } - - @Override - public String fetch(int gender) { - - StringBuilder name = new StringBuilder(markov.generateWord()); - name.append(" "); - - // check the gender. - // 0 = random gender, 1 = male, 2 = female - // if there's no gender specified (0), - // now it's time to pick it at random - // - if (gender == 0) { - gender = rng.nextBoolean() == true ? 1 : 2; - } - - if (gender == 2) { - name.append(markov3.generateWord()); - } - else { - name.append(markov2.generateWord()); - } - - return name.toString(); - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovOldNorse.java b/src/main/java/nikedemos/markovnames/generators/MarkovOldNorse.java deleted file mode 100644 index b26db87ec..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovOldNorse.java +++ /dev/null @@ -1,32 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -public class MarkovOldNorse extends MarkovGenerator { - - public MarkovDictionary markov2; - - public MarkovOldNorse(int seqlen, Random rng) - { - this.rng = rng; - this.markov = new MarkovDictionary("old_norse_bothgenders.txt",seqlen,rng); - } - - public MarkovOldNorse(int seqlen) - { - this(seqlen,new Random()); - } - - public MarkovOldNorse() - { - this(4, new Random()); //4 seems best-suited for Old Norse - } - - @Override - public String fetch(int gender) //Old Norse names are genderless - { - return markov.generateWord(); - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovRoman.java b/src/main/java/nikedemos/markovnames/generators/MarkovRoman.java deleted file mode 100644 index 86c8dca25..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovRoman.java +++ /dev/null @@ -1,65 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -public class MarkovRoman extends MarkovGenerator { - public MarkovDictionary markov2; - public MarkovDictionary markov3; - - public MarkovRoman(int seqlen, Random rng) { - this.rng = rng; - this.markov = new MarkovDictionary("roman_praenomina.txt", seqlen, rng); - this.markov2 = new MarkovDictionary("roman_nomina.txt", seqlen, rng); - this.markov3 = new MarkovDictionary("roman_cognomina.txt", seqlen, rng); - } - - public MarkovRoman(int seqlen) { - this(seqlen, new Random()); - - } - - public MarkovRoman() { - this(3, new Random()); - } - - @Override - public String feminize(String element, boolean flag) { - // change "us" into "a" and "o" at the end into "a" - if (element.endsWith("us")) { - element = element.substring(0, element.length() - 2) + "a"; - } - else if (element.endsWith("o")) { - element = element.substring(0, element.length() - 2) + "a"; - } - - return element; - } - - @Override - public String fetch(int gender) { - - String seq1 = markov.generateWord(); - String seq2 = markov2.generateWord(); - String seq3 = markov3.generateWord(); - - // check the gender. - // 0 = random gender, 1 = male, 2 = female - // if there's no gender specified (0), - // now it's time to pick it at random - // - if (gender == 0) { - gender = rng.nextBoolean() == true ? 1 : 2; - } - - // now if it's 2 - a lady - feminize the 3 sequences - if (gender == 2) { - seq1 = feminize(seq1, false); - seq2 = feminize(seq2, false); - seq3 = feminize(seq3, true); - } - - return (new StringBuilder(seq1).append(" ").append(seq2).append(" ").append(seq3).toString()); - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovSaami.java b/src/main/java/nikedemos/markovnames/generators/MarkovSaami.java deleted file mode 100644 index 8989d5f75..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovSaami.java +++ /dev/null @@ -1,33 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -public class MarkovSaami extends MarkovGenerator { - - public MarkovDictionary markov2; - - public MarkovSaami(int seqlen, Random rng) - { - this.rng = rng; - this.markov = new MarkovDictionary("saami_bothgenders.txt",seqlen,rng); - } - - public MarkovSaami(int seqlen) - { - this(seqlen,new Random()); - - } - - public MarkovSaami() - { - this(3, new Random()); //3 seems best-suited for Saami - } - - @Override - public String fetch(int gender) //Saami names are genderless - { - return markov.generateWord(); - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovSlavic.java b/src/main/java/nikedemos/markovnames/generators/MarkovSlavic.java deleted file mode 100644 index 21d344a82..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovSlavic.java +++ /dev/null @@ -1,59 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -public class MarkovSlavic extends MarkovGenerator { - - public MarkovSlavic(int seqlen, Random rng) { - this.rng = rng; - this.markov = new MarkovDictionary("slavic_given.txt", seqlen, rng); - } - - public MarkovSlavic(int seqlen) { - this(seqlen, new Random()); - - } - - public MarkovSlavic() { - this(3, new Random()); // 3 seems best-suited for Slavic - } - - @Override - public String feminize(String element, boolean flag) { - // add "a" at the end, if there isn't one - String lastChar = element.substring(element.length() - 1); - - if (element.endsWith("o")) { - element = element.substring(0, element.length() - 1) + "a"; - } - else if (!lastChar.endsWith("a")) { - element += "a"; - } - - return element; - } - - @Override - public String fetch(int gender) { - - String seq1 = markov.generateWord(); - - // check the gender. - // 0 = random gender, 1 = male, 2 = female - // if there's no gender specified (0), - // now it's time to pick it at random - // - if (gender == 0) { - gender = rng.nextBoolean() == true ? 1 : 2; - } - - // now if it's 2 - a lady - feminize the 3 sequences - if (gender == 2) { - seq1 = feminize(seq1, false); - } - - return seq1; - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovSpanish.java b/src/main/java/nikedemos/markovnames/generators/MarkovSpanish.java deleted file mode 100644 index e8770e0ef..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovSpanish.java +++ /dev/null @@ -1,52 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; -import nikedemos.markovnames.MarkovDictionarySPA; - -import java.util.Random; - -public class MarkovSpanish extends MarkovGenerator { - public MarkovDictionary markov2; - public MarkovDictionary markov3; - - public MarkovSpanish(int seqlen, Random rng) { - this.rng = rng; - this.markov = new MarkovDictionary("spanish_given_male.txt", seqlen, rng); - this.markov2 = new MarkovDictionary("spanish_given_female.txt", seqlen, rng); - this.markov3 = new MarkovDictionarySPA("spanish_surnames.txt", seqlen, rng); - } - - public MarkovSpanish(int seqlen) { - this(seqlen, new Random()); - } - - public MarkovSpanish() { - this(3, new Random()); - } - - @Override - public String fetch(int gender) { - String giv = ""; - - String sur = markov3.generateWord(); - - // check the gender. - // 0 = random gender, 1 = male, 2 = female - // if there's no gender specified (0), - // now it's time to pick it at random - // - if (gender == 0) { - gender = rng.nextBoolean() == true ? 1 : 2; - } - - if (gender == 1) { - giv = markov.generateWord(); - } - else { - giv = markov2.generateWord(); - - } - - return new StringBuilder(giv).append(" ").append(sur).toString(); - } -} diff --git a/src/main/java/nikedemos/markovnames/generators/MarkovWelsh.java b/src/main/java/nikedemos/markovnames/generators/MarkovWelsh.java deleted file mode 100644 index 2ad00bf84..000000000 --- a/src/main/java/nikedemos/markovnames/generators/MarkovWelsh.java +++ /dev/null @@ -1,50 +0,0 @@ -package nikedemos.markovnames.generators; - -import nikedemos.markovnames.MarkovDictionary; - -import java.util.Random; - -public class MarkovWelsh extends MarkovGenerator { - - public MarkovDictionary markov2; - - public MarkovWelsh(int seqlen, Random rng) { - this.rng = rng; - this.markov = new MarkovDictionary("welsh_male.txt", seqlen, rng); - this.markov2 = new MarkovDictionary("welsh_female.txt", seqlen, rng); - } - - public MarkovWelsh(int seqlen) { - this(seqlen, new Random()); - - } - - public MarkovWelsh() { - this(3, new Random()); // 3 seems best-suited for Welsh - } - - @Override - public String fetch(int gender) { - - String seq1; - - // check the gender. - // 0 = random gender, 1 = male, 2 = female - // if there's no gender specified (0), - // now it's time to pick it at random - // - if (gender == 0) { - gender = rng.nextBoolean() == true ? 1 : 2; - } - - // now if it's 2 - a lady - feminize the 3 sequences - if (gender == 2) { - seq1 = markov2.generateWord(); - } - else { - seq1 = markov.generateWord(); - } - - return seq1; - } -} diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java index 47e99d01d..423963949 100644 --- a/src/main/java/noppes/npcs/CommonProxy.java +++ b/src/main/java/noppes/npcs/CommonProxy.java @@ -4,34 +4,43 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.Item; -import net.minecraft.stats.Achievement; import net.minecraft.world.World; -import net.minecraftforge.common.util.FakePlayer; import noppes.npcs.blocks.tiles.TileNpcContainer; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.containers.*; -import noppes.npcs.controllers.PlayerData; -import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.containers.ContainerCarpentryBench; +import noppes.npcs.containers.ContainerCrate; +import noppes.npcs.containers.ContainerMail; +import noppes.npcs.containers.ContainerManageBanks; +import noppes.npcs.containers.ContainerManageRecipes; +import noppes.npcs.containers.ContainerMerchantAdd; +import noppes.npcs.containers.ContainerNPCBankLarge; +import noppes.npcs.containers.ContainerNPCBankSmall; +import noppes.npcs.containers.ContainerNPCBankUnlock; +import noppes.npcs.containers.ContainerNPCBankUpgrade; +import noppes.npcs.containers.ContainerNPCCompanion; +import noppes.npcs.containers.ContainerNPCFollower; +import noppes.npcs.containers.ContainerNPCFollowerHire; +import noppes.npcs.containers.ContainerNPCFollowerSetup; +import noppes.npcs.containers.ContainerNPCInv; +import noppes.npcs.containers.ContainerNPCTrader; +import noppes.npcs.containers.ContainerNPCTraderSetup; +import noppes.npcs.containers.ContainerNpcItemGiver; +import noppes.npcs.containers.ContainerNpcQuestReward; +import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.entity.EntityNPCInterface; import cpw.mods.fml.common.network.IGuiHandler; -import noppes.npcs.scripted.interfaces.IWorld; public class CommonProxy implements IGuiHandler { - + public boolean newVersionAvailable = false; - public int revision = 1; + public int revision = 4; public void load() { CustomNpcs.Channel.register(new PacketHandlerServer()); CustomNpcs.ChannelPlayer.register(new PacketHandlerPlayer()); } - public PlayerData getPlayerData(EntityPlayer player) { - return null; - } - @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { if(ID > EnumGuiType.values().length) @@ -41,39 +50,36 @@ public class CommonProxy implements IGuiHandler { return getContainer(gui, player, x, y, z, npc); } public Container getContainer(EnumGuiType gui,EntityPlayer player, int x, int y, int z,EntityNPCInterface npc){ - if(gui == EnumGuiType.CustomGui) - return new ContainerCustomGui(new InventoryBasic("", false, x)); - if(gui == EnumGuiType.MainMenuInv) return new ContainerNPCInv(npc, player); if(gui == EnumGuiType.PlayerBankSmall) return new ContainerNPCBankSmall(player, x , y); - + if(gui == EnumGuiType.PlayerBankUnlock) return new ContainerNPCBankUnlock(player, x , y); if(gui == EnumGuiType.PlayerBankUprade) return new ContainerNPCBankUpgrade(player, x , y); - + if(gui == EnumGuiType.PlayerBankLarge) return new ContainerNPCBankLarge(player, x , y); if(gui == EnumGuiType.PlayerFollowerHire) return new ContainerNPCFollowerHire(npc, player); - + if(gui == EnumGuiType.PlayerFollower) return new ContainerNPCFollower(npc, player); - + if(gui == EnumGuiType.PlayerTrader) return new ContainerNPCTrader(npc, player); if(gui == EnumGuiType.PlayerAnvil) return new ContainerCarpentryBench(player.inventory, player.worldObj, x, y, z); - + if(gui == EnumGuiType.SetupItemGiver) return new ContainerNpcItemGiver(npc, player); - + if(gui == EnumGuiType.SetupTrader) return new ContainerNPCTraderSetup(npc, player); @@ -82,10 +88,10 @@ public class CommonProxy implements IGuiHandler { if(gui == EnumGuiType.QuestReward) return new ContainerNpcQuestReward(player); - + if(gui == EnumGuiType.QuestItem) return new ContainerNpcQuestTypeItem(player); - + if(gui == EnumGuiType.ManageRecipes) return new ContainerManageRecipes(player,x); @@ -97,13 +103,13 @@ public class CommonProxy implements IGuiHandler { if(gui == EnumGuiType.Crate) return new ContainerCrate(player.inventory, (TileNpcContainer)player.worldObj.getTileEntity(x, y, z)); - + if(gui == EnumGuiType.PlayerMailman) return new ContainerMail(player, x == 1, y == 1); - + if(gui == EnumGuiType.CompanionInv) return new ContainerNPCCompanion(npc, player); - + return null; } @@ -123,21 +129,19 @@ public class CommonProxy implements IGuiHandler { public void openGui(int i, int j, int k, EnumGuiType gui, EntityPlayer player) { - + } public void openGui(EntityPlayer player, Object guiscreen) { // TODO Auto-generated method stub - + } public void spawnParticle(EntityLivingBase player, String string, Object... ob) { // TODO Auto-generated method stub - + } - public FakePlayer getCommandPlayer(IWorld world) { return null; } - public boolean hasClient() { return false; } @@ -148,7 +152,7 @@ public class CommonProxy implements IGuiHandler { public void registerItem(Item item) { // TODO Auto-generated method stub - + } public ModelBiped getSkirtModel() { @@ -156,15 +160,8 @@ public class CommonProxy implements IGuiHandler { } public void spawnParticle(String particle, double x, double y, double z, - double motionX, double motionY, double motionZ, float scale) { - + double motionX, double motionY, double motionZ, float scale) { + } - public String getAchievementDesc(Achievement achievement) { - return ""; - } - - public boolean isGUIOpen(){ - return false; - } -} \ No newline at end of file +} diff --git a/src/main/java/noppes/npcs/CustomItems.java b/src/main/java/noppes/npcs/CustomItems.java index 425889fca..ec44b0ab9 100644 --- a/src/main/java/noppes/npcs/CustomItems.java +++ b/src/main/java/noppes/npcs/CustomItems.java @@ -445,9 +445,6 @@ public class CustomItems { Item.getItemFromBlock(sign).setHasSubtypes(true); Item.getItemFromBlock(beam).setHasSubtypes(true); Item.getItemFromBlock(pedestal).setHasSubtypes(true); - - tabBlocks.item = Item.getItemFromBlock(couchWool); - tabBlocks.meta = 1; } banjo = new ItemMusicBanjo().setUnlocalizedName("npcBanjo").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcBanjo"); @@ -752,7 +749,7 @@ public class CustomItems { armor = new ItemNpcArmor(26922, armorEmerald,1,"fullemerald").setUnlocalizedName("npcFullEmeraldChest").setMaxStackSize(1).setTextureName("customnpcs:npcFullEmeraldChest"); armor = new ItemNpcArmor(26923, armorEmerald,2,"fullemerald").setUnlocalizedName("npcFullEmeraldLeggings").setMaxStackSize(1).setTextureName("customnpcs:npcFullEmeraldLeggings"); armor = new ItemNpcArmor(26924, armorEmerald,3,"fullemerald").setUnlocalizedName("npcFullEmeraldBoots").setMaxStackSize(1).setTextureName("customnpcs:npcFullEmeraldBoots"); - + armor = new ItemNpcArmor(26880,ArmorMaterial.CLOTH,0,"fullwood").setUnlocalizedName("npcFullWoodenHead").setMaxStackSize(1).setTextureName("customnpcs:npcFullWoodenHead"); armor = new ItemNpcArmor(26881,ArmorMaterial.CLOTH,1,"fullwood").setUnlocalizedName("npcFullWoodenChest").setMaxStackSize(1).setTextureName("customnpcs:npcFullWoodenChest"); armor = new ItemNpcArmor(26882,ArmorMaterial.CLOTH,2,"fullwood").setUnlocalizedName("npcFullWoodenLeggings").setMaxStackSize(1).setTextureName("customnpcs:npcFullWoodenLeggings"); @@ -890,6 +887,8 @@ public class CustomItems { tabArmor.item = cowarmor; tabWeapon.item = CustomItems.shuriken; tabMisc.item = CustomItems.coinGold; + tabBlocks.item = Item.getItemFromBlock(couchWool); + tabBlocks.meta = 1; } tab.item = wand; diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index a5aaa037e..e17cdc72c 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -7,7 +7,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.FMLEventChannel; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; @@ -22,7 +26,6 @@ import net.minecraft.entity.EntityList; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; -import nikedemos.markovnames.generators.*; import noppes.npcs.config.ConfigLoader; import noppes.npcs.config.ConfigProp; import noppes.npcs.controllers.BankController; @@ -40,7 +43,15 @@ import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.controllers.SpawnController; import noppes.npcs.controllers.TransportController; import noppes.npcs.enchants.EnchantInterface; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityChairMount; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityMagicProjectile; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; +import noppes.npcs.entity.EntityProjectile; import noppes.npcs.entity.old.EntityNPCDwarfFemale; import noppes.npcs.entity.old.EntityNPCDwarfMale; import noppes.npcs.entity.old.EntityNPCElfFemale; @@ -59,9 +70,8 @@ import noppes.npcs.entity.old.EntityNpcMonsterMale; import noppes.npcs.entity.old.EntityNpcNagaFemale; import noppes.npcs.entity.old.EntityNpcNagaMale; import noppes.npcs.entity.old.EntityNpcSkeleton; -import noppes.npcs.scripted.wrapper.WrapperNpcAPI; -@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.5.1-beta") +@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.7.10d") public class CustomNpcs { @ConfigProp(info = "Disable Chat Bubbles") @@ -69,18 +79,12 @@ public class CustomNpcs { private static int NewEntityStartId = 0; - @ConfigProp(info = "Navigation search range for NPCs. Not recommended to increase if you have a slow pc or on a server. Minimum of 16, maximum of 96.") + @ConfigProp(info = "Navigation search range for NPCs. Not recommended to increase if you have a slow pc or on a server") public static int NpcNavRange = 32; - @ConfigProp(info = "Size limit for NPCs. Default 100, larger sizes may cause lag on clients and servers that can't take it!") - public static int NpcSizeLimit = 100; - @ConfigProp(info = "Set to true if you want the dialog command option to be able to use op commands like tp etc") public static boolean NpcUseOpCommands = false; - @ConfigProp(info = "The amount of time that passes before a player's quests are checked for completion in seconds.") - public static int PlayerQuestCheck = 300; - @ConfigProp public static boolean InventoryGuiEnabled = true; @@ -146,8 +150,6 @@ public class CustomNpcs { public static ConfigLoader Config; - public static final MarkovGenerator[] MARKOV_GENERATOR = new MarkovGenerator[10]; - public CustomNpcs() { instance = this; } @@ -173,16 +175,6 @@ public class CustomNpcs { if (NpcNavRange < 16) { NpcNavRange = 16; } - if (NpcNavRange > 96) { - NpcNavRange = 96; - } - - if(NpcSizeLimit < 1) - NpcSizeLimit = 1; - - if(PlayerQuestCheck < 1) - PlayerQuestCheck = 1; - EnchantInterface.load(); CustomItems.load(); @@ -192,14 +184,6 @@ public class CustomNpcs { MinecraftForge.EVENT_BUS.register(new ServerEventsHandler()); MinecraftForge.EVENT_BUS.register(new ScriptController()); - ScriptPlayerEventHandler scriptPlayerEventHandler = new ScriptPlayerEventHandler(); - MinecraftForge.EVENT_BUS.register(scriptPlayerEventHandler); - FMLCommonHandler.instance().bus().register(scriptPlayerEventHandler); - - ScriptForgeEventHandler forgeEventHandler = (new ScriptForgeEventHandler()).registerForgeEvents(); - MinecraftForge.EVENT_BUS.register(forgeEventHandler); - FMLCommonHandler.instance().bus().register(forgeEventHandler); - FMLCommonHandler.instance().bus().register(new ServerTickHandler()); registerNpc(EntityNPCHumanMale.class, "npchumanmale"); @@ -227,8 +211,6 @@ public class CustomNpcs { registerNpc(EntityNPCGolem.class, "npcGolem"); registerNpc(EntityCustomNpc.class, "CustomNpc"); - - registerNewEntity(EntityChairMount.class, "CustomNpcChairMount", 64, 10, false); registerNewEntity(EntityProjectile.class, "throwableitem", 64, 3, true); registerNewEntity(EntityMagicProjectile.class, "magicprojectile", 64, 3, true); @@ -242,22 +224,6 @@ public class CustomNpcs { PixelmonHelper.load(); } - @EventHandler - public void load(FMLInitializationEvent ev) { - - MARKOV_GENERATOR[0] = new MarkovRoman(3); - MARKOV_GENERATOR[1] = new MarkovJapanese(4); - MARKOV_GENERATOR[2] = new MarkovSlavic(3); - MARKOV_GENERATOR[3] = new MarkovWelsh(3); - MARKOV_GENERATOR[4] = new MarkovSaami(3); - MARKOV_GENERATOR[5] = new MarkovOldNorse(4); - MARKOV_GENERATOR[6] = new MarkovAncientGreek(3); - MARKOV_GENERATOR[7] = new MarkovAztec(3); - MARKOV_GENERATOR[8] = new MarkovCustomNPCsClassic(3); - MARKOV_GENERATOR[9] = new MarkovSpanish(3); - - } - @EventHandler public void setAboutToStart(FMLServerAboutToStartEvent event) { ChunkController.instance.clear(); @@ -269,10 +235,7 @@ public class CustomNpcs { new SpawnController(); new LinkedNpcController(); ScriptController.Instance.loadStoredData(); - ScriptController.Instance.loadForgeScripts(); - ScriptController.Instance.loadPlayerScripts(); ScriptController.HasStart = false; - WrapperNpcAPI.clearCache(); Set names = Block.blockRegistry.getKeys(); for(String name : names){ @@ -336,33 +299,4 @@ public class CustomNpcs { return null; } - public static File getWorldSaveDirectory(String s) { - try { - File dir = new File("."); - if (getServer() != null) { - if (!getServer().isDedicatedServer()) { - dir = new File(Minecraft.getMinecraft().mcDataDir, "saves"); - } - - dir = new File(new File(dir, getServer().getFolderName()), "customnpcs"); - } - - if (s != null) { - dir = new File(dir, s); - } - - if (!dir.exists()) { - dir.mkdirs(); - } - - return dir; - } catch (Exception var2) { - LogWriter.error("Error getting worldsave", var2); - return null; - } - } - - public static MinecraftServer getServer(){ - return MinecraftServer.getServer(); - } } diff --git a/src/main/java/noppes/npcs/DataAI.java b/src/main/java/noppes/npcs/DataAI.java index 787da3b42..cb1b58a45 100644 --- a/src/main/java/noppes/npcs/DataAI.java +++ b/src/main/java/noppes/npcs/DataAI.java @@ -13,7 +13,7 @@ import noppes.npcs.constants.EnumStandingType; import noppes.npcs.entity.EntityNPCInterface; public class DataAI { - private EntityNPCInterface npc; + private EntityNPCInterface npc; public int onAttack = 0; //0:fight 1:panic 2:retreat 3:nothing public int doorInteract = 2; @@ -32,13 +32,6 @@ public class DataAI { public EnumNavType tacticalVariant = EnumNavType.Default; public int useRangeMelee = 0; public int tacticalRadius = 8; - - // Fly Change - public int movementType = 0; - public double flySpeed = 1.0D; - public double flyGravity = 0.0D; - public boolean hasFlyLimit = true; - public int flyHeightLimit = 2; public EnumAnimation animationType = EnumAnimation.NONE; public EnumStandingType standingType = EnumStandingType.RotateBody; @@ -100,28 +93,7 @@ public class DataAI { setMovingPath(NBTTags.getIntegerArraySet(compound.getTagList("MovingPathNew",10))); movingPos = compound.getInteger("MovingPos"); movingPattern = compound.getInteger("MovingPatern"); - - movementType = compound.getInteger("MovingType"); - if(!compound.hasKey("FlySpeed")) - flySpeed = 1.0D; - else - flySpeed = compound.getDouble("FlySpeed"); - - if(!compound.hasKey("FlyGravity")) - flyGravity = 0.0D; - else - flyGravity = compound.getDouble("FlyGravity"); - - if(!compound.hasKey("HasFlyLimit")) - hasFlyLimit = false; - else - hasFlyLimit = compound.getBoolean("HasFlyLimit"); - - if(!compound.hasKey("FlyHeightLimit")) - flyHeightLimit = 5; - else - flyHeightLimit = compound.getInteger("FlyHeightLimit"); - + startPos = compound.getIntArray("StartPosNew"); if (startPos == null || startPos.length != 3){ startPos = new int[] { @@ -167,13 +139,7 @@ public class DataAI { compound.setTag("MovingPathNew", NBTTags.nbtIntegerArraySet(movingPath)); compound.setInteger("MovingPos", movingPos); compound.setInteger("MovingPatern", movingPattern); - - compound.setInteger("MovingType", movementType); - compound.setDouble("FlySpeed",flySpeed); - compound.setDouble("FlyGravity",flyGravity); - compound.setBoolean("HasFlyLimit",hasFlyLimit); - compound.setInteger("FlyHeightLimit", flyHeightLimit); - + npc.setAvoidWater(avoidsWater); compound.setIntArray("StartPosNew", npc.getStartPos()); diff --git a/src/main/java/noppes/npcs/DataDisplay.java b/src/main/java/noppes/npcs/DataDisplay.java index 32781013b..15780845a 100644 --- a/src/main/java/noppes/npcs/DataDisplay.java +++ b/src/main/java/noppes/npcs/DataDisplay.java @@ -1,15 +1,8 @@ package noppes.npcs; -import java.util.ArrayList; -import java.util.List; import java.util.Random; -import java.util.UUID; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; import net.minecraft.nbt.NBTUtil; import net.minecraft.server.MinecraftServer; import net.minecraft.util.StringUtils; @@ -26,56 +19,59 @@ public class DataDisplay { public String name; public String title = ""; - private int markovGeneratorId = 8; //roman,japanese,slavic,welsh,sami,oldnorse,ancientgreek,aztec,classic,spanish (0 - 9 inclusively) - private int markovGender = 0; //0:random, 1:male, 2:female - - public byte skinType = 0; //0:normal, 1:player, 2:url, 3:url64 - + public byte skinType = 0; //0:normal, 1:player, 2:url public String url = ""; - public GameProfile playerProfile; - public String texture = "customnpcs:textures/entity/humanmale/Steve.png"; + public String texture = "customnpcs:textures/entity/humanmale/Steve.png";; public String cloakTexture = ""; public String glowTexture = ""; - public int visible = 0; //0:visible 1:Invisible 2:semi-invisible + public int visible = 0;//0:visible 1:Invisible 2:semi-invisible public int modelSize = 5; public int showName = 0; - - public int modelType = 0; - + public boolean disableLivingAnimation = false; public byte showBossBar = 0; - - public ArrayList invisibleToList = new ArrayList<>(); - - //0 - Yes, 1 - No, 2 - Only NPCs, 3 - Only Players, 4 - NPCs and Players - public int collidesWith = 1; - + public DataDisplay(EntityNPCInterface npc){ this.npc = npc; - markovGeneratorId = new Random().nextInt(CustomNpcs.MARKOV_GENERATOR.length-1); - name = getRandomName(); + String[] names = { "Noppes", "Noppes", "Noppes", "Noppes", "Atesson", + "Rothcersul", "Achdranys", "Pegato", "Chald", "Gareld", + "Nalworche", "Ineald", "Tia'kim", "Torerod", "Turturdar", + "Ranler", "Dyntan", "Oldrake", "Gharis", "Elmn", "Tanal", + "Waran-ess", "Ach-aldhat", "Athi", "Itageray", "Tasr", + "Ightech", "Gakih", "Adkal", "Qua'an", "Sieq", "Urnp", "Rods", + "Vorbani", "Smaik", "Fian", "Hir", "Ristai", "Kineth", "Naif", + "Issraya", "Arisotura", "Honf", "Rilfom", "Estz", "Ghatroth", + "Yosil", "Darage", "Aldny", "Tyltran", "Armos", "Loxiku", + "Burhat", "Tinlt", "Ightyd", "Mia", + "Ken", "Karla", "Lily", "Carina", "Daniel", "Slater", "Zidane", "Valentine", "Eirina", + "Carnow", "Grave", "Shadow", "Drakken", "Kaoz", "Silk", "Drake", "Oldam", "Lynxx", "Lenyx", + "Winter", "Seth", "Apolitho", "Amethyst", "Ankin", "Seinkan", "Ayumu", "Sakamoto", "Divina", + "Div", "Magia", "Magnus", "Tiakono", "Ruin", "Hailinx", "Ethan", "Wate", "Carter", "William", + "Brion", "Sparrow", "Basrrelen", "Gyaku", "Claire", "Crowfeather", "Blackwell", "Raven", "Farcri", + "Lucas", "Bangheart", "Kamoku", "Kyoukan", "Blaze", "Benjamin", "Larianne", "Kakaragon", + "Melancholy", "Epodyno", "Thanato", "Mika", "Dacks", "Ylander", "Neve", "Meadow", "Cuero", + "Embrera", "Eldamore", "Faolan", "Chim", "Nasu", "Kathrine", "Ariel", "Arei", "Demytrix", + "Kora", "Ava", "Larson", "Leonardo", "Wyrl", "Sakiama", "Lambton", "Kederath", "Malus", "Riplette", + "Andern", "Ezall", "Lucien", "Droco", "Cray", "Tymen", "Zenix", "Entranger", + "Saenorath", "Chris", "Christine", "Marble", "Mable", "Ross", "Rose", "Xalgan ", "Kennet" + }; + name = names[new Random().nextInt(names.length)]; } - - public String getRandomName() { - return CustomNpcs.MARKOV_GENERATOR[markovGeneratorId].fetch(markovGender); - } - + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setString("Name", name); - nbttagcompound.setInteger("MarkovGeneratorId", markovGeneratorId); - nbttagcompound.setInteger("MarkovGender", markovGender); nbttagcompound.setString("Title", title); nbttagcompound.setString("SkinUrl", url); nbttagcompound.setString("Texture", texture); nbttagcompound.setString("CloakTexture", cloakTexture); nbttagcompound.setString("GlowTexture", glowTexture); nbttagcompound.setByte("UsingSkinUrl", skinType); - + if (this.playerProfile != null) { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); @@ -84,7 +80,6 @@ public class DataDisplay { } nbttagcompound.setInteger("Size", modelSize); - nbttagcompound.setInteger("modelType", modelType); nbttagcompound.setInteger("ShowName", showName); nbttagcompound.setInteger("NpcVisible", visible); @@ -92,27 +87,14 @@ public class DataDisplay { nbttagcompound.setBoolean("NoLivingAnimation", disableLivingAnimation); nbttagcompound.setByte("BossBar", showBossBar); - nbttagcompound.setInteger("CollidesWith",collidesWith); - - NBTTagList list = new NBTTagList(); - for(UUID uuid : invisibleToList){ - list.appendTag(new NBTTagString(uuid.toString())); - } - - nbttagcompound.setTag("InvisibleToList", list); - return nbttagcompound; } public void readToNBT(NBTTagCompound nbttagcompound) { - setName(nbttagcompound.getString("Name")); - setMarkovGeneratorId(nbttagcompound.getInteger("MarkovGeneratorId")); - setMarkovGender(nbttagcompound.getInteger("MarkovGender")); - + name = nbttagcompound.getString("Name"); title = nbttagcompound.getString("Title"); url = nbttagcompound.getString("SkinUrl"); - - int prevSkinType = skinType; + int prevSkinType = skinType; skinType = nbttagcompound.getByte("UsingSkinUrl"); this.playerProfile = null; @@ -132,35 +114,14 @@ public class DataDisplay { cloakTexture = nbttagcompound.getString("CloakTexture"); glowTexture = nbttagcompound.getString("GlowTexture"); - modelSize = ValueUtil.CorrectInt(nbttagcompound.getInteger("Size"), 1, Integer.MAX_VALUE); - if(modelSize > CustomNpcs.NpcSizeLimit) - modelSize = CustomNpcs.NpcSizeLimit; + modelSize = ValueUtil.CorrectInt(nbttagcompound.getInteger("Size"), 1, 30); - modelType = nbttagcompound.getInteger("modelType"); - showName = nbttagcompound.getInteger("ShowName"); visible = nbttagcompound.getInteger("NpcVisible"); disableLivingAnimation = nbttagcompound.getBoolean("NoLivingAnimation"); showBossBar = nbttagcompound.getByte("BossBar"); - NBTTagList tagList = (NBTTagList)nbttagcompound.getTag("InvisibleToList"); - if(tagList != null) { - invisibleToList.clear(); - for (int i = 0; i < tagList.tagCount(); i++) { - String nbtTagString = tagList.getStringTagAt(i); - invisibleToList.add(UUID.fromString(nbtTagString)); - } - } - else { - invisibleToList = new ArrayList<>(); - } - - if(nbttagcompound.hasKey("CollidesWith")) - collidesWith = nbttagcompound.getInteger("CollidesWith"); - else - collidesWith = 1; - if(prevSkinType != skinType || !texture.equals(prevTexture)) npc.textureLocation = null; npc.textureGlowLocation = null; @@ -191,49 +152,4 @@ public class DataDisplay { return false; return showName == 0 || (showName == 2 && npc.isAttacking()); } - - public String getSkinTexture(){ - return texture; - } - - public void setSkinTexture(String texture){ - if(this.texture.equals(texture)) - return; - this.texture = texture; - npc.textureLocation = null; - skinType = 0; - npc.updateClient = true; - } - - public String getName(){ - return name; - } - - public void setName(String name){ - if(this.name.equals(name)) - return; - this.name = name; - npc.updateClient = true; - } - - public int getMarkovGender(){ - return markovGender; - } - - public void setMarkovGender(int gender) { - if(markovGender == gender) - return; - this.markovGender = ValueUtil.CorrectInt(gender, 0, 2); - } - - public int getMarkovGeneratorId(){ - return markovGeneratorId; - } - - public void setMarkovGeneratorId(int id) { - if(markovGeneratorId == id) - return; - this.markovGeneratorId = ValueUtil.CorrectInt(id, 0, CustomNpcs.MARKOV_GENERATOR.length-1); - } - } diff --git a/src/main/java/noppes/npcs/DataInventory.java b/src/main/java/noppes/npcs/DataInventory.java index 601cf1791..4f96b2f01 100644 --- a/src/main/java/noppes/npcs/DataInventory.java +++ b/src/main/java/noppes/npcs/DataInventory.java @@ -18,7 +18,7 @@ import noppes.npcs.entity.EntityNPCInterface; public class DataInventory implements IInventory{ public HashMap items = new HashMap(); - public HashMap dropchance = new HashMap(); + public HashMap dropchance = new HashMap(); public HashMap weapons = new HashMap(); public HashMap armor = new HashMap(); @@ -38,7 +38,7 @@ public class DataInventory implements IInventory{ nbttagcompound.setTag("NpcInv", NBTTags.nbtItemStackList(items)); nbttagcompound.setTag("Armor", NBTTags.nbtItemStackList(getArmor())); nbttagcompound.setTag("Weapons", NBTTags.nbtItemStackList(getWeapons())); - nbttagcompound.setTag("DoubleDropChance", NBTTags.nbtIntegerDoubleMap(dropchance)); + nbttagcompound.setTag("DropChance", NBTTags.nbtIntegerIntegerMap(dropchance)); nbttagcompound.setInteger("LootMode", lootMode); return nbttagcompound; @@ -49,17 +49,7 @@ public class DataInventory implements IInventory{ items = NBTTags.getItemStackList(nbttagcompound.getTagList("NpcInv", 10)); setArmor(NBTTags.getItemStackList(nbttagcompound.getTagList("Armor", 10))); setWeapons(NBTTags.getItemStackList(nbttagcompound.getTagList("Weapons", 10))); - - if(!nbttagcompound.hasKey("DoubleDropChance")) { - dropchance.clear(); - HashMap oldDropChance = NBTTags.getIntegerIntegerMap(nbttagcompound.getTagList("DropChance", 10)); - for(int i = 0; i < oldDropChance.entrySet().size(); i++){ - dropchance.put(i, Double.valueOf(oldDropChance.get(i))); - } - } else { - dropchance = NBTTags.getIntegerDoubleMap(nbttagcompound.getTagList("DoubleDropChance", 10)); - } - + dropchance = NBTTags.getIntegerIntegerMap(nbttagcompound.getTagList("DropChance", 10)); lootMode = nbttagcompound.getInteger("LootMode"); } public HashMap getWeapons() { @@ -99,10 +89,10 @@ public class DataInventory implements IInventory{ ItemStack item = items.get(i); if(item == null) continue; - double dchance = 100; + int dchance = 100; if(dropchance.containsKey(i)) dchance = dropchance.get(i); - double chance = Math.random()*100 + dchance; + int chance = npc.worldObj.rand.nextInt(100) + dchance; if(chance >= 100){ EntityItem e = getEntityItem(item.copy()); if(e != null) diff --git a/src/main/java/noppes/npcs/DataScript.java b/src/main/java/noppes/npcs/DataScript.java index d4074bda2..fc8f33b8c 100644 --- a/src/main/java/noppes/npcs/DataScript.java +++ b/src/main/java/noppes/npcs/DataScript.java @@ -1,10 +1,10 @@ package noppes.npcs; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import javax.script.ScriptEngine; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -12,23 +12,18 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.controllers.IScriptHandler; import noppes.npcs.controllers.ScriptController; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.event.ScriptEvent; -import noppes.npcs.scripted.entity.ScriptNpc; +import noppes.npcs.scripted.ScriptEvent; +import noppes.npcs.scripted.ScriptNpc; import noppes.npcs.scripted.ScriptWorld; import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.scripted.constants.JobType; import noppes.npcs.scripted.constants.RoleType; -import noppes.npcs.scripted.interfaces.ICustomNpc; -import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.scripted.wrapper.WrapperNpcAPI; -public class DataScript implements IScriptHandler { - public List scripts = new ArrayList(); +public class DataScript { + public Map scripts = new HashMap(); private final static EntityType entities = new EntityType(); private final static JobType jobs = new JobType(); private final static RoleType roles = new RoleType(); @@ -37,22 +32,18 @@ public class DataScript implements IScriptHandler { private EntityNPCInterface npc; public boolean enabled = false; - public ICustomNpc dummyNpc; - public IWorld dummyWorld; + public ScriptNpc dummyNpc; + public ScriptWorld dummyWorld; public boolean clientNeedsUpdate = false; public boolean aiNeedsUpdate = false; public boolean hasInited = false; public DataScript(EntityNPCInterface npc) { - for (int i = 0; i < 12; i++) { - scripts.add(new ScriptContainer(this)); - } - this.npc = npc; - dummyNpc = new ScriptNpc<>(npc); - + if(npc instanceof EntityCustomNpc) + dummyNpc = new ScriptNpc((EntityCustomNpc) npc); if(npc.worldObj instanceof WorldServer) - dummyWorld = NpcAPI.Instance().getIWorld((WorldServer) npc.worldObj);//new ScriptWorld((WorldServer) npc.worldObj); + dummyWorld = new ScriptWorld((WorldServer) npc.worldObj); } public void readFromNBT(NBTTagCompound compound) { @@ -68,25 +59,21 @@ public class DataScript implements IScriptHandler { return compound; } - private List readScript(NBTTagList list){ - List scripts = new ArrayList<>(); - for (int i = 0; i < 12; i++) { - scripts.add(new ScriptContainer(this)); - } - + private Map readScript(NBTTagList list){ + Map scripts = new HashMap(); for(int i = 0; i < list.tagCount(); i++){ NBTTagCompound compoundd = list.getCompoundTagAt(i); - ScriptContainer script = new ScriptContainer(this); + ScriptContainer script = new ScriptContainer(); script.readFromNBT(compoundd); - if(script.hasCode() || npc.isRemote()) - scripts.set(compoundd.getInteger("Type"), script); + if(script.hasCode() || npc.isRemote()) + scripts.put(compoundd.getInteger("Type"), script); } return scripts; } - private NBTTagList writeScript(List scripts){ + private NBTTagList writeScript(Map scripts){ NBTTagList list = new NBTTagList(); - for(int type = 0; type < scripts.size(); type++){ + for(Integer type : scripts.keySet()){ NBTTagCompound compoundd = new NBTTagCompound(); compoundd.setInteger("Type", type); ScriptContainer script = scripts.get(type); @@ -123,10 +110,20 @@ public class DataScript implements IScriptHandler { ob = ScriptController.Instance.getScriptForEntity((Entity)ob); script.engine.put(obs[i].toString(), ob); } - - return callScript(script); + try { + return callScript(script); + } + catch(Throwable e) { + script.errored = true; + script.appandConsole(e.getMessage()); + return false; + } } - + + public boolean isEnabled(){ + return enabled && ScriptController.HasStart && !npc.worldObj.isRemote && !scripts.isEmpty(); + } + private boolean callScript(ScriptContainer script){ ScriptEngine engine = script.engine; engine.put("npc", dummyNpc); @@ -134,12 +131,11 @@ public class DataScript implements IScriptHandler { ScriptEvent result = (ScriptEvent) engine.get("event"); if(result == null) engine.put("event", result = new ScriptEvent()); - engine.put("API", new WrapperNpcAPI()); engine.put("EntityType", entities); engine.put("RoleType", roles); engine.put("JobType", jobs); script.run(engine); - + if(clientNeedsUpdate){ npc.updateClient = true; clientNeedsUpdate = false; @@ -150,78 +146,6 @@ public class DataScript implements IScriptHandler { } return result.isCancelled(); } - - public boolean isEnabled(){ - return enabled && ScriptController.HasStart && !npc.worldObj.isRemote && !scripts.isEmpty(); - } - - public void callScript(EnumScriptType var1, Event var2, Object... obs) { - - } - - public Map getConsoleText() { - Map map = new TreeMap(); - int tab = 0; - Iterator var3 = this.getScripts().iterator(); - - while(var3.hasNext()) { - ScriptContainer script = (ScriptContainer)var3.next(); - ++tab; - Iterator var5 = script.console.entrySet().iterator(); - - while(var5.hasNext()) { - Map.Entry entry = (Map.Entry)var5.next(); - map.put(entry.getKey(), " tab " + tab + ":\n" + (String)entry.getValue()); - } - } - - return map; - } - - public void clearConsole() { - Iterator var1 = this.getScripts().iterator(); - - while(var1.hasNext()) { - ScriptContainer script = (ScriptContainer)var1.next(); - script.console.clear(); - } - - } - - @Override - public void callScript(EnumScriptType var1, Event var2) { - - } - - public boolean isClient() { - return this.npc.isRemote(); - } - - public boolean getEnabled() { - return this.enabled; - } - - public void setEnabled(boolean bo) { - this.enabled = bo; - } - - public String getLanguage() { - return this.scriptLanguage; - } - - public void setLanguage(String lang) { - this.scriptLanguage = lang; - } - - public List getScripts() { - return this.scripts; - } - - public String noticeString() { - //BlockPos pos = this.npc.func_180425_c(); - //return MoreObjects.toStringHelper(this.npc).add("x", pos.func_177958_n()).add("y", pos.func_177956_o()).add("z", pos.func_177952_p()).toString(); - return ""; - } public void setWorld(World world) { if(world instanceof WorldServer) diff --git a/src/main/java/noppes/npcs/DataStats.java b/src/main/java/noppes/npcs/DataStats.java index 48672d31f..f011ee324 100644 --- a/src/main/java/noppes/npcs/DataStats.java +++ b/src/main/java/noppes/npcs/DataStats.java @@ -8,12 +8,9 @@ import noppes.npcs.constants.EnumPotionType; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.util.ValueUtil; -import java.math.RoundingMode; -import java.text.DecimalFormat; - public class DataStats { - private float attackStrength = 5; + private int attackStrength = 5; public int attackSpeed = 20, attackRange = 2, knockback = 0; public int minDelay = 20, maxDelay = 40, rangedRange = 15, fireRate = 5, burstCount = 1, shotCount = 1, accuracy = 60; public int aggroRange = 16; @@ -22,7 +19,7 @@ public class DataStats { public int potionDuration = 5; //20 = 1 second public int potionAmp = 0; - public double maxHealth = 20; + public int maxHealth = 20; public int respawnTime = 20; public int spawnCycle = 0; public boolean hideKilledBody = false; @@ -35,11 +32,10 @@ public class DataStats { public boolean canDrown = true; public boolean burnInSun = false; public boolean noFallDamage = false; - public float healthRegen = 1; - public float combatRegen = 0; - - public float pDamage = 4; - public int pImpact = 0, pSize = 5, pSpeed = 10, pArea = 0, pDur = 5; + public int healthRegen = 1; + public int combatRegen = 0; + + public int pDamage = 4, pImpact = 0, pSize = 5, pSpeed = 10, pArea = 0, pDur = 5; public boolean pPhysics = true, pXlr8 = false, pGlows = false, pExplode = false; public boolean pRender3D = false, pSpin = false, pStick = false; public EnumPotionType pEffect = EnumPotionType.None; @@ -59,16 +55,16 @@ public class DataStats { public NBTTagCompound writeToNBT(NBTTagCompound compound) { compound.setTag("Resistances", resistances.writeToNBT()); - compound.setDouble("MaxHealth", maxHealth); + compound.setInteger("MaxHealth", maxHealth); compound.setInteger("AggroRange", aggroRange); compound.setBoolean("HideBodyWhenKilled", hideKilledBody); compound.setInteger("RespawnTime", respawnTime); compound.setInteger("SpawnCycle", spawnCycle); compound.setInteger("CreatureType", creatureType.ordinal()); - compound.setFloat("HealthRegen", healthRegen); - compound.setFloat("CombatRegen", combatRegen); + compound.setInteger("HealthRegen", healthRegen); + compound.setInteger("CombatRegen", combatRegen); - compound.setFloat("AttackStrenght", attackStrength); + compound.setInteger("AttackStrenght", attackStrength); compound.setInteger("AttackRange", attackRange); compound.setInteger("AttackSpeed", attackSpeed); compound.setInteger("KnockBack", knockback); @@ -84,7 +80,7 @@ public class DataStats { compound.setInteger("ShotCount", shotCount); compound.setInteger("Accuracy", accuracy); - compound.setFloat("pDamage", pDamage); + compound.setInteger("pDamage", pDamage); compound.setInteger("pImpact", pImpact); compound.setInteger("pSize", pSize); compound.setInteger("pSpeed", pSpeed); @@ -117,16 +113,16 @@ public class DataStats { public void readToNBT(NBTTagCompound compound) { resistances.readToNBT(compound.getCompoundTag("Resistances")); - setMaxHealth(compound.getDouble("MaxHealth")); + setMaxHealth(compound.getInteger("MaxHealth")); hideKilledBody = compound.getBoolean("HideBodyWhenKilled"); aggroRange = compound.getInteger("AggroRange"); respawnTime = compound.getInteger("RespawnTime"); spawnCycle = compound.getInteger("SpawnCycle"); creatureType = EnumCreatureAttribute.values()[compound.getInteger("CreatureType") % EnumPotionType.values().length]; - healthRegen = compound.getFloat("HealthRegen"); - combatRegen = compound.getFloat("CombatRegen"); + healthRegen = compound.getInteger("HealthRegen"); + combatRegen = compound.getInteger("CombatRegen"); - setAttackStrength(compound.getFloat("AttackStrenght")); + setAttackStrength(compound.getInteger("AttackStrenght")); attackSpeed = compound.getInteger("AttackSpeed"); attackRange = compound.getInteger("AttackRange"); knockback = compound.getInteger("KnockBack"); @@ -142,7 +138,7 @@ public class DataStats { shotCount = ValueUtil.CorrectInt(compound.getInteger("ShotCount"), 1, 10); accuracy = compound.getInteger("Accuracy"); - pDamage = compound.getFloat("pDamage"); + pDamage = compound.getInteger("pDamage"); pImpact = compound.getInteger("pImpact"); pSize = compound.getInteger("pSize"); pSpeed = compound.getInteger("pSpeed"); @@ -172,16 +168,16 @@ public class DataStats { npc.setImmuneToFire(immuneToFire); } - public float getAttackStrength(){ + public int getAttackStrength(){ return attackStrength; } - public void setAttackStrength(float strength){ - attackStrength = (float)(Math.floor(strength)); + public void setAttackStrength(int strength){ + attackStrength = strength; npc.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(attackStrength); } - public void setMaxHealth(double maxHealth) { - this.maxHealth = Math.floor(maxHealth); + public void setMaxHealth(int maxHealth) { + this.maxHealth = maxHealth; npc.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(maxHealth); } } diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java deleted file mode 100644 index c5e54cfc9..000000000 --- a/src/main/java/noppes/npcs/EventHooks.java +++ /dev/null @@ -1,389 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs; - -import cpw.mods.fml.common.eventhandler.Event; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityXPOrb; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.event.entity.EntityEvent; -import net.minecraftforge.event.world.WorldEvent; -import noppes.npcs.controllers.CustomGuiController; -import noppes.npcs.controllers.Quest; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.ForgeDataScript; -import noppes.npcs.controllers.data.PlayerDataScript; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.*; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.*; -import noppes.npcs.scripted.event.PlayerEvent.ChatEvent; -import noppes.npcs.scripted.event.PlayerEvent.ContainerOpen; -import noppes.npcs.scripted.event.PlayerEvent.DamagedEntityEvent; -import noppes.npcs.scripted.event.PlayerEvent.KeyPressedEvent; -import noppes.npcs.scripted.event.PlayerEvent.LoginEvent; -import noppes.npcs.scripted.event.PlayerEvent.LogoutEvent; -import noppes.npcs.scripted.event.PlayerEvent.PickUpEvent; -import noppes.npcs.scripted.event.PlayerEvent.DropEvent; -import noppes.npcs.scripted.interfaces.ICustomGui; -import noppes.npcs.scripted.interfaces.IEntity; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.scripted.wrapper.WrapperNpcAPI; -import noppes.npcs.constants.EnumScriptType; -import noppes.npcs.controllers.PlayerData; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; - -public class EventHooks { - public EventHooks() { - } - - - - public static void onNPCTimer(EntityNPCInterface npc, int id) { - NpcEvent.TimerEvent event = new NpcEvent.TimerEvent(npc.wrappedNPC, id); - ScriptEventTimer scriptEvent = new ScriptEventTimer(id); - npc.script.callScript(EnumScriptType.TIMER, "event", scriptEvent); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerInit(PlayerDataScript handler, ScriptPlayer player) { - noppes.npcs.scripted.event.PlayerEvent.InitEvent event = new noppes.npcs.scripted.event.PlayerEvent.InitEvent(player); - handler.callScript(EnumScriptType.INIT, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerTick(PlayerDataScript handler, ScriptPlayer player) { - noppes.npcs.scripted.event.PlayerEvent.UpdateEvent event = new noppes.npcs.scripted.event.PlayerEvent.UpdateEvent(player); - handler.callScript(EnumScriptType.TICK, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerInteract(PlayerDataScript handler, noppes.npcs.scripted.event.PlayerEvent.InteractEvent event) { - handler.callScript(EnumScriptType.INTERACT, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onStartUsingItem(PlayerDataScript handler, ScriptPlayer player, int duration, ItemStack item){ - PlayerEvent.StartUsingItem event = new PlayerEvent.StartUsingItem(player, item, duration); - handler.callScript(EnumScriptType.START_USING_ITEM, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onUsingItem(PlayerDataScript handler, ScriptPlayer player, int duration, ItemStack item){ - PlayerEvent.UsingItem event = new PlayerEvent.UsingItem(player, item, duration); - handler.callScript(EnumScriptType.USING_ITEM, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onStopUsingItem(PlayerDataScript handler, ScriptPlayer player, int duration, ItemStack item){ - PlayerEvent.StopUsingItem event = new PlayerEvent.StopUsingItem(player, item, duration); - handler.callScript(EnumScriptType.STOP_USING_ITEM, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onFinishUsingItem(PlayerDataScript handler, ScriptPlayer player, int duration, ItemStack item){ - PlayerEvent.FinishUsingItem event = new PlayerEvent.FinishUsingItem(player, item, duration); - handler.callScript(EnumScriptType.FINISH_USING_ITEM, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerDropItems(PlayerDataScript handler, ScriptPlayer player, ArrayList entityItems) { - IItemStack[] items = new IItemStack[entityItems.size()]; - for(int i = 0; i < entityItems.size(); i++){ items[i] = NpcAPI.Instance().getIItemStack(entityItems.get(i).getEntityItem()); } - - DropEvent event = new DropEvent(player, items); - handler.callScript(EnumScriptType.DROP, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerPickupXP(PlayerDataScript handler, ScriptPlayer player, EntityXPOrb orb) { - PlayerEvent.PickupXPEvent event = new PlayerEvent.PickupXPEvent(player, orb); - handler.callScript(EnumScriptType.PICKUP_XP, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerToss(PlayerDataScript handler, ScriptPlayer player, EntityItem entityItem) { - PlayerEvent.TossEvent event = new PlayerEvent.TossEvent(player, NpcAPI.Instance().getIItemStack(entityItem.getEntityItem())); - handler.callScript(EnumScriptType.TOSS, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerPickUp(PlayerDataScript handler, ScriptPlayer player, EntityItem entityItem) { - PickUpEvent event = new PickUpEvent(player, new ScriptItemStack(entityItem.getEntityItem()));//NpcAPI.Instance().getIItemStack(entityItem.getEntityItem())); - handler.callScript(EnumScriptType.PICKUP, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerContainerOpen(PlayerDataScript handler, ScriptPlayer player, Container container) { - ContainerOpen event = new ContainerOpen(player, NpcAPI.Instance().getIContainer(container)); - handler.callScript(EnumScriptType.CONTAINER_OPEN, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerUseHoe(PlayerDataScript handler, ScriptPlayer player, ItemStack hoe, int x, int y, int z) { - noppes.npcs.scripted.event.PlayerEvent.UseHoe event = new noppes.npcs.scripted.event.PlayerEvent.UseHoe(player, hoe, x, y, z); - handler.callScript(EnumScriptType.USE_HOE, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerSleep(PlayerDataScript handler, ScriptPlayer player, int x, int y, int z) { - noppes.npcs.scripted.event.PlayerEvent.Sleep event = new noppes.npcs.scripted.event.PlayerEvent.Sleep(player, x, y, z); - handler.callScript(EnumScriptType.SLEEP, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerWakeUp(PlayerDataScript handler, ScriptPlayer player, boolean setSpawn) { - noppes.npcs.scripted.event.PlayerEvent.WakeUp event = new noppes.npcs.scripted.event.PlayerEvent.WakeUp(player, setSpawn); - handler.callScript(EnumScriptType.WAKE_UP, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerDeath(PlayerDataScript handler, ScriptPlayer player, DamageSource source, Entity entity) { - noppes.npcs.scripted.event.PlayerEvent.DiedEvent event = new noppes.npcs.scripted.event.PlayerEvent.DiedEvent(player, source, entity); - handler.callScript(EnumScriptType.KILLED, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerKills(PlayerDataScript handler, ScriptPlayer player, EntityLivingBase entityLiving) { - noppes.npcs.scripted.event.PlayerEvent.KilledEntityEvent event = new noppes.npcs.scripted.event.PlayerEvent.KilledEntityEvent(player, entityLiving); - handler.callScript(EnumScriptType.KILLS, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerDamaged(PlayerDataScript handler, noppes.npcs.scripted.event.PlayerEvent.DamagedEvent event) { - handler.callScript(EnumScriptType.DAMAGED, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerLightning(PlayerDataScript handler, ScriptPlayer player) { - PlayerEvent.LightningEvent event = new PlayerEvent.LightningEvent(player); - handler.callScript(EnumScriptType.LIGHTNING, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerSound(PlayerDataScript handler, ScriptPlayer player, String name, float pitch, float volume) { - PlayerEvent.SoundEvent event = new PlayerEvent.SoundEvent(player, name, pitch, volume); - handler.callScript(EnumScriptType.PLAYSOUND, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerFall(PlayerDataScript handler, ScriptPlayer player, float distance) { - PlayerEvent.FallEvent event = new PlayerEvent.FallEvent(player,distance); - handler.callScript(EnumScriptType.FALL, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerJump(PlayerDataScript handler, ScriptPlayer player) { - PlayerEvent.JumpEvent event = new PlayerEvent.JumpEvent(player); - handler.callScript(EnumScriptType.JUMP, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerLogin(PlayerDataScript handler, ScriptPlayer player) { - LoginEvent event = new LoginEvent(player); - handler.callScript(EnumScriptType.LOGIN, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerAchievement(PlayerDataScript handler, ScriptPlayer player, String description) { - PlayerEvent.Achievement event = new PlayerEvent.Achievement(player, description); - handler.callScript(EnumScriptType.ACHIEVEMENT, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerFillBucket(PlayerDataScript handler, ScriptPlayer player, ItemStack current, ItemStack result) { - PlayerEvent.FillBucket event = new PlayerEvent.FillBucket(player, current, result); - handler.callScript(EnumScriptType.FILL_BUCKET, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerBonemeal(PlayerDataScript handler, ScriptPlayer player, int x, int y, int z, World world) { - PlayerEvent.Bonemeal event = new PlayerEvent.Bonemeal(player, x, y, z, world); - handler.callScript(EnumScriptType.BONEMEAL, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerRespawn(PlayerDataScript handler, ScriptPlayer player) { - PlayerEvent.RespawnEvent event = new PlayerEvent.RespawnEvent(player); - handler.callScript(EnumScriptType.RESPAWN, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerLogout(PlayerDataScript handler, ScriptPlayer player) { - LogoutEvent event = new LogoutEvent(player); - handler.callScript(EnumScriptType.LOGOUT, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerChat(PlayerDataScript handler, ChatEvent event) { - handler.callScript(EnumScriptType.CHAT, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerBowCharge(PlayerDataScript handler, noppes.npcs.scripted.event.PlayerEvent.RangedChargeEvent event) { - handler.callScript(EnumScriptType.RANGED_CHARGE, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerRanged(PlayerDataScript handler, noppes.npcs.scripted.event.PlayerEvent.RangedLaunchedEvent event) { - handler.callScript(EnumScriptType.RANGED_LAUNCHED, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerDamagedEntity(PlayerDataScript handler, DamagedEntityEvent event) { - handler.callScript(EnumScriptType.DAMAGED_ENTITY, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerChangeDim(PlayerDataScript handler, ScriptPlayer player, int fromDim, int toDim) { - PlayerEvent.ChangedDimension event = new PlayerEvent.ChangedDimension(player, fromDim, toDim); - handler.callScript(EnumScriptType.CHANGED_DIM, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerMouseClicked(EntityPlayerMP player, int button, int mouseWheel, boolean buttonDown) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - PlayerEvent.MouseClickedEvent event = new PlayerEvent.MouseClickedEvent((ScriptPlayer)ScriptController.Instance.getScriptForEntity(player), button, mouseWheel, buttonDown); - handler.callScript(EnumScriptType.MOUSE_CLICKED, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerKeyPressed(EntityPlayerMP player, int button, boolean isCtrlPressed, boolean isShiftPressed, boolean isAltPressed, boolean isMetaPressed, boolean buttonDown, int[] heldKeys) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - KeyPressedEvent event = new KeyPressedEvent((ScriptPlayer)ScriptController.Instance.getScriptForEntity(player), button, isCtrlPressed, isAltPressed, isShiftPressed, isMetaPressed, buttonDown, heldKeys); - handler.callScript(EnumScriptType.KEY_PRESSED, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onPlayerTimer(PlayerData data, int id) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - noppes.npcs.scripted.event.PlayerEvent.TimerEvent event = new noppes.npcs.scripted.event.PlayerEvent.TimerEvent((ScriptPlayer)ScriptController.Instance.getScriptForEntity(data.player), id); - handler.callScript(EnumScriptType.TIMER, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onPlayerBreak(PlayerDataScript handler, PlayerEvent.BreakEvent event) { - handler.callScript(EnumScriptType.BREAK_BLOCK, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onForgeEntityEvent(EntityEvent event) { - IEntity e = NpcAPI.Instance().getIEntity(event.entity); - onForgeEvent(new noppes.npcs.scripted.event.ForgeEvent.EntityEvent(event, e), event); - } - - public static void onForgeWorldEvent(WorldEvent event) { - if(ScriptController.Instance.forgeScripts.isEnabled()) { - IWorld e = NpcAPI.Instance().getIWorld((WorldServer)event.world); - onForgeEvent(new noppes.npcs.scripted.event.ForgeEvent.WorldEvent(event, e), event); - } - } - - public static void onForgeInit(ForgeDataScript handler) { - noppes.npcs.scripted.event.ForgeEvent.InitEvent event = new noppes.npcs.scripted.event.ForgeEvent.InitEvent(); - handler.callScript("init", event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onForgeEvent(ForgeEvent ev, Event event) { - ForgeDataScript handler = ScriptController.Instance.forgeScripts; - if(handler.isEnabled()) { - String eventName = event.getClass().getName(); - int i = eventName.lastIndexOf("."); - eventName = StringUtils.uncapitalize(eventName.substring(i + 1).replace("$", "")); - if(event.isCancelable()) { - ev.setCanceled(event.isCanceled()); - } - - handler.callScript(eventName, event); - WrapperNpcAPI.EVENT_BUS.post(ev); - if(event.isCancelable()) { - event.setCanceled(ev.isCanceled()); - } - - } - } - - public static void onCustomGuiButton(ScriptPlayer player, ICustomGui gui, int buttonId) { - CustomGuiEvent.ButtonEvent event = new CustomGuiEvent.ButtonEvent(player, gui, buttonId); - CustomGuiController.onButton(event); - } - - public static void onCustomGuiSlot(ScriptPlayer player, ICustomGui gui, int slotId) { - CustomGuiEvent.SlotEvent event = new CustomGuiEvent.SlotEvent(player, gui, slotId, player.getOpenContainer().getSlot(slotId)); - CustomGuiController.onSlotChange(event); - } - - public static void onCustomGuiUnfocused(ScriptPlayer player, ICustomGui gui, int textfieldId) { - CustomGuiEvent.UnfocusedEvent event = new CustomGuiEvent.UnfocusedEvent(player, gui, textfieldId); - CustomGuiController.onCustomGuiUnfocused(event); - } - - public static void onCustomGuiScrollClick(ScriptPlayer player, ICustomGui gui, int scrollId, int scrollIndex, String[] selection, boolean doubleClick) { - CustomGuiEvent.ScrollEvent event = new CustomGuiEvent.ScrollEvent(player, gui, scrollId, scrollIndex, selection, doubleClick); - CustomGuiController.onScrollClick(event); - } - - public static void onCustomGuiClose(ScriptPlayer player, ICustomGui gui) { - noppes.npcs.scripted.event.CustomGuiEvent.CloseEvent event = new noppes.npcs.scripted.event.CustomGuiEvent.CloseEvent(player, gui); - CustomGuiController.onClose(event); - } - - public static void onQuestFinished(EntityPlayer player, Quest quest){ - PlayerDataScript handler = ScriptController.Instance.playerScripts; - QuestEvent.QuestCompletedEvent event = new QuestEvent.QuestCompletedEvent(new ScriptPlayer((EntityPlayerMP) player), quest); - handler.callScript(EnumScriptType.QUEST_COMPLETED, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static boolean onQuestStarted(EntityPlayer player, Quest quest){ - PlayerDataScript handler = ScriptController.Instance.playerScripts; - QuestEvent.QuestStartEvent event = new QuestEvent.QuestStartEvent(new ScriptPlayer((EntityPlayerMP) player), quest); - handler.callScript(EnumScriptType.QUEST_START, event); - return WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onQuestTurnedIn(QuestEvent.QuestTurnedInEvent event){ - PlayerDataScript handler = ScriptController.Instance.playerScripts; - handler.callScript(EnumScriptType.QUEST_TURNIN, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onFactionPoints(FactionEvent.FactionPoints event){ - PlayerDataScript handler = ScriptController.Instance.playerScripts; - handler.callScript(EnumScriptType.FACTION_POINTS, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onDialogOpen(DialogEvent.DialogOpen event){ - PlayerDataScript handler = ScriptController.Instance.playerScripts; - handler.callScript(EnumScriptType.DIALOG_OPEN, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onDialogOption(DialogEvent.DialogOption event){ - PlayerDataScript handler = ScriptController.Instance.playerScripts; - handler.callScript(EnumScriptType.DIALOG_OPTION, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onDialogClosed(DialogEvent.DialogClosed event){ - PlayerDataScript handler = ScriptController.Instance.playerScripts; - handler.callScript(EnumScriptType.DIALOG_CLOSE, event); - WrapperNpcAPI.EVENT_BUS.post(event); - } -} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/ModelDataShared.java b/src/main/java/noppes/npcs/ModelDataShared.java index 298fb117b..63830d4c9 100644 --- a/src/main/java/noppes/npcs/ModelDataShared.java +++ b/src/main/java/noppes/npcs/ModelDataShared.java @@ -27,22 +27,8 @@ public class ModelDataShared{ private HashMap parts = new HashMap(); public byte breasts = 0; - - // Enabled vs Disabled + public byte headwear = 2; - public byte bodywear = 0; - public byte armwear = 0; - public byte legwear = 0; - - // Solid or normal arm/legwear [0: None, 1: Both, 2: Right, 3: Left] - public byte solidArmwear = 0; - public byte solidLegwear = 0; - - // Hide Body Parts [0: None, 1: Both, 2: Right, 3: Left], - public byte hideHead = 0; - public byte hideBody = 0; - public byte hideArms = 0; - public byte hideLegs = 0; public NBTTagCompound writeToNBT(){ NBTTagCompound compound = new NBTTagCompound(); @@ -58,18 +44,6 @@ public class ModelDataShared{ compound.setTag("LegParts", legParts.writeToNBT()); compound.setByte("Headwear", headwear); - compound.setByte("Bodywear", bodywear); - compound.setByte("Armwear", armwear); - compound.setByte("Legwear", legwear); - - compound.setByte("SolidArmwear", solidArmwear); - compound.setByte("SolidLegwear", solidLegwear); - - compound.setByte("hideHead", hideHead); - compound.setByte("hideBody", hideBody); - compound.setByte("hideArms", hideArms); - compound.setByte("hideLegs", hideLegs); - compound.setByte("Breasts", breasts); compound.setTag("ExtraData", extra); @@ -95,18 +69,6 @@ public class ModelDataShared{ legParts.readFromNBT(compound.getCompoundTag("LegParts")); headwear = compound.getByte("Headwear"); - bodywear = compound.getByte("Bodywear"); - armwear = compound.getByte("Armwear"); - legwear = compound.getByte("Legwear"); - - solidArmwear = compound.getByte("SolidArmwear"); - solidLegwear = compound.getByte("SolidLegwear"); - - hideHead = compound.getByte("hideHead"); - hideBody = compound.getByte("hideBody"); - hideArms = compound.getByte("hideArms"); - hideLegs = compound.getByte("hideLegs"); - breasts = compound.getByte("Breasts"); extra = compound.getCompoundTag("ExtraData"); diff --git a/src/main/java/noppes/npcs/ModelPartData.java b/src/main/java/noppes/npcs/ModelPartData.java index 98343d930..fd3cf2bc3 100644 --- a/src/main/java/noppes/npcs/ModelPartData.java +++ b/src/main/java/noppes/npcs/ModelPartData.java @@ -8,9 +8,9 @@ public class ModelPartData { public String texture; public byte type = 0; public boolean playerTexture; - + private ResourceLocation location; - + public ModelPartData(){ playerTexture = true; } @@ -24,30 +24,26 @@ public class ModelPartData { NBTTagCompound compound = new NBTTagCompound(); compound.setByte("Type", type); compound.setInteger("Color", color); - if(texture != null && !texture.isEmpty()) { + if(texture != null && !texture.isEmpty()) compound.setString("Texture", texture); - } compound.setBoolean("PlayerTexture", playerTexture); return compound; } - + public void readFromNBT(NBTTagCompound compound){ type = compound.getByte("Type"); color = compound.getInteger("Color"); texture = compound.getString("Texture"); - if(texture.contains("moreplayermodels:textures")){ - texture = texture.replace("moreplayermodels:textures", "customnpcs:textures/parts"); - } playerTexture = compound.getBoolean("PlayerTexture"); location = null; } - + public ResourceLocation getResource(){ if(texture.isEmpty()) return null; if(location != null) return location; - location = new ResourceLocation(texture); + location = new ResourceLocation(texture); return location; } @@ -59,11 +55,11 @@ public class ModelPartData { this.texture = texture; } else{ - this.texture = "customnpcs:textures/parts/"+ texture + ".png"; + this.texture = "moreplayermodels:textures/"+ texture + ".png"; playerTexture = false; } } - + public String toString(){ return "Color: " + color + " Type: " + type; } @@ -71,9 +67,9 @@ public class ModelPartData { public String getColor() { String str = Integer.toHexString(color); - while(str.length() < 6) - str = "0" + str; - - return str; + while(str.length() < 6) + str = "0" + str; + + return str; } -} \ No newline at end of file +} diff --git a/src/main/java/noppes/npcs/NBTTags.java b/src/main/java/noppes/npcs/NBTTags.java index 85b7eb08b..87fc9826a 100644 --- a/src/main/java/noppes/npcs/NBTTags.java +++ b/src/main/java/noppes/npcs/NBTTags.java @@ -1,14 +1,18 @@ package noppes.npcs; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.Vector; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagInt; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.controllers.IScriptHandler; public class NBTTags { @@ -69,17 +73,6 @@ public class NBTTags { } return list; } - - public static HashMap getIntegerDoubleMap( - NBTTagList tagList) { - HashMap list = new HashMap(); - for(int i = 0; i < tagList.tagCount(); i++) - { - NBTTagCompound nbttagcompound = tagList.getCompoundTagAt(i); - list.put(nbttagcompound.getInteger("Slot"), nbttagcompound.getDouble("Double")); - } - return list; - } public static HashMap getIntegerLongMap( NBTTagList tagList) { @@ -250,19 +243,6 @@ public class NBTTags { return nbttaglist; } - public static NBTTagList nbtIntegerDoubleMap(HashMap lines) { - NBTTagList nbttaglist = new NBTTagList(); - if(lines == null) - return nbttaglist; - for (int slot : lines.keySet()) { - NBTTagCompound nbttagcompound = new NBTTagCompound(); - nbttagcompound.setInteger("Slot", slot); - nbttagcompound.setDouble("Double", lines.get(slot)); - nbttaglist.appendTag(nbttagcompound); - } - return nbttaglist; - } - public static NBTTagList nbtIntegerLongMap(HashMap lines) { NBTTagList nbttaglist = new NBTTagList(); if(lines == null) @@ -403,60 +383,4 @@ public class NBTTags { return compound; } - public static TreeMap GetLongStringMap(NBTTagList tagList) { - TreeMap list = new TreeMap(); - - for(int i = 0; i < tagList.tagCount(); ++i) { - NBTTagCompound nbttagcompound = tagList.getCompoundTagAt(i); - list.put(Long.valueOf(nbttagcompound.getLong("Long")), nbttagcompound.getString("String")); - } - - return list; - } - - public static NBTTagList NBTLongStringMap(Map map) { - NBTTagList nbttaglist = new NBTTagList(); - if(map == null) { - return nbttaglist; - } else { - Iterator var2 = map.keySet().iterator(); - - while(var2.hasNext()) { - long slot = ((Long)var2.next()).longValue(); - NBTTagCompound nbttagcompound = new NBTTagCompound(); - nbttagcompound.setLong("Long", slot); - nbttagcompound.setString("String", (String) map.get(Long.valueOf(slot))); - nbttaglist.appendTag(nbttagcompound); - } - - return nbttaglist; - } - } - - public static List GetScript(NBTTagList list, IScriptHandler handler) { - ArrayList scripts = new ArrayList(); - - for(int i = 0; i < list.tagCount(); ++i) { - NBTTagCompound compoundd = list.getCompoundTagAt(i); - ScriptContainer script = new ScriptContainer(handler); - script.readFromNBT(compoundd); - scripts.add(script); - } - - return scripts; - } - - public static NBTTagList NBTScript(List scripts) { - NBTTagList list = new NBTTagList(); - Iterator var2 = scripts.iterator(); - - while(var2.hasNext()) { - ScriptContainer script = (ScriptContainer)var2.next(); - NBTTagCompound compound = new NBTTagCompound(); - script.writeToNBT(compound); - list.appendTag(compound); - } - - return list; - } } diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index db0bd623e..984bd717e 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -6,7 +6,6 @@ import io.netty.buffer.Unpooled; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -26,15 +25,24 @@ import noppes.npcs.constants.EnumScriptType; import noppes.npcs.containers.ContainerNPCBankInterface; import noppes.npcs.containers.ContainerNPCFollower; import noppes.npcs.containers.ContainerNPCFollowerHire; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.Bank; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.BankData; +import noppes.npcs.controllers.Dialog; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.DialogOption; +import noppes.npcs.controllers.Line; +import noppes.npcs.controllers.PlayerBankData; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.PlayerQuestData; +import noppes.npcs.controllers.PlayerTransportData; +import noppes.npcs.controllers.QuestData; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.DialogEvent; -import noppes.npcs.scripted.event.QuestEvent; -import noppes.npcs.scripted.interfaces.IItemStack; public class NoppesUtilPlayer { @@ -102,28 +110,6 @@ public class NoppesUtilPlayer { } player.worldObj.updateEntityWithOptionalForce(player, false); } - - public static void teleportPlayer(EntityPlayerMP player, double posX, double posY, double posZ, float yaw, float pitch, int dimension){ - if(player.dimension != dimension){ - int dim = player.dimension; - MinecraftServer server = MinecraftServer.getServer(); - WorldServer wor = server.worldServerForDimension(dimension); - if(wor == null){ - player.addChatMessage(new ChatComponentText("Broken transporter. Dimenion does not exist")); - return; - } - player.setLocationAndAngles(posX, posY, posZ, yaw, pitch); - server.getConfigurationManager().transferPlayerToDimension(player, dimension, new CustomTeleporter(wor)); - player.playerNetServerHandler.setPlayerLocation(posX, posY, posZ, yaw, pitch); - - if(!wor.playerEntities.contains(player)) - wor.spawnEntityInWorld(player); - } - else{ - player.playerNetServerHandler.setPlayerLocation(posX, posY, posZ, yaw, pitch); - } - player.worldObj.updateEntityWithOptionalForce(player, false); - } private static void followerBuy(RoleFollower role,IInventory currencyInv,EntityPlayerMP player, EntityNPCInterface npc){ ItemStack currency = currencyInv.getStackInSlot(0); @@ -251,19 +237,13 @@ public class NoppesUtilPlayer { Dialog dialog = DialogController.instance.dialogs.get(dialogId); if(dialog == null) return; - - EventHooks.onDialogOption(new DialogEvent.DialogOption(new ScriptPlayer((EntityPlayerMP) player), dialog)); - npc.script.callScript(EnumScriptType.DIALOG_CLOSE, "player", player, "dialog", dialogId, "option", optionId + 1); + npc.script.callScript(EnumScriptType.DIALOG_OPTION, "player", player, "dialog", dialogId, "option", optionId + 1); - if(!dialog.hasDialogs(player) && !dialog.hasOtherOptions()) { - EventHooks.onDialogClosed(new DialogEvent.DialogClosed(new ScriptPlayer((EntityPlayerMP) player), dialog)); + if(!dialog.hasDialogs(player) && !dialog.hasOtherOptions()) return; - } DialogOption option = dialog.options.get(optionId); - if(option == null || option.optionType == EnumOptionType.DialogOption && (!option.isAvailable(player) || !option.hasDialog()) || option.optionType == EnumOptionType.Disabled || option.optionType == EnumOptionType.QuitOption) { - EventHooks.onDialogClosed(new DialogEvent.DialogClosed(new ScriptPlayer((EntityPlayerMP) player), dialog)); - return; - } + if(option == null || option.optionType == EnumOptionType.DialogOption && (!option.isAvailable(player) || !option.hasDialog()) || option.optionType == EnumOptionType.Disabled || option.optionType == EnumOptionType.QuitOption) + return; if(option.optionType == EnumOptionType.RoleOption){ if(npc.roleInterface != null) npc.roleInterface.interact(player); @@ -289,61 +269,43 @@ public class NoppesUtilPlayer { Server.sendData(player, EnumPacketClient.GUI_DATA, data.writeNBT()); } public static void questCompletion(EntityPlayerMP player, int questId) { - PlayerData playerData = PlayerDataController.instance.getPlayerData(player); - PlayerQuestData questData = playerData.questData; - QuestData data = questData.activeQuests.get(questId); - + PlayerQuestData playerdata = PlayerDataController.instance.getPlayerData(player).questData; + QuestData data = playerdata.activeQuests.get(questId); if(data == null) return; - - if(!data.quest.questInterface.isCompleted(playerData)) + + if(!data.quest.questInterface.isCompleted(player)) return; - - QuestEvent.QuestTurnedInEvent event = new QuestEvent.QuestTurnedInEvent(new ScriptPlayer(player), data.quest); - event.expReward = data.quest.rewardExp; - - List list = new ArrayList(); - Iterator var8 = data.quest.rewardItems.items.values().iterator(); - - while(var8.hasNext()) { - ItemStack item = (ItemStack)var8.next(); - if (item.stackSize > 0) { - list.add(NpcAPI.Instance().getIItemStack(item)); - } - } - - if (!data.quest.randomReward) { - event.itemRewards = (IItemStack[])list.toArray(new IItemStack[list.size()]); - } else if (!list.isEmpty()) { - event.itemRewards = new IItemStack[]{(IItemStack)list.get(player.getRNG().nextInt(list.size()))}; - } - - EventHooks.onQuestTurnedIn(event); - IItemStack[] var12 = event.itemRewards; - int var14 = var12.length; - - for(int var10 = 0; var10 < var14; ++var10) { - IItemStack item = var12[var10]; - if (item != null) { - NoppesUtilServer.GivePlayerItem(player, player, item.getMCItemStack()); - } - } + data.quest.questInterface.handleComplete(player); if(data.quest.rewardExp > 0){ player.worldObj.playSoundAtEntity(player, "random.orb", 0.1F, 0.5F * ((player.worldObj.rand.nextFloat() - player.worldObj.rand.nextFloat()) * 0.7F + 1.8F)); - - player.addExperience(data.quest.rewardExp); + + player.addExperience(data.quest.rewardExp); } data.quest.factionOptions.addPoints(player); if(data.quest.mail.isValid()){ PlayerDataController.instance.addPlayerMessage(player.getCommandSenderName(), data.quest.mail); } - + if(!data.quest.randomReward){ + for(ItemStack item : data.quest.rewardItems.items.values()){ + NoppesUtilServer.GivePlayerItem(player, player, item); + } + } + else{ + List list = new ArrayList(); + for(ItemStack item : data.quest.rewardItems.items.values()){ + if(item != null && item.getItem() != null) + list.add(item); + } + if(!list.isEmpty()){ + NoppesUtilServer.GivePlayerItem(player, player, list.get(player.getRNG().nextInt(list.size()))); + } + } if(!data.quest.command.isEmpty()){ NoppesUtilServer.runCommand(player, "QuestCompletion", data.quest.command); } - PlayerQuestController.setQuestFinished(data.quest, player); if(data.quest.hasNewQuest()) PlayerQuestController.addActiveQuest(data.quest.getNextQuest(), player); } @@ -413,34 +375,5 @@ public class NoppesUtilPlayer { } } } - public static void isGUIOpen(EntityPlayerMP player){ - Server.sendData(player, EnumPacketClient.ISGUIOPEN); - } - public static List countStacks(IInventory inv, boolean ignoreDamage, boolean ignoreNBT) { - List list = new ArrayList(); - - for(int i = 0; i < inv.getSizeInventory(); ++i) { - ItemStack item = inv.getStackInSlot(i); - if (!NoppesUtilServer.IsItemStackNull(item)) { - boolean found = false; - Iterator var7 = list.iterator(); - - while(var7.hasNext()) { - ItemStack is = (ItemStack)var7.next(); - if (compareItems(item, is, ignoreDamage, ignoreNBT)) { - is.stackSize = is.stackSize + item.stackSize; - found = true; - break; - } - } - - if (!found) { - list.add(item.copy()); - } - } - } - - return list; - } } diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 6feca3dd1..dc5531e85 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -14,7 +14,6 @@ import java.util.Map; import java.util.UUID; import java.util.zip.GZIPOutputStream; -import net.minecraft.command.ICommandSender; import net.minecraft.command.server.CommandBlockLogic; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -22,8 +21,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -34,8 +31,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityCommandBlock; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPacketClient; @@ -72,9 +69,7 @@ import noppes.npcs.controllers.TransportLocation; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTransporter; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.DialogEvent; -import noppes.npcs.scripted.event.ScriptEventDialog; +import noppes.npcs.scripted.ScriptEventDialog; public class NoppesUtilServer { private static HashMap editingQuests = new HashMap(); @@ -182,9 +177,6 @@ public class NoppesUtilServer { public static void openDialog(EntityPlayer player, EntityNPCInterface npc, Dialog dia){ Dialog dialog = dia.copy(player); - - EventHooks.onDialogOpen(new DialogEvent.DialogOpen(new ScriptPlayer((EntityPlayerMP) player), dialog)); - if(npc instanceof EntityDialogNpc){ dialog.hideNPC = true; Server.sendData((EntityPlayerMP)player, EnumPacketClient.DIALOG_DUMMY, npc.getCommandSenderName(), dialog.writeToNBT(new NBTTagCompound())); @@ -224,19 +216,6 @@ public class NoppesUtilServer { logic.func_145754_b("@"+name); logic.func_145755_a(executer.worldObj); } - - public static void runCommand(World world, String name, String command) { - TileEntityCommandBlock tile = new TileEntityCommandBlock(); - tile.setWorldObj(world.provider.worldObj); - tile.xCoord = 0; - tile.yCoord = 0; - tile.zCoord = 0; - - CommandBlockLogic logic = tile.func_145993_a(); - logic.func_145752_a(command); - logic.func_145754_b("@"+name); - logic.func_145755_a(world); - } public static void consumeItemStack(int i, EntityPlayer player){ ItemStack item = player.inventory.getCurrentItem(); @@ -312,22 +291,6 @@ public class NoppesUtilServer { Server.sendAssociatedData(entity, EnumPacketClient.PARTICLE, entity.posX, entity.posY, entity.posZ, entity.height, entity.width, entity.yOffset, particle); } - public static void spawnScriptedParticle(Entity entity, String directory, int HEXcolor, int amount, int maxAge, - double x, double y, double z, - double motionX, double motionY, double motionZ, float gravity, - float scale1, float scale2, float scaleRate, int scaleRateStart, - float alpha1, float alpha2, float alphaRate, int alphaRateStart, - int entityID - ){ - Server.sendToAll(EnumPacketClient.SCRIPTED_PARTICLE, - directory, HEXcolor, amount, maxAge, - x, y, z, - motionX, motionY, motionZ, gravity, - scale1, scale2, scaleRate, scaleRateStart, - alpha1, alpha2, alphaRate, alphaRateStart, - entityID - ); - } public static void deleteNpc(EntityNPCInterface npc,EntityPlayer player) { Server.sendAssociatedData(npc, EnumPacketClient.DELETE_NPC, npc.getEntityId()); @@ -361,8 +324,7 @@ public class NoppesUtilServer { Map map = new HashMap(); if(type == EnumPlayerData.Players){ - File loc = PlayerDataController.instance.getSaveDir(); - for(String username : PlayerDataController.instance.getUsernameData().keySet()){ + for(String username : PlayerDataController.instance.nameUUIDs.keySet()){ map.put(username, 0); } } @@ -695,29 +657,4 @@ public class NoppesUtilServer { } return null; } - - public static Entity GetDamageSourcee(DamageSource damagesource) { - Object entity = damagesource.getEntity(); - if(entity == null) { - entity = damagesource.getSourceOfDamage(); - } - - if(entity instanceof EntityArrow && ((EntityArrow)entity).shootingEntity instanceof EntityLivingBase) { - entity = ((EntityArrow)entity).shootingEntity; - } else if(entity instanceof EntityThrowable) { - entity = ((EntityThrowable)entity).getThrower(); - } - - return (Entity)entity; - } - - public static void isGUIOpen(ByteBuf buffer, EntityPlayer player) throws IOException { - PlayerData playerdata = PlayerDataController.instance.getPlayerData(player); - boolean isGUIOpen = buffer.readBoolean(); - playerdata.setGUIOpen(isGUIOpen); - } - - public static boolean IsItemStackNull(ItemStack is) { - return is == null || is.stackSize == 0 || is.getItem() == null; - } } diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index 963a9f94c..63053e684 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -3,8 +3,6 @@ package noppes.npcs; import io.netty.buffer.ByteBuf; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import net.minecraft.entity.player.EntityPlayerMP; @@ -18,9 +16,19 @@ import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.tileentity.TileEntity; import noppes.npcs.blocks.tiles.TileBigSign; import noppes.npcs.blocks.tiles.TileBook; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumCompanionTalent; +import noppes.npcs.constants.EnumGuiType; +import noppes.npcs.constants.EnumPacketClient; +import noppes.npcs.constants.EnumPlayerPacket; +import noppes.npcs.constants.EnumRoleType; import noppes.npcs.containers.ContainerMail; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.BankData; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerFactionData; +import noppes.npcs.controllers.PlayerMail; +import noppes.npcs.controllers.PlayerMailData; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.PlayerQuestData; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -59,55 +67,17 @@ public class PacketHandlerPlayer{ return; NoppesUtilServer.sendOpenGui(player, EnumGuiType.CompanionInv, npc); } - else if(type == EnumPlayerPacket.KeyPressed) { - if(ScriptController.Instance.languages.isEmpty()) { - return; - } - - int button = buffer.readInt(); - boolean isCtrlPressed = buffer.readBoolean(); - boolean isShiftPressed = buffer.readBoolean(); - boolean isAltPressed = buffer.readBoolean(); - boolean isMetaPressed = buffer.readBoolean(); - boolean buttonDown = buffer.readBoolean(); - - String ints = Server.readString(buffer); - String[] split = ints.split(","); - int[] keysDown; - - if(ints.length() > 0) { - keysDown = new int[split.length]; - try { - for (int i = 0; i < split.length; i++) { - keysDown[i] = Integer.parseInt(split[i]); - } - } - catch (NumberFormatException ignored){ - } - } else { - keysDown = new int[0]; - } - - EventHooks.onPlayerKeyPressed(player, button, isCtrlPressed, isShiftPressed, isAltPressed, isMetaPressed, buttonDown, keysDown); - } - else if(type == EnumPlayerPacket.MouseClicked) { - if(ScriptController.Instance.languages.isEmpty()) { - return; - } - - EventHooks.onPlayerMouseClicked(player, buffer.readInt(), buffer.readInt(), buffer.readBoolean()); - } else if(type == EnumPlayerPacket.FollowerHire){ EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player); if(npc == null || npc.advanced.role != EnumRoleType.Follower) return; - NoppesUtilPlayer.hireFollower(player, npc); + NoppesUtilPlayer.hireFollower(player,npc); } else if(type == EnumPlayerPacket.FollowerExtend){ EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player); if(npc == null || npc.advanced.role != EnumRoleType.Follower) return; - NoppesUtilPlayer.extendFollower(player, npc); + NoppesUtilPlayer.extendFollower(player,npc); Server.sendData(player, EnumPacketClient.GUI_DATA, npc.roleInterface.writeToNBT(new NBTTagCompound())); } else if(type == EnumPlayerPacket.FollowerState){ @@ -154,18 +124,17 @@ public class PacketHandlerPlayer{ EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player); if(npc == null) return; - NoppesUtilPlayer.dialogSelected(buffer.readInt(), buffer.readInt(), player, npc); + NoppesUtilPlayer.dialogSelected(buffer.readInt(),buffer.readInt(),player,npc); } else if(type == EnumPlayerPacket.CheckQuestCompletion){ - PlayerData playerData = PlayerDataController.instance.getPlayerData(player); - PlayerQuestData questData = PlayerDataController.instance.getPlayerData(player).questData; - questData.checkQuestCompletion(playerData, null); + PlayerQuestData playerdata = PlayerDataController.instance.getPlayerData(player).questData; + playerdata.checkQuestCompletion(player,null); } else if(type == EnumPlayerPacket.QuestLog){ NoppesUtilPlayer.sendQuestLogData(player); } else if(type == EnumPlayerPacket.QuestCompletion){ - NoppesUtilPlayer.questCompletion(player, buffer.readInt()); + NoppesUtilPlayer.questCompletion(player,buffer.readInt()); } else if(type == EnumPlayerPacket.FactionsGet){ PlayerFactionData data = PlayerDataController.instance.getPlayerData(player).factionData; diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index d121009e9..490c567a7 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -9,6 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Set; +import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.passive.EntityVillager; @@ -36,12 +37,31 @@ import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.containers.ContainerMail; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.Bank; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.Dialog; +import noppes.npcs.controllers.DialogCategory; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.DialogOption; +import noppes.npcs.controllers.Faction; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.LinkedNpcController.LinkedData; -import noppes.npcs.controllers.data.ForgeDataScript; -import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerMail; +import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.QuestCategory; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeCarpentry; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.SpawnController; +import noppes.npcs.controllers.SpawnData; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.TransportLocation; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobSpawner; @@ -50,9 +70,6 @@ import noppes.npcs.roles.RoleTrader; import noppes.npcs.roles.RoleTransporter; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.gui.ScriptGui; public class PacketHandlerServer{ @@ -71,70 +88,33 @@ public class PacketHandlerServer{ ItemStack item = player.inventory.getCurrentItem(); EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player); - - if(type == EnumPacketServer.IsGuiOpen) { - isGuiOpenPacket(buffer, player); - return; - } else if (type == EnumPacketServer.CustomGuiButton && player.openContainer instanceof ContainerCustomGui) { - ((ContainerCustomGui)player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); - EventHooks.onCustomGuiButton((ScriptPlayer)NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui)player.openContainer).customGui, buffer.readInt()); - return; - } else if (type == EnumPacketServer.CustomGuiSlotChange && player.openContainer instanceof ContainerCustomGui) { - ((ContainerCustomGui)player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); - EventHooks.onCustomGuiSlot((ScriptPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui)player.openContainer).customGui, buffer.readInt()); - return; - } else if(type == EnumPacketServer.CustomGuiUnfocused && player.openContainer instanceof ContainerCustomGui) { - ((ContainerCustomGui)player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); - EventHooks.onCustomGuiUnfocused((ScriptPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt()); - return; - } else if (type == EnumPacketServer.CustomGuiScrollClick && player.openContainer instanceof ContainerCustomGui) { - ((ContainerCustomGui) player.openContainer).customGui.fromNBT(Server.readNBT(buffer)); - EventHooks.onCustomGuiScrollClick((ScriptPlayer) NpcAPI.Instance().getIEntity(player), ((ContainerCustomGui) player.openContainer).customGui, buffer.readInt(), buffer.readInt(), CustomGuiController.readScrollSelection(buffer), buffer.readBoolean()); - return; - } else if (type == EnumPacketServer.CustomGuiClose) { - EventHooks.onCustomGuiClose((ScriptPlayer)NpcAPI.Instance().getIEntity(player), (new ScriptGui()).fromNBT(Server.readNBT(buffer))); - return; - } - if(type.needsNpc && npc == null){ } else if(type.hasPermission() && !CustomNpcsPermissions.Instance.hasPermission(player, type.permission)){ - //player doesnt have permission to do this + //player doesnt have permission todo this } - else if(item == null && (type == EnumPacketServer.ScriptPlayerGet || type == EnumPacketServer.ScriptPlayerSave || type == EnumPacketServer.ScriptForgeGet || type == EnumPacketServer.ScriptForgeSave)) + else if(item == null ) warn(player, "tried to use custom npcs without a tool in hand, probably a hacker"); - else { - if (item != null) { - if (item.getItem() == CustomItems.wand) - wandPackets(type, buffer, player, npc); - else if (item.getItem() == CustomItems.moving) - movingPackets(type, buffer, player, npc); - else if (item.getItem() == CustomItems.mount) - mountPackets(type, buffer, player); - else if (item.getItem() == CustomItems.cloner) - clonePackets(type, buffer, player); - else if (item.getItem() == CustomItems.teleporter) - featherPackets(type, buffer, player); - else if (type == EnumPacketServer.ScriptPlayerGet || type == EnumPacketServer.ScriptPlayerSave) - playerScriptPackets(type, buffer, player); - else if (type == EnumPacketServer.ScriptForgeGet || type == EnumPacketServer.ScriptForgeSave) - forgeScriptPackets(type, buffer, player); - else if (item.getItem() == CustomItems.scripter) - scriptPackets(type, buffer, player, npc); - else if (item.getItem() == Item.getItemFromBlock(CustomItems.waypoint) || item.getItem() == Item.getItemFromBlock(CustomItems.border) || item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock)) - blockPackets(type, buffer, player); - } - } + else if(item.getItem() == CustomItems.wand) + wandPackets(type, buffer, player, npc); + else if(item.getItem() == CustomItems.moving) + movingPackets(type, buffer, player, npc); + else if(item.getItem() == CustomItems.mount) + mountPackets(type, buffer, player); + else if(item.getItem() == CustomItems.cloner) + clonePackets(type, buffer, player); + else if(item.getItem() == CustomItems.teleporter) + featherPackets(type, buffer, player); + else if(item.getItem() == CustomItems.scripter) + scriptPackets(type, buffer, player, npc); + else if(item.getItem() == Item.getItemFromBlock(CustomItems.waypoint) || item.getItem() == Item.getItemFromBlock(CustomItems.border) || item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock)) + blockPackets(type, buffer, player); } catch (Exception e) { LogWriter.error("Error with EnumPacketServer." + type, e); } } - - private void isGuiOpenPacket(ByteBuf buffer, EntityPlayerMP player) throws IOException { - NoppesUtilServer.isGUIOpen(buffer, player); - } - + private void scriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player, EntityNPCInterface npc) throws Exception { if(type == EnumPacketServer.ScriptDataSave){ npc.script.readFromNBT(Server.readNBT(buffer)); @@ -148,30 +128,6 @@ public class PacketHandlerServer{ } } - private void playerScriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws Exception { - NBTTagCompound compound; - if(type == EnumPacketServer.ScriptPlayerGet) { - PlayerDataScript data = ScriptController.Instance.playerScripts; - compound = data.writeToNBT(new NBTTagCompound()); - compound.setTag("Languages", ScriptController.Instance.nbtLanguages()); - Server.sendData(player, EnumPacketClient.GUI_DATA, compound); - } else if(type == EnumPacketServer.ScriptPlayerSave) { - ScriptController.Instance.setPlayerScripts(Server.readNBT(buffer)); - } - } - - private void forgeScriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws Exception { - NBTTagCompound compound; - if (type == EnumPacketServer.ScriptForgeGet) { - ForgeDataScript data = ScriptController.Instance.forgeScripts; - compound = data.writeToNBT(new NBTTagCompound()); - compound.setTag("Languages", ScriptController.Instance.nbtLanguages()); - Server.sendData(player, EnumPacketClient.GUI_DATA, new Object[]{compound}); - } else if (type == EnumPacketServer.ScriptForgeSave) { - ScriptController.Instance.setForgeScripts(Server.readNBT(buffer)); - } - } - private void featherPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException { if(type == EnumPacketServer.DimensionsGet){ HashMap map = new HashMap(); @@ -269,7 +225,7 @@ public class PacketHandlerServer{ } else if(type == EnumPacketServer.FactionGet){ NBTTagCompound compound = new NBTTagCompound(); - Faction faction = FactionController.getInstance().get(buffer.readInt()); + Faction faction = FactionController.getInstance().getFaction(buffer.readInt()); faction.writeNBT(compound); Server.sendData(player, EnumPacketClient.GUI_DATA, compound); } @@ -385,7 +341,7 @@ public class PacketHandlerServer{ NoppesUtilServer.setRecipeGui(player,recipe); } else if(type == EnumPacketServer.RecipeRemove){ - RecipeCarpentry recipe = RecipeController.instance.delete(buffer.readInt()); + RecipeCarpentry recipe = RecipeController.instance.removeRecipe(buffer.readInt()); NoppesUtilServer.sendRecipeData(player, recipe.isGlobal?3:4); NoppesUtilServer.setRecipeGui(player,new RecipeCarpentry("")); } @@ -567,7 +523,7 @@ public class PacketHandlerServer{ Server.sendData(player, EnumPacketClient.GUI_DATA, compound); } else if(type == EnumPacketServer.FactionRemove){ - FactionController.getInstance().delete(buffer.readInt()); + FactionController.getInstance().removeFaction(buffer.readInt()); NoppesUtilServer.sendFactionDataAll(player); NBTTagCompound compound = new NBTTagCompound(); (new Faction()).writeNBT(compound); diff --git a/src/main/java/noppes/npcs/QuestLogData.java b/src/main/java/noppes/npcs/QuestLogData.java index a0c83726e..19d59f88f 100644 --- a/src/main/java/noppes/npcs/QuestLogData.java +++ b/src/main/java/noppes/npcs/QuestLogData.java @@ -6,8 +6,6 @@ import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.constants.EnumQuestCompletion; -import noppes.npcs.controllers.PlayerData; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestController; import noppes.npcs.controllers.Quest; @@ -36,7 +34,7 @@ public class QuestLogData { } public void setData(EntityPlayer player){ - PlayerData playerData = PlayerDataController.instance.getPlayerData(player); + for(Quest quest : PlayerQuestController.getActiveQuests(player)) { String category = quest.category.title; @@ -48,7 +46,7 @@ public class QuestLogData { questText.put(category + ":" + quest.title, quest.logText); questStatus.put(category + ":" + quest.title, quest.questInterface.getQuestLogStatus(player)); - if(quest.completion == EnumQuestCompletion.Npc && quest.questInterface.isCompleted(playerData)) + if(quest.completion == EnumQuestCompletion.Npc && quest.questInterface.isCompleted(player)) finish.put(category + ":" + quest.title, quest.completerNpc); } } diff --git a/src/main/java/noppes/npcs/Resistances.java b/src/main/java/noppes/npcs/Resistances.java index 7598e0f4e..ff0cde972 100644 --- a/src/main/java/noppes/npcs/Resistances.java +++ b/src/main/java/noppes/npcs/Resistances.java @@ -9,8 +9,6 @@ public class Resistances { public float arrow = 1f; public float playermelee = 1f; public float explosion = 1f; - - public boolean disableDamage = false; public NBTTagCompound writeToNBT() { NBTTagCompound compound = new NBTTagCompound(); @@ -18,7 +16,6 @@ public class Resistances { compound.setFloat("Arrow", arrow); compound.setFloat("Melee", playermelee); compound.setFloat("Explosion", explosion); - compound.setBoolean("disableDamage", disableDamage); return compound; } @@ -27,14 +24,9 @@ public class Resistances { arrow = compound.getFloat("Arrow"); playermelee = compound.getFloat("Melee"); explosion = compound.getFloat("Explosion"); - disableDamage = compound.getBoolean("disableDamage"); } public float applyResistance(DamageSource source, float damage) { - if(disableDamage){ - return 0; - } - if(source.damageType.equals("arrow") || source.damageType.equals("thrown")){ damage *= (2 - arrow); } diff --git a/src/main/java/noppes/npcs/ScriptForgeEventHandler.java b/src/main/java/noppes/npcs/ScriptForgeEventHandler.java deleted file mode 100644 index 66959942d..000000000 --- a/src/main/java/noppes/npcs/ScriptForgeEventHandler.java +++ /dev/null @@ -1,126 +0,0 @@ -package noppes.npcs; - -import com.google.common.reflect.ClassPath; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent; -import cpw.mods.fml.relauncher.Side; -import net.minecraft.world.WorldServer; -import net.minecraftforge.event.entity.EntityEvent; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.event.world.ChunkDataEvent; -import net.minecraftforge.event.world.ChunkEvent; -import net.minecraftforge.event.world.ChunkWatchEvent; -import net.minecraftforge.event.world.WorldEvent; -import noppes.npcs.controllers.PixelmonHelper; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.event.ForgeEvent; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.Vector; - -public class ScriptForgeEventHandler { - public ScriptForgeEventHandler() { - } - - @SubscribeEvent - public void forgeEntity(Event event) { - if(CustomNpcs.getServer() != null && ScriptController.Instance.forgeScripts.isEnabled()) { - if(event instanceof TickEvent && !(((TickEvent)event).side == Side.SERVER && ((TickEvent)event).phase == TickEvent.Phase.START)) { - return; - } - - if(event instanceof EntityEvent) { - EntityEvent ev2 = (EntityEvent)event; - if(ev2.entity != null && ev2.entity.worldObj instanceof WorldServer) { - EventHooks.onForgeEntityEvent(ev2); - } - } else if(event instanceof WorldEvent) { - WorldEvent ev1 = (WorldEvent)event; - if(ev1.world instanceof WorldServer) { - EventHooks.onForgeWorldEvent(ev1); - } - } else if(!(event instanceof TickEvent) || ((TickEvent)event).side != Side.CLIENT) { - if (event instanceof PlayerEvent) { - PlayerEvent ev = (PlayerEvent) event; - if (ev.player == null || !(ev.player.worldObj instanceof WorldServer)) { - return; - } - } - - EventHooks.onForgeEvent(new ForgeEvent(event), event); - } - } - } - - public ScriptForgeEventHandler registerForgeEvents() { - try { - Method e = this.getClass().getMethod("forgeEntity", new Class[]{Event.class}); - Method register = FMLCommonHandler.instance().bus().getClass().getDeclaredMethod("register", new Class[]{Class.class, Object.class, Method.class, ModContainer.class}); - register.setAccessible(true); - ArrayList list = new ArrayList(); - list.addAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("cpw.mods.fml.common.gameevent")); - list.addAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("net.minecraftforge.event")); - list.removeAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("net.minecraftforge.event.terraingen")); - Iterator e1 = list.iterator(); - - while(true) { - ClassPath.ClassInfo classLoader; - String classes; - do { - if(!e1.hasNext()) { - if(PixelmonHelper.Enabled) { - try { - Field e2 = ClassLoader.class.getDeclaredField("classes"); - e2.setAccessible(true); - ClassLoader classLoader1 = Thread.currentThread().getContextClassLoader(); - ArrayList classes1 = new ArrayList((Vector)e2.get(classLoader1)); - Iterator infoClass1 = classes1.iterator(); - - while(infoClass1.hasNext()) { - Class c2 = (Class)infoClass1.next(); - } - } catch (Exception var12) { - var12.printStackTrace(); - } - - return this; - } - - return this; - } - - classLoader = (ClassPath.ClassInfo)e1.next(); - classes = classLoader.getName(); - } while(classes.startsWith("net.minecraftforge.event.terraingen")); - - Class infoClass = classLoader.load(); - ArrayList c = new ArrayList(Arrays.asList(infoClass.getDeclaredClasses())); - if(c.isEmpty()) { - c.add(infoClass); - } - - Iterator var10 = c.iterator(); - while(var10.hasNext()) { - Class c1 = (Class)var10.next(); - if(!EntityEvent.EntityConstructing.class.isAssignableFrom(c1) && !WorldEvent.PotentialSpawns.class.isAssignableFrom(c1) && !TickEvent.RenderTickEvent.class.isAssignableFrom(c1) && !TickEvent.ClientTickEvent.class.isAssignableFrom(c1) && !FMLNetworkEvent.ClientCustomPacketEvent.class.isAssignableFrom(c1) && !ItemTooltipEvent.class.isAssignableFrom(c1) && Event.class.isAssignableFrom(c1) && !Modifier.isAbstract(c1.getModifiers()) && Modifier.isPublic(c1.getModifiers()) && !ChunkEvent.class.isAssignableFrom(c1) && !ChunkWatchEvent.class.isAssignableFrom(c1) && !ChunkDataEvent.class.isAssignableFrom(c1)) { - register.invoke(FMLCommonHandler.instance().bus(), new Object[]{c1, this, e, Loader.instance().activeModContainer()}); - } - } - } - } catch (Exception var13) { - var13.printStackTrace(); - return this; - } - } -} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java deleted file mode 100644 index 18307e3fd..000000000 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ /dev/null @@ -1,488 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs; - -import com.google.common.reflect.ClassPath; -import com.google.common.reflect.ClassPath.ClassInfo; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.Vector; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent; -import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ContainerPlayer; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.EntityEvent; -import net.minecraftforge.event.entity.EntityEvent.EntityConstructing; -import net.minecraftforge.event.entity.EntityStruckByLightningEvent; -import net.minecraftforge.event.entity.PlaySoundAtEntityEvent; -import net.minecraftforge.event.entity.item.ItemTossEvent; -import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.living.LivingFallEvent; -import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.event.entity.player.*; -import net.minecraftforge.event.world.*; -import net.minecraftforge.event.world.WorldEvent.PotentialSpawns; -import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.PlayerDataScript; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.ForgeEvent; -import org.lwjgl.input.Mouse; - -public class ScriptPlayerEventHandler { - public ScriptPlayerEventHandler() { - } - @SubscribeEvent - public void onServerTick(TickEvent.PlayerTickEvent event) { - if(event.player == null || event.player.worldObj == null) - return; - - if(event.side == Side.SERVER && event.phase == TickEvent.Phase.START) { - EntityPlayer player = event.player; - - if(player.ticksExisted%10 == 0) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(player); - EventHooks.onPlayerTick(handler, scriptPlayer); - } - - PlayerData playerData = PlayerDataController.instance.getPlayerData(player); - if(PlayerDataController.instance != null) { - if(playerData.timers.size() > 0) - playerData.timers.update(); - } - - if(player.ticksExisted%(20*CustomNpcs.PlayerQuestCheck) == 0){ - PlayerQuestData questData = playerData.questData; - for(EnumQuestType e : EnumQuestType.values()) - questData.checkQuestCompletion(playerData, e); - } - } - } - - @SubscribeEvent - public void invoke(EntityInteractEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(!event.entityPlayer.worldObj.isRemote && event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - noppes.npcs.scripted.event.PlayerEvent.InteractEvent ev = new noppes.npcs.scripted.event.PlayerEvent.InteractEvent(scriptPlayer, 1, NpcAPI.Instance().getIEntity(event.target)); - event.setCanceled(EventHooks.onPlayerInteract(handler, ev)); - } - } - - @SubscribeEvent - public void invoke(ArrowNockEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(!event.entityPlayer.worldObj.isRemote && event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - noppes.npcs.scripted.event.PlayerEvent.RangedChargeEvent ev = new noppes.npcs.scripted.event.PlayerEvent.RangedChargeEvent(scriptPlayer); - EventHooks.onPlayerBowCharge(handler, ev); - } - } - - @SubscribeEvent - public void invoke(ArrowLooseEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(!event.entityPlayer.worldObj.isRemote && event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - noppes.npcs.scripted.event.PlayerEvent.RangedLaunchedEvent ev = new noppes.npcs.scripted.event.PlayerEvent.RangedLaunchedEvent(scriptPlayer, event.bow, event.charge); - EventHooks.onPlayerRanged(handler, ev); - } - } - - @SubscribeEvent - public void invoke(BlockEvent.BreakEvent event) { - if(event.getPlayer() == null || event.getPlayer().worldObj == null) - return; - - if(!event.getPlayer().worldObj.isRemote && event.world instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.getPlayer()); - noppes.npcs.scripted.event.PlayerEvent.BreakEvent ev = new noppes.npcs.scripted.event.PlayerEvent.BreakEvent(scriptPlayer, NpcAPI.Instance().getIBlock(event.world, new BlockPos(event.x,event.y,event.z)), event.getExpToDrop()); - event.setCanceled(EventHooks.onPlayerBreak(handler, ev)); - event.setExpToDrop(ev.exp); - } - } - - @SubscribeEvent - public void invoke(PlayerUseItemEvent.Start event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - event.setCanceled(EventHooks.onStartUsingItem(handler, scriptPlayer, event.duration, event.item)); - } - } - @SubscribeEvent - public void invoke(PlayerUseItemEvent.Tick event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - event.setCanceled(EventHooks.onUsingItem(handler, scriptPlayer, event.duration, event.item)); - } - } - @SubscribeEvent - public void invoke(PlayerUseItemEvent.Stop event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - event.setCanceled(EventHooks.onStopUsingItem(handler, scriptPlayer, event.duration, event.item)); - } - } - @SubscribeEvent - public void invoke(PlayerUseItemEvent.Finish event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - EventHooks.onFinishUsingItem(handler, scriptPlayer, event.duration, event.item); - } - } - - @SubscribeEvent - public void invoke(PlayerDropsEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - event.setCanceled(EventHooks.onPlayerDropItems(handler, scriptPlayer, event.drops)); - } - } - - @SubscribeEvent - public void invoke(PlayerPickupXpEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - EventHooks.onPlayerPickupXP(handler, scriptPlayer, event.orb); - } - } - - @SubscribeEvent - public void invoke(PlayerEvent.PlayerChangedDimensionEvent event) { - if(event.player == null || event.player.worldObj == null) - return; - - if(event.player.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.player); - EventHooks.onPlayerChangeDim(handler, scriptPlayer, event.fromDim, event.toDim); - } - } - - @SubscribeEvent - public void invoke(PlayerEvent.ItemPickupEvent event) { - if(event.player == null || event.player.worldObj == null) - return; - - if(event.player.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.player); - EventHooks.onPlayerPickUp(handler, scriptPlayer, event.pickedUp); - } - } - - @SubscribeEvent - public void invoke(PlayerOpenContainerEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer && !(event.entityPlayer.openContainer instanceof ContainerPlayer)) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - EventHooks.onPlayerContainerOpen(handler, scriptPlayer, event.entityPlayer.openContainer); - } - } - - @SubscribeEvent - public void invoke(UseHoeEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - EventHooks.onPlayerUseHoe(handler, scriptPlayer, event.current, event.x, event.y, event.z); - } - } - - @SubscribeEvent - public void invoke(PlayerSleepInBedEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - EventHooks.onPlayerSleep(handler, scriptPlayer, event.x, event.y, event.z); - } - } - - @SubscribeEvent - public void invoke(PlayerWakeUpEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - EventHooks.onPlayerWakeUp(handler, scriptPlayer, event.setSpawn); - } - } - - @SubscribeEvent - public void invoke(FillBucketEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - EventHooks.onPlayerFillBucket(handler, scriptPlayer, event.current, event.result); - } - } - - @SubscribeEvent - public void invoke(BonemealEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - EventHooks.onPlayerBonemeal(handler, scriptPlayer, event.x, event.y, event.z, event.world); - } - } - - @SubscribeEvent - public void invoke(AchievementEvent event) { - if(event.entityPlayer == null || event.entityPlayer.worldObj == null) - return; - - if(event.entityPlayer.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityPlayer); - EventHooks.onPlayerAchievement(handler, scriptPlayer, CustomNpcs.proxy.getAchievementDesc(event.achievement)); - } - } - - @SubscribeEvent - public void invoke(ItemTossEvent event) { - if(event.player == null || event.player.worldObj == null) - return; - - if(event.player.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.player); - EventHooks.onPlayerToss(handler, scriptPlayer, event.entityItem); - } - } - - @SubscribeEvent - public void invoke(LivingFallEvent event) { - if(event.entityLiving == null || event.entityLiving.worldObj == null) - return; - - if(event.entityLiving.worldObj instanceof WorldServer) { - if (event.entityLiving instanceof EntityPlayer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityLiving); - EventHooks.onPlayerFall(handler, scriptPlayer, event.distance); - } - } - } - - @SubscribeEvent - public void invoke(LivingEvent.LivingJumpEvent event) { - if(event.entityLiving == null || event.entityLiving.worldObj == null) - return; - - if(event.entityLiving.worldObj instanceof WorldServer) { - if (event.entityLiving instanceof EntityPlayer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityLiving); - EventHooks.onPlayerJump(handler, scriptPlayer); - } - } - } - - @SubscribeEvent - public void invoke(EntityStruckByLightningEvent event) { - if(event.entity == null || event.entity.worldObj == null) - return; - - if(event.entity.worldObj instanceof WorldServer) { - if (event.entity instanceof EntityPlayer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entity); - EventHooks.onPlayerLightning(handler, scriptPlayer); - } - } - } - - @SubscribeEvent - public void invoke(PlaySoundAtEntityEvent event) { - if(event.entity == null || event.entity.worldObj == null) - return; - - if(event.entity.worldObj instanceof WorldServer) { - if (event.entity instanceof EntityPlayer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entity); - EventHooks.onPlayerSound(handler,scriptPlayer,event.name,event.pitch,event.volume); - } - } - } - - @SubscribeEvent - public void invoke(LivingDeathEvent event) { - if(event.entityLiving == null || event.entityLiving.worldObj == null) - return; - - if(event.entityLiving.worldObj instanceof WorldServer) { - Entity source = NoppesUtilServer.GetDamageSourcee(event.source); - PlayerDataScript handler = ScriptController.Instance.playerScripts; - if(event.entityLiving instanceof EntityPlayer) { - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.entityLiving); - EventHooks.onPlayerDeath(handler,scriptPlayer, event.source, source); - } - - if(source instanceof EntityPlayer) { - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.source.getEntity()); - EventHooks.onPlayerKills(handler,scriptPlayer, event.entityLiving); - } - - } - } - - @SubscribeEvent - public void invoke(LivingHurtEvent event) { - if(event.entityLiving == null || event.entityLiving.worldObj == null) - return; - - if(event.entityLiving.worldObj instanceof WorldServer) { - Entity source = NoppesUtilServer.GetDamageSourcee(event.source); - PlayerDataScript handler = ScriptController.Instance.playerScripts; - if(event.entityLiving instanceof EntityPlayer) { - noppes.npcs.scripted.event.PlayerEvent.DamagedEvent pevent = new noppes.npcs.scripted.event.PlayerEvent.DamagedEvent((ScriptPlayer)ScriptController.Instance.getScriptForEntity((EntityPlayer)event.entityLiving), source, event.ammount, event.source); - event.setCanceled(EventHooks.onPlayerDamaged(handler, pevent)); - event.ammount = pevent.damage; - } - - if(source instanceof EntityPlayer) { - noppes.npcs.scripted.event.PlayerEvent.DamagedEntityEvent pevent1 = new noppes.npcs.scripted.event.PlayerEvent.DamagedEntityEvent((ScriptPlayer)ScriptController.Instance.getScriptForEntity((EntityPlayer)event.source.getEntity()), event.entityLiving, event.ammount, event.source); - event.setCanceled(EventHooks.onPlayerDamagedEntity(handler, pevent1)); - event.ammount = pevent1.damage; - } - - } - } - - @SubscribeEvent - public void invoke(PlayerEvent.PlayerRespawnEvent event) { - if(event.player == null || event.player.worldObj == null) - return; - - if(event.player.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.player); - EventHooks.onPlayerRespawn(handler, scriptPlayer); - } - } - - @SubscribeEvent - public void invoke(PlayerEvent.PlayerLoggedInEvent event) { - if(event.player == null || event.player.worldObj == null) - return; - - if(event.player.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.player); - EventHooks.onPlayerLogin(handler, scriptPlayer); - } - } - - @SubscribeEvent - public void invoke(PlayerEvent.PlayerLoggedOutEvent event) { - if(event.player == null || event.player.worldObj == null) - return; - - if(event.player.worldObj instanceof WorldServer) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.player); - EventHooks.onPlayerLogout(handler, scriptPlayer); - } - } - - @SubscribeEvent( - priority = EventPriority.HIGHEST - ) - public void invoke(net.minecraftforge.event.ServerChatEvent event) { - if(event.player == null || event.player.worldObj == null) - return; - - if(event.player.worldObj instanceof WorldServer && !event.player.equals(EntityNPCInterface.chateventPlayer)) { - PlayerDataScript handler = ScriptController.Instance.playerScripts; - ScriptPlayer scriptPlayer = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(event.player); - String message = event.message; - noppes.npcs.scripted.event.PlayerEvent.ChatEvent ev = new noppes.npcs.scripted.event.PlayerEvent.ChatEvent(scriptPlayer, event.message); - EventHooks.onPlayerChat(handler, ev); - event.setCanceled(ev.isCanceled()); - if(!message.equals(ev.message)) { - ChatComponentTranslation chat = new ChatComponentTranslation("", new Object[0]); - chat.appendSibling(ForgeHooks.newChatWithLinks(ev.message)); - event.component = chat; - } - } - } -} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 09049d05e..dec8576dc 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -35,7 +35,14 @@ import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.constants.EnumScriptType; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.Line; +import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestData; +import noppes.npcs.controllers.QuestData; +import noppes.npcs.controllers.RecipeCarpentry; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemExcalibur; import noppes.npcs.items.ItemShield; @@ -47,7 +54,7 @@ public class ServerEventsHandler { public static EntityVillager Merchant; public static Entity mounted; - + // private HashMap exps = new HashMap(); // // @SubscribeEvent @@ -57,10 +64,10 @@ public class ServerEventsHandler { // EntityPlayer player = (EntityPlayer) event.entityLiving; // if(exps.containsKey(player.getCommandSenderName())){ // int prevExp = exps.get(player.getCommandSenderName()); -// if(prevExp > player.experienceTotal){ +// if(prevExp > player.experienceTotal){ // player.addChatMessage(new ChatComponentText("Omg exp was gotten:" + (player.experienceTotal - prevExp))); // } -// else if(prevExp < player.experienceTotal){ +// else if(prevExp < player.experienceTotal){ // player.addChatMessage(new ChatComponentText("Omg exp was lost:" + (prevExp - player.experienceTotal))); // } // } @@ -78,11 +85,11 @@ public class ServerEventsHandler { if(!isRemote && CustomNpcs.OpsOnly && !MinecraftServer.getServer().getConfigurationManager().func_152596_g(event.entityPlayer.getGameProfile())){ return; } - + if(!isRemote && item.getItem() == CustomItems.soulstoneEmpty && event.target instanceof EntityLivingBase) { - ((ItemSoulstoneEmpty)item.getItem()).store((EntityLivingBase)event.target, item, event.entityPlayer); + ((ItemSoulstoneEmpty)item.getItem()).store((EntityLivingBase)event.target, item, event.entityPlayer); } - + if(item.getItem() == CustomItems.wand && npcInteracted && !isRemote){ if (!CustomNpcsPermissions.Instance.hasPermission(event.entityPlayer, CustomNpcsPermissions.NPC_GUI)){ return; @@ -104,43 +111,43 @@ public class ServerEventsHandler { else if(item.getItem() == CustomItems.scripter && !isRemote && npcInteracted){ if(!CustomNpcsPermissions.Instance.hasPermission(event.entityPlayer, CustomNpcsPermissions.NPC_GUI)) return; - NoppesUtilServer.setEditingNpc(event.entityPlayer, (EntityNPCInterface)event.target); + NoppesUtilServer.setEditingNpc(event.entityPlayer, (EntityNPCInterface)event.target); event.setCanceled(true); - Server.sendData((EntityPlayerMP)event.entityPlayer, EnumPacketClient.GUI, EnumGuiType.Script.ordinal()); + Server.sendData((EntityPlayerMP)event.entityPlayer, EnumPacketClient.GUI, EnumGuiType.Script.ordinal()); } else if(item.getItem() == CustomItems.mount){ if(!CustomNpcsPermissions.Instance.hasPermission(event.entityPlayer, CustomNpcsPermissions.TOOL_MOUNTER)) return; event.setCanceled(true); - mounted = event.target; - if(isRemote) - CustomNpcs.proxy.openGui(MathHelper.floor_double(mounted.posX), MathHelper.floor_double(mounted.posY), MathHelper.floor_double(mounted.posZ), EnumGuiType.MobSpawnerMounter, event.entityPlayer); + mounted = event.target; + if(isRemote) + CustomNpcs.proxy.openGui(MathHelper.floor_double(mounted.posX), MathHelper.floor_double(mounted.posY), MathHelper.floor_double(mounted.posZ), EnumGuiType.MobSpawnerMounter, event.entityPlayer); } else if(item.getItem() == CustomItems.wand && event.target instanceof EntityVillager){ if(!CustomNpcsPermissions.Instance.hasPermission(event.entityPlayer, CustomNpcsPermissions.EDIT_VILLAGER)) return; event.setCanceled(true); Merchant = (EntityVillager)event.target; - + if(!isRemote){ EntityPlayerMP player = (EntityPlayerMP) event.entityPlayer; player.openGui(CustomNpcs.instance, EnumGuiType.MerchantAdd.ordinal(), player.worldObj, 0, 0, 0); - MerchantRecipeList merchantrecipelist = Merchant.getRecipes(player); - - if (merchantrecipelist != null) - { - Server.sendData(player, EnumPacketClient.VILLAGER_LIST, merchantrecipelist); - } + MerchantRecipeList merchantrecipelist = Merchant.getRecipes(player); + + if (merchantrecipelist != null) + { + Server.sendData(player, EnumPacketClient.VILLAGER_LIST, merchantrecipelist); + } } } - + } - + @SubscribeEvent public void invoke(LivingHurtEvent event) { if(!(event.entityLiving instanceof EntityPlayer)) return; - + EntityPlayer player = (EntityPlayer) event.entityLiving; if(event.source.isUnblockable() || event.source.isFireDamage()) return; @@ -152,7 +159,7 @@ public class ServerEventsHandler { if(((ItemShield)item.getItem()).material.getDamageVsEntity() < player.getRNG().nextInt(9)) return; float damage = item.getItemDamage() + event.ammount; - + item.damageItem((int) event.ammount, player); if(damage > item.getMaxDamage()) @@ -162,7 +169,7 @@ public class ServerEventsHandler { event.setCanceled(true); } } - + @SubscribeEvent public void invoke(PlayerInteractEvent event) { EntityPlayer player = event.entityPlayer; @@ -170,50 +177,50 @@ public class ServerEventsHandler { if(event.action == Action.LEFT_CLICK_BLOCK && player.getHeldItem() != null && player.getHeldItem().getItem() == CustomItems.teleporter){ event.setCanceled(true); } - + if(block == Blocks.crafting_table && event.action == Action.RIGHT_CLICK_BLOCK && !player.worldObj.isRemote){ RecipeController controller = RecipeController.instance; - NBTTagList list = new NBTTagList(); - int i = 0; - for(RecipeCarpentry recipe : controller.globalRecipes.values()){ - list.appendTag(recipe.writeNBT()); - i++; - if(i % 10 == 0){ - NBTTagCompound compound = new NBTTagCompound(); - compound.setTag("recipes", list); - Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound); - list = new NBTTagList(); - } - } + NBTTagList list = new NBTTagList(); + int i = 0; + for(RecipeCarpentry recipe : controller.globalRecipes.values()){ + list.appendTag(recipe.writeNBT()); + i++; + if(i % 10 == 0){ + NBTTagCompound compound = new NBTTagCompound(); + compound.setTag("recipes", list); + Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound); + list = new NBTTagList(); + } + } - if(i % 10 != 0){ - NBTTagCompound compound = new NBTTagCompound(); - compound.setTag("recipes", list); - Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound); - } - Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_WORKBENCH); - } + if(i % 10 != 0){ + NBTTagCompound compound = new NBTTagCompound(); + compound.setTag("recipes", list); + Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound); + } + Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_WORKBENCH); + } if(block == CustomItems.carpentyBench && event.action == Action.RIGHT_CLICK_BLOCK && !player.worldObj.isRemote){ RecipeController controller = RecipeController.instance; - NBTTagList list = new NBTTagList(); - int i = 0; - for(RecipeCarpentry recipe : controller.anvilRecipes.values()){ - list.appendTag(recipe.writeNBT()); - i++; - if(i % 10 == 0){ - NBTTagCompound compound = new NBTTagCompound(); - compound.setTag("recipes", list); - Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound); - list = new NBTTagList(); - } - } + NBTTagList list = new NBTTagList(); + int i = 0; + for(RecipeCarpentry recipe : controller.anvilRecipes.values()){ + list.appendTag(recipe.writeNBT()); + i++; + if(i % 10 == 0){ + NBTTagCompound compound = new NBTTagCompound(); + compound.setTag("recipes", list); + Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound); + list = new NBTTagList(); + } + } - if(i % 10 != 0){ - NBTTagCompound compound = new NBTTagCompound(); - compound.setTag("recipes", list); - Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound); - } - Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_CARPENTRYBENCH); + if(i % 10 != 0){ + NBTTagCompound compound = new NBTTagCompound(); + compound.setTag("recipes", list); + Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_ADD, compound); + } + Server.sendData((EntityPlayerMP)player, EnumPacketClient.SYNCRECIPES_CARPENTRYBENCH); } if((block == CustomItems.banner || block == CustomItems.wallBanner || block == CustomItems.sign) && event.action == Action.RIGHT_CLICK_BLOCK){ ItemStack item = player.inventory.getCurrentItem(); @@ -225,20 +232,20 @@ public class ServerEventsHandler { y--; TileBanner tile = (TileBanner)player.worldObj.getTileEntity(event.x, y, event.z); if(!tile.canEdit()){ - if(item.getItem() == CustomItems.wand && CustomNpcsPermissions.hasPermission(player, CustomNpcsPermissions.EDIT_BLOCKS)){ - tile.time = System.currentTimeMillis(); - if(player.worldObj.isRemote) - player.addChatComponentMessage(new ChatComponentTranslation("availability.editIcon")); - } + if(item.getItem() == CustomItems.wand && CustomNpcsPermissions.hasPermission(player, CustomNpcsPermissions.EDIT_BLOCKS)){ + tile.time = System.currentTimeMillis(); + if(player.worldObj.isRemote) + player.addChatComponentMessage(new ChatComponentTranslation("availability.editIcon")); + } return; } - if(!player.worldObj.isRemote){ + if(!player.worldObj.isRemote){ tile.icon = item.copy(); - player.worldObj.markBlockForUpdate(event.x, y, event.z); - event.setCanceled(true); - } - + player.worldObj.markBlockForUpdate(event.x, y, event.z); + event.setCanceled(true); + } + } } @@ -250,7 +257,7 @@ public class ServerEventsHandler { if(event.source.getEntity() instanceof EntityPlayer){ doExcalibur((EntityPlayer) event.source.getEntity(),event.entityLiving); } - + if(event.source.getEntity() instanceof EntityNPCInterface && event.entityLiving != null){ EntityNPCInterface npc = (EntityNPCInterface) event.source.getEntity(); Line line = npc.advanced.getKillLine(); @@ -259,7 +266,7 @@ public class ServerEventsHandler { npc.script.callScript(EnumScriptType.KILLS, "target", event.entityLiving); } - + EntityPlayer player = null; if(event.source.getEntity() instanceof EntityPlayer) player = (EntityPlayer) event.source.getEntity(); @@ -267,7 +274,7 @@ public class ServerEventsHandler { player = ((RoleFollower)((EntityNPCInterface)event.source.getEntity()).roleInterface).owner; if(player != null){ doQuest(player, event.entityLiving, true); - + if(event.entityLiving instanceof EntityNPCInterface) doFactionPoints(player, (EntityNPCInterface)event.entityLiving); } @@ -291,12 +298,11 @@ public class ServerEventsHandler { } private void doQuest(EntityPlayer player, EntityLivingBase entity, boolean all) { - PlayerData playerData = PlayerDataController.instance.getPlayerData(player); - PlayerQuestData questData = playerData.questData; + PlayerQuestData playerdata = PlayerDataController.instance.getPlayerData(player).questData; boolean change = false; - String entityName = EntityList.getEntityString(entity); - - for(QuestData data : questData.activeQuests.values()){ + String entityName = EntityList.getEntityString(entity); + + for(QuestData data : playerdata.activeQuests.values()){ if(data.quest.type != EnumQuestType.Kill && data.quest.type != EnumQuestType.AreaKill) continue; if(data.quest.type == EnumQuestType.AreaKill && all){ @@ -304,12 +310,10 @@ public class ServerEventsHandler { for(EntityPlayer pl : list) if(pl != player) doQuest(pl, entity, false); - + } String name = entityName; QuestKill quest = (QuestKill) data.quest.questInterface; - if(quest.targetType == 1 && !(entity instanceof EntityNPCInterface)) - continue; if(quest.targets.containsKey(entity.getCommandSenderName())) name = entity.getCommandSenderName(); else if(!quest.targets.containsKey(name)) @@ -326,17 +330,16 @@ public class ServerEventsHandler { } if(!change) return; - - questData.checkQuestCompletion(playerData,EnumQuestType.Kill); + + playerdata.checkQuestCompletion(player,EnumQuestType.Kill); } @SubscribeEvent public void pickUp(EntityItemPickupEvent event){ if(event.entityPlayer.worldObj.isRemote) return; - PlayerData playerData = PlayerDataController.instance.getPlayerData(event.entityPlayer); - PlayerQuestData questData = playerData.questData; - questData.checkQuestCompletion(playerData, EnumQuestType.Item); + PlayerQuestData playerdata = PlayerDataController.instance.getPlayerData(event.entityPlayer).questData; + playerdata.checkQuestCompletion(event.entityPlayer, EnumQuestType.Item); } @SubscribeEvent diff --git a/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java b/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java index 4cf345196..b5859e296 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java +++ b/src/main/java/noppes/npcs/ai/EntityAIAttackTarget.java @@ -1,12 +1,10 @@ package noppes.npcs.ai; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import noppes.npcs.CustomNpcs; import noppes.npcs.constants.AiMutex; import noppes.npcs.entity.EntityNPCInterface; @@ -57,9 +55,7 @@ public class EntityAIAttackTarget extends EntityAIBase } else{ this.entityTarget = entitylivingbase; - this.attacker.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(((EntityNPCInterface) this.attacker).stats.aggroRange); this.entityPathEntity = this.attacker.getNavigator().getPathToEntityLiving(entitylivingbase); - this.attacker.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(CustomNpcs.NpcNavRange); return this.entityPathEntity != null; } } diff --git a/src/main/java/noppes/npcs/ai/EntityAIJob.java b/src/main/java/noppes/npcs/ai/EntityAIJob.java index 9badc98d4..144d54361 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIJob.java +++ b/src/main/java/noppes/npcs/ai/EntityAIJob.java @@ -16,9 +16,9 @@ public class EntityAIJob extends EntityAIBase { return false; return npc.jobInterface.aiShouldExecute(); } - - public void startExecuting() - { + + @Override + public void startExecuting(){ npc.jobInterface.aiStartExecuting(); } @@ -29,12 +29,14 @@ public class EntityAIJob extends EntityAIBase { return false; return npc.jobInterface.aiContinueExecute(); } - - public void updateTask() - { - npc.jobInterface.aiUpdateTask(); + + @Override + public void updateTask(){ + if(npc.jobInterface != null) + npc.jobInterface.aiUpdateTask(); } + @Override public void resetTask() { if(npc.jobInterface != null) npc.jobInterface.resetTask(); diff --git a/src/main/java/noppes/npcs/ai/EntityAIWander.java b/src/main/java/noppes/npcs/ai/EntityAIWander.java index 7913edff5..f43cec6d1 100644 --- a/src/main/java/noppes/npcs/ai/EntityAIWander.java +++ b/src/main/java/noppes/npcs/ai/EntityAIWander.java @@ -50,9 +50,6 @@ public class EntityAIWander extends EntityAIBase else{ this.xPosition = vec.xCoord; this.yPosition = vec.yCoord; - // FLY CHANGE - if(entity.canFly()) - this.yPosition = entity.getStartYPos() + entity.getRNG().nextFloat() * 0.75 * entity.ai.walkingRange; this.zPosition = vec.zCoord; } } diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyNodeProcessor.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyNodeProcessor.java deleted file mode 100644 index eecc15ddb..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyNodeProcessor.java +++ /dev/null @@ -1,73 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.math.BlockPos; -import noppes.npcs.entity.EntityNPCInterface; - -public class FlyNodeProcessor extends NodeProcessor{ - - public PathPoint getPathPointTo(Entity p_176161_1_) - { - return this.openPoint(MathHelper.floor_double(p_176161_1_.boundingBox.minX), MathHelper.floor_double(p_176161_1_.boundingBox.minY + 0.5D), MathHelper.floor_double(p_176161_1_.boundingBox.minZ)); - } - - public PathPoint getPathPointToCoords(Entity p_176160_1_, double p_176160_2_, double p_176160_4_, double p_176160_6_) - { - return this.openPoint(MathHelper.floor_double(p_176160_2_ - (double)(p_176160_1_.width / 2.0F)), MathHelper.floor_double(p_176160_4_ + 0.5D), MathHelper.floor_double(p_176160_6_ - (double)(p_176160_1_.width / 2.0F))); - } - - public int findPathOptions(PathPoint[] p_176164_1_, Entity p_176164_2_, PathPoint p_176164_3_, PathPoint p_176164_4_, float p_176164_5_) - { - int i = 0; - EnumFacing[] aenumfacing = EnumFacing.values(); - int j = aenumfacing.length; - - for (int k = 0; k < j; ++k) - { - EnumFacing enumfacing = aenumfacing[k]; - PathPoint pathpoint2 = this.getSafePoint(p_176164_2_, p_176164_3_.xCoord + enumfacing.getFrontOffsetX(), p_176164_3_.yCoord + enumfacing.getFrontOffsetY(), p_176164_3_.zCoord + enumfacing.getFrontOffsetZ()); - - if (pathpoint2 != null && !pathpoint2.isFirst && pathpoint2.distanceTo(p_176164_4_) < p_176164_5_) - { - p_176164_1_[i++] = pathpoint2; - } - } - - return i; - } - - private PathPoint getSafePoint(Entity p_176185_1_, int p_176185_2_, int p_176185_3_, int p_176185_4_) - { - int l = this.func_176186_b(p_176185_1_, p_176185_2_, p_176185_3_, p_176185_4_); - return l == -1 ? this.openPoint(p_176185_2_, p_176185_3_, p_176185_4_) : null; - } - - private int func_176186_b(Entity entityIn, int x, int y, int z) - { - - for (int i = x; i < x + this.entitySizeX; ++i) - { - for (int j = y; j < y + this.entitySizeY; ++j) - { - for (int k = z; k < z + this.entitySizeZ; ++k) - { - Block block = this.blockaccess.getBlock(i, j, k); - if(block.getMaterial() == Material.water && entityIn instanceof EntityNPCInterface && ((EntityNPCInterface)entityIn).ai.canSwim) - continue; - - if (block.getMaterial() != Material.air) - { - return 0; - } - } - } - } - - return -1; - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyPath.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyPath.java deleted file mode 100644 index 1f36db860..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyPath.java +++ /dev/null @@ -1,173 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -public class FlyPath { - private FlyPathPoint[] pathPoints = new FlyPathPoint[1024]; - /** The number of points in this path */ - private int count; - private static final String __OBFID = "CL_00000573"; - - /** - * Adds a point to the path - */ - public FlyPathPoint addPoint(FlyPathPoint p_75849_1_) - { - if (p_75849_1_.index >= 0) - { - throw new IllegalStateException("OW KNOWS!"); - } - else - { - if (this.count == this.pathPoints.length) - { - FlyPathPoint[] apathpoint = new FlyPathPoint[this.count << 1]; - System.arraycopy(this.pathPoints, 0, apathpoint, 0, this.count); - this.pathPoints = apathpoint; - } - - this.pathPoints[this.count] = p_75849_1_; - p_75849_1_.index = this.count; - this.sortBack(this.count++); - return p_75849_1_; - } - } - - /** - * Clears the path - */ - public void clearPath() - { - this.count = 0; - } - - /** - * Returns and removes the first point in the path - */ - public FlyPathPoint dequeue() - { - FlyPathPoint pathpoint = this.pathPoints[0]; - this.pathPoints[0] = this.pathPoints[--this.count]; - this.pathPoints[this.count] = null; - - if (this.count > 0) - { - this.sortForward(0); - } - - pathpoint.index = -1; - return pathpoint; - } - - /** - * Changes the provided point's distance to target - */ - public void changeDistance(FlyPathPoint p_75850_1_, float p_75850_2_) - { - float f1 = p_75850_1_.distanceToTarget; - p_75850_1_.distanceToTarget = p_75850_2_; - - if (p_75850_2_ < f1) - { - this.sortBack(p_75850_1_.index); - } - else - { - this.sortForward(p_75850_1_.index); - } - } - - /** - * Sorts a point to the left - */ - private void sortBack(int p_75847_1_) - { - FlyPathPoint pathpoint = this.pathPoints[p_75847_1_]; - int j; - - for (float f = pathpoint.distanceToTarget; p_75847_1_ > 0; p_75847_1_ = j) - { - j = p_75847_1_ - 1 >> 1; - FlyPathPoint pathpoint1 = this.pathPoints[j]; - - if (f >= pathpoint1.distanceToTarget) - { - break; - } - - this.pathPoints[p_75847_1_] = pathpoint1; - pathpoint1.index = p_75847_1_; - } - - this.pathPoints[p_75847_1_] = pathpoint; - pathpoint.index = p_75847_1_; - } - - /** - * Sorts a point to the right - */ - private void sortForward(int p_75846_1_) - { - FlyPathPoint pathpoint = this.pathPoints[p_75846_1_]; - float f = pathpoint.distanceToTarget; - - while (true) - { - int j = 1 + (p_75846_1_ << 1); - int k = j + 1; - - if (j >= this.count) - { - break; - } - - FlyPathPoint pathpoint1 = this.pathPoints[j]; - float f1 = pathpoint1.distanceToTarget; - FlyPathPoint pathpoint2; - float f2; - - if (k >= this.count) - { - pathpoint2 = null; - f2 = Float.POSITIVE_INFINITY; - } - else - { - pathpoint2 = this.pathPoints[k]; - f2 = pathpoint2.distanceToTarget; - } - - if (f1 < f2) - { - if (f1 >= f) - { - break; - } - - this.pathPoints[p_75846_1_] = pathpoint1; - pathpoint1.index = p_75846_1_; - p_75846_1_ = j; - } - else - { - if (f2 >= f) - { - break; - } - - this.pathPoints[p_75846_1_] = pathpoint2; - pathpoint2.index = p_75846_1_; - p_75846_1_ = k; - } - } - - this.pathPoints[p_75846_1_] = pathpoint; - pathpoint.index = p_75846_1_; - } - - /** - * Returns true if this path contains no points - */ - public boolean isPathEmpty() - { - return this.count == 0; - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathEntity.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathEntity.java deleted file mode 100644 index a6715e6c6..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathEntity.java +++ /dev/null @@ -1,130 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.entity.Entity; -import net.minecraft.pathfinding.PathEntity; -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.Vec3; - -public class FlyPathEntity extends PathEntity{ - public final PathPoint[] points; - /** PathEntity Array Index the Entity is currently targeting */ - public int currentPathIndex; - /** The total length of the path */ - public int pathLength; - private static final String __OBFID = "CL_00000575"; - - public FlyPathEntity(PathPoint[] p_i2136_1_) - { - super(p_i2136_1_); - this.points = p_i2136_1_; - this.pathLength = p_i2136_1_.length; - } - - /** - * Directs this path to the next point in its array - */ - public void incrementPathIndex() - { - ++this.currentPathIndex; - } - - /** - * Returns true if this path has reached the end - */ - public boolean isFinished() - { - return this.currentPathIndex >= this.pathLength; - } - - /** - * returns the last PathPoint of the Array - */ - public PathPoint getFinalPathPoint() - { - return this.pathLength > 0 ? this.points[this.pathLength - 1] : null; - } - - /** - * return the PathPoint located at the specified PathIndex, usually the current one - */ - public PathPoint getPathPointFromIndex(int p_75877_1_) - { - return this.points[p_75877_1_]; - } - - public int getCurrentPathLength() - { - return this.pathLength; - } - - public void setCurrentPathLength(int p_75871_1_) - { - this.pathLength = p_75871_1_; - } - - public int getCurrentPathIndex() - { - return this.currentPathIndex; - } - - public void setCurrentPathIndex(int p_75872_1_) - { - this.currentPathIndex = p_75872_1_; - } - - /** - * Gets the vector of the PathPoint associated with the given index. - */ - public Vec3 getVectorFromIndex(Entity p_75881_1_, int p_75881_2_) - { - double d0 = (double)this.points[p_75881_2_].xCoord + (double)((int)(p_75881_1_.width + 1.0F)) * 0.5D; - double d1 = (double)this.points[p_75881_2_].yCoord; - double d2 = (double)this.points[p_75881_2_].zCoord + (double)((int)(p_75881_1_.width + 1.0F)) * 0.5D; - return Vec3.createVectorHelper(d0, d1, d2); - } - - /** - * returns the current PathEntity target node as Vec3D - */ - public Vec3 getPosition(Entity p_75878_1_) - { - return this.getVectorFromIndex(p_75878_1_, this.currentPathIndex); - } - - /** - * Returns true if the EntityPath are the same. Non instance related equals. - */ - public boolean isSamePath(PathEntity pathEntity) - { - FlyPathEntity p_75876_1_ = (FlyPathEntity) pathEntity; - if (p_75876_1_ == null) - { - return false; - } - else if (p_75876_1_.points.length != this.points.length) - { - return false; - } - else - { - for (int i = 0; i < this.points.length; ++i) - { - if (this.points[i].xCoord != p_75876_1_.points[i].xCoord || this.points[i].yCoord != p_75876_1_.points[i].yCoord || this.points[i].zCoord != p_75876_1_.points[i].zCoord) - { - return false; - } - } - - return true; - } - } - - /** - * Returns true if the final PathPoint in the PathEntity is equal to Vec3D coords. - */ - public boolean isDestinationSame(Vec3 p_75880_1_) - { - PathPoint pathpoint = this.getFinalPathPoint(); - return pathpoint == null ? false : pathpoint.xCoord == (int)p_75880_1_.xCoord && pathpoint.zCoord == (int)p_75880_1_.zCoord; - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java deleted file mode 100644 index 9673520d5..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java +++ /dev/null @@ -1,448 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; -import net.minecraft.pathfinding.PathFinder; -import net.minecraft.util.IntHashMap; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; - -public class FlyPathFinder extends PathFinder -{ - /** Used to find obstacles */ - private IBlockAccess worldMap; - /** The path being generated */ - private FlyPath path = new FlyPath(); - /** The points in the path */ - private IntHashMap pointMap = new IntHashMap(); - /** Selection of path points to add to the path */ - private FlyPathPoint[] pathOptions = new FlyPathPoint[32]; - /** should the PathFinder go through wodden door blocks */ - private boolean isWoddenDoorAllowed; - /** should the PathFinder disregard BlockMovement type materials in its path */ - private boolean isMovementBlockAllowed; - private boolean isPathingInWater; - /** tells the FathFinder to not stop pathing underwater */ - private boolean canEntityDrown; - private static final String __OBFID = "CL_00000576"; - - public FlyPathFinder(IBlockAccess p_i2137_1_, boolean p_i2137_2_, boolean p_i2137_3_, boolean p_i2137_4_, boolean p_i2137_5_) - { - super(p_i2137_1_,p_i2137_2_,p_i2137_3_,p_i2137_4_,p_i2137_5_); - this.worldMap = p_i2137_1_; - this.isWoddenDoorAllowed = p_i2137_2_; - this.isMovementBlockAllowed = p_i2137_3_; - this.isPathingInWater = p_i2137_4_; - this.canEntityDrown = p_i2137_5_; - } - - /** - * Creates a path from one entity to another within a minimum distance - */ - public FlyPathEntity createEntityPathTo(Entity p_75856_1_, Entity p_75856_2_, float p_75856_3_) - { - return this.createEntityPathTo(p_75856_1_, p_75856_2_.posX, p_75856_2_.boundingBox.minY, p_75856_2_.posZ, p_75856_3_); - } - - /** - * Creates a path from an entity to a specified location within a minimum distance - */ - public FlyPathEntity createEntityPathTo(Entity p_75859_1_, int p_75859_2_, int p_75859_3_, int p_75859_4_, float p_75859_5_) - { - return this.createEntityPathTo(p_75859_1_, (double)((float)p_75859_2_ + 0.5F), (double)((float)p_75859_3_ + 0.5F), (double)((float)p_75859_4_ + 0.5F), p_75859_5_); - } - - /** - * Internal implementation of creating a path from an entity to a point - */ - private FlyPathEntity createEntityPathTo(Entity p_75857_1_, double p_75857_2_, double p_75857_4_, double p_75857_6_, float p_75857_8_) - { - this.path.clearPath(); - this.pointMap.clearMap(); - boolean flag = this.isPathingInWater; - int i = MathHelper.floor_double(p_75857_1_.boundingBox.minY + 0.5D); - - if (this.canEntityDrown && p_75857_1_.isInWater()) - { - i = (int)p_75857_1_.boundingBox.minY; - - for (Block block = this.worldMap.getBlock(MathHelper.floor_double(p_75857_1_.posX), i, MathHelper.floor_double(p_75857_1_.posZ)); block == Blocks.flowing_water || block == Blocks.water; block = this.worldMap.getBlock(MathHelper.floor_double(p_75857_1_.posX), i, MathHelper.floor_double(p_75857_1_.posZ))) - { - ++i; - } - - flag = this.isPathingInWater; - this.isPathingInWater = false; - } - else - { - i = MathHelper.floor_double(p_75857_1_.boundingBox.minY + 0.5D); - } - - FlyPathPoint pathpoint2 = this.openPoint(MathHelper.floor_double(p_75857_1_.boundingBox.minX), i, MathHelper.floor_double(p_75857_1_.boundingBox.minZ)); - FlyPathPoint pathpoint = this.openPoint(MathHelper.floor_double(p_75857_2_ - (double)(p_75857_1_.width / 2.0F)), MathHelper.floor_double(p_75857_4_), MathHelper.floor_double(p_75857_6_ - (double)(p_75857_1_.width / 2.0F))); - FlyPathPoint pathpoint1 = new FlyPathPoint(MathHelper.floor_float(p_75857_1_.width + 1.0F), MathHelper.floor_float(p_75857_1_.height + 1.0F), MathHelper.floor_float(p_75857_1_.width + 1.0F)); - FlyPathEntity pathentity = this.addToPath(p_75857_1_, pathpoint2, pathpoint, pathpoint1, p_75857_8_); - this.isPathingInWater = flag; - return pathentity; - } - - /** - * Adds a path from start to end and returns the whole path (args: unused, start, end, unused, maxDistance) - */ - private FlyPathEntity addToPath(Entity p_75861_1_, FlyPathPoint p_75861_2_, FlyPathPoint p_75861_3_, FlyPathPoint p_75861_4_, float p_75861_5_) - { - p_75861_2_.totalPathDistance = 0.0F; - p_75861_2_.distanceToNext = p_75861_2_.distanceToSquared(p_75861_3_); - p_75861_2_.distanceToTarget = p_75861_2_.distanceToNext; - this.path.clearPath(); - this.path.addPoint(p_75861_2_); - FlyPathPoint pathpoint3 = p_75861_2_; - - while (!this.path.isPathEmpty()) - { - FlyPathPoint pathpoint4 = this.path.dequeue(); - - if (pathpoint4.equals(p_75861_3_)) - { - return this.createEntityPath(p_75861_2_, p_75861_3_); - } - - if (pathpoint4.distanceToSquared(p_75861_3_) < pathpoint3.distanceToSquared(p_75861_3_)) - { - pathpoint3 = pathpoint4; - } - - pathpoint4.isFirst = true; - int i = this.findPathOptions(p_75861_1_, pathpoint4, p_75861_4_, p_75861_3_, p_75861_5_); - - for (int j = 0; j < i; ++j) - { - FlyPathPoint pathpoint5 = this.pathOptions[j]; - float f1 = pathpoint4.totalPathDistance + pathpoint4.distanceToSquared(pathpoint5); - - if (!pathpoint5.isAssigned() || f1 < pathpoint5.totalPathDistance) - { - pathpoint5.previous = pathpoint4; - pathpoint5.totalPathDistance = f1; - pathpoint5.distanceToNext = pathpoint5.distanceToSquared(p_75861_3_); - - if (pathpoint5.isAssigned()) - { - this.path.changeDistance(pathpoint5, pathpoint5.totalPathDistance + pathpoint5.distanceToNext); - } - else - { - pathpoint5.distanceToTarget = pathpoint5.totalPathDistance + pathpoint5.distanceToNext; - this.path.addPoint(pathpoint5); - } - } - } - } - - if (pathpoint3 == p_75861_2_) - { - return null; - } - else - { - return this.createEntityPath(p_75861_2_, pathpoint3); - } - } - - /** - * populates pathOptions with available points and returns the number of options found (args: unused1, currentPoint, - * unused2, targetPoint, maxDistance) - */ - private int findPathOptions(Entity p_75860_1_, FlyPathPoint p_75860_2_, FlyPathPoint p_75860_3_, FlyPathPoint p_75860_4_, float p_75860_5_) - { - int i = 0; - byte b0 = 0; - - if (this.getVerticalOffset(p_75860_1_, p_75860_2_.xCoord, p_75860_2_.yCoord + 1, p_75860_2_.zCoord, p_75860_3_) == 1) - { - b0 = 1; - } - - FlyPathPoint pathpoint3 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord, p_75860_2_.yCoord, p_75860_2_.zCoord + 1, p_75860_3_, b0); - FlyPathPoint pathpoint4 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord - 1, p_75860_2_.yCoord, p_75860_2_.zCoord, p_75860_3_, b0); - FlyPathPoint pathpoint5 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord + 1, p_75860_2_.yCoord, p_75860_2_.zCoord, p_75860_3_, b0); - FlyPathPoint pathpoint6 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord, p_75860_2_.yCoord, p_75860_2_.zCoord - 1, p_75860_3_, b0); - - FlyPathPoint pathpoint7 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord, p_75860_2_.yCoord + 1, p_75860_2_.zCoord + 1, p_75860_3_, b0); - FlyPathPoint pathpoint8 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord - 1, p_75860_2_.yCoord + 1, p_75860_2_.zCoord, p_75860_3_, b0); - FlyPathPoint pathpoint9 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord + 1, p_75860_2_.yCoord + 1, p_75860_2_.zCoord, p_75860_3_, b0); - FlyPathPoint pathpoint10 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord, p_75860_2_.yCoord + 1, p_75860_2_.zCoord - 1, p_75860_3_, b0); - - FlyPathPoint pathpoint11 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord, p_75860_2_.yCoord - 1, p_75860_2_.zCoord + 1, p_75860_3_, b0); - FlyPathPoint pathpoint12 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord - 1, p_75860_2_.yCoord - 1, p_75860_2_.zCoord, p_75860_3_, b0); - FlyPathPoint pathpoint13 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord + 1, p_75860_2_.yCoord - 1, p_75860_2_.zCoord, p_75860_3_, b0); - FlyPathPoint pathpoint14 = this.getSafePoint(p_75860_1_, p_75860_2_.xCoord, p_75860_2_.yCoord - 1, p_75860_2_.zCoord - 1, p_75860_3_, b0); - - if (pathpoint3 != null && !pathpoint3.isFirst && pathpoint3.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint3; - } - - if (pathpoint4 != null && !pathpoint4.isFirst && pathpoint4.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint4; - } - - if (pathpoint5 != null && !pathpoint5.isFirst && pathpoint5.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint5; - } - - if (pathpoint6 != null && !pathpoint6.isFirst && pathpoint6.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint6; - } - - if (pathpoint7 != null && !pathpoint7.isFirst && pathpoint7.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint7; - } - - if (pathpoint8 != null && !pathpoint8.isFirst && pathpoint8.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint8; - } - - if (pathpoint9 != null && !pathpoint9.isFirst && pathpoint9.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint9; - } - - if (pathpoint10 != null && !pathpoint10.isFirst && pathpoint10.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint10; - } - - if (pathpoint11 != null && !pathpoint11.isFirst && pathpoint11.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint11; - } - - if (pathpoint12 != null && !pathpoint12.isFirst && pathpoint12.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint12; - } - - if (pathpoint13 != null && !pathpoint13.isFirst && pathpoint13.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint13; - } - - if (pathpoint14 != null && !pathpoint14.isFirst && pathpoint14.distanceTo(p_75860_4_) < p_75860_5_) - { - this.pathOptions[i++] = pathpoint14; - } - - return i; - } - - /** - * Returns a point that the entity can safely move to - */ - private FlyPathPoint getSafePoint(Entity entity, int blockX, int blockY, int blockZ, FlyPathPoint pathPoint, int verticalOffsetFlag) - { - FlyPathPoint pathpoint1 = null; - int verticalOffset = this.getVerticalOffset(entity, blockX, blockY, blockZ, pathPoint); - - if (verticalOffset == 2) - { - return this.openPoint(blockX, blockY, blockZ); - } - else - { - if (verticalOffset == 1) - { - pathpoint1 = this.openPoint(blockX, blockY, blockZ); - } - - if (pathpoint1 == null && verticalOffsetFlag > 0 && verticalOffset != -3 && verticalOffset != -4 && this.getVerticalOffset(entity, blockX, blockY + verticalOffsetFlag, blockZ, pathPoint) == 1) - { - pathpoint1 = this.openPoint(blockX, blockY + verticalOffsetFlag, blockZ); - blockY += verticalOffsetFlag; - } - - if (pathpoint1 != null) - { - int j1 = 0; - int k1 = 0; - - while (blockY > 0) - { - k1 = this.getVerticalOffset(entity, blockX, blockY - 1, blockZ, pathPoint); - - if (this.isPathingInWater && k1 == -1) - { - return null; - } - - if (k1 != 1) - { - break; - } - - if (j1++ >= entity.getMaxSafePointTries()) - { - return null; - } - - --blockY; - - if (blockY > 0) - { - pathpoint1 = this.openPoint(blockX, blockY, blockZ); - } - } - - if (k1 == -2) - { - return null; - } - } - - return pathpoint1; - } - } - - /** - * Returns a mapped point or creates and adds one - */ - private final FlyPathPoint openPoint(int p_75854_1_, int p_75854_2_, int p_75854_3_) - { - int l = FlyPathPoint.makeHash(p_75854_1_, p_75854_2_, p_75854_3_); - FlyPathPoint pathpoint = (FlyPathPoint)this.pointMap.lookup(l); - - if (pathpoint == null) - { - pathpoint = new FlyPathPoint(p_75854_1_, p_75854_2_, p_75854_3_); - this.pointMap.addKey(l, pathpoint); - } - - return pathpoint; - } - - /** - * Checks if an entity collides with blocks at a position. Returns 1 if clear, 0 for colliding with any solid block, - * -1 for water(if avoiding water) but otherwise clear, -2 for lava, -3 for fence, -4 for closed trapdoor, 2 if - * otherwise clear except for open trapdoor or water(if not avoiding) - */ - public int getVerticalOffset(Entity p_75855_1_, int p_75855_2_, int p_75855_3_, int p_75855_4_, FlyPathPoint p_75855_5_) - { - return canEntityStandAt(p_75855_1_, p_75855_2_, p_75855_3_, p_75855_4_, p_75855_5_, this.isPathingInWater, this.isMovementBlockAllowed, this.isWoddenDoorAllowed); - } - - public static int canEntityStandAt(Entity entity, int blockX, int blockY, int blockZ, FlyPathPoint pathPoint, boolean isPathingInWater, boolean isMovementBlockAllowed, boolean isWoddenDoorAllowed) - { - boolean flag3 = false; - - for (int l = blockX; l < blockX + pathPoint.xCoord; ++l) - { - for (int i1 = blockY; i1 < blockY + pathPoint.yCoord; ++i1) - { - for (int j1 = blockZ; j1 < blockZ + pathPoint.zCoord; ++j1) - { - Block block = entity.worldObj.getBlock(l, i1, j1); - - if(block == Blocks.air) - { - return 2; - } - - if (block == Blocks.trapdoor) - { - flag3 = true; - } - else if (block != Blocks.flowing_water && block != Blocks.water) - { - if (!isWoddenDoorAllowed && block == Blocks.wooden_door) - { - return 0; - } - } - else - { - if (isPathingInWater) - { - return -1; - } - - flag3 = true; - } - - int k1 = block.getRenderType(); - - if (entity.worldObj.getBlock(l, i1, j1).getRenderType() == 9) - { - int j2 = MathHelper.floor_double(entity.posX); - int l1 = MathHelper.floor_double(entity.posY); - int i2 = MathHelper.floor_double(entity.posZ); - - if (entity.worldObj.getBlock(j2, l1, i2).getRenderType() != 9 && entity.worldObj.getBlock(j2, l1 - 1, i2).getRenderType() != 9) - { - return -3; - } - } - else if (!block.getBlocksMovement(entity.worldObj, l, i1, j1) && (!isMovementBlockAllowed || block != Blocks.wooden_door)) - { - if (k1 == 11 || block == Blocks.fence_gate || k1 == 32) - { - return -3; - } - - if (block == Blocks.trapdoor) - { - return -4; - } - - Material material = block.getMaterial(); - - if (material != Material.lava) - { - return 0; - } - - if (!entity.handleLavaMovement()) - { - return -2; - } - } - } - } - } - - return flag3 ? 2 : 1; - } - - /** - * Returns a new FlyPathEntity for a given start and end point - */ - private FlyPathEntity createEntityPath(FlyPathPoint p_75853_1_, FlyPathPoint p_75853_2_) - { - int i = 1; - FlyPathPoint pathpoint2; - - for (pathpoint2 = p_75853_2_; pathpoint2.previous != null; pathpoint2 = pathpoint2.previous) - { - ++i; - } - - FlyPathPoint[] apathpoint = new FlyPathPoint[i]; - pathpoint2 = p_75853_2_; - --i; - - for (apathpoint[i] = p_75853_2_; pathpoint2.previous != null; apathpoint[i] = pathpoint2) - { - pathpoint2 = pathpoint2.previous; - --i; - } - - return new FlyPathEntity(apathpoint); - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathPoint.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathPoint.java deleted file mode 100644 index 87af78ae7..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathPoint.java +++ /dev/null @@ -1,96 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.MathHelper; - -public class FlyPathPoint extends PathPoint -{ - /** The x coordinate of this point */ - public final int xCoord; - /** The y coordinate of this point */ - public final int yCoord; - /** The z coordinate of this point */ - public final int zCoord; - /** A hash of the coordinates used to identify this point */ - public final int hash; - /** The index of this point in its assigned path */ - public int index = -1; - /** The distance along the path to this point */ - public float totalPathDistance; - /** The linear distance to the next point */ - public float distanceToNext; - /** The distance to the target */ - public float distanceToTarget; - /** The point preceding this in its assigned path */ - public FlyPathPoint previous; - /** Indicates this is the origin */ - public boolean isFirst; - private static final String __OBFID = "CL_00000574"; - - public FlyPathPoint(int p_i2135_1_, int p_i2135_2_, int p_i2135_3_) - { - super(p_i2135_1_,p_i2135_2_,p_i2135_3_); - this.xCoord = p_i2135_1_; - this.yCoord = p_i2135_2_; - this.zCoord = p_i2135_3_; - this.hash = makeHash(p_i2135_1_, p_i2135_2_, p_i2135_3_); - } - - public static int makeHash(int p_75830_0_, int p_75830_1_, int p_75830_2_) - { - return p_75830_1_ & 255 | (p_75830_0_ & 32767) << 8 | (p_75830_2_ & 32767) << 24 | (p_75830_0_ < 0 ? Integer.MIN_VALUE : 0) | (p_75830_2_ < 0 ? 32768 : 0); - } - - /** - * Returns the linear distance to another path point - */ - public float distanceTo(net.minecraft.pathfinding.PathPoint p_75829_1_) - { - float f = (float)(p_75829_1_.xCoord - this.xCoord); - float f1 = (float)(p_75829_1_.yCoord - this.yCoord); - float f2 = (float)(p_75829_1_.zCoord - this.zCoord); - return MathHelper.sqrt_float(f * f + f1 * f1 + f2 * f2); - } - - /** - * Returns the squared distance to another path point - */ - public float distanceToSquared(net.minecraft.pathfinding.PathPoint p_75832_1_) - { - float f = (float)(p_75832_1_.xCoord - this.xCoord); - float f1 = (float)(p_75832_1_.yCoord - this.yCoord); - float f2 = (float)(p_75832_1_.zCoord - this.zCoord); - return f * f + f1 * f1 + f2 * f2; - } - - public boolean equals(Object p_equals_1_) - { - if (!(p_equals_1_ instanceof FlyPathPoint)) - { - return false; - } - else - { - FlyPathPoint pathpoint = (FlyPathPoint)p_equals_1_; - return this.hash == pathpoint.hash && this.xCoord == pathpoint.xCoord && this.yCoord == pathpoint.yCoord && this.zCoord == pathpoint.zCoord; - } - } - - public int hashCode() - { - return this.hash; - } - - /** - * Returns true if this point has already been assigned to a path - */ - public boolean isAssigned() - { - return this.index >= 0; - } - - public String toString() - { - return this.xCoord + ", " + this.yCoord + ", " + this.zCoord; - } -} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java deleted file mode 100644 index e316c7fb2..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyingMoveHelper.java +++ /dev/null @@ -1,115 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.EntityMoveHelper; -import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; -import noppes.npcs.entity.EntityNPCInterface; - -// Fly Change - -public class FlyingMoveHelper extends EntityMoveHelper{ - private final EntityNPCInterface entity; - - private double posX; - private double posY; - private double posZ; - private double speed; - private boolean update; - - public FlyingMoveHelper(EntityNPCInterface entity){ - super(entity); - this.entity = entity; - this.posX = entity.posX; - this.posY = entity.posY; - this.posZ = entity.posZ; - } - - public void onUpdateMoveHelper() { - if (this.update) { - this.update = false; - - double speed = this.entity.getEntityAttribute(SharedMonsterAttributes.movementSpeed).getAttributeValue(); - double speedMult = 0.6000000238418579D / 0.5D; - - double d0 = this.posX - this.entity.posX; - double d1 = this.posY - this.entity.posY; - double d2 = this.posZ - this.entity.posZ; - double d4 = d0 * d0 + d1 * d1 + d2 * d2; - - if (this.entity.hurtTime == 0 && d4 > 0.5D) { - if (this.posY != this.entity.posY) { - if (this.entity.motionY * Math.signum(this.entity.posY - this.posY) > 0.0D) { - this.entity.motionY = 0.0D; - } - - double verticalSpeed = Math.abs(this.entity.posY - this.posY); - if(verticalSpeed > speed * speedMult) - verticalSpeed = speed * speedMult; - verticalSpeed += this.entity.ai.flySpeed/2.0D; - - if(verticalSpeed > Math.abs(this.entity.posY - this.posY)) - verticalSpeed = Math.abs(this.entity.posY - this.posY); - - int blockY = (int) this.posY; - double heightOffGround = 0; - if(this.entity.ai.hasFlyLimit) { - for (blockY = (int) this.posY; blockY > 0; blockY--) { - heightOffGround = this.posY - blockY; - if (this.entity.worldObj.getBlock((int) this.posX, blockY, (int) this.posZ) != Blocks.air || heightOffGround > this.entity.ai.flyHeightLimit){ - break; - } - } - } - if(heightOffGround < this.entity.ai.flyHeightLimit || !this.entity.ai.hasFlyLimit) - this.entity.motionY -= Math.signum(this.entity.posY - this.posY) * verticalSpeed; - } - - double d5 = MathHelper.sqrt_double(d4); - this.entity.motionX += (d0 / d5 * speed - this.entity.motionX) * speed * speedMult; - this.entity.motionZ += (d2 / d5 * speed - this.entity.motionZ) * speed * speedMult; - } - - this.entity.rotationYaw = this.limitAngle(this.entity.rotationYaw,(float) ((Math.atan2(-d0, -d2) + Math.PI) * -(180F / Math.PI)),30.0F); - } - } - - private float limitAngle(float p_75639_1_, float p_75639_2_, float p_75639_3_) - { - float f3 = MathHelper.wrapAngleTo180_float(p_75639_2_ - p_75639_1_); - - if (f3 > p_75639_3_) - { - f3 = p_75639_3_; - } - - if (f3 < -p_75639_3_) - { - f3 = -p_75639_3_; - } - - return p_75639_1_ + f3; - } - - /** - * Sets the speed and location to move to - */ - public void setMoveTo(double p_75642_1_, double p_75642_3_, double p_75642_5_, double p_75642_7_) - { - this.posX = p_75642_1_; - this.posY = p_75642_3_; - this.posZ = p_75642_5_; - this.speed = p_75642_7_; - this.update = true; - } - - public boolean isUpdating() - { - return this.update; - } - - public double getSpeed() - { - return this.speed; - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/NPCPathFinder.java b/src/main/java/noppes/npcs/ai/pathfinder/NPCPathFinder.java deleted file mode 100644 index 8383397d1..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/NPCPathFinder.java +++ /dev/null @@ -1,146 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; -import net.minecraft.pathfinding.Path; -import net.minecraft.pathfinding.PathEntity; -import net.minecraft.pathfinding.PathFinder; -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.MathHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class NPCPathFinder extends PathFinder -{ - - public IBlockAccess worldMap; - - public Path path = new Path(); - public NPCPathPoint[] pathOptions = new NPCPathPoint[32]; - - private final NodeProcessor nodeProcessor; - - public NPCPathFinder(NodeProcessor nodeProcessorIn) - { - super(nodeProcessorIn.blockaccess, true, true, false, false); - this.nodeProcessor = nodeProcessorIn; - } - - /** - * Creates a path from one entity to another within a minimum distance - */ - public PathEntity createEntityPathTo(Entity p_75856_1_, Entity p_75856_2_, float p_75856_3_) - { - return this.createEntityPathTo(p_75856_1_, p_75856_2_.posX, p_75856_2_.boundingBox.minY, p_75856_2_.posZ, p_75856_3_); - } - - /** - * Creates a path from an entity to a specified location within a minimum distance - */ - public PathEntity createEntityPathTo(Entity p_75859_1_, int p_75859_2_, int p_75859_3_, int p_75859_4_, float p_75859_5_) - { - return this.createEntityPathTo(p_75859_1_, (double)((float)p_75859_2_ + 0.5F), (double)((float)p_75859_3_ + 0.5F), (double)((float)p_75859_4_ + 0.5F), p_75859_5_); - } - - /** - * Internal implementation of creating a path from an entity to a point - */ - public PathEntity createEntityPathTo(Entity p_75857_1_, double p_75857_2_, double p_75857_4_, double p_75857_6_, float p_75857_8_) - { - this.path.clearPath(); - this.nodeProcessor.initProcessor(worldMap, p_75857_1_); - NPCPathPoint pathpoint = (NPCPathPoint) this.nodeProcessor.getPathPointTo(p_75857_1_); - NPCPathPoint pathpoint1 = (NPCPathPoint) this.nodeProcessor.getPathPointToCoords(p_75857_1_, p_75857_2_, p_75857_4_, p_75857_6_); - PathEntity pathentity = this.addToPath(p_75857_1_, pathpoint, pathpoint1, p_75857_8_); - this.nodeProcessor.postProcess(); - return pathentity; - } - - public PathEntity addToPath(Entity entityIn, NPCPathPoint pathpointStart, NPCPathPoint pathpointEnd, float maxDistance) - { - pathpointStart.totalPathDistance = 0.0F; - pathpointStart.distanceToNext = pathpointStart.distanceToSquared(pathpointEnd); - pathpointStart.distanceToTarget = pathpointStart.distanceToNext; - this.path.clearPath(); - this.path.addPoint(pathpointStart); - NPCPathPoint pathpoint = pathpointStart; - - while (!this.path.isPathEmpty()) - { - NPCPathPoint pathpoint1 = (NPCPathPoint) this.path.dequeue(); - - if (pathpoint1.equals(pathpointEnd)) - { - return this.createEntityPath(pathpointStart, pathpointEnd); - } - - if (pathpoint1.distanceToSquared(pathpointEnd) < pathpoint.distanceToSquared(pathpointEnd)) - { - pathpoint = pathpoint1; - } - - pathpoint1.isFirst = true; - int i = this.nodeProcessor.findPathOptions(this.pathOptions, entityIn, pathpoint1, pathpointEnd, maxDistance); - - for (int j = 0; j < i; ++j) - { - NPCPathPoint pathpoint2 = (NPCPathPoint) this.pathOptions[j]; - float f = pathpoint1.totalPathDistance + pathpoint1.distanceToSquared(pathpoint2); - - if (f < maxDistance * 2.0F && (!pathpoint2.isAssigned() || f < pathpoint2.totalPathDistance)) - { - pathpoint2.previous = pathpoint1; - pathpoint2.totalPathDistance = f; - pathpoint2.distanceToNext = pathpoint2.distanceToSquared(pathpointEnd); - - if (pathpoint2.isAssigned()) - { - this.path.changeDistance(pathpoint2, pathpoint2.totalPathDistance + pathpoint2.distanceToNext); - } - else - { - pathpoint2.distanceToTarget = pathpoint2.totalPathDistance + pathpoint2.distanceToNext; - this.path.addPoint(pathpoint2); - } - } - } - } - - if (pathpoint == pathpointStart) - { - return null; - } - else - { - return this.createEntityPath(pathpointStart, pathpoint); - } - } - - - /** - * Returns a new PathEntity for a given start and end point - */ - private PathEntity createEntityPath(NPCPathPoint p_75853_1_, NPCPathPoint p_75853_2_) - { - int i = 1; - NPCPathPoint pathpoint2; - - for (pathpoint2 = p_75853_2_; pathpoint2.previous != null; pathpoint2 = (NPCPathPoint) pathpoint2.previous) - { - ++i; - } - - NPCPathPoint[] apathpoint = new NPCPathPoint[i]; - pathpoint2 = p_75853_2_; - --i; - - for (apathpoint[i] = p_75853_2_; pathpoint2.previous != null; apathpoint[i] = pathpoint2) - { - pathpoint2 = (NPCPathPoint) pathpoint2.previous; - --i; - } - - return new PathEntity(apathpoint); - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/NPCPathPoint.java b/src/main/java/noppes/npcs/ai/pathfinder/NPCPathPoint.java deleted file mode 100644 index 3cbb824e9..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/NPCPathPoint.java +++ /dev/null @@ -1,23 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.MathHelper; - -public class NPCPathPoint extends PathPoint -{ - /** The index of this point in its assigned path */ - public int index = -1; - /** The distance along the path to this point */ - public float totalPathDistance; - /** The linear distance to the next point */ - public float distanceToNext; - /** The distance to the target */ - public float distanceToTarget; - public PathPoint previous; - - public NPCPathPoint(int p_i2135_1_, int p_i2135_2_, int p_i2135_3_) - { - super(p_i2135_1_, p_i2135_2_,p_i2135_3_); - } - -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/NodeProcessor.java b/src/main/java/noppes/npcs/ai/pathfinder/NodeProcessor.java deleted file mode 100644 index 5ef60e03a..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/NodeProcessor.java +++ /dev/null @@ -1,50 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.entity.Entity; -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.IntHashMap; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; - -public abstract class NodeProcessor -{ - public IBlockAccess blockaccess; - public IntHashMap pointMap = new IntHashMap(); - public int entitySizeX; - public int entitySizeY; - public int entitySizeZ; - - - public void initProcessor(IBlockAccess iblockaccessIn, Entity entityIn) - { - this.blockaccess = iblockaccessIn; - this.pointMap.clearMap(); - this.entitySizeX = MathHelper.floor_float(entityIn.width + 1.0F); - this.entitySizeY = MathHelper.floor_float(entityIn.height + 1.0F); - this.entitySizeZ = MathHelper.floor_float(entityIn.width + 1.0F); - } - - public void postProcess() - { - } - - public PathPoint openPoint(int x, int y, int z) - { - int i = NPCPathPoint.makeHash(x, y, z); - NPCPathPoint pathpoint = (NPCPathPoint)this.pointMap.lookup(i); - - if (pathpoint == null) - { - pathpoint = new NPCPathPoint(x, y, z); - this.pointMap.addKey(i, pathpoint); - } - - return pathpoint; - } - - public abstract PathPoint getPathPointTo(Entity entityIn); - - public abstract PathPoint getPathPointToCoords(Entity entityIn, double x, double y, double target); - - public abstract int findPathOptions(PathPoint[] pathOptions, Entity entityIn, PathPoint currentPoint, PathPoint targetPoint, float maxDistance); -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateFlying.java b/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateFlying.java deleted file mode 100644 index b98743930..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateFlying.java +++ /dev/null @@ -1,491 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.IAttributeInstance; -import net.minecraft.init.Blocks; -import net.minecraft.pathfinding.PathEntity; -import net.minecraft.pathfinding.PathNavigate; -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; -import net.minecraft.world.ChunkCache; -import net.minecraft.world.World; -import noppes.npcs.entity.EntityNPCInterface; - -public class PathNavigateFlying extends PathNavigate { - private EntityNPCInterface theEntity; - private World worldObj; - /** The PathEntity being followed. */ - private FlyPathEntity currentPath; - private double speed; - /** The number of blocks (extra) +/- in each axis that get pulled out as cache for the pathfinder's search space */ - private IAttributeInstance pathSearchRange; - private boolean noSunPathfind; - /** Time, in number of ticks, following the current path */ - private int totalTicks; - /** The time when the last position check was done (to detect successful movement) */ - private int ticksAtLastPos; - /** Coordinates of the entity's position last time a check was done (part of monitoring getting 'stuck') */ - private Vec3 lastPosCheck = Vec3.createVectorHelper(0.0D, 0.0D, 0.0D); - /** Specifically, if a wooden door block is even considered to be passable by the pathfinder */ - private boolean canPassOpenWoodenDoors = true; - /** If door blocks are considered passable even when closed */ - private boolean canPassClosedWoodenDoors; - /** If water blocks are avoided (at least by the pathfinder) */ - private boolean avoidsWater; - /** - * If the entity can swim. Swimming AI enables this and the pathfinder will also cause the entity to swim straight - * upwards when underwater - */ - private boolean canSwim; - private static final String __OBFID = "CL_00001627"; - - public PathNavigateFlying(EntityLiving p_i45873_1_, World worldIn) { - super(p_i45873_1_, worldIn); - this.theEntity = (EntityNPCInterface)p_i45873_1_; - this.worldObj = worldIn; - this.pathSearchRange = p_i45873_1_.getEntityAttribute(SharedMonsterAttributes.followRange); - } - - public void setAvoidsWater(boolean p_75491_1_) - { - this.avoidsWater = p_75491_1_; - } - - public boolean getAvoidsWater() - { - return this.avoidsWater; - } - - public void setBreakDoors(boolean p_75498_1_) - { - this.canPassClosedWoodenDoors = p_75498_1_; - } - - /** - * Sets if the entity can enter open doors - */ - public void setEnterDoors(boolean p_75490_1_) - { - this.canPassOpenWoodenDoors = p_75490_1_; - } - - /** - * Returns true if the entity can break doors, false otherwise - */ - public boolean getCanBreakDoors() - { - return this.canPassClosedWoodenDoors; - } - - /** - * Sets if the path should avoid sunlight - */ - public void setAvoidSun(boolean p_75504_1_) - { - this.noSunPathfind = p_75504_1_; - } - - /** - * Sets the speed - */ - public void setSpeed(double p_75489_1_) - { - this.speed = p_75489_1_; - } - - /** - * Sets if the entity can swim - */ - public void setCanSwim(boolean p_75495_1_) - { - this.canSwim = p_75495_1_; - } - - /** - * Gets the maximum distance that the path finding will search in. - */ - public float getPathSearchRange() - { - return (float)this.pathSearchRange.getAttributeValue(); - } - - /** - * Returns the path to the given coordinates - */ - public FlyPathEntity getPathToXYZ(double p_75488_1_, double p_75488_3_, double p_75488_5_) - { - return !this.canNavigate() ? null : this.getEntityPathToXYZ(this.theEntity, MathHelper.floor_double(p_75488_1_), (int)p_75488_3_, MathHelper.floor_double(p_75488_5_), this.getPathSearchRange(), this.canPassOpenWoodenDoors, this.canPassClosedWoodenDoors, this.avoidsWater, this.canSwim); - } - - /** - * Try to find and set a path to XYZ. Returns true if successful. - */ - public boolean tryMoveToXYZ(double p_75492_1_, double p_75492_3_, double p_75492_5_, double p_75492_7_) - { - FlyPathEntity pathentity = this.getPathToXYZ((double)MathHelper.floor_double(p_75492_1_), (double)((int)p_75492_3_), (double)MathHelper.floor_double(p_75492_5_)); - return this.setPath(pathentity, p_75492_7_); - } - - /** - * Returns the path to the given EntityLiving - */ - public FlyPathEntity getPathToEntityLiving(Entity p_75494_1_) - { - return !this.canNavigate() ? null : this.getPathEntityToEntity(this.theEntity, p_75494_1_, this.getPathSearchRange(), this.canPassOpenWoodenDoors, this.canPassClosedWoodenDoors, this.avoidsWater, this.canSwim); - } - - /** - * Try to find and set a path to EntityLiving. Returns true if successful. - */ - public boolean tryMoveToEntityLiving(Entity p_75497_1_, double p_75497_2_) - { - FlyPathEntity pathentity = this.getPathToEntityLiving(p_75497_1_); - return pathentity != null && this.setPath(pathentity, p_75497_2_); - } - - /** - * sets the active path data if path is 100% unique compared to old path, checks to adjust path for sun avoiding - * ents and stores end coords - */ - public boolean setPath(PathEntity pathEntity, double p_75484_2_) - { - FlyPathEntity p_75484_1_ = (FlyPathEntity) pathEntity; - if (p_75484_1_ == null) - { - this.currentPath = null; - return false; - } - else - { - if (!p_75484_1_.isSamePath(this.currentPath)) - { - this.currentPath = p_75484_1_; - } - - if (this.noSunPathfind) - { - this.removeSunnyPath(); - } - - if (this.currentPath.getCurrentPathLength() == 0) - { - return false; - } - else - { - this.speed = p_75484_2_; - Vec3 vec3 = this.getEntityPosition(); - this.ticksAtLastPos = this.totalTicks; - this.lastPosCheck.xCoord = vec3.xCoord; - this.lastPosCheck.yCoord = vec3.yCoord; - this.lastPosCheck.zCoord = vec3.zCoord; - return true; - } - } - } - - /** - * gets the actively used PathEntity - */ - public PathEntity getPath() - { - return this.currentPath; - } - - public void onUpdateNavigation() - { - ++this.totalTicks; - - if (!this.noPath()) - { - if (this.canNavigate()) - { - this.pathFollow(); - } - - if (!this.noPath()) - { - Vec3 vec3 = this.currentPath.getPosition(this.theEntity); - - if (vec3 != null) - { - this.theEntity.getMoveHelper().setMoveTo(vec3.xCoord, vec3.yCoord, vec3.zCoord, this.speed); - } - } - } - } - - private void pathFollow() - { - Vec3 vec3 = this.getEntityPosition(); - int i = this.currentPath.getCurrentPathLength(); - - for (int j = this.currentPath.getCurrentPathIndex(); j < this.currentPath.getCurrentPathLength(); ++j) - { - if (this.currentPath.getPathPointFromIndex(j).yCoord != (int)vec3.yCoord) - { - i = j; - break; - } - } - - float f = this.theEntity.width * this.theEntity.width; - int k; - - for (k = this.currentPath.getCurrentPathIndex(); k < i; ++k) - { - if (vec3.squareDistanceTo(this.currentPath.getVectorFromIndex(this.theEntity, k)) < (double)f) - { - this.currentPath.setCurrentPathIndex(k + 1); - } - } - - k = MathHelper.ceiling_float_int(this.theEntity.width); - int l = (int)this.theEntity.height + 1; - int i1 = k; - - for (int j1 = i - 1; j1 >= this.currentPath.getCurrentPathIndex(); --j1) - { - if (this.isDirectPathBetweenPoints(vec3, this.currentPath.getVectorFromIndex(this.theEntity, j1), k, l, i1)) - { - this.currentPath.setCurrentPathIndex(j1); - break; - } - } - - if (this.totalTicks - this.ticksAtLastPos > 100) - { - if (vec3.squareDistanceTo(this.lastPosCheck) < 2.25D) - { - this.clearPathEntity(); - } - - this.ticksAtLastPos = this.totalTicks; - this.lastPosCheck.xCoord = vec3.xCoord; - this.lastPosCheck.yCoord = vec3.yCoord; - this.lastPosCheck.zCoord = vec3.zCoord; - } - } - - /** - * If null path or reached the end - */ - public boolean noPath() - { - return this.currentPath == null || this.currentPath.isFinished(); - } - - /** - * sets active PathEntity to null - */ - public void clearPathEntity() - { - this.currentPath = null; - } - - private Vec3 getEntityPosition() - { - return Vec3.createVectorHelper(this.theEntity.posX, (double)this.getPathableYPos(), this.theEntity.posZ); - } - - /** - * Gets the safe pathing Y position for the entity depending on if it can path swim or not - */ - private int getPathableYPos() - { - return (int)(this.theEntity.boundingBox.minY + 0.5D); - } - - /** - * If on ground or swimming and can swim - */ - private boolean canNavigate() - { - return true; - } - - /** - * Returns true when an entity could stand at a position, including solid blocks under the entire entity. Args: - * xOffset, yOffset, zOffset, entityXSize, entityYSize, entityZSize, originPosition, vecX, vecZ - */ - private boolean isSafeToStandAt(int p_75483_1_, int p_75483_2_, int p_75483_3_, int p_75483_4_, int p_75483_5_, int p_75483_6_, Vec3 p_75483_7_, double p_75483_8_, double p_75483_10_) - { - return true; - } - - /** - * Trims path data from the end to the first sun covered block - */ - private void removeSunnyPath() - { - if (!this.worldObj.canBlockSeeTheSky(MathHelper.floor_double(this.theEntity.posX), (int)(this.theEntity.boundingBox.minY + 0.5D), MathHelper.floor_double(this.theEntity.posZ))) - { - for (int i = 0; i < this.currentPath.getCurrentPathLength(); ++i) - { - PathPoint pathpoint = this.currentPath.getPathPointFromIndex(i); - - if (this.worldObj.canBlockSeeTheSky(pathpoint.xCoord, pathpoint.yCoord, pathpoint.zCoord)) - { - this.currentPath.setCurrentPathLength(i - 1); - return; - } - } - } - } - - /** - * Returns true when an entity of specified size could safely walk in a straight line between the two points. Args: - * pos1, pos2, entityXSize, entityYSize, entityZSize - */ - private boolean isDirectPathBetweenPoints(Vec3 p_75493_1_, Vec3 p_75493_2_, int p_75493_3_, int p_75493_4_, int p_75493_5_) - { - int l = MathHelper.floor_double(p_75493_1_.xCoord); - int i1 = MathHelper.floor_double(p_75493_1_.zCoord); - double d0 = p_75493_2_.xCoord - p_75493_1_.xCoord; - double d1 = p_75493_2_.zCoord - p_75493_1_.zCoord; - double d2 = d0 * d0 + d1 * d1; - - if (d2 < 1.0E-8D) - { - return false; - } - else - { - double d3 = 1.0D / Math.sqrt(d2); - d0 *= d3; - d1 *= d3; - p_75493_3_ += 2; - p_75493_5_ += 2; - - if (!this.isSafeToStandAt(l, (int)p_75493_1_.yCoord, i1, p_75493_3_, p_75493_4_, p_75493_5_, p_75493_1_, d0, d1)) - { - return false; - } - else - { - p_75493_3_ -= 2; - p_75493_5_ -= 2; - double d4 = 1.0D / Math.abs(d0); - double d5 = 1.0D / Math.abs(d1); - double d6 = (double)(l * 1) - p_75493_1_.xCoord; - double d7 = (double)(i1 * 1) - p_75493_1_.zCoord; - - if (d0 >= 0.0D) - { - ++d6; - } - - if (d1 >= 0.0D) - { - ++d7; - } - - d6 /= d0; - d7 /= d1; - int j1 = d0 < 0.0D ? -1 : 1; - int k1 = d1 < 0.0D ? -1 : 1; - int l1 = MathHelper.floor_double(p_75493_2_.xCoord); - int i2 = MathHelper.floor_double(p_75493_2_.zCoord); - int j2 = l1 - l; - int k2 = i2 - i1; - - do - { - if (j2 * j1 <= 0 && k2 * k1 <= 0) - { - return true; - } - - if (d6 < d7) - { - d6 += d4; - l += j1; - j2 = l1 - l; - } - else - { - d7 += d5; - i1 += k1; - k2 = i2 - i1; - } - } - while (this.isSafeToStandAt(l, (int)p_75493_1_.yCoord, i1, p_75493_3_, p_75493_4_, p_75493_5_, p_75493_1_, d0, d1)); - - return false; - } - } - } - - /** - * Returns true if an entity does not collide with any solid blocks at the position. Args: xOffset, yOffset, - * zOffset, entityXSize, entityYSize, entityZSize, originPosition, vecX, vecZ - */ - private boolean isPositionClear(int p_75496_1_, int p_75496_2_, int p_75496_3_, int p_75496_4_, int p_75496_5_, int p_75496_6_, Vec3 p_75496_7_, double p_75496_8_, double p_75496_10_) - { - for (int k1 = p_75496_1_; k1 < p_75496_1_ + p_75496_4_; ++k1) - { - for (int l1 = p_75496_2_; l1 < p_75496_2_ + p_75496_5_; ++l1) - { - for (int i2 = p_75496_3_; i2 < p_75496_3_ + p_75496_6_; ++i2) - { - double d2 = (double)k1 + 0.5D - p_75496_7_.xCoord; - double d3 = (double)i2 + 0.5D - p_75496_7_.zCoord; - - if (d2 * p_75496_8_ + d3 * p_75496_10_ >= 0.0D) - { - Block block = this.worldObj.getBlock(k1, l1, i2); - - if (!block.getBlocksMovement(this.worldObj, k1, l1, i2)) - { - return false; - } - } - } - } - } - - return true; - } - - public FlyPathEntity getPathEntityToEntity(Entity p_72865_1_, Entity p_72865_2_, float p_72865_3_, boolean p_72865_4_, boolean p_72865_5_, boolean p_72865_6_, boolean p_72865_7_) - { - this.theEntity.worldObj.theProfiler.startSection("pathfind"); - int i = MathHelper.floor_double(p_72865_1_.posX); - int j = MathHelper.floor_double(p_72865_1_.posY + 1.0D); - int k = MathHelper.floor_double(p_72865_1_.posZ); - int l = (int)(p_72865_3_ + 16.0F); - int i1 = i - l; - int j1 = j - l; - int k1 = k - l; - int l1 = i + l; - int i2 = j + l; - int j2 = k + l; - ChunkCache chunkcache = new ChunkCache(this.theEntity.worldObj, i1, j1, k1, l1, i2, j2, 0); - FlyPathEntity pathentity = (new FlyPathFinder(chunkcache, p_72865_4_, p_72865_5_, p_72865_6_, p_72865_7_)).createEntityPathTo(p_72865_1_, p_72865_2_, p_72865_3_); - this.theEntity.worldObj.theProfiler.endSection(); - return pathentity; - } - - public FlyPathEntity getEntityPathToXYZ(Entity p_72844_1_, int p_72844_2_, int p_72844_3_, int p_72844_4_, float p_72844_5_, boolean p_72844_6_, boolean p_72844_7_, boolean p_72844_8_, boolean p_72844_9_) - { - this.theEntity.worldObj.theProfiler.startSection("pathfind"); - int l = MathHelper.floor_double(p_72844_1_.posX); - int i1 = MathHelper.floor_double(p_72844_1_.posY); - int j1 = MathHelper.floor_double(p_72844_1_.posZ); - int k1 = (int)(p_72844_5_ + 8.0F); - int l1 = l - k1; - int i2 = i1 - k1; - int j2 = j1 - k1; - int k2 = l + k1; - int l2 = i1 + k1; - int i3 = j1 + k1; - ChunkCache chunkcache = new ChunkCache(this.theEntity.worldObj, l1, i2, j2, k2, l2, i3, 0); - FlyPathEntity pathentity = (new FlyPathFinder(chunkcache, p_72844_6_, p_72844_7_, p_72844_8_, p_72844_9_)).createEntityPathTo(p_72844_1_, p_72844_2_, p_72844_3_, p_72844_4_, p_72844_5_); - this.theEntity.worldObj.theProfiler.endSection(); - return pathentity; - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateGround.java b/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateGround.java deleted file mode 100644 index e920def57..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateGround.java +++ /dev/null @@ -1,299 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityChicken; -import net.minecraft.init.Blocks; -import net.minecraft.pathfinding.PathFinder; -import net.minecraft.pathfinding.PathNavigate; -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import noppes.npcs.util.Vec3NPC; - -public class PathNavigateGround extends PathNavigateNPC -{ - protected WalkNodeProcessor nodeProcessor; - private boolean shouldAvoidSun; - - public PathNavigateGround(EntityLiving entitylivingIn, World worldIn) - { - super(entitylivingIn, worldIn); - } - - protected PathFinder getPathFinder() - { - this.nodeProcessor = new WalkNodeProcessor(); - this.nodeProcessor.setEnterDoors(true); - return new NPCPathFinder(this.nodeProcessor); - } - - /** - * If on ground or swimming and can swim - */ - protected boolean canNavigate() - { - return this.theEntity.onGround || this.getCanSwim() && this.isInLiquid() || this.theEntity.isRiding() && this.theEntity instanceof EntityZombie && this.theEntity.ridingEntity instanceof EntityChicken; - } - - protected Vec3 getEntityPosition() - { - return new Vec3NPC(this.theEntity.posX, (double)this.getPathablePosY(), this.theEntity.posZ); - } - - /** - * Gets the safe pathing Y position for the entity depending on if it can path swim or not - */ - private int getPathablePosY() - { - if (this.theEntity.isInWater() && this.getCanSwim()) - { - int i = (int)this.theEntity.boundingBox.minY; - Block block = this.worldObj.getBlock(MathHelper.floor_double(this.theEntity.posX), i, MathHelper.floor_double(this.theEntity.posZ)); - int j = 0; - - while (block == Blocks.flowing_water || block == Blocks.water) - { - ++i; - block = this.worldObj.getBlock(MathHelper.floor_double(this.theEntity.posX), i, MathHelper.floor_double(this.theEntity.posZ)); - ++j; - - if (j > 16) - { - return (int)this.theEntity.boundingBox.minY; - } - } - - return i; - } - else - { - return (int)(this.theEntity.boundingBox.minY + 0.5D); - } - } - - /** - * Trims path data from the end to the first sun covered block - */ - protected void removeSunnyPath() - { - super.removeSunnyPath(); - - if (this.shouldAvoidSun) - { - if (this.worldObj.canBlockSeeTheSky(MathHelper.floor_double(this.theEntity.posX), (int)(this.theEntity.boundingBox.minY + 0.5D), MathHelper.floor_double(this.theEntity.posZ))) - { - return; - } - - for (int i = 0; i < this.currentPath.getCurrentPathLength(); ++i) - { - PathPoint pathpoint = this.currentPath.getPathPointFromIndex(i); - - if (this.worldObj.canBlockSeeTheSky(pathpoint.xCoord, pathpoint.yCoord, pathpoint.zCoord)) - { - this.currentPath.setCurrentPathLength(i - 1); - return; - } - } - } - } - - /** - * Returns true when an entity of specified size could safely walk in a straight line between the two points. Args: - * pos1, pos2, entityXSize, entityYSize, entityZSize - */ - protected boolean isDirectPathBetweenPoints(Vec3 posVec31, Vec3 posVec32, int sizeX, int sizeY, int sizeZ) - { - int i = MathHelper.floor_double(posVec31.xCoord); - int j = MathHelper.floor_double(posVec31.zCoord); - double d0 = posVec32.xCoord - posVec31.xCoord; - double d1 = posVec32.zCoord - posVec31.zCoord; - double d2 = d0 * d0 + d1 * d1; - - if (d2 < 1.0E-8D) - { - return false; - } - else - { - double d3 = 1.0D / Math.sqrt(d2); - d0 = d0 * d3; - d1 = d1 * d3; - sizeX = sizeX + 2; - sizeZ = sizeZ + 2; - - if (!this.isSafeToStandAt(i, (int)posVec31.yCoord, j, sizeX, sizeY, sizeZ, posVec31, d0, d1)) - { - return false; - } - else - { - sizeX = sizeX - 2; - sizeZ = sizeZ - 2; - double d4 = 1.0D / Math.abs(d0); - double d5 = 1.0D / Math.abs(d1); - double d6 = (double)(i * 1) - posVec31.xCoord; - double d7 = (double)(j * 1) - posVec31.zCoord; - - if (d0 >= 0.0D) - { - ++d6; - } - - if (d1 >= 0.0D) - { - ++d7; - } - - d6 = d6 / d0; - d7 = d7 / d1; - int k = d0 < 0.0D ? -1 : 1; - int l = d1 < 0.0D ? -1 : 1; - int i1 = MathHelper.floor_double(posVec32.xCoord); - int j1 = MathHelper.floor_double(posVec32.zCoord); - int k1 = i1 - i; - int l1 = j1 - j; - - while (k1 * k > 0 || l1 * l > 0) - { - if (d6 < d7) - { - d6 += d4; - i += k; - k1 = i1 - i; - } - else - { - d7 += d5; - j += l; - l1 = j1 - j; - } - - if (!this.isSafeToStandAt(i, (int)posVec31.yCoord, j, sizeX, sizeY, sizeZ, posVec31, d0, d1)) - { - return false; - } - } - - return true; - } - } - } - - /** - * Returns true when an entity could stand at a position, including solid blocks under the entire entity. - */ - private boolean isSafeToStandAt(int x, int y, int z, int sizeX, int sizeY, int sizeZ, Vec3 vec31, double p_179683_8_, double p_179683_10_) - { - int i = x - sizeX / 2; - int j = z - sizeZ / 2; - - if (!this.isPositionClear(i, y, j, sizeX, sizeY, sizeZ, vec31, p_179683_8_, p_179683_10_)) - { - return false; - } - else - { - for (int k = i; k < i + sizeX; ++k) - { - for (int l = j; l < j + sizeZ; ++l) - { - double d0 = (double)k + 0.5D - vec31.xCoord; - double d1 = (double)l + 0.5D - vec31.zCoord; - - if (d0 * p_179683_8_ + d1 * p_179683_10_ >= 0.0D) - { - Block block = this.worldObj.getBlock(k, y - 1, l); - Material material = block.getMaterial(); - - if (material == Material.air) - { - return false; - } - - if (material == Material.water && !this.theEntity.isInWater()) - { - return false; - } - - if (material == Material.lava) - { - return false; - } - } - } - } - - return true; - } - } - - /** - * Returns true if an entity does not collide with any solid blocks at the position. - */ - private boolean isPositionClear(int p_179692_1_, int p_179692_2_, int p_179692_3_, int p_179692_4_, int p_179692_5_, int p_179692_6_, Vec3 p_179692_7_, double p_179692_8_, double p_179692_10_) - { - for (BlockPos blockpos : BlockPos.getAllInBox(new BlockPos(p_179692_1_, p_179692_2_, p_179692_3_), new BlockPos(p_179692_1_ + p_179692_4_ - 1, p_179692_2_ + p_179692_5_ - 1, p_179692_3_ + p_179692_6_ - 1))) - { - double d0 = (double)blockpos.getX() + 0.5D - p_179692_7_.xCoord; - double d1 = (double)blockpos.getZ() + 0.5D - p_179692_7_.zCoord; - - if (d0 * p_179692_8_ + d1 * p_179692_10_ >= 0.0D) - { - Block block = this.worldObj.getBlock(blockpos.getX(), blockpos.getY(), blockpos.getZ()); - - if (!block.getBlocksMovement(this.worldObj, blockpos.getX(), blockpos.getY(), blockpos.getZ())) - { - return false; - } - } - } - - return true; - } - - public void setAvoidsWater(boolean avoidsWater) - { - this.nodeProcessor.setAvoidsWater(avoidsWater); - } - - public boolean getAvoidsWater() - { - return this.nodeProcessor.getAvoidsWater(); - } - - public void setBreakDoors(boolean canBreakDoors) - { - this.nodeProcessor.setBreakDoors(canBreakDoors); - } - - public void setEnterDoors(boolean par1) - { - this.nodeProcessor.setEnterDoors(par1); - } - - public boolean getEnterDoors() - { - return this.nodeProcessor.getEnterDoors(); - } - - public void setCanSwim(boolean canSwim) - { - this.nodeProcessor.setCanSwim(canSwim); - } - - public boolean getCanSwim() - { - return this.nodeProcessor.getCanSwim(); - } - - public void setAvoidSun(boolean par1) - { - this.shouldAvoidSun = par1; - } -} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateNPC.java b/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateNPC.java deleted file mode 100644 index 41b781a73..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateNPC.java +++ /dev/null @@ -1,88 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.IAttributeInstance; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityChicken; -import net.minecraft.init.Blocks; -import net.minecraft.pathfinding.PathEntity; -import net.minecraft.pathfinding.PathNavigate; -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - -public class PathNavigateNPC extends PathNavigate -{ - protected EntityLiving theEntity; - protected World worldObj; - /** The PathEntity being followed. */ - protected PathEntity currentPath; - - /** Time, in number of ticks, following the current path */ - protected int totalTicks; - /** The time when the last position check was done (to detect successful movement) */ - protected int ticksAtLastPos; - /** Coordinates of the entity's position last time a check was done (part of monitoring getting 'stuck') */ - protected Vec3 lastPosCheck = Vec3.createVectorHelper(0.0D, 0.0D, 0.0D); - - public PathNavigateNPC(EntityLiving p_i1671_1_, World p_i1671_2_) - { - super(p_i1671_1_, p_i1671_2_); - this.theEntity = p_i1671_1_; - this.worldObj = p_i1671_2_; - } - - /** Gets Current Path of NPC **/ - public PathEntity getPath() - { - return this.currentPath; - } - - - /** Returns true if the entity is in water or lava, false otherwise **/ - protected boolean isInLiquid() - { - return this.theEntity.isInWater() || this.theEntity.handleLavaMovement(); - } - - /** Trims path data from the end to the first sun covered block **/ - protected void removeSunnyPath() - { - if (!this.worldObj.canBlockSeeTheSky(MathHelper.floor_double(this.theEntity.posX), (int)(this.theEntity.boundingBox.minY + 0.5D), MathHelper.floor_double(this.theEntity.posZ))) - { - for (int i = 0; i < this.currentPath.getCurrentPathLength(); ++i) - { - PathPoint pathpoint = this.currentPath.getPathPointFromIndex(i); - - if (this.worldObj.canBlockSeeTheSky(pathpoint.xCoord, pathpoint.yCoord, pathpoint.zCoord)) - { - this.currentPath.setCurrentPathLength(i - 1); - return; - } - } - } - } - - /** - * Checks if entity haven't been moved when last checked and if so, clears current {@link - * net.minecraft.pathfinding.PathEntity} - */ - protected void checkForStuck(Vec3 positionVec3) - { - if (this.totalTicks - this.ticksAtLastPos > 100) - { - if (positionVec3.squareDistanceTo(this.lastPosCheck) < 2.25D) - { - this.clearPathEntity(); - } - - this.ticksAtLastPos = this.totalTicks; - this.lastPosCheck = positionVec3; - } - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateSwimmer.java b/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateSwimmer.java deleted file mode 100644 index 39493ba36..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/PathNavigateSwimmer.java +++ /dev/null @@ -1,80 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.entity.EntityLiving; -import net.minecraft.pathfinding.PathFinder; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import noppes.npcs.ai.pathfinder.NPCPathFinder; -import noppes.npcs.ai.pathfinder.PathNavigateNPC; -import noppes.npcs.ai.pathfinder.SwimNodeProcessor; -import noppes.npcs.util.Vec3NPC; - -public class PathNavigateSwimmer extends PathNavigateNPC -{ - public PathNavigateSwimmer(EntityLiving entitylivingIn, World worldIn) - { - super(entitylivingIn, worldIn); - } - - protected PathFinder getPathFinder() - { - return new NPCPathFinder(new SwimNodeProcessor()); - } - - /** - * If on ground or swimming and can swim - */ - protected boolean canNavigate() - { - return this.isInLiquid(); - } - - protected Vec3 getEntityPosition() - { - return new Vec3NPC(this.theEntity.posX, this.theEntity.posY + (double)this.theEntity.height * 0.5D, this.theEntity.posZ); - } - - protected void pathFollow() - { - Vec3 vec3 = this.getEntityPosition(); - float f = this.theEntity.width * this.theEntity.width; - int i = 6; - - if (vec3.squareDistanceTo(this.currentPath.getVectorFromIndex(this.theEntity, this.currentPath.getCurrentPathIndex())) < (double)f) - { - this.currentPath.incrementPathIndex(); - } - - for (int j = Math.min(this.currentPath.getCurrentPathIndex() + i, this.currentPath.getCurrentPathLength() - 1); j > this.currentPath.getCurrentPathIndex(); --j) - { - Vec3 vec31 = this.currentPath.getVectorFromIndex(this.theEntity, j); - - if (vec31.squareDistanceTo(vec3) <= 36.0D && this.isDirectPathBetweenPoints(vec3, vec31, 0, 0, 0)) - { - this.currentPath.setCurrentPathIndex(j); - break; - } - } - - this.checkForStuck(vec3); - } - - /** - * Trims path data from the end to the first sun covered block - */ - protected void removeSunnyPath() - { - super.removeSunnyPath(); - } - - /** - * Returns true when an entity of specified size could safely walk in a straight line between the two points. Args: - * pos1, pos2, entityXSize, entityYSize, entityZSize - */ - protected boolean isDirectPathBetweenPoints(Vec3 posVec31, Vec3 posVec32, int sizeX, int sizeY, int sizeZ) - { - MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(posVec31, new Vec3NPC(posVec32.xCoord, posVec32.yCoord + (double)this.theEntity.height * 0.5D, posVec32.zCoord), false, true, false); - return movingobjectposition == null || movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.MISS; - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/SwimNodeProcessor.java b/src/main/java/noppes/npcs/ai/pathfinder/SwimNodeProcessor.java deleted file mode 100644 index 2fb31c70d..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/SwimNodeProcessor.java +++ /dev/null @@ -1,93 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class SwimNodeProcessor extends NodeProcessor -{ - public void initProcessor(IBlockAccess iblockaccessIn, Entity entityIn) - { - super.initProcessor(iblockaccessIn, entityIn); - } - - /** - * This method is called when all nodes have been processed and PathEntity is created. - * {@link net.minecraft.world.pathfinder.WalkNodeProcessor WalkNodeProcessor} uses this to change its field {@link - * net.minecraft.world.pathfinder.WalkNodeProcessor#avoidsWater avoidsWater} - */ - public void postProcess() - { - super.postProcess(); - } - - /** - * Returns given entity's position as PathPoint - */ - public PathPoint getPathPointTo(Entity entityIn) - { - return this.openPoint(MathHelper.floor_double(entityIn.boundingBox.minX), MathHelper.floor_double(entityIn.boundingBox.minY + 0.5D), MathHelper.floor_double(entityIn.boundingBox.minZ)); - } - - /** - * Returns PathPoint for given coordinates - */ - public PathPoint getPathPointToCoords(Entity entityIn, double x, double y, double target) - { - return this.openPoint(MathHelper.floor_double(x - (double)(entityIn.width / 2.0F)), MathHelper.floor_double(y + 0.5D), MathHelper.floor_double(target - (double)(entityIn.width / 2.0F))); - } - - public int findPathOptions(PathPoint[] pathOptions, Entity entityIn, PathPoint currentPoint, PathPoint targetPoint, float maxDistance) - { - int i = 0; - - for (EnumFacing enumfacing : EnumFacing.values()) - { - PathPoint pathpoint = this.getSafePoint(entityIn, currentPoint.xCoord + enumfacing.getFrontOffsetX(), currentPoint.yCoord + enumfacing.getFrontOffsetY(), currentPoint.zCoord + enumfacing.getFrontOffsetZ()); - - if (pathpoint != null && !pathpoint.isFirst && pathpoint.distanceTo(targetPoint) < maxDistance) - { - pathOptions[i++] = pathpoint; - } - } - - return i; - } - - /** - * Returns a point that the entity can safely move to - */ - private PathPoint getSafePoint(Entity entityIn, int x, int y, int z) - { - int i = this.func_176186_b(entityIn, x, y, z); - return i == -1 ? this.openPoint(x, y, z) : null; - } - - private int func_176186_b(Entity entityIn, int x, int y, int z) - { - BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(); - - for (int i = x; i < x + this.entitySizeX; ++i) - { - for (int j = y; j < y + this.entitySizeY; ++j) - { - for (int k = z; k < z + this.entitySizeZ; ++k) - { - Block block = this.blockaccess.getBlock(i, j, k); - - if (block.getMaterial() != Material.water) - { - return 0; - } - } - } - } - - return -1; - } -} diff --git a/src/main/java/noppes/npcs/ai/pathfinder/WalkNodeProcessor.java b/src/main/java/noppes/npcs/ai/pathfinder/WalkNodeProcessor.java deleted file mode 100644 index 48ceeaf82..000000000 --- a/src/main/java/noppes/npcs/ai/pathfinder/WalkNodeProcessor.java +++ /dev/null @@ -1,303 +0,0 @@ -package noppes.npcs.ai.pathfinder; - -import net.minecraft.block.*; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; -import net.minecraft.pathfinding.PathPoint; -import net.minecraft.util.MathHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -public class WalkNodeProcessor extends NodeProcessor -{ - private boolean canEnterDoors; - private boolean canBreakDoors; - private boolean avoidsWater; - private boolean canSwim; - private boolean shouldAvoidWater; - - public void initProcessor(IBlockAccess iblockaccessIn, Entity entityIn) - { - super.initProcessor(iblockaccessIn, entityIn); - this.shouldAvoidWater = this.avoidsWater; - } - - /** - * This method is called when all nodes have been processed and PathEntity is created. - * {@link noppes.npcs.ai.pathfinder.WalkNodeProcessor WalkNodeProcessor} uses this to change its field {@link - * noppes.npcs.ai.pathfinder.WalkNodeProcessor#avoidsWater avoidsWater} - */ - public void postProcess() - { - super.postProcess(); - this.avoidsWater = this.shouldAvoidWater; - } - - /** - * Returns given entity's position as PathPoint - */ - public PathPoint getPathPointTo(Entity entityIn) - { - int i; - - if (this.canSwim && entityIn.isInWater()) - { - i = (int)entityIn.boundingBox.minY; - BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(MathHelper.floor_double(entityIn.posX), i, MathHelper.floor_double(entityIn.posZ)); - - for (Block block = this.blockaccess.getBlock(blockpos$mutableblockpos.getX(), blockpos$mutableblockpos.getY(), blockpos$mutableblockpos.getZ()); block == Blocks.flowing_water || block == Blocks.water; block = this.blockaccess.getBlock(blockpos$mutableblockpos.getX(), blockpos$mutableblockpos.getY(), blockpos$mutableblockpos.getZ())) - { - ++i; - blockpos$mutableblockpos.set(MathHelper.floor_double(entityIn.posX), i, MathHelper.floor_double(entityIn.posZ)); - } - - this.avoidsWater = false; - } - else - { - i = MathHelper.floor_double(entityIn.boundingBox.minY + 0.5D); - } - - return this.openPoint(MathHelper.floor_double(entityIn.boundingBox.minX), i, MathHelper.floor_double(entityIn.boundingBox.minZ)); - } - - /** - * Returns PathPoint for given coordinates - */ - public PathPoint getPathPointToCoords(Entity entityIn, double x, double y, double target) - { - return this.openPoint(MathHelper.floor_double(x - (double)(entityIn.width / 2.0F)), MathHelper.floor_double(y), MathHelper.floor_double(target - (double)(entityIn.width / 2.0F))); - } - - public int findPathOptions(PathPoint[] pathOptions, Entity entityIn, PathPoint currentPoint, PathPoint targetPoint, float maxDistance) - { - int i = 0; - int j = 0; - - if (this.getVerticalOffset(entityIn, currentPoint.xCoord, currentPoint.yCoord + 1, currentPoint.zCoord) == 1) - { - j = 1; - } - - PathPoint pathpoint = this.getSafePoint(entityIn, currentPoint.xCoord, currentPoint.yCoord, currentPoint.zCoord + 1, j); - PathPoint pathpoint1 = this.getSafePoint(entityIn, currentPoint.xCoord - 1, currentPoint.yCoord, currentPoint.zCoord, j); - PathPoint pathpoint2 = this.getSafePoint(entityIn, currentPoint.xCoord + 1, currentPoint.yCoord, currentPoint.zCoord, j); - PathPoint pathpoint3 = this.getSafePoint(entityIn, currentPoint.xCoord, currentPoint.yCoord, currentPoint.zCoord - 1, j); - - if (pathpoint != null && !pathpoint.isFirst && pathpoint.distanceTo(targetPoint) < maxDistance) - { - pathOptions[i++] = pathpoint; - } - - if (pathpoint1 != null && !pathpoint1.isFirst && pathpoint1.distanceTo(targetPoint) < maxDistance) - { - pathOptions[i++] = pathpoint1; - } - - if (pathpoint2 != null && !pathpoint2.isFirst && pathpoint2.distanceTo(targetPoint) < maxDistance) - { - pathOptions[i++] = pathpoint2; - } - - if (pathpoint3 != null && !pathpoint3.isFirst && pathpoint3.distanceTo(targetPoint) < maxDistance) - { - pathOptions[i++] = pathpoint3; - } - - return i; - } - - /** - * Returns a point that the entity can safely move to - */ - private PathPoint getSafePoint(Entity entityIn, int x, int y, int z, int p_176171_5_) - { - PathPoint pathpoint = null; - int i = this.getVerticalOffset(entityIn, x, y, z); - - if (i == 2) - { - return this.openPoint(x, y, z); - } - else - { - if (i == 1) - { - pathpoint = this.openPoint(x, y, z); - } - - if (pathpoint == null && p_176171_5_ > 0 && i != -3 && i != -4 && this.getVerticalOffset(entityIn, x, y + p_176171_5_, z) == 1) - { - pathpoint = this.openPoint(x, y + p_176171_5_, z); - y += p_176171_5_; - } - - if (pathpoint != null) - { - int j = 0; - int k; - - for (k = 0; y > 0; pathpoint = this.openPoint(x, y, z)) - { - k = this.getVerticalOffset(entityIn, x, y - 1, z); - - if (this.avoidsWater && k == -1) - { - return null; - } - - if (k != 1) - { - break; - } - - if (j++ >= entityIn.getMaxSafePointTries()) - { - return null; - } - - --y; - - if (y <= 0) - { - return null; - } - } - - if (k == -2) - { - return null; - } - } - - return pathpoint; - } - } - - /** - * Checks if an entity collides with blocks at a position. - * Returns 1 if clear, 0 for colliding with any solid block, -1 for water(if avoids water), - * -2 for lava, -3 for fence and wall, -4 for closed trapdoor, 2 if otherwise clear except for open trapdoor or - * water(if not avoiding) - */ - private int getVerticalOffset(Entity entityIn, int x, int y, int z) - { - return func_176170_a(this.blockaccess, entityIn, x, y, z, this.entitySizeX, this.entitySizeY, this.entitySizeZ, this.avoidsWater, this.canBreakDoors, this.canEnterDoors); - } - - public static int func_176170_a(IBlockAccess blockaccessIn, Entity entityIn, int x, int y, int z, int sizeX, int sizeY, int sizeZ, boolean avoidWater, boolean breakDoors, boolean enterDoors) - { - boolean flag = false; - BlockPos blockpos = new BlockPos(entityIn); - BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(); - - for (int i = x; i < x + sizeX; ++i) - { - for (int j = y; j < y + sizeY; ++j) - { - for (int k = z; k < z + sizeZ; ++k) - { - blockpos$mutableblockpos.set(i, j, k); - Block block = blockaccessIn.getBlock(blockpos$mutableblockpos.getX(), blockpos$mutableblockpos.getY(), blockpos$mutableblockpos.getZ()); - - if (block.getMaterial() != Material.air) - { - if (block != Blocks.trapdoor) - { - if (block != Blocks.flowing_water && block != Blocks.water) - { - if (!enterDoors && block instanceof BlockDoor && block.getMaterial() == Material.wood) - { - return 0; - } - } - else - { - if (avoidWater) - { - return -1; - } - - flag = true; - } - } - else - { - flag = true; - } - - if (entityIn.worldObj.getBlock(blockpos$mutableblockpos.getX(), blockpos$mutableblockpos.getY(), blockpos$mutableblockpos.getZ()) instanceof BlockRailBase) - { - if (!(entityIn.worldObj.getBlock(blockpos.getX(), blockpos.getY(), blockpos.getZ()) instanceof BlockRailBase) && !(entityIn.worldObj.getBlock(blockpos.down().getX(), blockpos.down().getY(), blockpos.down().getZ()) instanceof BlockRailBase)) - { - return -3; - } - } - else if (!block.getBlocksMovement(blockaccessIn, blockpos$mutableblockpos.getX(), blockpos$mutableblockpos.getY(), blockpos$mutableblockpos.getZ()) && (!breakDoors || !(block instanceof BlockDoor) || block.getMaterial() != Material.wood)) - { - if (block instanceof BlockFence || block instanceof BlockFenceGate || block instanceof BlockWall) - { - return -3; - } - - if (block == Blocks.trapdoor) - { - return -4; - } - - Material material = block.getMaterial(); - - if (material != Material.lava) - { - return 0; - } - - if (!entityIn.handleLavaMovement()) - { - return -2; - } - } - } - } - } - } - - return flag ? 2 : 1; - } - - public void setEnterDoors(boolean canEnterDoorsIn) - { - this.canEnterDoors = canEnterDoorsIn; - } - - public void setBreakDoors(boolean canBreakDoorsIn) - { - this.canBreakDoors = canBreakDoorsIn; - } - - public void setAvoidsWater(boolean avoidsWaterIn) - { - this.avoidsWater = avoidsWaterIn; - } - - public void setCanSwim(boolean canSwimIn) - { - this.canSwim = canSwimIn; - } - - public boolean getEnterDoors() - { - return this.canEnterDoors; - } - - public boolean getCanSwim() - { - return this.canSwim; - } - - public boolean getAvoidsWater() - { - return this.avoidsWater; - } -} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/ai/target/EntityAIClosestTarget.java b/src/main/java/noppes/npcs/ai/target/EntityAIClosestTarget.java index 454d1fb71..6bf82b4b3 100644 --- a/src/main/java/noppes/npcs/ai/target/EntityAIClosestTarget.java +++ b/src/main/java/noppes/npcs/ai/target/EntityAIClosestTarget.java @@ -6,13 +6,10 @@ import java.util.List; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITarget; import net.minecraft.entity.monster.EntityMob; import net.minecraft.util.MathHelper; -import noppes.npcs.CustomNpcs; -import noppes.npcs.entity.EntityNPCInterface; public class EntityAIClosestTarget extends EntityAITarget { @@ -55,11 +52,10 @@ public class EntityAIClosestTarget extends EntityAITarget } else { - taskOwner.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(((EntityNPCInterface) taskOwner).stats.aggroRange); double d0 = this.getTargetDistance(); List list = this.taskOwner.worldObj.selectEntitiesWithinAABB(this.targetClass, this.taskOwner.boundingBox.expand(d0, MathHelper.ceiling_double_int(d0 / 2.0D), d0), this.field_82643_g); Collections.sort(list, this.theNearestAttackableTargetSorter); - taskOwner.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(CustomNpcs.NpcNavRange); + if (list.isEmpty()) { return false; diff --git a/src/main/java/noppes/npcs/blocks/BlockPedestal.java b/src/main/java/noppes/npcs/blocks/BlockPedestal.java index 2caaa5786..68c401f18 100644 --- a/src/main/java/noppes/npcs/blocks/BlockPedestal.java +++ b/src/main/java/noppes/npcs/blocks/BlockPedestal.java @@ -8,7 +8,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.tileentity.TileEntity; @@ -42,7 +41,7 @@ public class BlockPedestal extends BlockTrigger{ par1World.markBlockForUpdate(i, j, k); updateSurrounding(par1World, i, j, k); } - else if(item == null || item.getItem() == null || item.getItem() instanceof ItemBlock) + else if(item == null || item.getItem() == null || !(item.getItem() instanceof ItemSword)) return true; else if(item != null && weapon == null){ tile.setInventorySlotContents(0, item); diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java index 5d8b5914a..564a3f94b 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java @@ -10,7 +10,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.PlayerData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestData; import noppes.npcs.controllers.QuestData; @@ -44,16 +43,15 @@ public class TileWaypoint extends TileEntity { if(toCheck.isEmpty()) return; for(EntityPlayer player : toCheck){ - PlayerData playerData = PlayerDataController.instance.getPlayerData(player); - PlayerQuestData questData = playerData.questData; - for(QuestData data : questData.activeQuests.values()){ + PlayerQuestData playerdata = PlayerDataController.instance.getPlayerData(player).questData; + for(QuestData data : playerdata.activeQuests.values()){ if(data.quest.type != EnumQuestType.Location) continue; QuestLocation quest = (QuestLocation) data.quest.questInterface; if(quest.setFound(data, name)){ player.addChatMessage(new ChatComponentTranslation(name + " " + StatCollector.translateToLocal("quest.found"))); - questData.checkQuestCompletion(playerData, EnumQuestType.Location); + playerdata.checkQuestCompletion(player, EnumQuestType.Location); } } } diff --git a/src/main/java/noppes/npcs/client/Client.java b/src/main/java/noppes/npcs/client/Client.java index cb37e5d72..7d57987b3 100644 --- a/src/main/java/noppes/npcs/client/Client.java +++ b/src/main/java/noppes/npcs/client/Client.java @@ -4,16 +4,13 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.io.IOException; -import java.util.HashMap; import noppes.npcs.CustomNpcs; import noppes.npcs.Server; -import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.constants.EnumPacketServer; import cpw.mods.fml.common.network.internal.FMLProxyPacket; public class Client { - public static HashMap customOverlays = new HashMap<>(); public static void sendData(EnumPacketServer enu, Object... obs) { ByteBuf buffer = Unpooled.buffer(); diff --git a/src/main/java/noppes/npcs/client/ClientEventHandler.java b/src/main/java/noppes/npcs/client/ClientEventHandler.java index 90c49f506..919318be6 100644 --- a/src/main/java/noppes/npcs/client/ClientEventHandler.java +++ b/src/main/java/noppes/npcs/client/ClientEventHandler.java @@ -1,18 +1,5 @@ package noppes.npcs.client; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import noppes.npcs.client.gui.customoverlay.OverlayCustom; -import org.lwjgl.opengl.GL11; - public class ClientEventHandler { - @SubscribeEvent - public void onOverlayRender(RenderGameOverlayEvent.Post event){ - if(event.type == RenderGameOverlayEvent.ElementType.ALL) { - for (OverlayCustom overlayCustom : Client.customOverlays.values()) { - overlayCustom.renderGameOverlay(event.partialTicks); - } - } - } + } diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index ec1779fc4..ed09acadb 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -21,14 +21,12 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.Item; -import net.minecraft.stats.Achievement; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.FakePlayer; import noppes.npcs.CommonProxy; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; @@ -64,8 +62,16 @@ import noppes.npcs.client.controllers.PresetController; import noppes.npcs.client.fx.EntityElementalStaffFX; import noppes.npcs.client.fx.EntityEnderFX; import noppes.npcs.client.fx.EntityRainbowFX; -import noppes.npcs.client.gui.*; -import noppes.npcs.client.gui.custom.GuiCustom; +import noppes.npcs.client.gui.GuiBorderBlock; +import noppes.npcs.client.gui.GuiMerchantAdd; +import noppes.npcs.client.gui.GuiNpcDimension; +import noppes.npcs.client.gui.GuiNpcMobSpawner; +import noppes.npcs.client.gui.GuiNpcMobSpawnerMounter; +import noppes.npcs.client.gui.GuiNpcPather; +import noppes.npcs.client.gui.GuiNpcRedstoneBlock; +import noppes.npcs.client.gui.GuiNpcRemoteEditor; +import noppes.npcs.client.gui.GuiNpcWaypoint; +import noppes.npcs.client.gui.GuiScript; import noppes.npcs.client.gui.global.GuiNPCManageBanks; import noppes.npcs.client.gui.global.GuiNPCManageDialogs; import noppes.npcs.client.gui.global.GuiNPCManageFactions; @@ -99,9 +105,19 @@ import noppes.npcs.client.gui.roles.GuiNpcFollowerSetup; import noppes.npcs.client.gui.roles.GuiNpcItemGiver; import noppes.npcs.client.gui.roles.GuiNpcTraderSetup; import noppes.npcs.client.gui.roles.GuiNpcTransporter; -import noppes.npcs.client.gui.script.GuiScriptGlobal; -import noppes.npcs.client.model.*; -import noppes.npcs.client.renderer.*; +import noppes.npcs.client.model.ModelNPCGolem; +import noppes.npcs.client.model.ModelNpcCrystal; +import noppes.npcs.client.model.ModelNpcDragon; +import noppes.npcs.client.model.ModelNpcSlime; +import noppes.npcs.client.model.ModelSkirtArmor; +import noppes.npcs.client.renderer.NpcItemRenderer; +import noppes.npcs.client.renderer.RenderCustomNpc; +import noppes.npcs.client.renderer.RenderNPCHumanMale; +import noppes.npcs.client.renderer.RenderNPCPony; +import noppes.npcs.client.renderer.RenderNpcCrystal; +import noppes.npcs.client.renderer.RenderNpcDragon; +import noppes.npcs.client.renderer.RenderNpcSlime; +import noppes.npcs.client.renderer.RenderProjectile; import noppes.npcs.client.renderer.blocks.BlockBannerRenderer; import noppes.npcs.client.renderer.blocks.BlockBarrelRenderer; import noppes.npcs.client.renderer.blocks.BlockBeamRenderer; @@ -129,11 +145,31 @@ import noppes.npcs.client.renderer.blocks.BlockWallBannerRenderer; import noppes.npcs.client.renderer.blocks.BlockWeaponRackRenderer; import noppes.npcs.config.StringCache; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.containers.*; -import noppes.npcs.controllers.PlayerData; -import noppes.npcs.entity.*; +import noppes.npcs.containers.ContainerCarpentryBench; +import noppes.npcs.containers.ContainerCrate; +import noppes.npcs.containers.ContainerMail; +import noppes.npcs.containers.ContainerManageBanks; +import noppes.npcs.containers.ContainerManageRecipes; +import noppes.npcs.containers.ContainerNPCBankInterface; +import noppes.npcs.containers.ContainerNPCCompanion; +import noppes.npcs.containers.ContainerNPCFollower; +import noppes.npcs.containers.ContainerNPCFollowerHire; +import noppes.npcs.containers.ContainerNPCFollowerSetup; +import noppes.npcs.containers.ContainerNPCInv; +import noppes.npcs.containers.ContainerNPCTrader; +import noppes.npcs.containers.ContainerNPCTraderSetup; +import noppes.npcs.containers.ContainerNpcItemGiver; +import noppes.npcs.containers.ContainerNpcQuestReward; +import noppes.npcs.containers.ContainerNpcQuestTypeItem; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; +import noppes.npcs.entity.EntityProjectile; -import noppes.npcs.scripted.interfaces.IWorld; import org.lwjgl.input.Keyboard; import tconstruct.client.tabs.InventoryTabFactions; @@ -147,9 +183,9 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper; public class ClientProxy extends CommonProxy { public static KeyBinding QuestLog; - + public static FontContainer Font; - + public void load() { Font = new FontContainer(CustomNpcs.FontType, CustomNpcs.FontSize); createFolders(); @@ -162,10 +198,7 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityNpcDragon.class, new RenderNpcDragon(new ModelNpcDragon(0.0F), 0.5F)); RenderingRegistry.registerEntityRenderingHandler(EntityNpcSlime.class, new RenderNpcSlime(new ModelNpcSlime(16), new ModelNpcSlime(0), 0.25F)); RenderingRegistry.registerEntityRenderingHandler(EntityProjectile.class, new RenderProjectile()); - RenderingRegistry.registerEntityRenderingHandler(EntityCustomNpc.class, new RenderCustomNpc()); - - RenderingRegistry.registerEntityRenderingHandler(EntityNPCGolem.class, new RenderNPCHumanMale( new ModelNPCGolem(0), new ModelNPCGolem(1F), new ModelNPCGolem(0.5F))); FMLCommonHandler.instance().bus().register(new ClientTickHandler()); @@ -173,7 +206,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileBlockAnvil.class, new BlockCarpentryBenchRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileMailbox.class, new BlockMailboxRenderer()); RenderingRegistry.registerBlockHandler(new BlockBorderRenderer()); - + if(!CustomNpcs.DisableExtraBlock){ ClientRegistry.bindTileEntitySpecialRenderer(TileBanner.class, new BlockBannerRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileWallBanner.class, new BlockWallBannerRenderer()); @@ -199,47 +232,43 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerBlockHandler(new BlockBloodRenderer()); } Minecraft mc = Minecraft.getMinecraft(); - + QuestLog = new KeyBinding("Quest Log", Keyboard.KEY_L, "key.categories.gameplay"); - + ClientRegistry.registerKeyBinding(QuestLog); mc.gameSettings.loadOptions(); - + new PresetController(CustomNpcs.Dir); - + if(CustomNpcs.EnableUpdateChecker){ VersionChecker checker = new VersionChecker(); checker.start(); } - + ClientCloneController.Instance = new ClientCloneController(); - MinecraftForge.EVENT_BUS.register(new ClientEventHandler()); - - if(CustomNpcs.InventoryGuiEnabled){ - MinecraftForge.EVENT_BUS.register(new TabRegistry()); - - if (TabRegistry.getTabList().size() < 2){ - TabRegistry.registerTab(new InventoryTabVanilla()); - } - TabRegistry.registerTab(new InventoryTabFactions()); - TabRegistry.registerTab(new InventoryTabQuests()); - } - } - - public FakePlayer getCommandPlayer(IWorld world) { - return (FakePlayer)(new EntityCustomNpc(world.getMCWorld())).getFakePlayer(); + MinecraftForge.EVENT_BUS.register(new ClientEventHandler()); + + if(CustomNpcs.InventoryGuiEnabled){ + MinecraftForge.EVENT_BUS.register(new TabRegistry()); + + if (TabRegistry.getTabList().size() < 2){ + TabRegistry.registerTab(new InventoryTabVanilla()); + } + TabRegistry.registerTab(new InventoryTabFactions()); + TabRegistry.registerTab(new InventoryTabQuests()); + } } private void createFolders() { File file = new File(CustomNpcs.Dir,"assets/customnpcs"); if(!file.exists()) file.mkdirs(); - + File check = new File(file,"sounds"); if(!check.exists()) check.mkdir(); - + File json = new File(file, "sounds.json"); if(!json.exists()){ try { @@ -254,30 +283,16 @@ public class ClientProxy extends CommonProxy { check = new File(file,"textures"); if(!check.exists()) check.mkdir(); - + File cache = new File(check,"cache"); if(!cache.exists()) cache.mkdir(); ((IReloadableResourceManager)Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new CustomNpcResourceListener()); } - public static PlayerData playerData = new PlayerData(); - @Override - public PlayerData getPlayerData(EntityPlayer player) { - if (player.getUniqueID() == Minecraft.getMinecraft().thePlayer.getUniqueID()) { - if (playerData.player != player) { - playerData.player = player; - } - - return playerData; - } else { - return null; - } - } - @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - + if (ID > EnumGuiType.values().length) return null; EnumGuiType gui = EnumGuiType.values()[ID]; @@ -286,8 +301,6 @@ public class ClientProxy extends CommonProxy { return getGui(npc, gui, container, x, y, z); } - - private GuiScreen getGui(EntityNPCInterface npc, EnumGuiType gui, Container container, int x, int y, int z) { if (gui == EnumGuiType.MainMenuDisplay){ if(npc != null) @@ -306,16 +319,16 @@ public class ClientProxy extends CommonProxy { else if(gui == EnumGuiType.QuestReward) return new GuiNpcQuestReward(npc, (ContainerNpcQuestReward) container); - + else if(gui == EnumGuiType.QuestItem) return new GuiNpcQuestTypeItem(npc, (ContainerNpcQuestTypeItem) container); - + else if (gui == EnumGuiType.MovingPath) return new GuiNpcPather(npc); else if (gui == EnumGuiType.ManageFactions) return new GuiNPCManageFactions(npc); - + else if (gui == EnumGuiType.ManageLinked) return new GuiNPCManageLinkedNpc(npc); @@ -324,15 +337,15 @@ public class ClientProxy extends CommonProxy { else if (gui == EnumGuiType.ManageRecipes) return new GuiNpcManageRecipes(npc,(ContainerManageRecipes) container); - + else if (gui == EnumGuiType.ManageDialogs) return new GuiNPCManageDialogs(npc); - + else if (gui == EnumGuiType.ManageQuests) return new GuiNPCManageQuest(npc); - + else if(gui == EnumGuiType.ManageBanks) - return new GuiNPCManageBanks(npc,(ContainerManageBanks) container); + return new GuiNPCManageBanks(npc,(ContainerManageBanks) container); else if (gui == EnumGuiType.MainMenuGlobal) return new GuiNPCGlobalMainMenu(npc); @@ -345,91 +358,84 @@ public class ClientProxy extends CommonProxy { else if (gui == EnumGuiType.PlayerFollower) return new GuiNpcFollower(npc, (ContainerNPCFollower) container); - + else if(gui == EnumGuiType.PlayerTrader) return new GuiNPCTrader(npc, (ContainerNPCTrader) container); - + else if(gui == EnumGuiType.PlayerBankSmall || gui == EnumGuiType.PlayerBankUnlock || gui == EnumGuiType.PlayerBankUprade || gui == EnumGuiType.PlayerBankLarge) return new GuiNPCBankChest(npc, (ContainerNPCBankInterface) container); else if(gui == EnumGuiType.PlayerTransporter) return new GuiTransportSelection(npc); - + else if(gui == EnumGuiType.Script) return new GuiScript(npc); - + else if(gui == EnumGuiType.PlayerAnvil) return new GuiNpcCarpentryBench((ContainerCarpentryBench) container); - + else if (gui == EnumGuiType.SetupFollower) return new GuiNpcFollowerSetup(npc, (ContainerNPCFollowerSetup) container); - + else if (gui == EnumGuiType.SetupItemGiver) return new GuiNpcItemGiver(npc, (ContainerNpcItemGiver) container); - + else if(gui == EnumGuiType.SetupTrader) return new GuiNpcTraderSetup(npc, (ContainerNPCTraderSetup) container); else if(gui == EnumGuiType.SetupTransporter) return new GuiNpcTransporter(npc); - + else if(gui == EnumGuiType.SetupBank) return new GuiNpcBankSetup(npc); - + else if(gui == EnumGuiType.NpcRemote && Minecraft.getMinecraft().currentScreen == null) return new GuiNpcRemoteEditor(); - else if(gui == EnumGuiType.ScriptEvent && Minecraft.getMinecraft().currentScreen == null) - return new GuiScriptGlobal(); - else if(gui == EnumGuiType.PlayerMailman) return new GuiMailmanWrite((ContainerMail) container, x == 1, y == 1); - + else if(gui == EnumGuiType.PlayerMailbox) return new GuiMailbox(); - + else if(gui == EnumGuiType.MerchantAdd) return new GuiMerchantAdd(); - + else if(gui == EnumGuiType.Crate) return new GuiCrate((ContainerCrate)container); else if(gui == EnumGuiType.NpcDimensions) return new GuiNpcDimension(); - + else if(gui == EnumGuiType.Border) return new GuiBorderBlock(x, y, z); else if(gui == EnumGuiType.BigSign) return new GuiBigSign(x, y, z); - + else if (gui == EnumGuiType.RedstoneBlock) return new GuiNpcRedstoneBlock(x, y, z); - + else if(gui == EnumGuiType.MobSpawner) return new GuiNpcMobSpawner(x, y, z); - + else if(gui == EnumGuiType.MobSpawnerMounter) return new GuiNpcMobSpawnerMounter(x, y, z); else if (gui == EnumGuiType.Waypoint) return new GuiNpcWaypoint(x, y, z); - + else if (gui == EnumGuiType.Companion) return new GuiNpcCompanionStats(npc); - + else if (gui == EnumGuiType.CompanionTalent) return new GuiNpcCompanionTalents(npc); - + else if (gui == EnumGuiType.CompanionInv) return new GuiNpcCompanionInv(npc, (ContainerNPCCompanion) container); - - else if (gui == EnumGuiType.CustomGui) - return new GuiCustom((ContainerCustomGui)container); - return null; } - + @Override public void openGui(int i, int j, int k, EnumGuiType gui, EntityPlayer player) { Minecraft minecraft = Minecraft.getMinecraft(); @@ -437,7 +443,7 @@ public class ClientProxy extends CommonProxy { return; GuiScreen guiscreen = getGui(null, gui, null, i, j, k); - + if (guiscreen != null) { minecraft.displayGuiScreen(guiscreen); @@ -468,7 +474,7 @@ public class ClientProxy extends CommonProxy { if (guiscreen != null) { minecraft.displayGuiScreen((GuiScreen)guiscreen); } - + } @Override @@ -476,18 +482,18 @@ public class ClientProxy extends CommonProxy { if(string.equals("Spell")){ int color = (Integer) ob[0]; int number = (Integer) ob[1]; - for(int i = 0; i < number; i++){ - Random rand = player.worldObj.rand; + for(int i = 0; i < number; i++){ + Random rand = player.worldObj.rand; double x = (rand.nextDouble() - 0.5D) * (double)player.width; double y = player.getEyeHeight(); double z = (rand.nextDouble() - 0.5D) * (double)player.width; - - double f = (rand.nextDouble() - 0.5D) * 2D; - double f1 = -rand.nextDouble(); - double f2 = (rand.nextDouble() - 0.5D) * 2D; - - Minecraft.getMinecraft().effectRenderer.addEffect(new EntityElementalStaffFX(player, x, y, z, f, f1, f2, color)); - } + + double f = (rand.nextDouble() - 0.5D) * 2D; + double f1 = -rand.nextDouble(); + double f2 = (rand.nextDouble() - 0.5D) * 2D; + + Minecraft.getMinecraft().effectRenderer.addEffect(new EntityElementalStaffFX(player, x, y, z, f, f1, f2, color)); + } } else if(string.equals("ModelData")){ ModelData data = (ModelData) ob[0]; @@ -501,21 +507,21 @@ public class ClientProxy extends CommonProxy { EntityEnderFX fx = new EntityEnderFX(npc, (rand.nextDouble() - 0.5D) * (double)player.width, (rand.nextDouble() * (double)player.height) - height - 0.25D, (rand.nextDouble() - 0.5D) * (double)player.width, (rand.nextDouble() - 0.5D) * 2D, -rand.nextDouble(), (rand.nextDouble() - 0.5D) * 2D, particles); minecraft.effectRenderer.addEffect(fx); } - + } else if(particles.type == 1){ - for(int i = 0; i < 2; i++){ - double x = player.posX + (rand.nextDouble() - 0.5D) * 0.9; - double y = (player.posY + rand.nextDouble() * 1.9) - 0.25D - height; - double z = player.posZ + (rand.nextDouble() - 0.5D) * 0.9; - - - double f = (rand.nextDouble() - 0.5D) * 2D; - double f1 = -rand.nextDouble(); - double f2 = (rand.nextDouble() - 0.5D) * 2D; - - minecraft.effectRenderer.addEffect(new EntityRainbowFX(player.worldObj, x, y, z, f, f1, f2)); - } + for(int i = 0; i < 2; i++){ + double x = player.posX + (rand.nextDouble() - 0.5D) * 0.9; + double y = (player.posY + rand.nextDouble() * 1.9) - 0.25D - height; + double z = player.posZ + (rand.nextDouble() - 0.5D) * 0.9; + + + double f = (rand.nextDouble() - 0.5D) * 2D; + double f1 = -rand.nextDouble(); + double f2 = (rand.nextDouble() - 0.5D) * 2D; + + minecraft.effectRenderer.addEffect(new EntityRainbowFX(player.worldObj, x, y, z, f, f1, f2)); + } } } } @@ -528,7 +534,7 @@ public class ClientProxy extends CommonProxy { public boolean hasClient() { return true; } - + public EntityPlayer getPlayer() { return Minecraft.getMinecraft().thePlayer; } @@ -543,63 +549,54 @@ public class ClientProxy extends CommonProxy { try{ if(location == null) return; - TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - if(location != null) - texturemanager.bindTexture((ResourceLocation) location); + TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); + if(location != null) + texturemanager.bindTexture((ResourceLocation) location); } catch(NullPointerException ex){ - + } catch(ReportedException ex){ - + } } @Override public void spawnParticle(String particle, double x, double y, double z, - double motionX, double motionY, double motionZ, float scale) { - + double motionX, double motionY, double motionZ, float scale) { + RenderGlobal render = Minecraft.getMinecraft().renderGlobal; - + EntityFX fx = render.doSpawnParticle(particle, x, y, z, motionX, motionY, motionZ); if(fx == null) return; - if (particle.equals("flame")){ - ObfuscationReflectionHelper.setPrivateValue(EntityFlameFX.class, (EntityFlameFX)fx, scale, 0); - } - else if (particle.equals("smoke")){ - ObfuscationReflectionHelper.setPrivateValue(EntitySmokeFX.class, (EntitySmokeFX)fx, scale, 0); - } - } - - @Override - public String getAchievementDesc(Achievement achievement) { - return achievement.getDescription(); - } - - @Override - public boolean isGUIOpen(){ - return Minecraft.getMinecraft().currentScreen != null; + if (particle.equals("flame")){ + ObfuscationReflectionHelper.setPrivateValue(EntityFlameFX.class, (EntityFlameFX)fx, scale, 0); + } + else if (particle.equals("smoke")){ + ObfuscationReflectionHelper.setPrivateValue(EntitySmokeFX.class, (EntitySmokeFX)fx, scale, 0); + } } + public static class FontContainer { private StringCache textFont = null; public boolean useCustomFont = true; - + private FontContainer(){ - + } - + public FontContainer(String fontType, int fontSize) { textFont = new StringCache(); textFont.setDefaultFont("Arial", fontSize, true); useCustomFont = !fontType.equalsIgnoreCase("minecraft"); - try { - if(!useCustomFont || fontType.isEmpty() || fontType.equalsIgnoreCase("default")) - textFont.setCustomFont(new ResourceLocation("customnpcs","OpenSans.ttf"), fontSize, true); - else - textFont.setDefaultFont(fontType, fontSize, true); + try { + if(!useCustomFont || fontType.isEmpty() || fontType.equalsIgnoreCase("default")) + textFont.setCustomFont(new ResourceLocation("customnpcs","OpenSans.ttf"), fontSize, true); + else + textFont.setDefaultFont(fontType, fontSize, true); } catch (Exception e) { LogWriter.info("Failed loading font so using Arial"); } @@ -610,7 +607,7 @@ public class ClientProxy extends CommonProxy { return textFont.fontHeight; return Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT; } - + public int width(String text){ if(useCustomFont) return textFont.getStringWidth(text); @@ -640,4 +637,4 @@ public class ClientProxy extends CommonProxy { return textFont.usedFont().getFontName(); } } -} \ No newline at end of file +} diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java index 43216ce45..06cd83b1a 100644 --- a/src/main/java/noppes/npcs/client/ClientTickHandler.java +++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java @@ -14,15 +14,11 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; public class ClientTickHandler{ + private World prevWorld; private boolean otherContainer = false; - private int buttonPressed = -1; - private long buttonTime = 0L; - private final int[] ignoreKeys = new int[]{157, 29, 54, 42, 184, 56, 220, 219}; @SubscribeEvent(priority = EventPriority.LOWEST) public void onClientTick(TickEvent.ClientTickEvent event){ @@ -45,14 +41,6 @@ public class ClientTickHandler{ } } - @SubscribeEvent - public void onMouse(InputEvent.MouseInputEvent event){ - if(Mouse.getEventButton() == -1 && Mouse.getDWheel() == 0) - return; - - NoppesUtilPlayer.sendData(EnumPlayerPacket.MouseClicked, new Object[]{Mouse.getEventButton(),Mouse.getEventDWheel(),Mouse.isButtonDown(Mouse.getEventButton())}); - } - @SubscribeEvent public void onKey(InputEvent.KeyInputEvent event){ if(ClientProxy.QuestLog.isPressed()){ @@ -62,48 +50,6 @@ public class ClientTickHandler{ else if(mc.currentScreen instanceof GuiQuestLog) mc.setIngameFocus(); } - - int key = Keyboard.getEventKey(); - long time = Keyboard.getEventNanoseconds(); - - if(Keyboard.getEventKeyState()) { - if(!this.isIgnoredKey(key)) { - this.buttonTime = time; - } - } - - if(time-this.buttonTime == 0 || !Keyboard.getEventKeyState()) { - boolean isCtrlPressed = Keyboard.isKeyDown(157) || Keyboard.isKeyDown(29); - boolean isShiftPressed = Keyboard.isKeyDown(54) || Keyboard.isKeyDown(42); - boolean isAltPressed = Keyboard.isKeyDown(184) || Keyboard.isKeyDown(56); - boolean isMetaPressed = Keyboard.isKeyDown(220) || Keyboard.isKeyDown(219); - boolean keyDown = Keyboard.isKeyDown(key); - - StringBuilder keysDownString = new StringBuilder(); - for(int i = 0; i < Keyboard.getKeyCount(); i++){//Creates a comma separated string of the integer IDs of held keys - if(Keyboard.isKeyDown(i)){ - keysDownString.append(Integer.valueOf(i)).append(","); - } - } - if(keysDownString.length() > 0){//Removes last comma for later parsing - keysDownString.deleteCharAt(keysDownString.length()-1); - } - - NoppesUtilPlayer.sendData(EnumPlayerPacket.KeyPressed, new Object[]{Integer.valueOf(key), Boolean.valueOf(isCtrlPressed), Boolean.valueOf(isShiftPressed), Boolean.valueOf(isAltPressed), Boolean.valueOf(isMetaPressed), Boolean.valueOf(keyDown), keysDownString.toString()}); - } } - private boolean isIgnoredKey(int key) { - int[] var2 = this.ignoreKeys; - int var3 = var2.length; - - for(int var4 = 0; var4 < var3; ++var4) { - int i = var2[var4]; - if(i == key) { - return true; - } - } - - return false; - } } diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java index cfe3ce72e..945911008 100644 --- a/src/main/java/noppes/npcs/client/NoppesUtil.java +++ b/src/main/java/noppes/npcs/client/NoppesUtil.java @@ -6,14 +6,12 @@ import java.io.File; import java.io.IOException; import java.net.URI; import java.util.HashMap; -import java.util.List; import java.util.Random; import java.util.Vector; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -23,7 +21,6 @@ import net.minecraft.world.World; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.Server; -import noppes.npcs.client.fx.EntityCustomFX; import noppes.npcs.client.gui.player.GuiDialogInteract; import noppes.npcs.client.gui.player.GuiQuestCompletion; import noppes.npcs.client.gui.util.GuiContainerNPCInterface; @@ -70,57 +67,6 @@ public class NoppesUtil { } } - public static void spawnScriptedParticle(ByteBuf buffer){ - Minecraft minecraft = Minecraft.getMinecraft(); - - String directory = Server.readString(buffer); - - int HEXcolor = buffer.readInt(); - int amount = buffer.readInt(); - int maxAge = buffer.readInt(); - - double x = buffer.readDouble(); - double y = buffer.readDouble(); - double z = buffer.readDouble(); - - double motionX = buffer.readDouble(); - double motionY = buffer.readDouble(); - double motionZ = buffer.readDouble(); - float gravity = buffer.readFloat(); - - float scale1 = buffer.readFloat(); - float scale2 = buffer.readFloat(); - float scaleRate = buffer.readFloat(); - int scaleRateStart = buffer.readInt(); - - float alpha1 = buffer.readFloat(); - float alpha2 = buffer.readFloat(); - float alphaRate = buffer.readFloat(); - int alphaRateStart = buffer.readInt(); - - int entityID = buffer.readInt(); - - World worldObj = Minecraft.getMinecraft().theWorld; - Entity entity = worldObj.getEntityByID(entityID); - - if(entity == null) - return; - - EntityCustomFX fx = new EntityCustomFX( - entity, - directory, HEXcolor, - x, y, z, - motionX, motionY, motionZ, gravity, - scale1, scale2, scaleRate, scaleRateStart, - alpha1, alpha2, alphaRate, alphaRateStart, - maxAge - ); - - for(int i = 0; i < amount; i++){ - minecraft.effectRenderer.addEffect(fx); - } - } - public static void clickSound() { Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); } @@ -291,7 +237,4 @@ public class NoppesUtil { CustomNpcs.proxy.openGui(x, y, z, EnumGuiType.Waypoint, player); } - public static void isGUIOpen(boolean isGUIOpen) { - Client.sendData(EnumPacketServer.IsGuiOpen, isGUIOpen); - } } diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java index ea6c4891c..4331b1d43 100644 --- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java +++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java @@ -26,7 +26,6 @@ import noppes.npcs.ServerEventsHandler; import noppes.npcs.client.ClientProxy.FontContainer; import noppes.npcs.client.controllers.MusicController; import noppes.npcs.client.gui.GuiNpcMobSpawnerAdd; -import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.player.GuiBook; import noppes.npcs.client.gui.util.GuiContainerNPCInterface; import noppes.npcs.client.gui.util.GuiNPCInterface; @@ -152,9 +151,6 @@ public class PacketHandlerClient extends PacketHandlerServer{ EnumGuiType gui = EnumGuiType.values()[buffer.readInt()]; CustomNpcs.proxy.openGui(NoppesUtil.getLastNpc(), gui, buffer.readInt(), buffer.readInt(), buffer.readInt()); } - else if(type == EnumPacketClient.SCRIPTED_PARTICLE){ - NoppesUtil.spawnScriptedParticle(buffer); - } else if(type == EnumPacketClient.PARTICLE){ NoppesUtil.spawnParticle(buffer); } @@ -255,20 +251,8 @@ public class PacketHandlerClient extends PacketHandlerServer{ player.addChatMessage(new ChatComponentTranslation("Current font is %s", ClientProxy.Font.getName())); } } - else if(type == EnumPacketClient.ISGUIOPEN){ - boolean isGUIOpen = Minecraft.getMinecraft().currentScreen != null; - - NoppesUtil.isGUIOpen(isGUIOpen); - } - else if(type == EnumPacketClient.OVERLAY_DATA){ - OverlayCustom overlayCustom = new OverlayCustom(Minecraft.getMinecraft()); - overlayCustom.setOverlayData(Server.readNBT(buffer)); - - Client.customOverlays.put(overlayCustom.overlay.getID(),overlayCustom); - } - else if(type == EnumPacketClient.OVERLAY_CLOSE){ - int id = buffer.readInt(); - Client.customOverlays.remove(id); - } } + + + } diff --git a/src/main/java/noppes/npcs/client/controllers/MusicController.java b/src/main/java/noppes/npcs/client/controllers/MusicController.java index 4fb230003..51e80971c 100644 --- a/src/main/java/noppes/npcs/client/controllers/MusicController.java +++ b/src/main/java/noppes/npcs/client/controllers/MusicController.java @@ -1,22 +1,10 @@ package noppes.npcs.client.controllers; -import java.util.Map; - -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import net.minecraft.block.BlockJukebox; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundHandler; -import net.minecraft.client.audio.SoundManager; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemRecord; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import noppes.npcs.client.AssetsBrowser; public class MusicController { diff --git a/src/main/java/noppes/npcs/client/fx/EntityCustomFX.java b/src/main/java/noppes/npcs/client/fx/EntityCustomFX.java deleted file mode 100644 index 3ba3a02d6..000000000 --- a/src/main/java/noppes/npcs/client/fx/EntityCustomFX.java +++ /dev/null @@ -1,224 +0,0 @@ -package noppes.npcs.client.fx; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.ClientProxy; -import org.lwjgl.Sys; -import org.lwjgl.opengl.GL11; - -public class EntityCustomFX extends EntityFX { - private Entity entity; - private final ResourceLocation location; - private static final ResourceLocation resource = new ResourceLocation("textures/particle/particles.png"); - private boolean move = true; - private float startX = 0, startY = 0, startZ = 0; - - public float scale1 = 1.0F; - public float scale2 = 1.0F; - public float scaleRate = 1.0F; - public int scaleRateStart = 0; - - public float alpha1 = 1.0F; - public float alpha2 = 0; - public float alphaRate = 0.0F; - public int alphaRateStart = 0; - - public EntityCustomFX(Entity entity, String directory, int HEXColor, double x, double y, double z, - double motionX, double motionY, double motionZ, float gravity, - float scale1, float scale2, float scaleRate, int scaleRateStart, - float alpha1, float alpha2, float alphaRate, int alphaRateStart, - int age) { - super(entity.worldObj, x, y, z, motionX, motionY, motionZ); - - this.scale1 = scale1; - this.scale2 = scale2; - this.scaleRate = Math.abs(scaleRate); - this.scaleRateStart = scaleRateStart; - particleScale = scale1; - if(scale1 > scale2) - this.scaleRate *= -1; - - this.alpha1 = alpha1; - this.alpha2 = alpha2; - this.alphaRate = Math.abs(alphaRate); - this.alphaRateStart = alphaRateStart; - particleAlpha = alpha1; - if(alpha1 > alpha2) - this.alphaRate *= -1; - - particleGravity = gravity/0.04F; - particleMaxAge = age; - - this.motionX = motionX; - this.motionY = motionY; - this.motionZ = motionZ; - - this.entity = entity; - noClip = true; - - particleRed = (HEXColor >> 16 & 255) / 255f; - particleGreen = (HEXColor >> 8 & 255) / 255f; - particleBlue = (HEXColor & 255) / 255f; - - if(Math.floor(Math.random()*3) == 1){ - move = false; - this.startX = (float) entity.posX; - this.startY = (float) entity.posY; - this.startZ = (float) entity.posZ; - } - - location = new ResourceLocation(directory); - } - - /* - par2 = partial tick time - par3 = ActiveRenderInfo.rotationX; - par4 = ActiveRenderInfo.rotationZ; - par5 = ActiveRenderInfo.rotationYZ; - par6 = ActiveRenderInfo.rotationXY; - par7 = ActiveRenderInfo.rotationXZ; - */ - - @Override - public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) - { - if(move){ - startX = (float)(entity.prevPosX + (entity.posX - entity.prevPosX) * (double)par2); - startY = (float)(entity.prevPosY + (entity.posY - entity.prevPosY) * (double)par2); - startZ = (float)(entity.prevPosZ + (entity.posZ - entity.prevPosZ) * (double)par2); - } - Tessellator tessellator = Tessellator.instance; - tessellator.draw(); - - float scale = this.scaleRate / (float)particleMaxAge; - if((this.scaleRate < 0 && particleScale+scale < this.scale2) || (this.scaleRate > 0 && particleScale+scale > this.scale2)) - particleScale = this.scale2; - else if(particleAge >= this.scaleRateStart) - particleScale += scale; - - float alpha = this.alphaRate / (float)particleMaxAge; - if((this.alphaRate < 0 && particleAlpha+alpha < this.alpha2) || (this.alphaRate > 0 && particleAlpha+alpha > this.alpha2)) - particleAlpha = this.alpha2; - else if(particleAge >= this.alphaRateStart) - particleAlpha += alpha; - - ClientProxy.bindTexture(location); - - float f = 0.0f; - float f1 = 1.0f; - float f2 = 0.0f; - float f3 = 1.0f; - float f4 = 0.1F * particleScale; - float f5 = (float)(((prevPosX + (posX - prevPosX) * (double)par2) - interpPosX) + startX); - float f6 = (float)(((prevPosY + (posY - prevPosY) * (double)par2) - interpPosY) + startY); - float f7 = (float)(((prevPosZ + (posZ - prevPosZ) * (double)par2) - interpPosZ) + startZ); - - tessellator.startDrawingQuads(); - tessellator.setBrightness(240); - par1Tessellator.setColorOpaque_F(1, 1, 1); - par1Tessellator.setColorRGBA_F(particleRed, particleGreen, particleBlue, particleAlpha); - par1Tessellator.addVertexWithUV(f5 - par3 * f4 - par6 * f4, f6 - par4 * f4, f7 - par5 * f4 - par7 * f4, f1, f3); - par1Tessellator.addVertexWithUV((f5 - par3 * f4) + par6 * f4, f6 + par4 * f4, (f7 - par5 * f4) + par7 * f4, f1, f2); - par1Tessellator.addVertexWithUV(f5 + par3 * f4 + par6 * f4, f6 + par4 * f4, f7 + par5 * f4 + par7 * f4, f, f2); - par1Tessellator.addVertexWithUV((f5 + par3 * f4) - par6 * f4, f6 - par4 * f4, (f7 + par5 * f4) - par7 * f4, f, f3); - - /* - Minecraft minecraft = Minecraft.getMinecraft(); - EntityPlayer player = minecraft.thePlayer; - - double angle = Minecraft.getMinecraft().theWorld.getWorldTime()%360; - double angleRad = (angle/180)*Math.PI; - - double diffX = player.posX - this.startX; - double diffY = player.posY - player.getYOffset() - this.startY; - double diffZ = player.posZ - this.startZ; - - double yaw = (player.rotationYaw/180)*Math.PI; - double pitch = (player.rotationPitch/180)*Math.PI; - - double angleX = Math.sin(yaw)*Math.cos(pitch); - if(Math.abs(angleX) < 0.0001){ - angleX = 0.0D; - } - double angleY = Math.sin(pitch); - if(Math.abs(angleY) < 0.0001){ - angleY = 0.0D; - } - double angleZ = -Math.cos(yaw)*Math.cos(pitch); - if(Math.abs(angleZ) < 0.0001){ - angleZ = 0.0D; - } - - double angleXtranslateX = 0.0D; - double angleXtranslateY = 0.0D;//(-diffY + Math.cos(angleRad)*diffY) + (-Math.sin(angleRad)*diffZ); - double angleXtranslateZ = 0.0D;//(Math.sin(angleRad)*diffY) + (-diffZ + Math.cos(angleRad)*diffZ); - - double angleYtranslateX = 0.0D;//(-diffX + Math.cos(angleRad)*diffX) + (Math.sin(angleRad)*diffZ); - double angleYtranslateY = 0.0D; - double angleYtranslateZ = 0.0D;//(-Math.sin(angleRad)*diffX) + (-diffZ + Math.cos(angleRad)*diffZ); - - double angleZtranslateX = 0.0D;//(-diffX + Math.cos(angleRad)*diffX) + (-Math.sin(angleRad)*diffY); - double angleZtranslateY = 0.0D;//(Math.sin(angleRad)*diffX) + (-diffY + Math.cos(angleRad)*diffY); - double angleZtranslateZ = 0.0D; - - double translateX = angleXtranslateX + angleYtranslateX + angleZtranslateX; - double translateY = angleXtranslateY + angleYtranslateY + angleZtranslateY; - double translateZ = angleXtranslateZ + angleYtranslateZ + angleZtranslateZ; - - //distance in the X & Z plane - double distXZ = Math.sqrt(Math.pow(diffX,2) + Math.pow(diffZ,2)); - //distance in the X & Y plane - double distXY = Math.sqrt(Math.pow(diffX,2) + Math.pow(diffY,2)); - //distance in the Y & Z plane - double distYZ = Math.sqrt(Math.pow(diffY,2) + Math.pow(diffZ,2)); - - double signDiffX = Math.signum(diffX); - double signDiffY = Math.signum(diffY); - double signDiffZ = Math.signum(diffZ); - - double angleXtoNorm = Math.sin(Math.acos(diffX/distXZ)); - double angleZtoNorm = Math.sin(Math.acos(diffZ/distXZ)); - - double angleDiffX = (Math.abs(Math.cos(yaw))-angleXtoNorm); - double angleDiffZ = (Math.abs(Math.cos(yaw))-angleZtoNorm); - - double translateX = -Math.abs(angleDiffX*angleZ*distXZ)*signDiffX; - double translateY = 0; - double translateZ = -Math.abs(angleDiffX*angleX*distXZ)*signDiffZ + Math.cos(angleRad)*Math.abs(angleDiffX*angleX*distXZ)*signDiffZ; - - if(minecraft.currentScreen == null) { - System.out.println(); - //System.out.printf("diffX: %f, diffY: %f, diffZ: %f\n", diffX, diffY, diffZ); - //System.out.printf("angleX: %f, angleY: %f, angleZ: %f\n", angleX, angleY, angleZ); - //System.out.printf("angleXtoNorm: %f, angleZtoNorm: %f\n", angleXtoNorm, angleZtoNorm); - System.out.printf("Math.sin(yaw): %f\n", Math.sin(yaw)); - System.out.printf("Math.cos(yaw): %f\n", Math.cos(yaw)); - //System.out.printf("Math.sin(pitch): %f\n", Math.sin(pitch)); - //System.out.printf("Math.cos(pitch): %f\n", Math.cos(pitch)); - System.out.printf("angleDiffX: %f\n", angleDiffX); - System.out.printf("angleDiffZ: %f\n", angleDiffZ); - System.out.printf("translateX: %f\n", Math.cos(angleRad)*Math.abs(angleDiffX*angleZ*distXZ)*signDiffX); - System.out.printf("translateZ: %f\n", Math.cos(angleRad)*Math.abs(angleDiffX*angleX*distXZ)*signDiffZ); - } - */ - - GL11.glPushMatrix(); - GL11.glColor4f(1, 1, 1, 1.0F); - - //GL11.glTranslated(translateX,translateY,translateZ); - //GL11.glRotated(angle, angleX, angleY, angleZ); - - tessellator.draw(); - ClientProxy.bindTexture(resource); - tessellator.startDrawingQuads(); - GL11.glPopMatrix(); - } - - public int getFXLayer(){ - return 0; - } -} diff --git a/src/main/java/noppes/npcs/client/gui/EventGuiScriptList.java b/src/main/java/noppes/npcs/client/gui/EventGuiScriptList.java deleted file mode 100644 index 757bc9e51..000000000 --- a/src/main/java/noppes/npcs/client/gui/EventGuiScriptList.java +++ /dev/null @@ -1,103 +0,0 @@ -package noppes.npcs.client.gui; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.GuiButton; -import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.client.gui.util.GuiNpcLabel; -import noppes.npcs.client.gui.util.SubGuiInterface; - -public class EventGuiScriptList extends SubGuiInterface{ - private GuiCustomScroll scroll1; - private GuiCustomScroll scroll2; - private ScriptContainer container; - private List scripts; - - public EventGuiScriptList(List scripts, ScriptContainer container){ - this.container = container; - setBackground("menubg.png"); - xSize = 346; - ySize = 216; - if(scripts == null) - scripts = new ArrayList(); - this.scripts = scripts; - } - @Override - public void initGui(){ - super.initGui(); - if(scroll1 == null){ - scroll1 = new GuiCustomScroll(this,0); - scroll1.setSize(140, 180); - } - scroll1.guiLeft = guiLeft + 4; - scroll1.guiTop = guiTop + 14; - this.addScroll(scroll1); - addLabel(new GuiNpcLabel(1, "script.availableScripts", guiLeft + 4, guiTop + 4)); - - if(scroll2 == null){ - scroll2 = new GuiCustomScroll(this,1); - scroll2.setSize(140, 180); - } - scroll2.guiLeft = guiLeft + 200; - scroll2.guiTop = guiTop + 14; - this.addScroll(scroll2); - addLabel(new GuiNpcLabel(2, "script.loadedScripts", guiLeft + 200, guiTop + 4)); - List temp = new ArrayList(scripts); - temp.removeAll(container.scripts); - scroll1.setList(temp); - scroll2.setList(container.scripts); - - addButton(new GuiNpcButton(1, guiLeft + 145, guiTop + 40, 55, 20, ">")); - addButton(new GuiNpcButton(2, guiLeft + 145, guiTop + 62, 55, 20, "<")); - - addButton(new GuiNpcButton(3, guiLeft + 145, guiTop + 90, 55, 20, ">>")); - addButton(new GuiNpcButton(4, guiLeft + 145, guiTop + 112, 55, 20, "<<")); - - addButton(new GuiNpcButton(66, guiLeft + 260, guiTop + 194, 60, 20, "gui.done")); - } - - protected void actionPerformed(GuiButton guibutton){ - GuiNpcButton button = (GuiNpcButton) guibutton; - if(button.id == 1){ - if(scroll1.hasSelected()){ - container.scripts.add(scroll1.getSelected()); - scroll1.selected = -1; - scroll1.selected = -1; - initGui(); - } - } - if(button.id == 2){ - if(scroll2.hasSelected()){ - container.scripts.remove(scroll2.getSelected()); - scroll2.selected = -1; - initGui(); - } - } - if(button.id == 3){ - container.scripts.clear(); - for(String script : scripts){ - container.scripts.add(script); - } - scroll1.selected = -1; - scroll1.selected = -1; - initGui(); - } - if(button.id == 4){ - container.scripts.clear(); - scroll1.selected = -1; - scroll1.selected = -1; - initGui(); - } - if(button.id == 66){ - close(); - } - } - @Override - public void save() { - - } - -} diff --git a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java index d0ee018bc..fe5464912 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java +++ b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java @@ -4,6 +4,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.blocks.tiles.TileBorder; import noppes.npcs.client.Client; +import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; @@ -29,7 +30,7 @@ public class GuiBorderBlock extends GuiNPCInterface implements IGuiData{ addLabel(new GuiNpcLabel(0,"Height", guiLeft+ 1, guiTop + 76, 0xffffff)); addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft+ 60, guiTop + 71,40,20, tile.height + "")); - getTextField(0).integersOnly = true; + getTextField(0).numbersOnly = true; getTextField(0).setMinMaxDefault(0, 500, 6); addLabel(new GuiNpcLabel(1,"Message", guiLeft+ 1, guiTop + 100, 0xffffff)); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java index e4e2dbfe1..85817887b 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java @@ -39,7 +39,7 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData{ public GuiNpcMobSpawner(int i, int j, int k) { super(); - xSize = 384; + xSize = 256; posX = i; posY = j; @@ -56,7 +56,7 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData{ if(scroll == null){ scroll = new GuiCustomScroll(this,0); - scroll.setSize(293, 188); + scroll.setSize(165, 188); } else scroll.clear(); @@ -64,7 +64,7 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData{ scroll.guiTop = guiTop + 26; addScroll(scroll); - addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft + 4, guiTop + 4, 293, 20, search)); + addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft + 4, guiTop + 4, 165, 20, search)); GuiMenuTopButton button; addTopButton(button = new GuiMenuTopButton(3,guiLeft + 4, guiTop - 17, "spawner.clones")); @@ -74,38 +74,28 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData{ addTopButton(button = new GuiMenuTopButton(5, button, "gui.server")); button.active = showingClones == 2; - addButton(new GuiNpcButton(1, guiLeft + 298, guiTop + 6, 82, 20, "item.monsterPlacer.name")); + addButton(new GuiNpcButton(1, guiLeft + 170, guiTop + 6, 82, 20, "item.monsterPlacer.name")); - addButton(new GuiNpcButton(2, guiLeft + 298, guiTop + 100, 82, 20, "spawner.mobspawner")); + addButton(new GuiNpcButton(2, guiLeft + 170, guiTop + 100, 82, 20, "spawner.mobspawner")); if(showingClones == 0 || showingClones == 2){ - - addSideButton(new GuiMenuSideButton(21,guiLeft - 90, this.guiTop + 2, 90,22, "1")); - addSideButton(new GuiMenuSideButton(22,guiLeft - 90, this.guiTop + 23, 90,22, "2")); - addSideButton(new GuiMenuSideButton(23,guiLeft - 90, this.guiTop + 44, 90,22, "3")); - addSideButton(new GuiMenuSideButton(24,guiLeft - 90, this.guiTop + 65, 90,22, "4")); - addSideButton(new GuiMenuSideButton(25,guiLeft - 90, this.guiTop + 86, 90,22, "5")); - addSideButton(new GuiMenuSideButton(26,guiLeft - 90, this.guiTop + 107, 45,22, "6")); - addSideButton(new GuiMenuSideButton(27,guiLeft - 45, this.guiTop + 107, 45,22, "7")); - addSideButton(new GuiMenuSideButton(28,guiLeft - 90, this.guiTop + 128, 45,22, "8")); - addSideButton(new GuiMenuSideButton(29,guiLeft - 45, this.guiTop + 128, 45,22, "9")); - addSideButton(new GuiMenuSideButton(30,guiLeft - 90, this.guiTop + 149, 45,22, "10")); - addSideButton(new GuiMenuSideButton(31,guiLeft - 45, this.guiTop + 149, 45,22, "11")); - addSideButton(new GuiMenuSideButton(32,guiLeft - 90, this.guiTop + 170, 45,22, "12")); - addSideButton(new GuiMenuSideButton(33,guiLeft - 45, this.guiTop + 170, 45,22, "13")); - addSideButton(new GuiMenuSideButton(34,guiLeft - 90, this.guiTop + 191, 45,22, "14")); - addSideButton(new GuiMenuSideButton(35,guiLeft - 45, this.guiTop + 191, 45,22, "15")); - - - - addButton(new GuiNpcButton(6, guiLeft + 298, guiTop + 190, 82, 20, "gui.remove")); - + addSideButton(new GuiMenuSideButton(21,guiLeft - 69, this.guiTop + 2, 70,22, "Tab 1")); + addSideButton(new GuiMenuSideButton(22,guiLeft - 69, this.guiTop + 23, 70,22, "Tab 2")); + addSideButton(new GuiMenuSideButton(23,guiLeft - 69, this.guiTop + 44, 70,22, "Tab 3")); + addSideButton(new GuiMenuSideButton(24,guiLeft - 69, this.guiTop + 65, 70,22, "Tab 4")); + addSideButton(new GuiMenuSideButton(25,guiLeft - 69, this.guiTop + 86, 70,22, "Tab 5")); + addSideButton(new GuiMenuSideButton(26,guiLeft - 69, this.guiTop + 107, 70,22, "Tab 6")); + addSideButton(new GuiMenuSideButton(27,guiLeft - 69, this.guiTop + 128, 70,22, "Tab 7")); + addSideButton(new GuiMenuSideButton(28,guiLeft - 69, this.guiTop + 149, 70,22, "Tab 8")); + addSideButton(new GuiMenuSideButton(29,guiLeft - 69, this.guiTop + 170, 70,22, "Tab 9")); + + addButton(new GuiNpcButton(6, guiLeft + 170, guiTop + 30, 82, 20, "gui.remove")); + getSideButton(20 + activeTab).active = true; showClones(); } - else{ + else showEntities(); - } } private void showEntities() { @@ -129,6 +119,7 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData{ Client.sendData(EnumPacketServer.CloneList, activeTab); return; } + ArrayList list = new ArrayList(); this.list = ClientCloneController.Instance.getClones(activeTab); scroll.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java index 5a4146a05..df6e7da50 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java @@ -12,7 +12,11 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityNPCInterface; @@ -40,8 +44,7 @@ public class GuiNpcMobSpawnerAdd extends GuiNPCInterface implements GuiYesNoCall addLabel(new GuiNpcLabel(1, "Tab", guiLeft + 10, guiTop + 50)); - // addButton(new GuiNpcButton(2, guiLeft + 40, guiTop + 45, 20, 20, new String[]{"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"}, tab - 1)); - addButton(new GuiButtonBiDirectional(2, guiLeft + 40, guiTop + 45, 60, 20, new String[]{"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"}, tab - 1)); + addButton(new GuiNpcButton(2, guiLeft + 40, guiTop + 45, 20, 20, new String[]{"1","2","3","4","5","6","7","8","9"}, tab - 1)); addButton(new GuiNpcButton(3, guiLeft + 4, guiTop + 95, new String[]{"Client side", "Server side"}, serverSide?1:0)); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java index b3cec0a09..42882a792 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java @@ -82,21 +82,15 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData addButton(new GuiNpcButton(2, guiLeft + 170, guiTop + 50, 82, 20, "spawner.mountplayer")); if(showingClones == 0 || showingClones == 2){ - addSideButton(new GuiMenuSideButton(21,guiLeft - 90, this.guiTop + 2, 90,22, "1")); - addSideButton(new GuiMenuSideButton(22,guiLeft - 90, this.guiTop + 23, 90,22, "2")); - addSideButton(new GuiMenuSideButton(23,guiLeft - 90, this.guiTop + 44, 90,22, "3")); - addSideButton(new GuiMenuSideButton(24,guiLeft - 90, this.guiTop + 65, 90,22, "4")); - addSideButton(new GuiMenuSideButton(25,guiLeft - 90, this.guiTop + 86, 90,22, "5")); - addSideButton(new GuiMenuSideButton(26,guiLeft - 45, this.guiTop + 107, 45,22, "6")); - addSideButton(new GuiMenuSideButton(27,guiLeft - 90, this.guiTop + 107, 45,22, "7")); - addSideButton(new GuiMenuSideButton(28,guiLeft - 45, this.guiTop + 128, 45,22, "8")); - addSideButton(new GuiMenuSideButton(29,guiLeft - 90, this.guiTop + 128, 45,22, "9")); - addSideButton(new GuiMenuSideButton(30,guiLeft - 45, this.guiTop + 149, 45,22, "10")); - addSideButton(new GuiMenuSideButton(31,guiLeft - 90, this.guiTop + 149, 45,22, "11")); - addSideButton(new GuiMenuSideButton(32,guiLeft - 45, this.guiTop + 170, 45,22, "12")); - addSideButton(new GuiMenuSideButton(33,guiLeft - 90, this.guiTop + 170, 45,22, "13")); - addSideButton(new GuiMenuSideButton(34,guiLeft - 45, this.guiTop + 191, 45,22, "14")); - addSideButton(new GuiMenuSideButton(35,guiLeft - 90, this.guiTop + 191, 45,22, "15")); + addSideButton(new GuiMenuSideButton(21,guiLeft - 69, this.guiTop + 2, 70,22, "Tab 1")); + addSideButton(new GuiMenuSideButton(22,guiLeft - 69, this.guiTop + 23, 70,22, "Tab 2")); + addSideButton(new GuiMenuSideButton(23,guiLeft - 69, this.guiTop + 44, 70,22, "Tab 3")); + addSideButton(new GuiMenuSideButton(24,guiLeft - 69, this.guiTop + 65, 70,22, "Tab 4")); + addSideButton(new GuiMenuSideButton(25,guiLeft - 69, this.guiTop + 86, 70,22, "Tab 5")); + addSideButton(new GuiMenuSideButton(26,guiLeft - 69, this.guiTop + 107, 70,22, "Tab 6")); + addSideButton(new GuiMenuSideButton(27,guiLeft - 69, this.guiTop + 128, 70,22, "Tab 7")); + addSideButton(new GuiMenuSideButton(28,guiLeft - 69, this.guiTop + 149, 70,22, "Tab 8")); + addSideButton(new GuiMenuSideButton(29,guiLeft - 69, this.guiTop + 170, 70,22, "Tab 9")); getSideButton(20 + activeTab).active = true; showClones(); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java index 4636347d6..98acfd5e8 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java @@ -59,22 +59,16 @@ public class GuiNpcMobSpawnerSelector extends SubGuiInterface implements IGuiDat addButton(new GuiNpcButton(0, guiLeft + 171, guiTop + 80, 80, 20, "gui.done")); addButton(new GuiNpcButton(1, guiLeft + 171, guiTop + 103, 80, 20, "gui.cancel")); - - addSideButton(new GuiMenuSideButton(21,guiLeft - 90, this.guiTop + 2, 90,22, "1")); - addSideButton(new GuiMenuSideButton(22,guiLeft - 90, this.guiTop + 23, 90,22, "2")); - addSideButton(new GuiMenuSideButton(23,guiLeft - 90, this.guiTop + 44, 90,22, "3")); - addSideButton(new GuiMenuSideButton(24,guiLeft - 90, this.guiTop + 65, 90,22, "4")); - addSideButton(new GuiMenuSideButton(25,guiLeft - 90, this.guiTop + 86, 90,22, "5")); - addSideButton(new GuiMenuSideButton(26,guiLeft - 45, this.guiTop + 107, 45,22, "6")); - addSideButton(new GuiMenuSideButton(27,guiLeft - 90, this.guiTop + 107, 45,22, "7")); - addSideButton(new GuiMenuSideButton(28,guiLeft - 45, this.guiTop + 128, 45,22, "8")); - addSideButton(new GuiMenuSideButton(29,guiLeft - 90, this.guiTop + 128, 45,22, "9")); - addSideButton(new GuiMenuSideButton(30,guiLeft - 45, this.guiTop + 149, 45,22, "10")); - addSideButton(new GuiMenuSideButton(31,guiLeft - 90, this.guiTop + 149, 45,22, "11")); - addSideButton(new GuiMenuSideButton(32,guiLeft - 45, this.guiTop + 170, 45,22, "12")); - addSideButton(new GuiMenuSideButton(33,guiLeft - 90, this.guiTop + 170, 45,22, "13")); - addSideButton(new GuiMenuSideButton(34,guiLeft - 45, this.guiTop + 191, 45,22, "14")); - addSideButton(new GuiMenuSideButton(35,guiLeft - 90, this.guiTop + 191, 45,22, "15")); + + addSideButton(new GuiMenuSideButton(21,guiLeft - 69, this.guiTop + 2, 70,22, "Tab 1")); + addSideButton(new GuiMenuSideButton(22,guiLeft - 69, this.guiTop + 23, 70,22, "Tab 2")); + addSideButton(new GuiMenuSideButton(23,guiLeft - 69, this.guiTop + 44, 70,22, "Tab 3")); + addSideButton(new GuiMenuSideButton(24,guiLeft - 69, this.guiTop + 65, 70,22, "Tab 4")); + addSideButton(new GuiMenuSideButton(25,guiLeft - 69, this.guiTop + 86, 70,22, "Tab 5")); + addSideButton(new GuiMenuSideButton(26,guiLeft - 69, this.guiTop + 107, 70,22, "Tab 6")); + addSideButton(new GuiMenuSideButton(27,guiLeft - 69, this.guiTop + 128, 70,22, "Tab 7")); + addSideButton(new GuiMenuSideButton(28,guiLeft - 69, this.guiTop + 149, 70,22, "Tab 8")); + addSideButton(new GuiMenuSideButton(29,guiLeft - 69, this.guiTop + 170, 70,22, "Tab 9")); getSideButton(20 + activeTab).active = true; showClones(); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcRedstoneBlock.java b/src/main/java/noppes/npcs/client/gui/GuiNpcRedstoneBlock.java index b965a877c..f48b634f3 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcRedstoneBlock.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcRedstoneBlock.java @@ -5,6 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.blocks.tiles.TileRedstoneBlock; import noppes.npcs.client.Client; +import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; @@ -32,39 +33,39 @@ public class GuiNpcRedstoneBlock extends GuiNPCInterface{ if(tile.isDetailed){ addLabel(new GuiNpcLabel(0,StatCollector.translateToLocal("bard.ondistance") + " X:", guiLeft+ 1, guiTop + 76, 0xffffff)); addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft+ 80, guiTop + 71,30,20, tile.onRangeX + "")); - getTextField(0).integersOnly = true; + getTextField(0).numbersOnly = true; getTextField(0).setMinMaxDefault(0, 50, 6); addLabel(new GuiNpcLabel(1,"Y:", guiLeft+ 113, guiTop + 76, 0xffffff)); addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft+ 122, guiTop + 71,30,20, tile.onRangeY + "")); - getTextField(1).integersOnly = true; + getTextField(1).numbersOnly = true; getTextField(1).setMinMaxDefault(0, 50, 6); addLabel(new GuiNpcLabel(2,"Z:", guiLeft+ 155, guiTop + 76, 0xffffff)); addTextField(new GuiNpcTextField(2, this, fontRendererObj, guiLeft+ 164, guiTop + 71,30,20, tile.onRangeZ + "")); - getTextField(2).integersOnly = true; + getTextField(2).numbersOnly = true; getTextField(2).setMinMaxDefault(0, 50, 6); addLabel(new GuiNpcLabel(3,StatCollector.translateToLocal("bard.offdistance") + " X:", guiLeft - 3, guiTop + 99, 0xffffff)); addTextField(new GuiNpcTextField(3, this, fontRendererObj, guiLeft+ 80, guiTop + 94,30,20, tile.offRangeX + "")); - getTextField(3).integersOnly = true; + getTextField(3).numbersOnly = true; getTextField(3).setMinMaxDefault(0, 50, 10); addLabel(new GuiNpcLabel(4,"Y:", guiLeft+ 113, guiTop + 99, 0xffffff)); addTextField(new GuiNpcTextField(4, this, fontRendererObj, guiLeft+ 122, guiTop + 94,30,20, tile.offRangeY + "")); - getTextField(4).integersOnly = true; + getTextField(4).numbersOnly = true; getTextField(4).setMinMaxDefault(0, 50, 10); addLabel(new GuiNpcLabel(5,"Z:", guiLeft+ 155, guiTop + 99, 0xffffff)); addTextField(new GuiNpcTextField(5, this, fontRendererObj, guiLeft+ 164, guiTop + 94,30,20, tile.offRangeZ + "")); - getTextField(5).integersOnly = true; + getTextField(5).numbersOnly = true; getTextField(5).setMinMaxDefault(0, 50, 10); } else{ addLabel(new GuiNpcLabel(0,"bard.ondistance", guiLeft+ 1, guiTop + 76, 0xffffff)); addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft+ 80, guiTop + 71,30,20, tile.onRange + "")); - getTextField(0).integersOnly = true; + getTextField(0).numbersOnly = true; getTextField(0).setMinMaxDefault(0, 50, 6); addLabel(new GuiNpcLabel(3,"bard.offdistance", guiLeft - 3, guiTop + 99, 0xffffff)); addTextField(new GuiNpcTextField(3, this, fontRendererObj, guiLeft+ 80, guiTop + 94,30,20, tile.offRange + "")); - getTextField(3).integersOnly = true; + getTextField(3).numbersOnly = true; getTextField(3).setMinMaxDefault(0, 50, 10); } addButton(new GuiNpcButton(0, guiLeft + 40, guiTop + 190,120,20, "Done")); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcWaypoint.java b/src/main/java/noppes/npcs/client/gui/GuiNpcWaypoint.java index bd1c40785..602292ca0 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcWaypoint.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcWaypoint.java @@ -29,7 +29,7 @@ public class GuiNpcWaypoint extends GuiNPCInterface{ addLabel(new GuiNpcLabel(1,"gui.range", guiLeft+ 1, guiTop + 97, 0xffffff)); addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft+ 60, guiTop + 92,200,20, tile.range + "")); - getTextField(1).integersOnly = true; + getTextField(1).numbersOnly = true; getTextField(1).setMinMaxDefault(2, 60, 10); addButton(new GuiNpcButton(0, guiLeft + 40, guiTop + 190,120,20, "Done")); diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java index 199529ae5..4d84a3fc6 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiScript.java +++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java @@ -1,6 +1,9 @@ package noppes.npcs.client.gui; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiConfirmOpenLink; @@ -27,23 +30,23 @@ import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.entity.EntityNPCInterface; -public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCallback, ICustomScrollListener, IJTextAreaListener { +public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCallback, ICustomScrollListener, IJTextAreaListener { public boolean showScript = false; private int activeTab = 0; public DataScript script; public Map> languages = new HashMap>(); - + private static int activeConsole = 0; - + public GuiScript(EntityNPCInterface npc) { super(npc); script = npc.script; drawDefaultBackground = true; closeOnEsc = true; - xSize = 420; - - setBackground("menubg.png"); - Client.sendData(EnumPacketServer.ScriptDataGet); + xSize = 420; + + setBackground("menubg.png"); + Client.sendData(EnumPacketServer.ScriptDataGet); } public void initGui() { @@ -56,38 +59,37 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall top.active = !showScript; addTopButton(new GuiMenuTopButton(15, top, "gui.website")); - List list = new ArrayList(); - list.add("script.init"); - list.add("script.update"); - list.add("script.interact"); - list.add("dialog.dialog"); - list.add("script.damaged"); - list.add("script.killed"); - list.add("script.attack"); - list.add("script.target"); - list.add("script.collide"); - list.add("script.kills"); - list.add("script.dialog_closed"); - list.add("script.timer"); - + List list = new ArrayList(); + list.add("script.init"); + list.add("script.update"); + list.add("script.interact"); + list.add("dialog.dialog"); + list.add("script.damaged"); + list.add("script.killed"); + list.add("script.attack"); + list.add("script.target"); + list.add("script.collide"); + list.add("script.kills"); + list.add("script.dialog_closed"); + if(showScript){ addLabel(new GuiNpcLabel(0, "script.hooks", guiLeft + 4, guiTop + 5)); GuiCustomScroll hooks = new GuiCustomScroll(this, 1); hooks.setSize(68, 198); hooks.guiLeft = guiLeft + 4; hooks.guiTop = guiTop + 14; - hooks.setUnsortedList(list); - hooks.selected = activeTab; - addScroll(hooks); - + hooks.setUnsortedList(list); + hooks.selected = activeTab; + addScroll(hooks); + ScriptContainer container = script.scripts.get(activeTab); - + addTextField(new GuiNpcTextArea(2, this, guiLeft + 74, guiTop + 4, 239, 208, container == null?"":container.script)); addButton(new GuiNpcButton(102, guiLeft + 315, guiTop + 4, 50, 20, "gui.clear")); addButton(new GuiNpcButton(101, guiLeft + 366, guiTop + 4, 50, 20, "gui.paste")); addButton(new GuiNpcButton(100, guiLeft + 315, guiTop + 25, 50, 20, "gui.copy")); - + addButton(new GuiNpcButton(108, guiLeft + 315, guiTop + 47, 80, 20, "gui.editor")); addButton(new GuiNpcButton(107, guiLeft + 315, guiTop + 70, 80, 20, "script.loadscript")); @@ -112,14 +114,14 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall l.add("All"); l.addAll(list); addButton(new GuiNpcButton(105, guiLeft + 60, guiTop + 4, 80, 20, l.toArray(new String[l.size()]), activeConsole)); - + addLabel(new GuiNpcLabel(1, "script.language", guiLeft + 232, guiTop + 30)); addButton(new GuiNpcButton(103, guiLeft + 294, guiTop + 25, 80, 20, languages.keySet().toArray(new String[languages.keySet().size()]), getScriptIndex())); getButton(103).enabled = languages.size() > 0; addLabel(new GuiNpcLabel(2, "gui.enabled", guiLeft + 232, guiTop + 53)); addButton(new GuiNpcButton(104, guiLeft + 294, guiTop + 48, 50, 20, new String[]{"gui.no","gui.yes"}, script.enabled?1:0)); - + if(MinecraftServer.getServer() != null) addButton(new GuiNpcButton(106, guiLeft + 232, guiTop + 71, 150, 20, "script.openfolder")); } @@ -136,24 +138,27 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall } private String getConsoleText() { - Map map = this.script.getConsoleText(); - StringBuilder builder = new StringBuilder(); - Iterator var3 = map.entrySet().iterator(); - - while(var3.hasNext()) { - Map.Entry entry = (Map.Entry)var3.next(); - builder.insert(0, new Date((Long)entry.getKey()) + (String)entry.getValue() + "\n"); + String console = ""; + if(activeConsole == 0){ + for(ScriptContainer container : script.scripts.values()){ + if(!container.console.isEmpty()) + console += container.console + '\n'; + } } - - return builder.toString(); + else{ + ScriptContainer container = script.scripts.get(activeConsole - 1); + if(container != null) + console = container.console; + } + return console; } - - @Override - public void confirmClicked(boolean flag, int i){ - if(flag) - openLink("http://www.kodevelopment.nl/minecraft/customnpcs/scripting"); + + @Override + public void confirmClicked(boolean flag, int i){ + if(flag) + openLink("http://www.kodevelopment.nl/minecraft/customnpcs/scripting"); displayGuiScreen(this); - } + } @Override protected void actionPerformed(GuiButton guibutton) { @@ -168,7 +173,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall } if(guibutton.id == 15){ GuiConfirmOpenLink guiyesno = new GuiConfirmOpenLink(this, "http://www.kodevelopment.nl/minecraft/customnpcs/scripting", 0, true); - mc.displayGuiScreen(guiyesno); + mc.displayGuiScreen(guiyesno); } if (guibutton.id == 100) { NoppesStringUtils.setClipboardContents(getTextField(2).getText()); @@ -180,13 +185,13 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall getTextField(2).setText(""); if(!showScript){ if(activeConsole == 0){ - for(ScriptContainer container : script.scripts) - container.console.clear(); + for(ScriptContainer container : script.scripts.values()) + container.console = ""; } else{ ScriptContainer container = script.scripts.get(activeConsole - 1); if(container != null) - container.console.clear(); + container.console = ""; } } } @@ -206,7 +211,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall if (guibutton.id == 107) { ScriptContainer container = script.scripts.get(activeTab); if(container == null) - script.scripts.set(activeTab, container = new ScriptContainer(this.script)); + script.scripts.put(activeTab, container = new ScriptContainer()); setSubGui(new GuiScriptList(languages.get(script.scriptLanguage), container)); } if (guibutton.id == 108) { @@ -217,12 +222,12 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall } } } - + private void setScript(){ if(showScript){ ScriptContainer container = script.scripts.get(activeTab); if(container == null) - script.scripts.set(activeTab, container = new ScriptContainer(this.script)); + script.scripts.put(activeTab, container = new ScriptContainer()); String text = getTextField(2).getText(); text = text.replace("\r\n", "\n"); text = text.replace("\r", "\n"); @@ -251,7 +256,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall @Override public void save() { setScript(); - Client.sendData(EnumPacketServer.ScriptDataSave, script.writeToNBT(new NBTTagCompound())); + Client.sendData(EnumPacketServer.ScriptDataSave, script.writeToNBT(new NBTTagCompound())); } @Override @@ -272,4 +277,3 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall } } - diff --git a/src/main/java/noppes/npcs/client/gui/GuiScriptList.java b/src/main/java/noppes/npcs/client/gui/GuiScriptList.java index 5ec6bd1f2..34c121776 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiScriptList.java +++ b/src/main/java/noppes/npcs/client/gui/GuiScriptList.java @@ -4,11 +4,14 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.gui.GuiButton; +import net.minecraft.world.biome.BiomeGenBase; import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.ScriptContainer; +import noppes.npcs.entity.EntityNPCInterface; public class GuiScriptList extends SubGuiInterface{ private GuiCustomScroll scroll1; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java index a1708aa89..beee1673b 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java @@ -1,9 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; +import noppes.npcs.client.gui.global.GuiNPCQuestSelection; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; @@ -11,11 +13,15 @@ import noppes.npcs.client.gui.util.GuiSelectionListener; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.constants.EnumAvailabilityDialog; import noppes.npcs.constants.EnumAvailabilityFactionType; +import noppes.npcs.constants.EnumAvailabilityQuest; import noppes.npcs.constants.EnumDayTime; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.Availability; +import noppes.npcs.controllers.Dialog; import noppes.npcs.controllers.Faction; +import noppes.npcs.controllers.Quest; public class SubGuiNpcAvailability extends SubGuiInterface implements ITextfieldListener, GuiSelectionListener, IGuiData { @@ -60,7 +66,7 @@ public class SubGuiNpcAvailability extends SubGuiInterface implements ITextfield addLabel(new GuiNpcLabel(51,"availability.minlevel", guiLeft + 4 , guiTop + 175)); this.addTextField(new GuiNpcTextField(51, this, fontRendererObj, guiLeft + 50, guiTop + 170,90, 20, availabitily.minPlayerLevel + "")); - this.getTextField(51).integersOnly = true; + this.getTextField(51).numbersOnly = true; this.getTextField(51).setMinMaxDefault(0, Integer.MAX_VALUE, 0); this.addButton(new GuiNpcButton(66, guiLeft + 82, guiTop + 192,98, 20, "gui.done")); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java index 3c20cc863..df50d234c 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogExtra.java @@ -55,9 +55,6 @@ public class SubGuiNpcDialogExtra extends SubGuiInterface implements ISubGuiList addButton(new GuiNpcButtonYesNo(15, guiLeft + 120, y += 22, dialog.disableEsc)); addLabel(new GuiNpcLabel(15, "dialog.disableEsc", guiLeft + 4, y + 5)); - - addButton(new GuiNpcButtonYesNo(16, guiLeft + 120, y += 22, dialog.darkenScreen)); - addLabel(new GuiNpcLabel(16, "Darken Screen", guiLeft + 4, y + 5)); this.addButton(new GuiNpcButton(66, guiLeft + 82, guiTop + 192,98, 20, "gui.done")); @@ -79,9 +76,6 @@ public class SubGuiNpcDialogExtra extends SubGuiInterface implements ISubGuiList if(button.id == 15){ dialog.disableEsc = button.getValue() == 1; } - if(button.id == 16){ - dialog.darkenScreen = button.getValue() == 1; - } if(button.id == 13){ setSubGui(new SubGuiMailmanSendSetup(dialog.mail, getParent())); } diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java index 4f4fa1469..021f43165 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java @@ -80,7 +80,7 @@ public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollD addButton(new GuiNpcButton(2, guiLeft + 4, guiTop + 60, 90, 20, new String[]{"gui.increase","gui.decrease"},0)); addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft + 4, guiTop + 82, 110, 20, "10")); - getTextField(1).integersOnly = true; + getTextField(1).numbersOnly = true; getTextField(1).setMinMaxDefault(1, 100000, 10); addButton(new GuiNpcButton(3, guiLeft + 4, guiTop + 104, 60, 20, "gui.add")); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java index 0f018ea15..909bb11ab 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java @@ -28,7 +28,7 @@ public class SubGuiNpcFactionPoints extends SubGuiInterface implements ITextfiel this.addTextField(new GuiNpcTextField(2, this, guiLeft + 8 + fontRendererObj.getStringWidth(getLabel(2).label), guiTop + 28, 70, 20, faction.defaultPoints + "")); getTextField(2).setMaxStringLength(6); - getTextField(2).integersOnly = true; + getTextField(2).numbersOnly = true; String title = StatCollector.translateToLocal("faction.unfriendly") + "<->" + StatCollector.translateToLocal("faction.neutral"); addLabel(new GuiNpcLabel(3, title, guiLeft + 4, guiTop + 80)); @@ -38,8 +38,8 @@ public class SubGuiNpcFactionPoints extends SubGuiInterface implements ITextfiel addLabel(new GuiNpcLabel(4, title, guiLeft + 4, guiTop + 105)); addTextField(new GuiNpcTextField(4, this, guiLeft + 8 + fontRendererObj.getStringWidth(title), guiTop + 100, 70, 20, faction.friendlyPoints + "")); - getTextField(3).integersOnly = true; - getTextField(4).integersOnly = true; + getTextField(3).numbersOnly = true; + getTextField(4).numbersOnly = true; if(getTextField(3).xPosition > getTextField(4).xPosition) getTextField(4).xPosition = getTextField(3).xPosition; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java index 611aa10b5..642b0d356 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java @@ -27,30 +27,30 @@ public class SubGuiNpcMeleeProperties extends SubGuiInterface implements ITextfi { super.initGui(); addLabel(new GuiNpcLabel(1,"stats.meleestrength", guiLeft + 5, guiTop + 15)); - addTextField(new GuiNpcTextField(1,this, fontRendererObj, guiLeft + 85, guiTop + 10, 50, 18, String.format("%.0f", stats.getAttackStrength()) + "")); - getTextField(1).floatsOnly = true; - getTextField(1).setMinMaxDefaultFloat(0,Float.MAX_VALUE,5); + addTextField(new GuiNpcTextField(1,this, fontRendererObj, guiLeft + 85, guiTop + 10, 50, 18, stats.getAttackStrength()+"")); + getTextField(1).numbersOnly = true; + getTextField(1).setMinMaxDefault(0, 99999, 5); addLabel(new GuiNpcLabel(2,"stats.meleerange", guiLeft + 5, guiTop + 45)); addTextField(new GuiNpcTextField(2,this, fontRendererObj, guiLeft + 85, guiTop + 40, 50, 18, stats.attackRange+"")); - getTextField(2).integersOnly = true; - getTextField(2).setMinMaxDefault(1, Integer.MAX_VALUE, 2); + getTextField(2).numbersOnly = true; + getTextField(2).setMinMaxDefault(1, 30, 2); addLabel(new GuiNpcLabel(3,"stats.meleespeed", guiLeft + 5, guiTop + 75)); addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 85, guiTop + 70, 50, 18, stats.attackSpeed+"")); - getTextField(3).integersOnly = true; - getTextField(3).setMinMaxDefault(1, Integer.MAX_VALUE, 20); + getTextField(3).numbersOnly = true; + getTextField(3).setMinMaxDefault(1, 1000, 20); addLabel(new GuiNpcLabel(4,"enchantment.knockback", guiLeft + 5, guiTop + 105)); addTextField(new GuiNpcTextField(4,this, fontRendererObj, guiLeft + 85, guiTop + 100, 50, 18, stats.knockback + "")); - getTextField(4).integersOnly = true; - getTextField(4).setMinMaxDefault(0, Integer.MAX_VALUE, 0); + getTextField(4).numbersOnly = true; + getTextField(4).setMinMaxDefault(0, 4, 0); addLabel(new GuiNpcLabel(5,"stats.meleeeffect", guiLeft + 5, guiTop + 135)); addButton(new GuiNpcButton(5,guiLeft + 85, guiTop + 130, 52, 20, potionNames, stats.potionType.ordinal())); if(stats.potionType != EnumPotionType.None) { addLabel(new GuiNpcLabel(6,"gui.time", guiLeft + 5, guiTop + 165)); addTextField(new GuiNpcTextField(6,this, fontRendererObj, guiLeft + 85, guiTop + 160, 50, 18, stats.potionDuration + "")); - getTextField(6).integersOnly = true; - getTextField(6).setMinMaxDefault(1, Integer.MAX_VALUE, 5); + getTextField(6).numbersOnly = true; + getTextField(6).setMinMaxDefault(1, 99999, 5); if(stats.potionType != EnumPotionType.Fire) { addLabel(new GuiNpcLabel(7,"stats.amplify", guiLeft + 5, guiTop + 195)); addButton(new GuiNpcButton(7,guiLeft + 85, guiTop + 190, 52, 20, new String[]{"gui.no", "gui.yes"} ,stats.potionAmp)); @@ -61,7 +61,7 @@ public class SubGuiNpcMeleeProperties extends SubGuiInterface implements ITextfi public void unFocused(GuiNpcTextField textfield) { if(textfield.id == 1){ - stats.setAttackStrength(Float.parseFloat(textfield.getText())); + stats.setAttackStrength(textfield.getInteger()); } else if(textfield.id == 2){ stats.attackRange = textfield.getInteger(); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java index 15f85b70a..76e6d1d13 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java @@ -28,36 +28,11 @@ public class SubGuiNpcMovement extends SubGuiInterface implements ITextfieldList int y = guiTop + 4; this.addLabel(new GuiNpcLabel(0, "movement.type", guiLeft + 4, y + 5)); this.addButton(new GuiNpcButton(0, guiLeft + 80, y, 100, 20, EnumMovingType.names(), ai.movingType.ordinal())); - - // Fly Change - this.addButton(new GuiNpcButton(15, guiLeft + 80, y += 22, 100, 20, new String[]{"movement.ground","movement.flying"}, ai.movementType)); - - if(ai.movementType == 1){ - this.addLabel(new GuiNpcLabel(18, "fly.speed", guiLeft + 4, y + 140)); - addTextField(new GuiNpcTextField(18,this, guiLeft + 80, y + 135, 40, 20, ai.flySpeed + "")); - getTextField(18).doublesOnly = true; - getTextField(18).setMinMaxDefaultDouble(0.0D,Double.MAX_VALUE,1.0D); - - this.addLabel(new GuiNpcLabel(19, "fly.gravity", guiLeft + 4, y + 160)); - addTextField(new GuiNpcTextField(19,this, guiLeft + 80, y + 155, 40, 20, ai.flyGravity + "")); - getTextField(19).doublesOnly = true; - getTextField(19).setMinMaxDefaultDouble(0.0D,1.0D,0.0D); - - this.addLabel(new GuiNpcLabel(20, "Limit Height", guiLeft + 150, y + 116)); - addButton(new GuiNpcButton(20, guiLeft + 210, y + 110, 40, 20, new String[]{"gui.no","gui.yes"}, ai.hasFlyLimit?1:0)); - - if(ai.hasFlyLimit) { - this.addLabel(new GuiNpcLabel(21, "Height", guiLeft + 150, y + 140)); - addTextField(new GuiNpcTextField(21, this, guiLeft + 185, y + 135, 40, 20, ai.flyHeightLimit + "")); - getTextField(21).integersOnly = true; - getTextField(21).setMinMaxDefaultDouble(0.0D, Double.MAX_VALUE, 1.0D); - } - } - + if(ai.movingType == EnumMovingType.Wandering){ addTextField(new GuiNpcTextField(4,this, guiLeft + 100, y += 22, 40, 20, ai.walkingRange + "")); - getTextField(4).integersOnly = true; - getTextField(4).setMinMaxDefault(0, Integer.MAX_VALUE, 5); + getTextField(4).numbersOnly = true; + getTextField(4).setMinMaxDefault(0, 1000, 5); addLabel(new GuiNpcLabel(4,"gui.range", guiLeft + 4, y + 5)); addButton(new GuiNpcButton(5, guiLeft + 100, y += 22, 50, 20, new String[]{"gui.no","gui.yes"}, ai.npcInteracting?1:0)); @@ -67,15 +42,15 @@ public class SubGuiNpcMovement extends SubGuiInterface implements ITextfieldList addTextField(new GuiNpcTextField(7,this, guiLeft + 99, y += 22, 24, 20, (int)ai.bodyOffsetX + "")); addLabel(new GuiNpcLabel(17, "spawner.posoffset", guiLeft + 4, y + 5)); addLabel(new GuiNpcLabel(7,"X:", guiLeft + 115, y + 5)); - getTextField(7).integersOnly = true; + getTextField(7).numbersOnly = true; getTextField(7).setMinMaxDefault(0, 10, 5); addLabel(new GuiNpcLabel(8,"Y:", guiLeft + 125, y + 5)); addTextField(new GuiNpcTextField(8,this, guiLeft + 135, y, 24, 20, (int)ai.bodyOffsetY + "")); - getTextField(8).integersOnly = true; + getTextField(8).numbersOnly = true; getTextField(8).setMinMaxDefault(0, 10, 5); addLabel(new GuiNpcLabel(9,"Z:", guiLeft + 161, y + 5)); addTextField(new GuiNpcTextField(9,this, guiLeft + 171, y, 24, 20, (int)ai.bodyOffsetZ + "")); - getTextField(9).integersOnly = true; + getTextField(9).numbersOnly = true; getTextField(9).setMinMaxDefault(0, 10, 5); this.addButton(new GuiNpcButton(3, guiLeft + 80, y += 22, 100, 20, new String[]{"stats.normal","movement.sitting","movement.lying","movement.sneaking","movement.dancing","movement.aiming", "movement.crawling", "movement.hug"},ai.animationType.ordinal())); @@ -87,14 +62,14 @@ public class SubGuiNpcMovement extends SubGuiInterface implements ITextfieldList } else{ addTextField(new GuiNpcTextField(5,this, guiLeft + 99, y += 22, 40, 20, ai.orientation + "")); - getTextField(5).integersOnly = true; + getTextField(5).numbersOnly = true; getTextField(5).setMinMaxDefault(0, 359, 0); this.addLabel(new GuiNpcLabel(6, "movement.rotation", guiLeft + 4, y + 5)); addLabel(new GuiNpcLabel(5,"(0-359)", guiLeft + 142, y + 5)); } if(ai.standingType == EnumStandingType.NoRotation || ai.standingType == EnumStandingType.HeadRotation){ addTextField(new GuiNpcTextField(5,this, guiLeft + 165, y, 40, 20, ai.orientation + "")); - getTextField(5).integersOnly = true; + getTextField(5).numbersOnly = true; getTextField(5).setMinMaxDefault(0, 359, 0); addLabel(new GuiNpcLabel(5,"(0-359)", guiLeft + 207, y + 5)); } @@ -114,8 +89,8 @@ public class SubGuiNpcMovement extends SubGuiInterface implements ITextfieldList addLabel(new GuiNpcLabel(13,"movement.stopinteract", guiLeft + 4, y + 5)); addTextField(new GuiNpcTextField(14,this, guiLeft + 80, y += 22, 50, 18, ai.getWalkingSpeed()+"")); - getTextField(14).integersOnly = true; - getTextField(14).setMinMaxDefault(0, Integer.MAX_VALUE, 4); + getTextField(14).numbersOnly = true; + getTextField(14).setMinMaxDefault(0, 10, 4); addLabel(new GuiNpcLabel(14,"stats.walkspeed", guiLeft + 5, y + 5)); addButton(new GuiNpcButton(66, guiLeft + 190, guiTop + 190, 60, 20, "gui.done")); @@ -166,15 +141,9 @@ public class SubGuiNpcMovement extends SubGuiInterface implements ITextfieldList else if (button.id == 13) { ai.stopAndInteract = button.getValue() == 1; } - else if (button.id == 15) { - ai.movementType = button.getValue(); - initGui(); - } else if (button.id == 20) { - ai.hasFlyLimit = button.getValue() == 1; - initGui(); - } else if (button.id == 66) { - close(); - } + else if(button.id == 66){ + close(); + } } @Override @@ -197,15 +166,6 @@ public class SubGuiNpcMovement extends SubGuiInterface implements ITextfieldList else if(textfield.id == 14){ ai.setWalkingSpeed(textfield.getInteger()); } - else if(textfield.id == 18){ - ai.flySpeed = textfield.getDouble(); - } - else if(textfield.id == 19){ - ai.flyGravity = textfield.getDouble(); - } - else if(textfield.id == 21){ - ai.flyHeightLimit = textfield.getInteger(); - } } } diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java deleted file mode 100644 index ff9e0d7e9..000000000 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java +++ /dev/null @@ -1,63 +0,0 @@ -package noppes.npcs.client.gui; - -import net.minecraft.client.gui.GuiButton; -import noppes.npcs.DataDisplay; -import noppes.npcs.client.gui.mainmenu.GuiNpcDisplay; -import noppes.npcs.client.gui.util.*; - -public class SubGuiNpcName extends SubGuiInterface implements ITextfieldListener { - private DataDisplay display; - public SubGuiNpcName(DataDisplay display){ - this.display = display; - setBackground("menubg.png"); - xSize = 256; - ySize = 216; - closeOnEsc = true; - } - - @Override - public void initGui(){ - super.initGui(); - int y = guiTop + 4; - addButton(new GuiNpcButton(66, guiLeft + xSize - 24, y, 20, 20, "X")); - - addTextField(new GuiNpcTextField(0,this, fontRendererObj, guiLeft + 4, y += 50, 226, 20, display.name)); - this.addButton(new GuiButtonBiDirectional(1, guiLeft + 4, y += 22 , 200, 20, new String[] {"markov.roman.name", "markov.japanese.name", "markov.slavic.name", "markov.welsh.name", "markov.sami.name", "markov.oldNorse.name", "markov.ancientGreek.name", "markov.aztec.name", "markov.classicCNPCs.name", "markov.spanish.name"}, display.getMarkovGeneratorId())); - - this.addButton(new GuiButtonBiDirectional(2, guiLeft + 64, y += 22 , 120, 20, new String[] {"markov.gender.either", "markov.gender.male", "markov.gender.female"}, display.getMarkovGender())); - addLabel(new GuiNpcLabel(2,"markov.gender.name", guiLeft + 5, y + 5)); - - addButton(new GuiNpcButton(3, guiLeft + 4, y += 42, 70, 20, "markov.generate")); - } - - @Override - public void unFocused(GuiNpcTextField textfield) { - if(textfield.id == 0){ - if(!textfield.isEmpty()) - display.setName(textfield.getText()); - else - textfield.setText(display.getName()); - } - } - - @Override - protected void actionPerformed(GuiButton guibutton){ - GuiNpcButton button = (GuiNpcButton) guibutton; - - if(button.id == 1) { - display.setMarkovGeneratorId(button.getValue()); - } - if(button.id == 2) { - display.setMarkovGender(button.getValue()); - } - if(button.id == 3) { - String name = display.getRandomName(); - display.setName(name); - getTextField(0).setText(name); - ((GuiNpcDisplay)parent).nameText.setText(name); - } - if(button.id == 66){ - close(); - } - } -} diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java index 0fda866ba..7b9f6af39 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java @@ -7,6 +7,7 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumPotionType; import noppes.npcs.constants.EnumParticleType; @@ -28,21 +29,21 @@ public class SubGuiNpcProjectiles extends SubGuiInterface implements ITextfieldL { super.initGui(); addLabel(new GuiNpcLabel(1,"enchantment.arrowDamage", guiLeft + 5, guiTop + 15)); - addTextField(new GuiNpcTextField(1,this, fontRendererObj, guiLeft + 45, guiTop + 10, 50, 18, String.format("%.0f", stats.pDamage) +"")); - getTextField(1).setFloatsOnly(); - getTextField(1).setMinMaxDefaultFloat(0, Float.MAX_VALUE, 5); + addTextField(new GuiNpcTextField(1,this, fontRendererObj, guiLeft + 45, guiTop + 10, 50, 18, stats.pDamage+"")); + getTextField(1).numbersOnly = true; + getTextField(1).setMinMaxDefault(0, 9999, 5); addLabel(new GuiNpcLabel(2,"enchantment.arrowKnockback", guiLeft + 110, guiTop + 15)); addTextField(new GuiNpcTextField(2,this, fontRendererObj, guiLeft + 150, guiTop + 10, 50, 18, stats.pImpact+"")); - getTextField(2).integersOnly = true; - getTextField(2).setMinMaxDefault(0, Integer.MAX_VALUE, 0); + getTextField(2).numbersOnly = true; + getTextField(2).setMinMaxDefault(0, 3, 0); addLabel(new GuiNpcLabel(3,"stats.size", guiLeft + 5, guiTop + 45)); addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 45, guiTop + 40, 50, 18, stats.pSize+"")); - getTextField(3).integersOnly = true; - getTextField(3).setMinMaxDefault(1, Integer.MAX_VALUE, 10); + getTextField(3).numbersOnly = true; + getTextField(3).setMinMaxDefault(1, 10, 10); addLabel(new GuiNpcLabel(4,"stats.speed", guiLeft + 5, guiTop + 75)); addTextField(new GuiNpcTextField(4,this, fontRendererObj, guiLeft + 45, guiTop + 70, 50, 18, stats.pSpeed+"")); - getTextField(4).integersOnly = true; - getTextField(4).setMinMaxDefault(1, Integer.MAX_VALUE, 10); + getTextField(4).numbersOnly = true; + getTextField(4).setMinMaxDefault(1, 50, 10); addLabel(new GuiNpcLabel(5,"stats.hasgravity", guiLeft + 5, guiTop + 105)); addButton(new GuiNpcButton(0, guiLeft + 60, guiTop + 100, 60, 20, new String[]{"gui.no", "gui.yes"} ,stats.pPhysics ? 1:0)); @@ -58,8 +59,8 @@ public class SubGuiNpcProjectiles extends SubGuiInterface implements ITextfieldL addButton(new GuiNpcButton(4,guiLeft + 60, guiTop + 160, 60, 20, potionNames, stats.pEffect.ordinal())); if(stats.pEffect != EnumPotionType.None) { addTextField(new GuiNpcTextField(5,this, fontRendererObj, guiLeft + 140, guiTop + 160, 60, 18, stats.pDur + "")); - getTextField(5).integersOnly = true; - getTextField(5).setMinMaxDefault(1, Integer.MAX_VALUE, 5); + getTextField(5).numbersOnly = true; + getTextField(5).setMinMaxDefault(1, 99999, 5); if(stats.pEffect != EnumPotionType.Fire) { addButton(new GuiNpcButton(10, guiLeft + 210, guiTop + 160, 40, 20, new String[]{"stats.regular", "stats.amplified"} ,stats.pEffAmp)); } @@ -81,7 +82,7 @@ public class SubGuiNpcProjectiles extends SubGuiInterface implements ITextfieldL public void unFocused(GuiNpcTextField textfield) { if(textfield.id == 1){ - stats.pDamage = (float)(Math.floor(Float.parseFloat(textfield.getText()))); + stats.pDamage = textfield.getInteger(); } else if(textfield.id == 2){ stats.pImpact = textfield.getInteger(); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java index 9810d7085..2077f34f0 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java @@ -29,36 +29,36 @@ public class SubGuiNpcRangeProperties extends SubGuiInterface implements ITextfi int y = guiTop + 4; addTextField(new GuiNpcTextField(1,this, fontRendererObj, guiLeft + 85, y, 50, 18, stats.accuracy+"")); addLabel(new GuiNpcLabel(1,"stats.accuracy", guiLeft + 5, y + 5)); - getTextField(1).integersOnly = true; + getTextField(1).numbersOnly = true; getTextField(1).setMinMaxDefault(0, 100, 90); addTextField(new GuiNpcTextField(2,this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.rangedRange+"")); addLabel(new GuiNpcLabel(2,"stats.rangedrange", guiLeft + 5, y + 5)); - getTextField(2).integersOnly = true; - getTextField(2).setMinMaxDefault(1, Integer.MAX_VALUE, 2); + getTextField(2).numbersOnly = true; + getTextField(2).setMinMaxDefault(1, 64, 2); addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.minDelay+"")); addLabel(new GuiNpcLabel(3,"stats.mindelay", guiLeft + 5, y + 5)); - getTextField(3).integersOnly = true; - getTextField(3).setMinMaxDefault(1, Integer.MAX_VALUE, 20); + getTextField(3).numbersOnly = true; + getTextField(3).setMinMaxDefault(1, 9999, 20); addTextField(new GuiNpcTextField(4,this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.maxDelay+"")); addLabel(new GuiNpcLabel(4,"stats.maxdelay", guiLeft + 5, y + 5)); - getTextField(4).integersOnly = true; - getTextField(4).setMinMaxDefault(1, Integer.MAX_VALUE, 20); + getTextField(4).numbersOnly = true; + getTextField(4).setMinMaxDefault(1, 9999, 20); addTextField(new GuiNpcTextField(5, this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.fireRate + "")); addLabel(new GuiNpcLabel(5, "stats.burstspeed", guiLeft + 5, y + 5)); - getTextField(5).integersOnly = true; - getTextField(5).setMinMaxDefault(0, Integer.MAX_VALUE, 0); + getTextField(5).numbersOnly = true; + getTextField(5).setMinMaxDefault(0, 30, 0); addTextField(new GuiNpcTextField(6, this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.burstCount + "")); addLabel(new GuiNpcLabel(6, "stats.burstcount", guiLeft + 5, y + 5)); - getTextField(6).integersOnly = true; - getTextField(6).setMinMaxDefault(1, Integer.MAX_VALUE, 20); + getTextField(6).numbersOnly = true; + getTextField(6).setMinMaxDefault(1, 100, 20); addTextField(new GuiNpcTextField(7,this, fontRendererObj, guiLeft + 85, y += 22, 100, 20, stats.fireSound)); addLabel(new GuiNpcLabel(7, "stats.firesound:", guiLeft + 5, y + 5)); addButton(new GuiNpcButton(7, guiLeft + 187, y, 60, 20, "mco.template.button.select")); addTextField(new GuiNpcTextField(8, this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.shotCount + "")); addLabel(new GuiNpcLabel(8, "stats.shotcount", guiLeft + 5, y + 5)); - getTextField(8).integersOnly = true; - getTextField(8).setMinMaxDefault(1, Integer.MAX_VALUE, 1); + getTextField(8).numbersOnly = true; + getTextField(8).setMinMaxDefault(1, 10, 1); addButton(new GuiNpcButtonYesNo(9, guiLeft + 100, y += 22, stats.aimWhileShooting)); addLabel(new GuiNpcLabel(9, "stats.aimWhileShooting", guiLeft + 5, y + 5)); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java index 63427aa77..08cd8519e 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java @@ -35,11 +35,7 @@ public class SubGuiNpcResistanceProperties extends SubGuiInterface implements IS addLabel(new GuiNpcLabel(3,"stats.explosion", guiLeft + 4, guiTop + 81)); addSlider(new GuiNpcSlider(this, 3, guiLeft + 94, guiTop + 76, (int)(resistances.explosion * 100 - 100) + "%", resistances.explosion / 2)); - if(resistances.disableDamage){ - addLabel(new GuiNpcLabel(4,"stats.disabletrue", guiLeft + 4, guiTop + 103)); - } - - addButton(new GuiNpcButton(66, guiLeft + 190, guiTop + 190, 60, 20, "gui.done")); + addButton(new GuiNpcButton(66, guiLeft + 190, guiTop + 190, 60, 20, "gui.done")); } protected void actionPerformed(GuiButton guibutton) diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java index 16d5f191c..26f28e05f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java @@ -27,7 +27,7 @@ public class SubGuiNpcRespawn extends SubGuiInterface implements ITextfieldListe if(stats.respawnTime > 0){ addLabel(new GuiNpcLabel(3,"gui.time", guiLeft + 5, guiTop + 57)); addTextField(new GuiNpcTextField(2,this, fontRendererObj, guiLeft + 122, guiTop + 53, 50, 18, stats.respawnTime + "")); - getTextField(2).integersOnly = true; + getTextField(2).numbersOnly = true; getTextField(2).setMinMaxDefault(1, Integer.MAX_VALUE, 20); addLabel(new GuiNpcLabel(4,"stats.deadbody", guiLeft + 4, guiTop + 79)); diff --git a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java deleted file mode 100644 index f94cb1461..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java +++ /dev/null @@ -1,910 +0,0 @@ -package noppes.npcs.client.gui.custom; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.Client; -import noppes.npcs.client.gui.custom.components.*; -import noppes.npcs.client.gui.custom.interfaces.IClickListener; -import noppes.npcs.client.gui.custom.interfaces.IDataHolder; -import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.ICustomScrollListener; -import noppes.npcs.client.gui.util.IGuiData; -import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.scripted.gui.*; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import java.util.*; - -public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiData { - ScriptGui gui; - int xSize; - int ySize; - public static int guiLeft; - public static int guiTop; - ResourceLocation background; - public String[] hoverText; - Map components = new HashMap(); - List clickListeners = new ArrayList(); - List keyListeners = new ArrayList(); - List dataHolders = new ArrayList(); - - public Container inventorySlots; - private Slot theSlot; - private Slot clickedSlot; - private boolean isRightMouseClick; - private ItemStack draggedStack; - private int field_147011_y; - private int field_147010_z; - private Slot returningStackDestSlot; - private long returningStackTime; - private ItemStack returningStack; - private Slot field_146985_D; - private long field_146986_E; - protected final Set field_147008_s = new HashSet(); - protected boolean field_147007_t; - private int field_146987_F; - private int field_146988_G; - private boolean field_146995_H; - private int field_146996_I; - private long field_146997_J; - private Slot field_146998_K; - private int field_146992_L; - private boolean field_146993_M; - private ItemStack field_146994_N; - - public GuiCustom(ContainerCustomGui container) { - this.inventorySlots = container; - this.field_146995_H = true; - this.allowUserInput = true; - } - - public void initGui() { - super.initGui(); - this.mc.thePlayer.openContainer = this.inventorySlots; - if (this.gui != null) { - guiLeft = (this.width - this.xSize)/2; - guiTop = (this.height - this.ySize)/2; - this.components.clear(); - this.clickListeners.clear(); - this.keyListeners.clear(); - this.dataHolders.clear(); - Iterator var1 = this.gui.getComponents().iterator(); - - while(var1.hasNext()) { - ICustomGuiComponent c = (ICustomGuiComponent)var1.next(); - this.addComponent(c); - } - } - - } - - public void updateScreen() { - super.updateScreen(); - - Iterator var1 = this.dataHolders.iterator(); - - while(var1.hasNext()) { - IDataHolder component = (IDataHolder)var1.next(); - if (component instanceof GuiTextField) { - ((GuiTextField)component).updateCursorCounter(); - } - } - - if (!this.mc.thePlayer.isEntityAlive() || this.mc.thePlayer.isDead) - { - this.mc.thePlayer.closeScreen(); - } - } - - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - this.hoverText = null; - //this.drawDefaultBackground(); - if (this.background != null) { - this.drawBackgroundTexture(); - } - - Iterator var4 = this.components.values().iterator(); - - while(var4.hasNext()) { - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); - GL11.glDisable(GL11.GL_ALPHA_TEST); - - IGuiComponent component = (IGuiComponent)var4.next(); - component.onRender(this.mc, mouseX, mouseY, Mouse.getDWheel(), partialTicks); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_ALPHA_TEST); - } - - if (this.hoverText != null) { - this.func_146283_a(Arrays.asList(this.hoverText), mouseX, mouseY); - } - - drawScreenSuper(mouseX, mouseY, partialTicks); - } - - public void drawScreenSuper(int mouseX, int mouseY, float partialTicks) - { - //this.drawDefaultBackground(); - int k = this.guiLeft; - int l = this.guiTop; - //this.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - super.drawScreen(mouseX, mouseY, partialTicks); - RenderHelper.enableGUIStandardItemLighting(); - GL11.glPushMatrix(); - GL11.glTranslatef((float)k, (float)l, 0.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - this.theSlot = null; - short short1 = 240; - short short2 = 240; - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)short1 / 1.0F, (float)short2 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int k1; - - for (int i1 = 0; i1 < this.inventorySlots.inventorySlots.size(); ++i1) - { - Slot slot = (Slot)this.inventorySlots.inventorySlots.get(i1); - this.drawSlot(slot); - - if (this.isMouseOverSlot(slot, mouseX, mouseY) && slot.func_111238_b()) - { - this.theSlot = slot; - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - int j1 = slot.xDisplayPosition; - k1 = slot.yDisplayPosition; - GL11.glColorMask(true, true, true, false); - this.drawGradientRect(j1, k1, j1 + 16, k1 + 16, -2130706433, -2130706433); - GL11.glColorMask(true, true, true, true); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - } - } - - //Forge: Force lighting to be disabled as there are some issue where lighting would - //incorrectly be applied based on items that are in the inventory. - GL11.glDisable(GL11.GL_LIGHTING); - //this.drawGuiContainerForegroundLayer(mouseX, mouseY); - GL11.glEnable(GL11.GL_LIGHTING); - InventoryPlayer inventoryplayer = this.mc.thePlayer.inventory; - ItemStack itemstack = this.draggedStack == null ? inventoryplayer.getItemStack() : this.draggedStack; - - if (itemstack != null) - { - byte b0 = 8; - k1 = this.draggedStack == null ? 8 : 16; - String s = null; - - if (this.draggedStack != null && this.isRightMouseClick) - { - itemstack = itemstack.copy(); - itemstack.stackSize = MathHelper.ceiling_float_int((float)itemstack.stackSize / 2.0F); - } - else if (this.field_147007_t && this.field_147008_s.size() > 1) - { - itemstack = itemstack.copy(); - itemstack.stackSize = this.field_146996_I; - - if (itemstack.stackSize == 0) - { - s = "" + EnumChatFormatting.YELLOW + "0"; - } - } - - this.drawItemStack(itemstack, mouseX - k - b0, mouseY - l - k1, s); - } - - if (this.returningStack != null) - { - float f1 = (float)(Minecraft.getSystemTime() - this.returningStackTime) / 100.0F; - - if (f1 >= 1.0F) - { - f1 = 1.0F; - this.returningStack = null; - } - - k1 = this.returningStackDestSlot.xDisplayPosition - this.field_147011_y; - int j2 = this.returningStackDestSlot.yDisplayPosition - this.field_147010_z; - int l1 = this.field_147011_y + (int)((float)k1 * f1); - int i2 = this.field_147010_z + (int)((float)j2 * f1); - this.drawItemStack(this.returningStack, l1, i2, (String)null); - } - - GL11.glPopMatrix(); - - if (inventoryplayer.getItemStack() == null && this.theSlot != null && this.theSlot.getHasStack()) - { - ItemStack itemstack1 = this.theSlot.getStack(); - this.renderToolTip(itemstack1, mouseX, mouseY); - } - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - RenderHelper.enableStandardItemLighting(); - } - - private void drawItemStack(ItemStack p_146982_1_, int p_146982_2_, int p_146982_3_, String p_146982_4_) - { - GL11.glTranslatef(0.0F, 0.0F, 32.0F); - this.zLevel = 200.0F; - itemRender.zLevel = 200.0F; - FontRenderer font = null; - if (p_146982_1_ != null) font = p_146982_1_.getItem().getFontRenderer(p_146982_1_); - if (font == null) font = fontRendererObj; - itemRender.renderItemAndEffectIntoGUI(font, this.mc.getTextureManager(), p_146982_1_, p_146982_2_, p_146982_3_); - itemRender.renderItemOverlayIntoGUI(font, this.mc.getTextureManager(), p_146982_1_, p_146982_2_, p_146982_3_ - (this.draggedStack == null ? 0 : 8), p_146982_4_); - this.zLevel = 0.0F; - itemRender.zLevel = 0.0F; - } - - private boolean isMouseOverSlot(Slot slot, int posX, int posY) - { - return this.isPointInRegion(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, posX, posY); - } - - protected boolean isPointInRegion(int slotDisplayX, int slotDisplayY, int slotSizeX, int slotSizeY, int posX, int posY) - { - int k1 = this.guiLeft; - int l1 = this.guiTop; - posX -= k1; - posY -= l1; - return posX >= slotDisplayX - 1 && posX < slotDisplayX + slotSizeX + 1 && posY >= slotDisplayY - 1 && posY < slotDisplayY + slotSizeY + 1; - } - - private void drawSlot(Slot p_146977_1_) - { - int i = p_146977_1_.xDisplayPosition; - int j = p_146977_1_.yDisplayPosition; - ItemStack itemstack = p_146977_1_.getStack(); - boolean flag = false; - boolean flag1 = p_146977_1_ == this.clickedSlot && this.draggedStack != null && !this.isRightMouseClick; - ItemStack itemstack1 = this.mc.thePlayer.inventory.getItemStack(); - String s = null; - - if (p_146977_1_ == this.clickedSlot && this.draggedStack != null && this.isRightMouseClick && itemstack != null) - { - itemstack = itemstack.copy(); - itemstack.stackSize /= 2; - } - else if (this.field_147007_t && this.field_147008_s.contains(p_146977_1_) && itemstack1 != null) - { - if (this.field_147008_s.size() == 1) - { - return; - } - - if (Container.func_94527_a(p_146977_1_, itemstack1, true) && this.inventorySlots.canDragIntoSlot(p_146977_1_)) - { - itemstack = itemstack1.copy(); - flag = true; - Container.func_94525_a(this.field_147008_s, this.field_146987_F, itemstack, p_146977_1_.getStack() == null ? 0 : p_146977_1_.getStack().stackSize); - - if (itemstack.stackSize > itemstack.getMaxStackSize()) - { - s = EnumChatFormatting.YELLOW + "" + itemstack.getMaxStackSize(); - itemstack.stackSize = itemstack.getMaxStackSize(); - } - - if (itemstack.stackSize > p_146977_1_.getSlotStackLimit()) - { - s = EnumChatFormatting.YELLOW + "" + p_146977_1_.getSlotStackLimit(); - itemstack.stackSize = p_146977_1_.getSlotStackLimit(); - } - } - else - { - this.field_147008_s.remove(p_146977_1_); - this.func_146980_g(); - } - } - - this.zLevel = 100.0F; - itemRender.zLevel = 100.0F; - - if (itemstack == null) - { - IIcon iicon = p_146977_1_.getBackgroundIconIndex(); - - if (iicon != null) - { - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); // Forge: Blending needs to be enabled for this. - this.mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture); - this.drawTexturedModelRectFromIcon(i, j, iicon, 16, 16); - GL11.glDisable(GL11.GL_BLEND); // Forge: And clean that up - GL11.glEnable(GL11.GL_LIGHTING); - flag1 = true; - } - } - - if (!flag1) - { - if (flag) - { - drawRect(i, j, i + 16, j + 16, -2130706433); - } - - GL11.glEnable(GL11.GL_DEPTH_TEST); - itemRender.renderItemAndEffectIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), itemstack, i, j); - itemRender.renderItemOverlayIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), itemstack, i, j, s); - } - - itemRender.zLevel = 0.0F; - this.zLevel = 0.0F; - } - - private void func_146980_g() - { - ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack(); - - if (itemstack != null && this.field_147007_t) - { - this.field_146996_I = itemstack.stackSize; - ItemStack itemstack1; - int i; - - for (Iterator iterator = this.field_147008_s.iterator(); iterator.hasNext(); this.field_146996_I -= itemstack1.stackSize - i) - { - Slot slot = (Slot)iterator.next(); - itemstack1 = itemstack.copy(); - i = slot.getStack() == null ? 0 : slot.getStack().stackSize; - Container.func_94525_a(this.field_147008_s, this.field_146987_F, itemstack1, i); - - if (itemstack1.stackSize > itemstack1.getMaxStackSize()) - { - itemstack1.stackSize = itemstack1.getMaxStackSize(); - } - - if (itemstack1.stackSize > slot.getSlotStackLimit()) - { - itemstack1.stackSize = slot.getSlotStackLimit(); - } - } - } - } - - protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { - } - - void drawBackgroundTexture() { - this.mc.getTextureManager().bindTexture(this.background); - this.drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize); - } - - private void addComponent(ICustomGuiComponent component) { - ScriptGuiComponent c = (ScriptGuiComponent)component; - switch(c.getType()) { - case 0: - CustomGuiButton button = CustomGuiButton.fromComponent((ScriptGuiButton)component); - button.setParent(this); - this.components.put(button.getID(), button); - this.addClickListener(button); - break; - case 1: - CustomGuiLabel lbl = CustomGuiLabel.fromComponent((ScriptGuiLabel)component); - lbl.setParent(this); - this.components.put(lbl.getID(), lbl); - break; - case 2: - CustomGuiTexturedRect rect = CustomGuiTexturedRect.fromComponent((ScriptGuiTexturedRect)component); - rect.setParent(this); - this.components.put(rect.getID(), rect); - break; - case 3: - CustomGuiTextField textField = CustomGuiTextField.fromComponent((ScriptGuiTextField)component); - textField.setParent(this); - this.components.put(textField.getID(), textField); - this.addDataHolder(textField); - this.addClickListener(textField); - this.addKeyListener(textField); - break; - case 4: - CustomGuiScrollComponent scroll = new CustomGuiScrollComponent(this.mc, this, component.getID(), ((ScriptGuiScroll)component).isMultiSelect()); - scroll.fromComponent((ScriptGuiScroll)component); - scroll.setParent(this); - this.components.put(scroll.getID(), scroll); - this.addDataHolder(scroll); - this.addClickListener(scroll); - break; - case 6: - CustomGuiLine line = CustomGuiLine.fromComponent((ScriptGuiLine) component); - this.components.put(line.getID(),line); - break; - } - - } - - protected void actionPerformed(GuiButton button) { - super.actionPerformed(button); - Client.sendData(EnumPacketServer.CustomGuiButton, new Object[]{this.updateGui().toNBT(), button.id}); - } - - public void buttonClick(CustomGuiButton button) { - Client.sendData(EnumPacketServer.CustomGuiButton, new Object[]{this.updateGui().toNBT(), button.id}); - } - - public void slotChange(CustomGuiSlot slot) { - Client.sendData(EnumPacketServer.CustomGuiSlotChange, new Object[]{this.updateGui().toNBT(), slot.slotNumber}); - } - - public String prevScrollClicked = null; - public void customScrollClicked(int i, int j, int k, GuiCustomScroll scroll) { - Client.sendData(EnumPacketServer.CustomGuiScrollClick, new Object[]{this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), false}); - if(Integer.toString(scroll.selected).equals(prevScrollClicked)){ - Client.sendData(EnumPacketServer.CustomGuiScrollClick, new Object[]{this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), true}); - } - prevScrollClicked = Integer.toString(scroll.selected); - } - - public void onGuiClosed() { - if (this.gui != null) { - Client.sendData(EnumPacketServer.CustomGuiClose, new Object[]{this.updateGui().toNBT()}); - } - - if (this.mc.thePlayer != null) - { - this.inventorySlots.onContainerClosed(this.mc.thePlayer); - } - } - - public void onTextFieldUnfocused(CustomGuiTextField textField){ - Client.sendData(EnumPacketServer.CustomGuiUnfocused, new Object[]{this.updateGui().toNBT(), textField.getID()}); - } - - ScriptGui updateGui() { - Iterator var1 = this.dataHolders.iterator(); - - while(var1.hasNext()) { - IDataHolder component = (IDataHolder)var1.next(); - this.gui.updateComponent(component.toComponent()); - } - - return this.gui; - } - - NBTTagCompound getScrollSelection(CustomGuiScrollComponent scroll) { - NBTTagList list = new NBTTagList(); - if (scroll.multiSelect) { - Iterator var3 = scroll.getSelectedList().iterator(); - - while(var3.hasNext()) { - String s = (String)var3.next(); - list.appendTag(new NBTTagString(s)); - } - } else { - list.appendTag(new NBTTagString(scroll.getSelected())); - } - - NBTTagCompound selection = new NBTTagCompound(); - selection.setTag("selection", list); - return selection; - } - - protected void keyTyped(char typedChar, int keyCode) { - if (keyCode == 1 || keyCode == this.mc.gameSettings.keyBindInventory.getKeyCode()) - { - this.mc.thePlayer.closeScreen(); - } - - this.checkHotbarKeys(keyCode); - - if (this.theSlot != null && this.theSlot.getHasStack()) - { - if (keyCode == this.mc.gameSettings.keyBindPickBlock.getKeyCode()) - { - this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, 0, 3); - } - else if (keyCode == this.mc.gameSettings.keyBindDrop.getKeyCode()) - { - this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4); - } - } - - Iterator var3 = this.keyListeners.iterator(); - - while(var3.hasNext()) { - CustomGuiTextField listener = (CustomGuiTextField) var3.next(); - listener.keyTyped(typedChar, keyCode); - } - - if (this.mc.gameSettings.keyBindInventory.getKeyCode() != keyCode && !this.mc.gameSettings.keyBindInventory.getIsKeyPressed()) { - super.keyTyped(typedChar, keyCode); - } - } - - public void mouseClicked(int mouseX, int mouseY, int mouseButton) { - super.mouseClicked(mouseX, mouseY, mouseButton); - - boolean flag = mouseButton == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100; - Slot slot = this.getSlotAtPosition(mouseX, mouseY); - long l = Minecraft.getSystemTime(); - this.field_146993_M = this.field_146998_K == slot && l - this.field_146997_J < 250L && this.field_146992_L == mouseButton; - this.field_146995_H = false; - - if (mouseButton == 0 || mouseButton == 1 || flag) { - boolean flag1 = true; - int k1 = -1; - - for (int i = 0; i < this.inventorySlots.inventorySlots.size(); ++i) - { - Slot invSlot = (Slot)this.inventorySlots.inventorySlots.get(i); - - if (invSlot.equals(slot)) - { - flag1 = false; - } - } - - if (slot != null) { - k1 = slot.slotNumber; - } - - if (flag1) { - k1 = -999; - } - - if (this.mc.gameSettings.touchscreen && flag1 && this.mc.thePlayer.inventory.getItemStack() == null) { - this.mc.displayGuiScreen((GuiScreen) null); - return; - } - - if (k1 != -1) { - if (this.mc.gameSettings.touchscreen) { - if (slot != null && slot.getHasStack()) { - this.clickedSlot = slot; - this.draggedStack = null; - this.isRightMouseClick = mouseButton == 1; - } else { - this.clickedSlot = null; - } - } else if (!this.field_147007_t) { - if (this.mc.thePlayer.inventory.getItemStack() == null) { - if (mouseButton == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100) { - this.handleMouseClick(slot, k1, mouseButton, 3); - } else { - boolean flag2 = k1 != -999 && (Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54)); - byte b0 = 0; - - if (flag2) { - this.field_146994_N = slot != null && slot.getHasStack() ? slot.getStack() : null; - b0 = 1; - } else if (k1 == -999) { - b0 = 4; - } - - this.handleMouseClick(slot, k1, mouseButton, b0); - } - - this.field_146995_H = true; - } else { - this.field_147007_t = true; - this.field_146988_G = mouseButton; - this.field_147008_s.clear(); - - if (mouseButton == 0) { - this.field_146987_F = 0; - } else if (mouseButton == 1) { - this.field_146987_F = 1; - } - } - } - } - } - - this.field_146998_K = slot; - this.field_146997_J = l; - this.field_146992_L = mouseButton; - - Iterator var4 = this.clickListeners.iterator(); - - while(var4.hasNext()) { - IClickListener listener = (IClickListener)var4.next(); - listener.mouseClicked(this, mouseX, mouseY, mouseButton); - } - - } - - public boolean doesGuiPauseGame() { - return this.gui == null || this.gui.getDoesPauseGame(); - } - - public void addDataHolder(IDataHolder component) { - this.dataHolders.add(component); - } - - public void addKeyListener(CustomGuiTextField component) { - this.keyListeners.add(component); - } - - public void addClickListener(IClickListener component) { - this.clickListeners.add(component); - } - - public void setGuiData(NBTTagCompound compound) { - Minecraft mc = Minecraft.getMinecraft(); - ScriptGui gui = (ScriptGui)(new ScriptGui()).fromNBT(compound); - ((ContainerCustomGui)this.inventorySlots).setGui(gui, mc.thePlayer); - this.gui = gui; - this.xSize = gui.getWidth(); - this.ySize = gui.getHeight(); - if (!gui.getBackgroundTexture().isEmpty()) { - this.background = new ResourceLocation(gui.getBackgroundTexture()); - } - - this.initGui(); - } - - /** - * This function is what controls the hotbar shortcut check when you press a number key when hovering a stack. - */ - protected boolean checkHotbarKeys(int p_146983_1_) - { - if (this.mc.thePlayer.inventory.getItemStack() == null && this.theSlot != null) - { - for (int j = 0; j < 9; ++j) - { - if (p_146983_1_ == this.mc.gameSettings.keyBindsHotbar[j].getKeyCode()) - { - this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, j, 2); - return true; - } - } - } - - return false; - } - - protected void handleMouseClick(Slot slot, int index, int p_146984_3_, int p_146984_4_) - { - if (slot != null) - { - index = slot.slotNumber; - } - - this.mc.playerController.windowClick(this.inventorySlots.windowId, index, p_146984_3_, p_146984_4_, this.mc.thePlayer); - } - - protected void mouseMovedOrUp(int p_146286_1_, int p_146286_2_, int p_146286_3_) - { - super.mouseMovedOrUp(p_146286_1_, p_146286_2_, p_146286_3_); //Forge, Call parent to release buttons - Slot slot = this.getSlotAtPosition(p_146286_1_, p_146286_2_); - int l = this.guiLeft; - int i1 = this.guiTop; - boolean flag = p_146286_1_ < l || p_146286_2_ < i1 || p_146286_1_ >= l + this.xSize || p_146286_2_ >= i1 + this.ySize; - int j1 = -1; - - if (slot != null) - { - j1 = slot.slotNumber; - } - - if (flag) - { - j1 = -999; - } - - Slot slot1; - Iterator iterator; - - if (this.field_146993_M && slot != null && p_146286_3_ == 0 && this.inventorySlots.func_94530_a((ItemStack)null, slot)) - { - if (isShiftKeyDown()) - { - if (slot != null && slot.inventory != null && this.field_146994_N != null) - { - iterator = this.inventorySlots.inventorySlots.iterator(); - - while (iterator.hasNext()) - { - slot1 = (Slot)iterator.next(); - - if (slot1 != null && slot1.canTakeStack(this.mc.thePlayer) && slot1.getHasStack() && slot1.inventory == slot.inventory && Container.func_94527_a(slot1, this.field_146994_N, true)) - { - this.handleMouseClick(slot1, slot1.slotNumber, p_146286_3_, 1); - } - } - } - } - else - { - this.handleMouseClick(slot, j1, p_146286_3_, 6); - } - - this.field_146993_M = false; - this.field_146997_J = 0L; - } - else - { - if (this.field_147007_t && this.field_146988_G != p_146286_3_) - { - this.field_147007_t = false; - this.field_147008_s.clear(); - this.field_146995_H = true; - return; - } - - if (this.field_146995_H) - { - this.field_146995_H = false; - return; - } - - boolean flag1; - - if (this.clickedSlot != null && this.mc.gameSettings.touchscreen) - { - if (p_146286_3_ == 0 || p_146286_3_ == 1) - { - if (this.draggedStack == null && slot != this.clickedSlot) - { - this.draggedStack = this.clickedSlot.getStack(); - } - - flag1 = Container.func_94527_a(slot, this.draggedStack, false); - - if (j1 != -1 && this.draggedStack != null && flag1) - { - this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, p_146286_3_, 0); - this.handleMouseClick(slot, j1, 0, 0); - - if (this.mc.thePlayer.inventory.getItemStack() != null) - { - this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, p_146286_3_, 0); - this.field_147011_y = p_146286_1_ - l; - this.field_147010_z = p_146286_2_ - i1; - this.returningStackDestSlot = this.clickedSlot; - this.returningStack = this.draggedStack; - this.returningStackTime = Minecraft.getSystemTime(); - } - else - { - this.returningStack = null; - } - } - else if (this.draggedStack != null) - { - this.field_147011_y = p_146286_1_ - l; - this.field_147010_z = p_146286_2_ - i1; - this.returningStackDestSlot = this.clickedSlot; - this.returningStack = this.draggedStack; - this.returningStackTime = Minecraft.getSystemTime(); - } - - this.draggedStack = null; - this.clickedSlot = null; - } - } - else if (this.field_147007_t && !this.field_147008_s.isEmpty()) - { - this.handleMouseClick((Slot)null, -999, Container.func_94534_d(0, this.field_146987_F), 5); - iterator = this.field_147008_s.iterator(); - - while (iterator.hasNext()) - { - slot1 = (Slot)iterator.next(); - this.handleMouseClick(slot1, slot1.slotNumber, Container.func_94534_d(1, this.field_146987_F), 5); - } - - this.handleMouseClick((Slot)null, -999, Container.func_94534_d(2, this.field_146987_F), 5); - } - else if (this.mc.thePlayer.inventory.getItemStack() != null) - { - if (p_146286_3_ == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100) - { - this.handleMouseClick(slot, j1, p_146286_3_, 3); - } - else - { - flag1 = j1 != -999 && (Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54)); - - if (flag1) - { - this.field_146994_N = slot != null && slot.getHasStack() ? slot.getStack() : null; - } - - this.handleMouseClick(slot, j1, p_146286_3_, flag1 ? 1 : 0); - } - } - } - - if (this.mc.thePlayer.inventory.getItemStack() == null) - { - this.field_146997_J = 0L; - } - - this.field_147007_t = false; - } - - private Slot getSlotAtPosition(int posX, int posY) - { - for (int k = 0; k < this.inventorySlots.inventorySlots.size(); ++k) - { - Slot slot = (Slot)this.inventorySlots.inventorySlots.get(k); - - if (this.isMouseOverSlot(slot, posX, posY)) - { - return slot; - } - } - - return null; - } - - protected void mouseClickMove(int p_146273_1_, int p_146273_2_, int p_146273_3_, long p_146273_4_) - { - Slot slot = this.getSlotAtPosition(p_146273_1_, p_146273_2_); - ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack(); - - if (this.clickedSlot != null && this.mc.gameSettings.touchscreen) - { - if (p_146273_3_ == 0 || p_146273_3_ == 1) - { - if (this.draggedStack == null) - { - if (slot != this.clickedSlot) - { - this.draggedStack = this.clickedSlot.getStack().copy(); - } - } - else if (this.draggedStack.stackSize > 1 && slot != null && Container.func_94527_a(slot, this.draggedStack, false)) - { - long i1 = Minecraft.getSystemTime(); - - if (this.field_146985_D == slot) - { - if (i1 - this.field_146986_E > 500L) - { - this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, 0, 0); - this.handleMouseClick(slot, slot.slotNumber, 1, 0); - this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, 0, 0); - this.field_146986_E = i1 + 750L; - --this.draggedStack.stackSize; - } - } - else - { - this.field_146985_D = slot; - this.field_146986_E = i1; - } - } - } - } - else if (this.field_147007_t && slot != null && itemstack != null && itemstack.stackSize > this.field_147008_s.size() && Container.func_94527_a(slot, itemstack, true) && slot.isItemValid(itemstack) && this.inventorySlots.canDragIntoSlot(slot)) - { - this.field_147008_s.add(slot); - this.func_146980_g(); - } - } -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java deleted file mode 100644 index b2d73a5cd..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java +++ /dev/null @@ -1,168 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.components; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.texture.ITextureObject; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.SkinManager; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.ImageDownloadAlt; -import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.client.gui.custom.interfaces.IClickListener; -import noppes.npcs.client.renderer.ImageBufferDownloadAlt; -import noppes.npcs.scripted.gui.ScriptGuiButton; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import org.lwjgl.opengl.GL11; - -public class CustomGuiButton extends GuiButton implements IClickListener { - GuiCustom parent; - ResourceLocation texture; - public int textureX; - public int textureY; - boolean field_146123_n; - String label; - String[] hoverText; - - int color; - float alpha; - - public CustomGuiButton(int id, String buttonText, int x, int y) { - super(id, GuiCustom.guiLeft + x, GuiCustom.guiTop + y, buttonText); - } - - public CustomGuiButton(int id, String buttonText, int x, int y, int width, int height) { - super(id, GuiCustom.guiLeft + x, GuiCustom.guiTop + y, width, height, buttonText); - } - - public CustomGuiButton(int buttonId, String buttonText, int x, int y, int width, int height, String texture) { - this(buttonId, buttonText, x, y, width, height, texture, 0, 0); - } - - public CustomGuiButton(int buttonId, String buttonText, int x, int y, int width, int height, String texture, int textureX, int textureY) { - this(buttonId, buttonText, x, y, width, height); - this.textureX = textureX; - this.textureY = textureY; - this.label = buttonText; - this.texture = new ResourceLocation(texture); - - if(texture.startsWith("https://")){ - TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - ITextureObject object = new ImageDownloadAlt(null, texture, SkinManager.field_152793_a, new ImageBufferDownloadAlt(false)); - texturemanager.loadTexture(this.texture, object); - } - } - - public void setParent(GuiCustom parent) { - this.parent = parent; - } - - public static CustomGuiButton fromComponent(ScriptGuiButton component) { - CustomGuiButton btn; - if (component.hasTexture()) { - if (component.getTextureX() >= 0 && component.getTextureY() >= 0) { - btn = new CustomGuiButton(component.getID(), component.getLabel(), component.getPosX(), component.getPosY(), component.getWidth(), component.getHeight(), component.getTexture(), component.getTextureX(), component.getTextureY()); - } else { - btn = new CustomGuiButton(component.getID(), component.getLabel(), component.getPosX(), component.getPosY(), component.getWidth(), component.getHeight(), component.getTexture()); - } - } else if (component.getWidth() >= 0 && component.getHeight() >= 0) { - btn = new CustomGuiButton(component.getID(), component.getLabel(), component.getPosX(), component.getPosY(), component.getWidth(), component.getHeight()); - } else { - btn = new CustomGuiButton(component.getID(), component.getLabel(), component.getPosX(), component.getPosY()); - } - - btn.color = component.getColor(); - btn.alpha = component.getAlpha(); - - if (component.hasHoverText()) { - btn.hoverText = component.getHoverText(); - } - - return btn; - } - - public int getID() { - return this.id; - } - - public void onRender(Minecraft mc, int mouseX, int mouseY, int mouseWheel, float partialTicks) { - //GL11.func_179094_E(); - //GL11.func_179109_b(0.0F, 0.0F, (float)this.id); - GL11.glPushMatrix(); - float red = (color >> 16 & 255) / 255f; - float green = (color >> 8 & 255) / 255f; - float blue = (color & 255) / 255f; - GL11.glColor4f(red,green,blue,this.alpha); - - GL11.glTranslatef(0.0F, 0.0F, (float)this.id); - FontRenderer fontRenderer = mc.fontRenderer; - int i; - if (this.texture == null) { - mc.getTextureManager().bindTexture(buttonTextures); - this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; - i = this.getHoverState(this.field_146123_n); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - //GL11.func_187428_a(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO); - //GL11.func_187401_a(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA); - this.drawTexturedModalRect(this.xPosition, this.yPosition, 0, 46 + i * 20, this.width / 2, this.height); - this.drawTexturedModalRect(this.xPosition + this.width / 2, this.yPosition, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height); - this.mouseDragged(mc, mouseX, mouseY); - int j = 14737632; - if (this.packedFGColour != 0) { - j = this.packedFGColour; - } else if (!this.enabled) { - j = 10526880; - } else if (this.field_146123_n) { - j = 16777120; - } - - GL11.glTranslated(0.0D, 0.0D, 0.1D); - this.drawCenteredString(fontRenderer, this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height - 8) / 2, j); - } else { - mc.getTextureManager().bindTexture(this.texture); - this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; - i = this.hoverState(this.field_146123_n); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - //GL11.func_187428_a(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO); - //GL11.func_187401_a(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA); - this.drawTexturedModalRect(this.xPosition, this.yPosition, this.textureX, this.textureY + i * this.height, this.width, this.height); - this.drawCenteredString(fontRenderer, this.label, this.xPosition + this.width / 2, this.yPosition + (this.height - 8) / 2, this.color); - if (this.field_146123_n && this.hoverText != null && this.hoverText.length > 0) { - this.parent.hoverText = this.hoverText; - } - } - GL11.glPopMatrix(); - } - - public ICustomGuiComponent toComponent() { - ScriptGuiButton component = new ScriptGuiButton(this.id, this.label, this.xPosition, this.yPosition, this.width, this.height, this.texture.toString(), this.textureX, this.textureY); - component.setHoverText(this.hoverText); - component.setColor(this.color); - component.setAlpha(this.alpha); - return component; - } - - protected int hoverState(boolean mouseOver) { - int i = 0; - if (mouseOver) { - i = 1; - } - - return i; - } - - public boolean mouseClicked(GuiCustom gui, int mouseX, int mouseY, int mouseButton) { - if (mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height) { - //Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147673_a(SoundEvents.field_187909_gi, 1.0F)); - gui.buttonClick(this); - return true; - } else { - return false; - } - } -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java deleted file mode 100644 index e17ad09d4..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java +++ /dev/null @@ -1,568 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.components; - -import com.ibm.icu.text.ArabicShaping; -import com.ibm.icu.text.ArabicShapingException; -import com.ibm.icu.text.Bidi; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiLabel; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; -import noppes.npcs.scripted.gui.ScriptGuiLabel; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import org.lwjgl.opengl.GL11; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; - -public class CustomGuiLabel extends Gui implements IGuiComponent { - int x, y, width, height; - GuiCustom parent; - String fullLabel; - String[] hoverText; - float scale; - int id; - int border = 2; - boolean labelBgEnabled = true; - boolean labelShadowEnabled = false; - - int color; - float alpha; - float rotation; - - protected int field_146167_a; - protected int field_146161_f; - public int field_146162_g; - public int field_146174_h; - - private boolean randomStyle = false; - private boolean boldStyle = false; - private boolean italicStyle = false; - private boolean underlineStyle = false; - private boolean strikethroughStyle = false; - private boolean bidiFlag = false; - private boolean unicodeFlag = false; - - private static final ResourceLocation[] unicodePageLocations = new ResourceLocation[256]; - protected final ResourceLocation locationFontTexture; - protected int[] charWidth = new int[256]; - protected byte[] glyphWidth = new byte[65536]; - private final int[] colorCode = new int[32]; - - - private float red; - private float green; - private float blue; - - private float posX; - private float posY; - - public CustomGuiLabel(int id, String fullLabel, int x, int y, int width, int height, boolean shadow){ - this.id = id; - this.fullLabel = fullLabel; - this.x = x; - this.y = y; - this.width = width; - this.height = height; - this.labelShadowEnabled = shadow; - - locationFontTexture = new ResourceLocation("textures/font/ascii.png"); - readFontTexture(); - readGlyphSizes(); - for (int i = 0; i < 32; ++i) - { - int j = (i >> 3 & 1) * 85; - int k = (i >> 2 & 1) * 170 + j; - int l = (i >> 1 & 1) * 170 + j; - int i1 = (i >> 0 & 1) * 170 + j; - - if (i == 6) - { - k += 85; - } - - if (Minecraft.getMinecraft().gameSettings.anaglyph) - { - int j1 = (k * 30 + l * 59 + i1 * 11) / 100; - int k1 = (k * 30 + l * 70) / 100; - int l1 = (k * 30 + i1 * 70) / 100; - k = j1; - l = k1; - i1 = l1; - } - - if (i >= 16) - { - k /= 4; - l /= 4; - i1 /= 4; - } - - this.colorCode[i] = (k & 255) << 16 | (l & 255) << 8 | i1 & 255; - } - } - - public void setParent(GuiCustom parent) { - this.parent = parent; - } - - public void onRender(Minecraft mc, int mouseX, int mouseY, int mouseWheel, float partialTicks) { - boolean hovered = mouseX >= this.field_146162_g && mouseY >= this.field_146174_h && mouseX < this.field_146162_g + this.field_146167_a && mouseY < this.field_146174_h + this.field_146161_f; - this.drawLabel(); - if (hovered && this.hoverText != null && this.hoverText.length > 0) { - this.parent.hoverText = this.hoverText; - } - } - - public int getID() { - return this.id; - } - - public void setScale(float scale) { - this.scale = scale; - } - - public static CustomGuiLabel fromComponent(ScriptGuiLabel component) { - CustomGuiLabel lbl = new CustomGuiLabel(component.getID(), component.getText(), GuiCustom.guiLeft + component.getPosX(), GuiCustom.guiTop + component.getPosY(), component.getWidth(), component.getHeight(), component.hasShadow()); - lbl.scale = 1.0F; - lbl.color = component.getColor(); - lbl.setScale(component.getScale()); - if (component.hasHoverText()) { - lbl.hoverText = component.getHoverText(); - } - lbl.labelShadowEnabled = component.hasShadow(); - lbl.color = component.getColor(); - lbl.alpha = component.getAlpha(); - lbl.rotation = component.getRotation(); - - return lbl; - } - - public ICustomGuiComponent toComponent() { - ScriptGuiLabel component = new ScriptGuiLabel(this.id, this.fullLabel, this.field_146162_g, this.field_146174_h, this.field_146167_a, this.field_146161_f, this.color); - component.setHoverText(this.hoverText); - component.enableShadow(this.labelShadowEnabled); - component.setColor(this.color); - component.setAlpha(this.alpha); - component.setRotation(this.rotation); - return component; - } - - public void drawLabel() - { - GL11.glPushMatrix(); - red = (color >> 16 & 255) / 255f; - green = (color >> 8 & 255) / 255f; - blue = (color & 255) / 255f; - - GL11.glTranslatef(this.x,this.y,0.0F); - GL11.glRotated(rotation,0.0D,0.0D,1.0D); - GL11.glScalef(this.scale, this.scale, this.scale); - this.drawString(fullLabel, 0, 0, this.color, this.labelShadowEnabled); - GL11.glPopMatrix(); - } - - public int drawString(String p_85187_1_, int p_85187_2_, int p_85187_3_, int p_85187_4_, boolean p_85187_5_) - { - this.resetStyles(); - int l; - - if (p_85187_5_) - { - l = this.renderString(p_85187_1_, p_85187_2_ + 1, p_85187_3_ + 1, p_85187_4_, true); - l = Math.max(l, this.renderString(p_85187_1_, p_85187_2_, p_85187_3_, p_85187_4_, false)); - } - else - { - l = this.renderString(p_85187_1_, p_85187_2_, p_85187_3_, p_85187_4_, false); - } - - return l; - } - - private void resetStyles() - { - this.randomStyle = false; - this.boldStyle = false; - this.italicStyle = false; - this.underlineStyle = false; - this.strikethroughStyle = false; - } - - private int renderString(String p_78258_1_, int p_78258_2_, int p_78258_3_, int p_78258_4_, boolean p_78258_5_) - { - if (p_78258_1_ == null) - { - return 0; - } - else - { - if (this.bidiFlag) - { - p_78258_1_ = this.bidiReorder(p_78258_1_); - } - - setColor(this.red, this.green, this.blue, this.alpha); - this.posX = (float)p_78258_2_; - this.posY = (float)p_78258_3_; - this.renderStringAtPos(p_78258_1_, p_78258_5_); - return (int)this.posX; - } - } - - private void renderStringAtPos(String p_78255_1_, boolean p_78255_2_) - { - for (int i = 0; i < p_78255_1_.length(); ++i) - { - char c0 = p_78255_1_.charAt(i); - int j; - int k; - - if (c0 == 38 && i + 1 < p_78255_1_.length()) - { - j = "0123456789abcdefklmnor".indexOf(p_78255_1_.toLowerCase().charAt(i + 1)); - - if(j < 16){ - this.randomStyle = false; - this.boldStyle = false; - this.strikethroughStyle = false; - this.underlineStyle = false; - this.italicStyle = false; - - if (j < 0 || j > 15) - { - j = 15; - } - - if (p_78255_2_) - { - j += 16; - } - - k = this.colorCode[j]; - setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.alpha); - } - else if (j == 16) - { - this.randomStyle = true; - } - else if (j == 17) - { - this.boldStyle = true; - } - else if (j == 18) - { - this.strikethroughStyle = true; - } - else if (j == 19) - { - this.underlineStyle = true; - } - else if (j == 20) - { - this.italicStyle = true; - } - else if (j == 21) - { - this.randomStyle = false; - this.boldStyle = false; - this.strikethroughStyle = false; - this.underlineStyle = false; - this.italicStyle = false; - } - - ++i; - } - else - { - j = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000".indexOf(c0); - - if (this.randomStyle && j != -1) - { - do - { - k = Minecraft.getMinecraft().fontRenderer.fontRandom.nextInt(this.charWidth.length); - } - while (this.charWidth[j] != this.charWidth[k]); - - j = k; - } - - float f1 = this.unicodeFlag ? 0.5F : 1.0F; - boolean flag1 = (c0 == 0 || j == -1 || this.unicodeFlag) && p_78255_2_; - - if (flag1) - { - this.posX -= f1; - this.posY -= f1; - } - - float f = this.renderCharAtPos(j, c0, this.italicStyle); - - if (flag1) - { - this.posX += f1; - this.posY += f1; - } - - if (this.boldStyle) - { - this.posX += f1; - - if (flag1) - { - this.posX -= f1; - this.posY -= f1; - } - - this.renderCharAtPos(j, c0, this.italicStyle); - this.posX -= f1; - - if (flag1) - { - this.posX += f1; - this.posY += f1; - } - - ++f; - } - - doDraw(f); - } - } - } - - protected void doDraw(float f) - { - { - { - Tessellator tessellator; - - if (this.strikethroughStyle) - { - tessellator = Tessellator.instance; - GL11.glDisable(GL11.GL_TEXTURE_2D); - tessellator.startDrawingQuads(); - tessellator.addVertex((double)this.posX, (double)(this.posY + (float)(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT / 2)), 0.0D); - tessellator.addVertex((double)(this.posX + f), (double)(this.posY + (float)(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT / 2)), 0.0D); - tessellator.addVertex((double)(this.posX + f), (double)(this.posY + (float)(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT / 2) - 1.0F), 0.0D); - tessellator.addVertex((double)this.posX, (double)(this.posY + (float)(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT / 2) - 1.0F), 0.0D); - tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } - - if (this.underlineStyle) - { - tessellator = Tessellator.instance; - GL11.glDisable(GL11.GL_TEXTURE_2D); - tessellator.startDrawingQuads(); - int l = this.underlineStyle ? -1 : 0; - tessellator.addVertex((double)(this.posX + (float)l), (double)(this.posY + (float)Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT), 0.0D); - tessellator.addVertex((double)(this.posX + f), (double)(this.posY + (float)Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT), 0.0D); - tessellator.addVertex((double)(this.posX + f), (double)(this.posY + (float)Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT - 1.0F), 0.0D); - tessellator.addVertex((double)(this.posX + (float)l), (double)(this.posY + (float)Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT - 1.0F), 0.0D); - tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } - - this.posX += (float)((int)f); - } - } - } - - private float renderCharAtPos(int p_78278_1_, char p_78278_2_, boolean p_78278_3_) - { - return p_78278_2_ == 32 ? 4.0F : ("\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000".indexOf(p_78278_2_) != -1 && !this.unicodeFlag ? this.renderDefaultChar(p_78278_1_, p_78278_3_) : this.renderUnicodeChar(p_78278_2_, p_78278_3_)); - } - - protected float renderDefaultChar(int p_78266_1_, boolean p_78266_2_) - { - float f = (float)(p_78266_1_ % 16 * 8); - float f1 = (float)(p_78266_1_ / 16 * 8); - float f2 = p_78266_2_ ? 1.0F : 0.0F; - bindTexture(this.locationFontTexture); - float f3 = (float)this.charWidth[p_78266_1_] - 0.01F; - GL11.glBegin(GL11.GL_TRIANGLE_STRIP); - GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F); - GL11.glVertex3f(this.posX + f2, this.posY, 0.0F); - GL11.glTexCoord2f(f / 128.0F, (f1 + 7.99F) / 128.0F); - GL11.glVertex3f(this.posX - f2, this.posY + 7.99F, 0.0F); - GL11.glTexCoord2f((f + f3 - 1.0F) / 128.0F, f1 / 128.0F); - GL11.glVertex3f(this.posX + f3 - 1.0F + f2, this.posY, 0.0F); - GL11.glTexCoord2f((f + f3 - 1.0F) / 128.0F, (f1 + 7.99F) / 128.0F); - GL11.glVertex3f(this.posX + f3 - 1.0F - f2, this.posY + 7.99F, 0.0F); - GL11.glEnd(); - return (float)this.charWidth[p_78266_1_]; - } - - private ResourceLocation getUnicodePageLocation(int p_111271_1_) - { - if (unicodePageLocations[p_111271_1_] == null) - { - unicodePageLocations[p_111271_1_] = new ResourceLocation(String.format("textures/font/unicode_page_%02x.png", new Object[] {Integer.valueOf(p_111271_1_)})); - } - - return unicodePageLocations[p_111271_1_]; - } - - private void loadGlyphTexture(int p_78257_1_) - { - bindTexture(this.getUnicodePageLocation(p_78257_1_)); - } - - /** - * Render a single Unicode character at current (posX,posY) location using one of the /font/glyph_XX.png files... - */ - protected float renderUnicodeChar(char p_78277_1_, boolean p_78277_2_) - { - if (this.glyphWidth[p_78277_1_] == 0) - { - return 0.0F; - } - else - { - int i = p_78277_1_ / 256; - this.loadGlyphTexture(i); - int j = this.glyphWidth[p_78277_1_] >>> 4; - int k = this.glyphWidth[p_78277_1_] & 15; - float f = (float)j; - float f1 = (float)(k + 1); - float f2 = (float)(p_78277_1_ % 16 * 16) + f; - float f3 = (float)((p_78277_1_ & 255) / 16 * 16); - float f4 = f1 - f - 0.02F; - float f5 = p_78277_2_ ? 1.0F : 0.0F; - GL11.glBegin(GL11.GL_TRIANGLE_STRIP); - GL11.glTexCoord2f(f2 / 256.0F, f3 / 256.0F); - GL11.glVertex3f(this.posX + f5, this.posY, 0.0F); - GL11.glTexCoord2f(f2 / 256.0F, (f3 + 15.98F) / 256.0F); - GL11.glVertex3f(this.posX - f5, this.posY + 7.99F, 0.0F); - GL11.glTexCoord2f((f2 + f4) / 256.0F, f3 / 256.0F); - GL11.glVertex3f(this.posX + f4 / 2.0F + f5, this.posY, 0.0F); - GL11.glTexCoord2f((f2 + f4) / 256.0F, (f3 + 15.98F) / 256.0F); - GL11.glVertex3f(this.posX + f4 / 2.0F - f5, this.posY + 7.99F, 0.0F); - GL11.glEnd(); - return (f1 - f) / 2.0F + 1.0F; - } - } - - protected void setColor(float r, float g, float b, float a) - { - GL11.glColor4f(r, g, b, a); - } - - protected void bindTexture(ResourceLocation location) - { - Minecraft.getMinecraft().renderEngine.bindTexture(location); - } - - private void readFontTexture() - { - BufferedImage bufferedimage; - - try - { - bufferedimage = ImageIO.read(getResourceInputStream(this.locationFontTexture)); - } - catch (IOException ioexception) - { - throw new RuntimeException(ioexception); - } - - int i = bufferedimage.getWidth(); - int j = bufferedimage.getHeight(); - int[] aint = new int[i * j]; - bufferedimage.getRGB(0, 0, i, j, aint, 0, i); - int k = j / 16; - int l = i / 16; - byte b0 = 1; - float f = 8.0F / (float)l; - int i1 = 0; - - while (i1 < 256) - { - int j1 = i1 % 16; - int k1 = i1 / 16; - - if (i1 == 32) - { - this.charWidth[i1] = 3 + b0; - } - - int l1 = l - 1; - - while (true) - { - if (l1 >= 0) - { - int i2 = j1 * l + l1; - boolean flag = true; - - for (int j2 = 0; j2 < k && flag; ++j2) - { - int k2 = (k1 * l + j2) * i; - - if ((aint[i2 + k2] >> 24 & 255) != 0) - { - flag = false; - } - } - - if (flag) - { - --l1; - continue; - } - } - - ++l1; - this.charWidth[i1] = (int)(0.5D + (double)((float)l1 * f)) + b0; - ++i1; - break; - } - } - } - - private void readGlyphSizes() - { - try - { - InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin")); - inputstream.read(this.glyphWidth); - } - catch (IOException ioexception) - { - throw new RuntimeException(ioexception); - } - } - - protected InputStream getResourceInputStream(ResourceLocation location) throws IOException - { - return Minecraft.getMinecraft().getResourceManager().getResource(location).getInputStream(); - } - - private String bidiReorder(String p_147647_1_) - { - try - { - Bidi bidi = new Bidi((new ArabicShaping(8)).shape(p_147647_1_), 127); - bidi.setReorderingMode(0); - return bidi.writeReordered(2); - } - catch (ArabicShapingException arabicshapingexception) - { - return p_147647_1_; - } - } -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java deleted file mode 100644 index 5a1b2804e..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLine.java +++ /dev/null @@ -1,79 +0,0 @@ -package noppes.npcs.client.gui.custom.components; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; -import noppes.npcs.scripted.gui.ScriptGuiLine; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import org.lwjgl.opengl.GL11; - -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; - -public class CustomGuiLine extends Gui implements IGuiComponent { - int id; - GuiCustom parent; - int x1; - int y1; - int x2; - int y2; - int color; - float alpha; - float rotation; - int thickness; - - public CustomGuiLine(int id, int x1, int y1, int x2, int y2, int color, int thickness){ - this.id = id; - this.x1 = x1; - this.y1 = y1; - this.x2 = x2; - this.y2 = y2; - this.color = color; - this.thickness = thickness; - } - - public void setParent(GuiCustom parent) { - this.parent = parent; - } - - @Override - public int getID() { - return this.id; - } - - public void onRender(Minecraft mc, int mouseX, int mouseY, int mouseWheel, float partialTicks) { - double distance = Math.sqrt(Math.pow(x1-x2,2)+Math.pow(y1-y2,2)); - - mc.getTextureManager().bindTexture(new ResourceLocation("customnpcs:textures/gui/misc.png")); - GL11.glPushMatrix(); - float red = (color >> 16 & 255) / 255f; - float green = (color >> 8 & 255) / 255f; - float blue = (color & 255) / 255f; - GL11.glColor4f(red,green,blue,this.alpha); - - GL11.glTranslatef(GuiCustom.guiLeft+this.x1,GuiCustom.guiTop+this.y1,0.0F); - GL11.glRotated(-Math.toDegrees(Math.atan2(x2-x1,y2-y1)),0.0F,0.0F,1.0F); - GL11.glRotated(rotation,0.0D,0.0D,1.0D); - GL11.glScaled(thickness, distance,0.0D); - this.drawTexturedModalRect(0,0,0,0, 1, 1); - GL11.glPopMatrix(); - } - - public ICustomGuiComponent toComponent() { - ScriptGuiLine line = new ScriptGuiLine(this.id, this.x1,this.y1,this.x2,this.y2,this.color,this.thickness); - line.setColor(this.color); - line.setAlpha(this.alpha); - line.setRotation(this.rotation); - return line; - } - - public static CustomGuiLine fromComponent(ScriptGuiLine component) { - CustomGuiLine line = new CustomGuiLine(component.getID(), component.getX1(), component.getY1(), component.getX2(), component.getY2(), component.getColor(), component.getThickness()); - line.color = component.getColor(); - line.alpha = component.getAlpha(); - line.rotation = component.getRotation(); - return line; - } -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java deleted file mode 100644 index 26f626ad9..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiScrollComponent.java +++ /dev/null @@ -1,122 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.components; - -import java.util.Arrays; -import java.util.Iterator; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; -import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.client.gui.custom.interfaces.IClickListener; -import noppes.npcs.client.gui.custom.interfaces.IDataHolder; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.scripted.gui.ScriptGuiScroll; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import org.lwjgl.opengl.GL11; - -public class CustomGuiScrollComponent extends GuiCustomScroll implements IDataHolder, IClickListener { - GuiCustom parent; - String[] hoverText; - public boolean multiSelect = false; - - int color; - float alpha; - - public CustomGuiScrollComponent(Minecraft mc, GuiScreen parent, int id) { - super(parent, id); - this.mc = mc; - this.fontRendererObj = mc.fontRenderer; - } - - public CustomGuiScrollComponent(Minecraft mc, GuiScreen parent, int id, boolean multiSelect) { - super(parent, id, multiSelect); - this.mc = mc; - this.fontRendererObj = mc.fontRenderer; - this.multiSelect = multiSelect; - } - - public void setParent(GuiCustom parent) { - this.parent = parent; - } - - public int getID() { - return this.id; - } - - public void onRender(Minecraft mc, int mouseX, int mouseY, int mouseWheel, float partialTicks) { - GL11.glPushMatrix(); - float red = (color >> 16 & 255) / 255f; - float green = (color >> 8 & 255) / 255f; - float blue = (color & 255) / 255f; - GL11.glColor4f(red,green,blue,this.alpha); - - GL11.glTranslatef(0.0F, 0.0F, (float)this.id); - boolean hovered = mouseX >= this.guiLeft && mouseY >= this.guiTop && mouseX < this.guiLeft + this.xSize && mouseY < this.guiTop + this.ySize; - super.drawScreen(mouseX, mouseY, partialTicks, mouseWheel); - if (hovered && this.hoverText != null && this.hoverText.length > 0) { - this.parent.hoverText = this.hoverText; - } - GL11.glPopMatrix(); - } - - public boolean mouseClicked(GuiCustom gui, int mouseX, int mouseY, int mouseButton) { - super.mouseClicked(mouseX, mouseY, mouseButton); - return this.isMouseOver(mouseX, mouseY); - } - - public void fromComponent(ScriptGuiScroll component) { - this.guiLeft = GuiCustom.guiLeft + component.getPosX(); - this.guiTop = GuiCustom.guiTop + component.getPosY(); - this.setSize(component.getWidth(), component.getHeight()); - this.setUnsortedList(Arrays.asList(component.getList())); - if (component.getDefaultSelection() >= 0) { - int defaultSelect = component.getDefaultSelection(); - if (defaultSelect < this.getList().size()) { - this.selected = defaultSelect; - } - } - - if (component.hasHoverText()) { - this.hoverText = component.getHoverText(); - } - - this.color = component.getColor(); - this.alpha = component.getAlpha(); - } - - public ICustomGuiComponent toComponent() { - ScriptGuiScroll component = new ScriptGuiScroll(this.id, this.guiLeft - GuiCustom.guiLeft, this.guiTop - GuiCustom.guiTop, this.width, this.height, (String[])this.getList().toArray(new String[0])); - component.setHoverText(this.hoverText); - component.setColor(color); - component.setAlpha(alpha); - return component; - } - - public NBTTagCompound toNBT() { - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setInteger("id", this.id); - if (!this.getSelectedList().isEmpty()) { - NBTTagList tagList = new NBTTagList(); - Iterator var3 = this.getSelectedList().iterator(); - - while(var3.hasNext()) { - String s = (String)var3.next(); - tagList.appendTag(new NBTTagString(s)); - } - - nbt.setTag("selectedList", tagList); - } else if (this.getSelected() != null && !this.getSelected().isEmpty()) { - nbt.setString("selected", this.getSelected()); - } else { - nbt.setString("selected", "Null"); - } - - return nbt; - } -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiSlot.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiSlot.java deleted file mode 100644 index 61c31ce4c..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiSlot.java +++ /dev/null @@ -1,30 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.components; - -import net.minecraft.client.Minecraft; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import noppes.npcs.client.gui.custom.GuiCustom; - -public class CustomGuiSlot extends Slot { - public boolean clientSide; - public int slotNumber; - - public CustomGuiSlot(IInventory inventoryIn, int index, int xPosition, int yPosition, boolean clientSide) { - super(inventoryIn, index, xPosition, yPosition); - this.clientSide = clientSide; - this.slotNumber = index; - } - - public void onSlotChanged() { - if (this.clientSide) { - ((GuiCustom)Minecraft.getMinecraft().currentScreen).slotChange(this); - } - - super.onSlotChanged(); - } -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java deleted file mode 100644 index 876eccd41..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTextField.java +++ /dev/null @@ -1,103 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.components; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.Client; -import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.client.gui.custom.interfaces.IClickListener; -import noppes.npcs.client.gui.custom.interfaces.IDataHolder; -import noppes.npcs.client.gui.custom.interfaces.IKeyListener; -import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.scripted.gui.ScriptGuiTextField; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import org.lwjgl.opengl.GL11; - -public class CustomGuiTextField extends GuiTextField implements IKeyListener, IDataHolder, IClickListener { - GuiCustom parent; - String[] hoverText; - int id; - - int color; - float alpha; - - public CustomGuiTextField(int id, int x, int y, int width, int height) { - super(Minecraft.getMinecraft().fontRenderer, GuiCustom.guiLeft + x, GuiCustom.guiTop + y, width, height); - this.id = id; - this.setMaxStringLength(500); - } - - public void keyTyped(char typedChar, int keyCode) { - this.textboxKeyTyped(typedChar, keyCode); - } - - public void onRender(Minecraft mc, int mouseX, int mouseY, int mouseWheel, float partialTicks) { - boolean hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; - float red = (color >> 16 & 255) / 255f; - float green = (color >> 8 & 255) / 255f; - float blue = (color & 255) / 255f; - GL11.glColor4f(red,green,blue,this.alpha); - this.drawTextBox(); - GL11.glColor4f(1.0F,1.0F,1.0F,1.0F); - if (hovered && this.hoverText != null && this.hoverText.length > 0) { - this.parent.hoverText = this.hoverText; - } - } - - public void setParent(GuiCustom parent) { - this.parent = parent; - } - - public int getID() { - return this.id; - } - - public NBTTagCompound toNBT() { - NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("id", this.id); - tag.setString("text", this.getText()); - return tag; - } - - public ICustomGuiComponent toComponent() { - ScriptGuiTextField component = new ScriptGuiTextField(this.id, this.xPosition - GuiCustom.guiLeft, this.yPosition - GuiCustom.guiTop, this.width, this.height); - component.setText(this.getText()); - component.setHoverText(this.hoverText); - component.setColor(color); - component.setAlpha(alpha); - return component; - } - - public static CustomGuiTextField fromComponent(ScriptGuiTextField component) { - CustomGuiTextField txt = new CustomGuiTextField(component.getID(), component.getPosX(), component.getPosY(), component.getWidth(), component.getHeight()); - if (component.hasHoverText()) { - txt.hoverText = component.getHoverText(); - } - - if (component.getText() != null && !component.getText().isEmpty()) { - txt.setText(component.getText()); - } - - txt.color = component.getColor(); - txt.alpha = component.getAlpha(); - - return txt; - } - - public boolean mouseClicked(GuiCustom gui, int mouseX, int mouseY, int mouseButton) { - boolean flag = mouseX >= this.xPosition && mouseX < this.xPosition + this.width && mouseY >= this.yPosition && mouseY < this.yPosition + this.height; - - if (this.isFocused() && mouseButton == 0 && !flag){ - parent.onTextFieldUnfocused(this); - } - - this.mouseClicked(mouseX, mouseY, mouseButton); - - return true; - } -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java deleted file mode 100644 index 4be936f3c..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java +++ /dev/null @@ -1,142 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.components; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.ITextureObject; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.SkinManager; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.ImageDownloadAlt; -import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; -import noppes.npcs.client.renderer.ImageBufferDownloadAlt; -import noppes.npcs.scripted.gui.ScriptGuiTexturedRect; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import org.lwjgl.opengl.GL11; - -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; - -public class CustomGuiTexturedRect extends Gui implements IGuiComponent { - GuiCustom parent; - ResourceLocation texture; - int id; - int x; - int y; - int width; - int height; - int textureX; - int textureY; - float scale; - String[] hoverText; - - int color; - float alpha; - float rotation; - - public CustomGuiTexturedRect(int id, String texture, int x, int y, int width, int height) { - this(id, texture, x, y, width, height, 0, 0); - } - - public CustomGuiTexturedRect(int id, String texture, int x, int y, int width, int height, int textureX, int textureY) { - this.scale = 1.0F; - this.id = id; - this.texture = new ResourceLocation(texture); - this.x = x; - this.y = y; - this.width = width; - this.height = height; - this.textureX = textureX; - this.textureY = textureY; - - if(texture.startsWith("https://")){ - TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - ITextureObject object = new ImageDownloadAlt(null, texture, SkinManager.field_152793_a, new ImageBufferDownloadAlt(false)); - texturemanager.loadTexture(this.texture, object); - } - } - - public void setParent(GuiCustom parent) { - this.parent = parent; - } - - public int getID() { - return this.id; - } - - public void onRender(Minecraft mc, int mouseX, int mouseY, int mouseWheel, float partialTicks) { - boolean hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; - mc.getTextureManager().bindTexture(this.texture); - - GL11.glPushMatrix(); - float red = (color >> 16 & 255) / 255f; - float green = (color >> 8 & 255) / 255f; - float blue = (color & 255) / 255f; - GL11.glColor4f(red,green,blue,this.alpha); - - GL11.glScalef(this.scale, this.scale, this.scale); - - GL11.glTranslatef(GuiCustom.guiLeft,GuiCustom.guiTop,0.0F); - GL11.glRotatef(this.rotation,0.0F,0.0F,1.0F); - - int p_73729_1_ = (int) (this.x/this.scale); - int p_73729_2_ = (int) (this.y/this.scale); - int p_73729_3_ = this.textureX; - int p_73729_4_ = this.textureY; - int p_73729_5_ = (int)(this.width); - int p_73729_6_ = (int)(this.height); - - float f = 0.00390625F; - float f1 = 0.00390625F; - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setColorOpaque_F(1, 1, 1); - tessellator.setColorRGBA_F(red, green, blue, alpha); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + p_73729_6_), (double)this.zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + p_73729_6_), (double)this.zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + 0), (double)this.zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + 0) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + 0), (double)this.zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + 0) * f1)); - tessellator.draw(); - GL11.glPopMatrix(); - - if (hovered && this.hoverText != null && this.hoverText.length > 0) { - this.parent.hoverText = this.hoverText; - } - } - - public ICustomGuiComponent toComponent() { - ScriptGuiTexturedRect component = new ScriptGuiTexturedRect(this.id, this.texture.toString(), this.x, this.y, this.width, this.height, this.textureX, this.textureY); - component.setHoverText(this.hoverText); - component.setScale(this.scale); - component.setColor(color); - component.setAlpha(alpha); - component.setRotation(rotation); - return component; - } - - public static CustomGuiTexturedRect fromComponent(ScriptGuiTexturedRect component) { - CustomGuiTexturedRect rect; - if (component.getTextureX() >= 0 && component.getTextureY() >= 0) { - rect = new CustomGuiTexturedRect(component.getID(), component.getTexture(), component.getPosX(), component.getPosY(), component.getWidth(), component.getHeight(), component.getTextureX(), component.getTextureY()); - } else { - rect = new CustomGuiTexturedRect(component.getID(), component.getTexture(), component.getPosX(), component.getPosY(), component.getWidth(), component.getHeight()); - } - - rect.scale = component.getScale(); - if (component.hasHoverText()) { - rect.hoverText = component.getHoverText(); - } - - rect.color = component.getColor(); - rect.alpha = component.getAlpha(); - rect.rotation = component.getRotation(); - - return rect; - } -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IClickListener.java b/src/main/java/noppes/npcs/client/gui/custom/interfaces/IClickListener.java deleted file mode 100644 index 4130d438c..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IClickListener.java +++ /dev/null @@ -1,12 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.interfaces; - -import noppes.npcs.client.gui.custom.GuiCustom; - -public interface IClickListener extends IGuiComponent { - boolean mouseClicked(GuiCustom var1, int var2, int var3, int var4); -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IDataHolder.java b/src/main/java/noppes/npcs/client/gui/custom/interfaces/IDataHolder.java deleted file mode 100644 index a49821f51..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IDataHolder.java +++ /dev/null @@ -1,12 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.interfaces; - -import net.minecraft.nbt.NBTTagCompound; - -public interface IDataHolder extends IGuiComponent { - NBTTagCompound toNBT(); -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IGuiComponent.java b/src/main/java/noppes/npcs/client/gui/custom/interfaces/IGuiComponent.java deleted file mode 100644 index af8f1d248..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IGuiComponent.java +++ /dev/null @@ -1,17 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.interfaces; - -import net.minecraft.client.Minecraft; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; - -public interface IGuiComponent { - int getID(); - - void onRender(Minecraft var1, int var2, int var3, int var4, float var5); - - ICustomGuiComponent toComponent(); -} diff --git a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IKeyListener.java b/src/main/java/noppes/npcs/client/gui/custom/interfaces/IKeyListener.java deleted file mode 100644 index c0d5968f2..000000000 --- a/src/main/java/noppes/npcs/client/gui/custom/interfaces/IKeyListener.java +++ /dev/null @@ -1,10 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.custom.interfaces; - -public interface IKeyListener extends IGuiComponent { - void keyTyped(char var1, int var2); -} diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java deleted file mode 100644 index dea871e62..000000000 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java +++ /dev/null @@ -1,97 +0,0 @@ -package noppes.npcs.client.gui.customoverlay; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLabel; -import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLine; -import noppes.npcs.client.gui.customoverlay.components.CustomOverlayTexturedRect; -import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; -import noppes.npcs.scripted.overlay.*; -import org.lwjgl.opengl.GL11; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -public class OverlayCustom extends Gui { - protected final Minecraft mc; - - private ScaledResolution res = null; - public static int scaledWidth = 0; - public static int scaledHeight = 0; - - public ScriptOverlay overlay; - Map components = new HashMap(); - - public OverlayCustom(Minecraft mc) { - this.mc = mc; - } - - public void initOverlay(){ - res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - if(this.overlay != null){ - scaledWidth = res.getScaledWidth(); - scaledHeight = res.getScaledHeight(); - - this.components.clear(); - Iterator var1 = this.overlay.getComponents().iterator(); - - while(var1.hasNext()) { - ICustomOverlayComponent c = (ICustomOverlayComponent)var1.next(); - this.addComponent(c); - } - } - } - - private void addComponent(ICustomOverlayComponent component) { - ScriptOverlayComponent c = (ScriptOverlayComponent)component; - switch(c.getType()) { - case 0: - CustomOverlayTexturedRect rect = CustomOverlayTexturedRect.fromComponent((ScriptOverlayTexturedRect) component); - rect.setParent(this); - this.components.put(rect.getID(), rect); - break; - case 1: - CustomOverlayLabel lbl = CustomOverlayLabel.fromComponent((ScriptOverlayLabel)component); - lbl.setParent(this); - this.components.put(lbl.getID(), lbl); - break; - case 2: - CustomOverlayLine line = CustomOverlayLine.fromComponent((ScriptOverlayLine) component); - line.setParent(this); - this.components.put(line.getID(), line); - break; - } - } - - public void renderGameOverlay(float partialTicks){ - res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - scaledWidth = res.getScaledWidth(); - scaledHeight = res.getScaledHeight(); - - Iterator var4 = this.components.values().iterator(); - - while(var4.hasNext()) { - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); - GL11.glDisable(GL11.GL_ALPHA_TEST); - - IOverlayComponent component = (IOverlayComponent)var4.next(); - component.onRender(this.mc, partialTicks); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_ALPHA_TEST); - } - } - - public void setOverlayData(NBTTagCompound compound) { - this.overlay = (ScriptOverlay)(new ScriptOverlay()).fromNBT(compound); - this.initOverlay(); - } -} diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java deleted file mode 100644 index ec7212a2a..000000000 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java +++ /dev/null @@ -1,553 +0,0 @@ -package noppes.npcs.client.gui.customoverlay.components; - -import com.ibm.icu.text.ArabicShaping; -import com.ibm.icu.text.ArabicShapingException; -import com.ibm.icu.text.Bidi; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.customoverlay.OverlayCustom; -import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; -import noppes.npcs.scripted.overlay.ScriptOverlayLabel; -import org.lwjgl.opengl.GL11; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; - -public class CustomOverlayLabel extends Gui implements IOverlayComponent { - OverlayCustom parent; - int id; - - String fullLabel; - int x, y, width, height, alignment; - float scale, rotation; - int color; - float alpha; - - int border = 2; - boolean labelBgEnabled = true; - boolean labelShadowEnabled = false; - - protected int field_146167_a; - protected int field_146161_f; - public int field_146162_g; - public int field_146174_h; - - private boolean randomStyle = false; - private boolean boldStyle = false; - private boolean italicStyle = false; - private boolean underlineStyle = false; - private boolean strikethroughStyle = false; - private boolean bidiFlag = false; - private boolean unicodeFlag = false; - - private static final ResourceLocation[] unicodePageLocations = new ResourceLocation[256]; - protected final ResourceLocation locationFontTexture; - protected int[] charWidth = new int[256]; - protected byte[] glyphWidth = new byte[65536]; - private final int[] colorCode = new int[32]; - - private float red; - private float green; - private float blue; - - private float posX; - private float posY; - - public CustomOverlayLabel(int id, String fullLabel, int x, int y, int width, int height, boolean shadow){ - this.id = id; - this.fullLabel = fullLabel; - this.x = x; - this.y = y; - this.width = width; - this.height = height; - this.labelShadowEnabled = shadow; - - locationFontTexture = new ResourceLocation("textures/font/ascii.png"); - readFontTexture(); - readGlyphSizes(); - for (int i = 0; i < 32; ++i) - { - int j = (i >> 3 & 1) * 85; - int k = (i >> 2 & 1) * 170 + j; - int l = (i >> 1 & 1) * 170 + j; - int i1 = (i >> 0 & 1) * 170 + j; - - if (i == 6) - { - k += 85; - } - - if (Minecraft.getMinecraft().gameSettings.anaglyph) - { - int j1 = (k * 30 + l * 59 + i1 * 11) / 100; - int k1 = (k * 30 + l * 70) / 100; - int l1 = (k * 30 + i1 * 70) / 100; - k = j1; - l = k1; - i1 = l1; - } - - if (i >= 16) - { - k /= 4; - l /= 4; - i1 /= 4; - } - - this.colorCode[i] = (k & 255) << 16 | (l & 255) << 8 | i1 & 255; - } - } - - public void setParent(OverlayCustom parent) { - this.parent = parent; - } - - public void onRender(Minecraft mc, float partialTicks) { - this.drawLabel(); - } - - public int getID() { - return this.id; - } - - public void setScale(float scale) { - this.scale = scale; - } - - public static CustomOverlayLabel fromComponent(ScriptOverlayLabel component) { - CustomOverlayLabel lbl = new CustomOverlayLabel(component.getID(), component.getText(), component.getPosX(), component.getPosY(), component.getWidth(), component.getHeight(), component.getShadow()); - lbl.scale = 1.0F; - lbl.color = component.getColor(); - lbl.labelShadowEnabled = component.getShadow(); - lbl.alignment = component.getAlignment(); - lbl.alpha = component.getAlpha(); - lbl.rotation = component.getRotation(); - lbl.setScale(component.getScale()); - - return lbl; - } - - public ICustomOverlayComponent toComponent() { - ScriptOverlayLabel component = new ScriptOverlayLabel(this.id, this.fullLabel, this.field_146162_g, this.field_146174_h, this.field_146167_a, this.field_146161_f, this.color); - component.setShadow(this.labelShadowEnabled); - component.setAlignment(alignment); - component.setAlpha(alpha); - component.setColor(color); - component.setRotation(rotation); - - return component; - } - - public void drawLabel() - { - GL11.glPushMatrix(); - GL11.glTranslatef(this.alignment%3*((float)(OverlayCustom.scaledWidth)/2), (float) (Math.floor((float)(alignment/3))*((float)(OverlayCustom.scaledHeight)/2)),0.0F);//alignment%3 * width/2 Math.floor(alignment/3) * height/2 - - red = (color >> 16 & 255) / 255f; - green = (color >> 8 & 255) / 255f; - blue = (color & 255) / 255f; - - GL11.glTranslatef(this.x,this.y,0.0F); - GL11.glRotated(rotation,0.0D,0.0D,1.0D); - GL11.glScalef(this.scale, this.scale, this.scale); - this.drawString(fullLabel, 0, 0, this.color, this.labelShadowEnabled); - GL11.glPopMatrix(); - } - - public int drawString(String p_85187_1_, int p_85187_2_, int p_85187_3_, int p_85187_4_, boolean p_85187_5_) - { - this.resetStyles(); - int l; - - if (p_85187_5_) - { - l = this.renderString(p_85187_1_, p_85187_2_ + 1, p_85187_3_ + 1, p_85187_4_, true); - l = Math.max(l, this.renderString(p_85187_1_, p_85187_2_, p_85187_3_, p_85187_4_, false)); - } - else - { - l = this.renderString(p_85187_1_, p_85187_2_, p_85187_3_, p_85187_4_, false); - } - - return l; - } - - private void resetStyles() - { - this.randomStyle = false; - this.boldStyle = false; - this.italicStyle = false; - this.underlineStyle = false; - this.strikethroughStyle = false; - } - - private int renderString(String p_78258_1_, int p_78258_2_, int p_78258_3_, int p_78258_4_, boolean p_78258_5_) - { - if (p_78258_1_ == null) - { - return 0; - } - else - { - if (this.bidiFlag) - { - p_78258_1_ = this.bidiReorder(p_78258_1_); - } - - setColor(this.red, this.green, this.blue, this.alpha); - this.posX = (float)p_78258_2_; - this.posY = (float)p_78258_3_; - this.renderStringAtPos(p_78258_1_, p_78258_5_); - return (int)this.posX; - } - } - - private void renderStringAtPos(String p_78255_1_, boolean p_78255_2_) - { - for (int i = 0; i < p_78255_1_.length(); ++i) - { - char c0 = p_78255_1_.charAt(i); - int j; - int k; - - if (c0 == 38 && i + 1 < p_78255_1_.length()) - { - j = "0123456789abcdefklmnor".indexOf(p_78255_1_.toLowerCase().charAt(i + 1)); - - if(j < 16){ - this.randomStyle = false; - this.boldStyle = false; - this.strikethroughStyle = false; - this.underlineStyle = false; - this.italicStyle = false; - - if (j < 0 || j > 15) - { - j = 15; - } - - if (p_78255_2_) - { - j += 16; - } - - k = this.colorCode[j]; - setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.alpha); - } - else if (j == 16) - { - this.randomStyle = true; - } - else if (j == 17) - { - this.boldStyle = true; - } - else if (j == 18) - { - this.strikethroughStyle = true; - } - else if (j == 19) - { - this.underlineStyle = true; - } - else if (j == 20) - { - this.italicStyle = true; - } - else if (j == 21) - { - this.randomStyle = false; - this.boldStyle = false; - this.strikethroughStyle = false; - this.underlineStyle = false; - this.italicStyle = false; - } - - ++i; - } - else - { - j = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000".indexOf(c0); - - if (this.randomStyle && j != -1) - { - do - { - k = Minecraft.getMinecraft().fontRenderer.fontRandom.nextInt(this.charWidth.length); - } - while (this.charWidth[j] != this.charWidth[k]); - - j = k; - } - - float f1 = this.unicodeFlag ? 0.5F : 1.0F; - boolean flag1 = (c0 == 0 || j == -1 || this.unicodeFlag) && p_78255_2_; - - if (flag1) - { - this.posX -= f1; - this.posY -= f1; - } - - float f = this.renderCharAtPos(j, c0, this.italicStyle); - - if (flag1) - { - this.posX += f1; - this.posY += f1; - } - - if (this.boldStyle) - { - this.posX += f1; - - if (flag1) - { - this.posX -= f1; - this.posY -= f1; - } - - this.renderCharAtPos(j, c0, this.italicStyle); - this.posX -= f1; - - if (flag1) - { - this.posX += f1; - this.posY += f1; - } - - ++f; - } - - doDraw(f); - } - } - } - - protected void doDraw(float f) - { - { - { - Tessellator tessellator; - - if (this.strikethroughStyle) - { - tessellator = Tessellator.instance; - GL11.glDisable(GL11.GL_TEXTURE_2D); - tessellator.startDrawingQuads(); - tessellator.addVertex((double)this.posX, (double)(this.posY + (float)(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT / 2)), 0.0D); - tessellator.addVertex((double)(this.posX + f), (double)(this.posY + (float)(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT / 2)), 0.0D); - tessellator.addVertex((double)(this.posX + f), (double)(this.posY + (float)(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT / 2) - 1.0F), 0.0D); - tessellator.addVertex((double)this.posX, (double)(this.posY + (float)(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT / 2) - 1.0F), 0.0D); - tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } - - if (this.underlineStyle) - { - tessellator = Tessellator.instance; - GL11.glDisable(GL11.GL_TEXTURE_2D); - tessellator.startDrawingQuads(); - int l = this.underlineStyle ? -1 : 0; - tessellator.addVertex((double)(this.posX + (float)l), (double)(this.posY + (float)Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT), 0.0D); - tessellator.addVertex((double)(this.posX + f), (double)(this.posY + (float)Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT), 0.0D); - tessellator.addVertex((double)(this.posX + f), (double)(this.posY + (float)Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT - 1.0F), 0.0D); - tessellator.addVertex((double)(this.posX + (float)l), (double)(this.posY + (float)Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT - 1.0F), 0.0D); - tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } - - this.posX += (float)((int)f); - } - } - } - - private float renderCharAtPos(int p_78278_1_, char p_78278_2_, boolean p_78278_3_) - { - return p_78278_2_ == 32 ? 4.0F : ("\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000".indexOf(p_78278_2_) != -1 && !this.unicodeFlag ? this.renderDefaultChar(p_78278_1_, p_78278_3_) : this.renderUnicodeChar(p_78278_2_, p_78278_3_)); - } - - protected float renderDefaultChar(int p_78266_1_, boolean p_78266_2_) - { - float f = (float)(p_78266_1_ % 16 * 8); - float f1 = (float)(p_78266_1_ / 16 * 8); - float f2 = p_78266_2_ ? 1.0F : 0.0F; - bindTexture(this.locationFontTexture); - float f3 = (float)this.charWidth[p_78266_1_] - 0.01F; - GL11.glBegin(GL11.GL_TRIANGLE_STRIP); - GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F); - GL11.glVertex3f(this.posX + f2, this.posY, 0.0F); - GL11.glTexCoord2f(f / 128.0F, (f1 + 7.99F) / 128.0F); - GL11.glVertex3f(this.posX - f2, this.posY + 7.99F, 0.0F); - GL11.glTexCoord2f((f + f3 - 1.0F) / 128.0F, f1 / 128.0F); - GL11.glVertex3f(this.posX + f3 - 1.0F + f2, this.posY, 0.0F); - GL11.glTexCoord2f((f + f3 - 1.0F) / 128.0F, (f1 + 7.99F) / 128.0F); - GL11.glVertex3f(this.posX + f3 - 1.0F - f2, this.posY + 7.99F, 0.0F); - GL11.glEnd(); - return (float)this.charWidth[p_78266_1_]; - } - - private ResourceLocation getUnicodePageLocation(int p_111271_1_) - { - if (unicodePageLocations[p_111271_1_] == null) - { - unicodePageLocations[p_111271_1_] = new ResourceLocation(String.format("textures/font/unicode_page_%02x.png", new Object[] {Integer.valueOf(p_111271_1_)})); - } - - return unicodePageLocations[p_111271_1_]; - } - - private void loadGlyphTexture(int p_78257_1_) - { - bindTexture(this.getUnicodePageLocation(p_78257_1_)); - } - - /** - * Render a single Unicode character at current (posX,posY) location using one of the /font/glyph_XX.png files... - */ - protected float renderUnicodeChar(char p_78277_1_, boolean p_78277_2_) - { - if (this.glyphWidth[p_78277_1_] == 0) - { - return 0.0F; - } - else - { - int i = p_78277_1_ / 256; - this.loadGlyphTexture(i); - int j = this.glyphWidth[p_78277_1_] >>> 4; - int k = this.glyphWidth[p_78277_1_] & 15; - float f = (float)j; - float f1 = (float)(k + 1); - float f2 = (float)(p_78277_1_ % 16 * 16) + f; - float f3 = (float)((p_78277_1_ & 255) / 16 * 16); - float f4 = f1 - f - 0.02F; - float f5 = p_78277_2_ ? 1.0F : 0.0F; - GL11.glBegin(GL11.GL_TRIANGLE_STRIP); - GL11.glTexCoord2f(f2 / 256.0F, f3 / 256.0F); - GL11.glVertex3f(this.posX + f5, this.posY, 0.0F); - GL11.glTexCoord2f(f2 / 256.0F, (f3 + 15.98F) / 256.0F); - GL11.glVertex3f(this.posX - f5, this.posY + 7.99F, 0.0F); - GL11.glTexCoord2f((f2 + f4) / 256.0F, f3 / 256.0F); - GL11.glVertex3f(this.posX + f4 / 2.0F + f5, this.posY, 0.0F); - GL11.glTexCoord2f((f2 + f4) / 256.0F, (f3 + 15.98F) / 256.0F); - GL11.glVertex3f(this.posX + f4 / 2.0F - f5, this.posY + 7.99F, 0.0F); - GL11.glEnd(); - return (f1 - f) / 2.0F + 1.0F; - } - } - - protected void setColor(float r, float g, float b, float a) - { - GL11.glColor4f(r, g, b, a); - } - - protected void bindTexture(ResourceLocation location) - { - Minecraft.getMinecraft().renderEngine.bindTexture(location); - } - - private void readFontTexture() - { - BufferedImage bufferedimage; - - try - { - bufferedimage = ImageIO.read(getResourceInputStream(this.locationFontTexture)); - } - catch (IOException ioexception) - { - throw new RuntimeException(ioexception); - } - - int i = bufferedimage.getWidth(); - int j = bufferedimage.getHeight(); - int[] aint = new int[i * j]; - bufferedimage.getRGB(0, 0, i, j, aint, 0, i); - int k = j / 16; - int l = i / 16; - byte b0 = 1; - float f = 8.0F / (float)l; - int i1 = 0; - - while (i1 < 256) - { - int j1 = i1 % 16; - int k1 = i1 / 16; - - if (i1 == 32) - { - this.charWidth[i1] = 3 + b0; - } - - int l1 = l - 1; - - while (true) - { - if (l1 >= 0) - { - int i2 = j1 * l + l1; - boolean flag = true; - - for (int j2 = 0; j2 < k && flag; ++j2) - { - int k2 = (k1 * l + j2) * i; - - if ((aint[i2 + k2] >> 24 & 255) != 0) - { - flag = false; - } - } - - if (flag) - { - --l1; - continue; - } - } - - ++l1; - this.charWidth[i1] = (int)(0.5D + (double)((float)l1 * f)) + b0; - ++i1; - break; - } - } - } - - private void readGlyphSizes() - { - try - { - InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin")); - inputstream.read(this.glyphWidth); - } - catch (IOException ioexception) - { - throw new RuntimeException(ioexception); - } - } - - protected InputStream getResourceInputStream(ResourceLocation location) throws IOException - { - return Minecraft.getMinecraft().getResourceManager().getResource(location).getInputStream(); - } - - private String bidiReorder(String p_147647_1_) - { - try - { - Bidi bidi = new Bidi((new ArabicShaping(8)).shape(p_147647_1_), 127); - bidi.setReorderingMode(0); - return bidi.writeReordered(2); - } - catch (ArabicShapingException arabicshapingexception) - { - return p_147647_1_; - } - } -} diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java deleted file mode 100644 index be019ee22..000000000 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLine.java +++ /dev/null @@ -1,104 +0,0 @@ -package noppes.npcs.client.gui.customoverlay.components; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.customoverlay.OverlayCustom; -import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; -import noppes.npcs.scripted.overlay.ScriptOverlayLine; -import org.lwjgl.opengl.GL11; - -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; - -public class CustomOverlayLine extends Gui implements IOverlayComponent { - OverlayCustom parent; - int alignment; - int id; - - int x1; - int y1; - int x2; - int y2; - int color; - int thickness; - float alpha; - float rotation; - - public CustomOverlayLine(int id, int x1, int y1, int x2, int y2, int color, int thickness){ - this.id = id; - this.x1 = x1; - this.y1 = y1; - this.x2 = x2; - this.y2 = y2; - this.color = color; - this.thickness = thickness; - } - - public void setParent(OverlayCustom parent) { - this.parent = parent; - } - - public int getID() { - return this.id; - } - - public void onRender(Minecraft mc, float partialTicks) { - double distance = Math.hypot(x1-x2, y1-y2); - - mc.getTextureManager().bindTexture(new ResourceLocation("customnpcs:textures/gui/misc.png")); - GL11.glPushMatrix(); - float red = (color >> 16 & 255) / 255f; - float green = (color >> 8 & 255) / 255f; - float blue = (color & 255) / 255f; - - GL11.glTranslatef(this.alignment%3*((float)(OverlayCustom.scaledWidth)/2), (float) (Math.floor((float)(alignment/3))*((float)(OverlayCustom.scaledHeight)/2)),0.0F);//alignment%3 * width/2 Math.floor(alignment/3) * height/2 - GL11.glTranslatef(this.x1,this.y1,0.0F); - - GL11.glRotated(-Math.toDegrees(Math.atan2(x2-x1,y2-y1)),0.0F,0.0F,1.0F); - GL11.glRotated(rotation,0.0D,0.0D,1.0D); - GL11.glScaled(thickness, distance,0.0D); - - int p_73729_1_ = 0; - int p_73729_2_ = 0; - int p_73729_3_ = 0; - int p_73729_4_ = 0; - int p_73729_5_ = 1; - int p_73729_6_ = 1; - - float f = 0.00390625F; - float f1 = 0.00390625F; - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setColorOpaque_F(1, 1, 1); - tessellator.setColorRGBA_F(red, green, blue, alpha); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + p_73729_6_), (double)this.zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + p_73729_6_), (double)this.zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + 0), (double)this.zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + 0) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + 0), (double)this.zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + 0) * f1)); - tessellator.draw(); - GL11.glPopMatrix(); - } - - public ICustomOverlayComponent toComponent() { - ScriptOverlayLine line = new ScriptOverlayLine(this.id, this.x1,this.y1,this.x2,this.y2,this.color,this.thickness); - line.setAlignment(alignment); - line.setAlpha(alpha); - line.setColor(color); - line.setRotation(rotation); - return line; - } - - public static CustomOverlayLine fromComponent(ScriptOverlayLine component) { - CustomOverlayLine line = new CustomOverlayLine(component.getID(), component.getX1(), component.getY1(), component.getX2(), component.getY2(), component.getColor(), component.getThickness()); - line.alignment = component.getAlignment(); - line.alpha = component.getAlpha(); - line.color = component.getColor(); - line.rotation = component.getRotation(); - - return line; - } -} diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java deleted file mode 100644 index 06867b921..000000000 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayTexturedRect.java +++ /dev/null @@ -1,132 +0,0 @@ -package noppes.npcs.client.gui.customoverlay.components; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.ITextureObject; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.SkinManager; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.ImageDownloadAlt; -import noppes.npcs.client.gui.customoverlay.OverlayCustom; -import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.client.renderer.ImageBufferDownloadAlt; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; -import noppes.npcs.scripted.overlay.ScriptOverlayTexturedRect; -import org.lwjgl.opengl.GL11; - -import static org.lwjgl.opengl.GL11.*; -import static org.lwjgl.opengl.GL14.glBlendFuncSeparate; - -public class CustomOverlayTexturedRect extends Gui implements IOverlayComponent { - OverlayCustom parent; - int alignment; - int id; - - ResourceLocation texture; - int x; - int y; - int width; - int height; - int textureX; - int textureY; - float scale; - - int color; - float alpha; - float rotation; - - public CustomOverlayTexturedRect(int id, String texture, int x, int y, int width, int height) { - this(id, texture, x, y, width, height, 0, 0); - } - - public CustomOverlayTexturedRect(int id, String texture, int x, int y, int width, int height, int textureX, int textureY) { - this.scale = 1.0F; - this.alignment = 0; - this.id = id; - this.texture = new ResourceLocation(texture); - this.x = x; - this.y = y; - this.width = width; - this.height = height; - this.textureX = textureX; - this.textureY = textureY; - - if(texture.startsWith("https://")){ - TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - ITextureObject object = new ImageDownloadAlt(null, texture, SkinManager.field_152793_a, new ImageBufferDownloadAlt(false)); - texturemanager.loadTexture(this.texture, object); - } - } - - public void setParent(OverlayCustom parent) { - this.parent = parent; - } - - public int getID() { - return this.id; - } - - public void onRender(Minecraft mc, float partialTicks) { - mc.getTextureManager().bindTexture(this.texture); - - GL11.glPushMatrix(); - float red = (color >> 16 & 255) / 255f; - float green = (color >> 8 & 255) / 255f; - float blue = (color & 255) / 255f; - - GL11.glTranslatef(this.alignment%3*((float)(OverlayCustom.scaledWidth)/2), (float) (Math.floor((float)(alignment/3))*((float)(OverlayCustom.scaledHeight)/2)),0.0F);//alignment%3 * width/2 Math.floor(alignment/3) * height/2 - - GL11.glScalef(this.scale, this.scale, this.scale); - - GL11.glRotatef(this.rotation,0.0F,0.0F,1.0F); - - int p_73729_1_ = (int) (this.x/this.scale); - int p_73729_2_ = (int) (this.y/this.scale); - int p_73729_3_ = this.textureX; - int p_73729_4_ = this.textureY; - int p_73729_5_ = (int)(this.width); - int p_73729_6_ = (int)(this.height); - - float f = 0.00390625F; - float f1 = 0.00390625F; - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setColorOpaque_F(1, 1, 1); - tessellator.setColorRGBA_F(red, green, blue, alpha); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + p_73729_6_), (double)this.zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + p_73729_6_), (double)this.zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + 0), (double)this.zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + 0) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + 0), (double)this.zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + 0) * f1)); - tessellator.draw(); - GL11.glPopMatrix(); - } - - public ICustomOverlayComponent toComponent() { - ScriptOverlayTexturedRect component = new ScriptOverlayTexturedRect(this.id, this.texture.toString(), this.x, this.y, this.width, this.height, this.textureX, this.textureY); - component.setScale(scale); - component.setAlignment(alignment); - component.setAlpha(alpha); - component.setColor(color); - component.setRotation(rotation); - return component; - } - - public static CustomOverlayTexturedRect fromComponent(ScriptOverlayTexturedRect component) { - CustomOverlayTexturedRect rect; - if (component.getTextureX() >= 0 && component.getTextureY() >= 0) { - rect = new CustomOverlayTexturedRect(component.getID(), component.getTexture(), component.getPosX(), component.getPosY(), component.getWidth(), component.getHeight(), component.getTextureX(), component.getTextureY()); - } else { - rect = new CustomOverlayTexturedRect(component.getID(), component.getTexture(), component.getPosX(), component.getPosY(), component.getWidth(), component.getHeight()); - } - - rect.scale = component.getScale(); - rect.alignment = component.getAlignment(); - rect.alpha = component.getAlpha(); - rect.color = component.getColor(); - rect.rotation = component.getRotation(); - - return rect; - } -} diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/interfaces/IOverlayComponent.java b/src/main/java/noppes/npcs/client/gui/customoverlay/interfaces/IOverlayComponent.java deleted file mode 100644 index 685cb46da..000000000 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/interfaces/IOverlayComponent.java +++ /dev/null @@ -1,7 +0,0 @@ -package noppes.npcs.client.gui.customoverlay.interfaces; - -import net.minecraft.client.Minecraft; - -public interface IOverlayComponent { - void onRender(Minecraft mc, float partialTicks); -} diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java index 0a544a5cb..647177b4f 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.Client; import noppes.npcs.client.CustomNpcResourceListener; +import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.ICustomScrollListener; @@ -62,11 +63,11 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr getTextField(0).setMaxStringLength(20); addTextField(new GuiNpcTextField(1,this, this.fontRendererObj, guiLeft+10, guiTop + 80, 16, 16, "")); - getTextField(1).integersOnly = true; + getTextField(1).numbersOnly = true; getTextField(1).setMaxStringLength(1); addTextField(new GuiNpcTextField(2,this, this.fontRendererObj, guiLeft+10, guiTop + 110, 16, 16, "")); - getTextField(2).integersOnly = true; + getTextField(2).numbersOnly = true; getTextField(2).setMaxStringLength(1); } diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java index 2a0d5bd3c..545efde11 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java @@ -32,8 +32,8 @@ public class GuiNpcQuestReward extends GuiContainerNPCInterface implements IText addLabel(new GuiNpcLabel(1, "quest.exp", guiLeft + 4, guiTop + 45)); addTextField(new GuiNpcTextField(0, this, this.fontRendererObj, guiLeft + 4, guiTop + 55, 60, 20, quest.rewardExp + "")); - getTextField(0).integersOnly = true; - getTextField(0).setMinMaxDefault(0, Integer.MAX_VALUE, 0); + getTextField(0).numbersOnly = true; + getTextField(0).setMinMaxDefault(0, 99999, 0); } public void actionPerformed(GuiButton guibutton){ diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java index 690adbdd8..f18b87dae 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java @@ -6,30 +6,30 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.NoppesUtil; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISliderListener; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.containers.ContainerNPCInv; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; -public class GuiNPCInv extends GuiContainerNPCInterface2 implements IGuiData, ITextfieldListener +public class GuiNPCInv extends GuiContainerNPCInterface2 implements ISliderListener, IGuiData { - private HashMap chances = new HashMap(); + private HashMap chances = new HashMap(); private ContainerNPCInv container; private ResourceLocation slot; - private int inventoryTab = 0; - public GuiNPCInv(EntityNPCInterface npc,ContainerNPCInv container) { super(npc,container,3); @@ -45,70 +45,37 @@ public class GuiNPCInv extends GuiContainerNPCInterface2 implements IGuiData, IT super.initGui(); addLabel(new GuiNpcLabel(0,"inv.minExp", guiLeft + 118, guiTop + 18)); addTextField(new GuiNpcTextField(0,this, fontRendererObj, guiLeft + 108, guiTop + 29, 60, 20, npc.inventory.minExp + "")); - getTextField(0).integersOnly = true; - getTextField(0).setMinMaxDefault(0, npc.inventory.maxExp, 0); + getTextField(0).numbersOnly = true; + getTextField(0).setMinMaxDefault(0, Short.MAX_VALUE, 0); addLabel(new GuiNpcLabel(1,"inv.maxExp", guiLeft + 118, guiTop + 52)); addTextField(new GuiNpcTextField(1,this, fontRendererObj, guiLeft + 108, guiTop + 63, 60, 20, npc.inventory.maxExp + "")); - getTextField(1).integersOnly = true; - getTextField(1).setMinMaxDefault(npc.inventory.maxExp, Short.MAX_VALUE, 0); + getTextField(1).numbersOnly = true; + getTextField(1).setMinMaxDefault(0, Short.MAX_VALUE, 0); addButton(new GuiNpcButton(10, guiLeft + 88, guiTop + 88, 80, 20, new String[]{"stats.normal", "inv.auto"}, npc.inventory.lootMode)); addLabel(new GuiNpcLabel(2,"inv.npcInventory", guiLeft + 191, guiTop + 5)); addLabel(new GuiNpcLabel(3,"inv.inventory", guiLeft + 8, guiTop + 101)); - - addLabel(new GuiNpcLabel(4,"Tab", guiLeft + 381, guiTop + 5)); - addButton(new GuiNpcButton(11, guiLeft + 375, guiTop + 13, 30, 20, "1")); - addButton(new GuiNpcButton(12, guiLeft + 375, guiTop + 34, 30, 20, "2")); - - for(int c = 0; c < 4; c++) { - for (int r = 0; r < 9; r++) { - double chance = 100; - if (npc.inventory.dropchance.containsKey(r + c*9)) { - chance = npc.inventory.dropchance.get(r + c*9); - } - if (chance <= 0 || chance > 100) - chance = 100; - chances.put(r + c*9, chance); - - if(Math.floor((float)c/2) != this.inventoryTab) { - container.getSlot(r + c*9 + 7).xDisplayPosition = 10000; - container.getSlot(r + c*9 + 7).yDisplayPosition = 10000; - continue; - } else { - container.getSlot(r + c*9 + 7).xDisplayPosition = 191 + (c-this.inventoryTab*2) * 90; - container.getSlot(r + c*9 + 7).yDisplayPosition = 16 + r * 21; - } - - GuiNpcTextField textField = new GuiNpcTextField(2 + r + c*9, this, fontRendererObj, guiLeft + 210 + (c-this.inventoryTab*2)*90, guiTop + 14 + r * 21, 60, 18, chance + ""); - addLabel(new GuiNpcLabel(c*9 + r + 5,"%", guiLeft + 272 + (c-this.inventoryTab*2)*90, guiTop + 16 + r * 21)); - textField.doublesOnly = true; - textField.setMinMaxDefaultDouble(0, 100, 100); - addTextField(textField); - } + + for(int i = 0; i < 9; i++){ + int chance = 100; + if(npc.inventory.dropchance.containsKey(i)){ + chance = npc.inventory.dropchance.get(i); + } + if(chance <= 0 || chance > 100) + chance = 100; + chances.put(i, chance); + GuiNpcSlider slider = new GuiNpcSlider(this, i, guiLeft + 211, guiTop + 14 + i * 21, ((float)chance)/100); + addSlider(slider); } } - private void drawSlot(int x, int y) - { - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); // Forge: Blending needs to be enabled for this. - this.mc.getTextureManager().bindTexture(slot); - this.drawTexturedModalRect(x, y, 0,0,18, 18); - GL11.glDisable(GL11.GL_BLEND); // Forge: And clean that up - GL11.glEnable(GL11.GL_LIGHTING); - } - @Override protected void actionPerformed(GuiButton guibutton) { if(guibutton.id == 10){ npc.inventory.lootMode = ((GuiNpcButton)guibutton).getValue(); } - if(guibutton.id == 11 || guibutton.id == 12){ - this.inventoryTab = Integer.parseInt(guibutton.displayString)-1; - initGui(); - } } protected void drawGuiContainerBackgroundLayer(float f, int i, int j) @@ -116,18 +83,12 @@ public class GuiNPCInv extends GuiContainerNPCInterface2 implements IGuiData, IT super.drawGuiContainerBackgroundLayer(f, i, j); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.renderEngine.bindTexture(slot); - + for(int id = 4; id <= 6;id++){ Slot slot = container.getSlot(id); if(slot.getHasStack()) drawTexturedModalRect(guiLeft + slot.xDisplayPosition - 1, guiTop + slot.yDisplayPosition -1, 0, 0, 18, 18); } - - for(int c = 0; c < 2; c++) { - for (int r = 0; r < 9; r++) { - this.drawSlot(guiLeft + 190 + c*90, guiTop + 15 + r * 21); - } - } } public void drawScreen(int i, int j, float f) { @@ -189,12 +150,18 @@ public class GuiNPCInv extends GuiContainerNPCInterface2 implements IGuiData, IT npc.inventory.readEntityFromNBT(compound); initGui(); } - - @Override - public void unFocused(GuiNpcTextField textfield) { - if(textfield.id >= 2){ - chances.put(textfield.id-2, Double.parseDouble(textfield.getText())); - this.save(); - } - } + + @Override + public void mouseDragged(GuiNpcSlider guiNpcSlider) { + guiNpcSlider.displayString = StatCollector.translateToLocal("inv.dropChance") + ": " + (int) (guiNpcSlider.sliderValue * 100) + "%"; + } + + @Override + public void mousePressed(GuiNpcSlider guiNpcSlider) { + } + + @Override + public void mouseReleased(GuiNpcSlider guiNpcSlider) { + chances.put(guiNpcSlider.id, (int) (guiNpcSlider.sliderValue * 100)); + } } diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java index dd95ceab9..10e367774 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java @@ -52,7 +52,7 @@ public class GuiNpcAI extends GuiNPCInterface2 implements ITextfieldListener, IG if (ai.useRangeMelee >= 1){ addLabel(new GuiNpcLabel(20,"gui.minrange", guiLeft + 300, guiTop + 115)); addTextField(new GuiNpcTextField(6,this, fontRendererObj, guiLeft + 380, guiTop + 110, 30, 20, ai.distanceToMelee + "")); - getTextField(6).integersOnly = true; + getTextField(6).numbersOnly = true; getTextField(6).setMinMaxDefault(1, npc.stats.aggroRange, 5); } addLabel(new GuiNpcLabel(19,"ai.tacticalvariant", guiLeft + 150, guiTop + 140)); @@ -70,7 +70,7 @@ public class GuiNpcAI extends GuiNPCInterface2 implements ITextfieldListener, IG } addLabel(new GuiNpcLabel(21, label, guiLeft + 300, guiTop + 140)); addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 380, guiTop + 135, 30, 20, ai.tacticalRadius + "")); - getTextField(3).integersOnly = true; + getTextField(3).numbersOnly = true; getTextField(3).setMinMaxDefault(1, npc.stats.aggroRange, 5); } @@ -141,7 +141,7 @@ public class GuiNpcAI extends GuiNPCInterface2 implements ITextfieldListener, IG } else if (button.id == 17) { ai.tacticalVariant = EnumNavType.values()[button.getValue()]; - ai.directLOS = EnumNavType.values()[button.getValue()] != EnumNavType.Stalk && this.ai.directLOS; + ai.directLOS = EnumNavType.values()[button.getValue()] == EnumNavType.Stalk ? false : this.ai.directLOS; initGui(); } else if (button.id == 22) { diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java index ca2055e63..ccf93aaee 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java @@ -4,16 +4,20 @@ import com.mojang.authlib.GameProfile; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; import noppes.npcs.DataDisplay; import noppes.npcs.client.Client; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.GuiNPCTextures; import noppes.npcs.client.gui.GuiNpcTextureCloaks; import noppes.npcs.client.gui.GuiNpcTextureOverlays; -import noppes.npcs.client.gui.SubGuiNpcName; import noppes.npcs.client.gui.model.GuiCreationScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiHoverText; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; @@ -21,7 +25,6 @@ import noppes.npcs.entity.EntityNPCInterface; public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListener, IGuiData{ private DataDisplay display; - public GuiNpcTextField nameText; public GuiNpcDisplay(EntityNPCInterface npc) { super(npc,1); @@ -32,20 +35,9 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene public void initGui(){ super.initGui(); int y = guiTop + 4; - - // Old Implementation -// addLabel(new GuiNpcLabel(0,"gui.name", guiLeft + 5, y + 5)); -// addTextField(new GuiNpcTextField(0,this, fontRendererObj, guiLeft + 50, y, 200, 20, display.name)); -// this.addButton(new GuiNpcButton(0, guiLeft + 253, y , 110, 20, new String[]{"display.show","display.hide","display.showAttacking"} ,display.showName)); - - addLabel(new GuiNpcLabel(0,"gui.name", guiLeft + 5, y + 5)); - nameText = new GuiNpcTextField(0,this, fontRendererObj, guiLeft + 50, y, 206, 20, display.name); - addTextField(nameText); - this.addButton(new GuiNpcButton(0, guiLeft + 253+52, y , 110, 20, new String[]{"display.show","display.hide","display.showAttacking"} ,display.showName)); - - - this.addButton(new GuiNpcButton(14, guiLeft + 259, y , 20, 20, Character.toString('\u21bb'))); - this.addButton(new GuiNpcButton(15, guiLeft + 259 + 22, y , 20, 20, Character.toString('\u22EE'))); + addLabel(new GuiNpcLabel(0,"gui.name", guiLeft + 5, y + 5)); + addTextField(new GuiNpcTextField(0,this, fontRendererObj, guiLeft + 50, y, 200, 20, display.name)); + this.addButton(new GuiNpcButton(0, guiLeft + 253, y , 110, 20, new String[]{"display.show","display.hide","display.showAttacking"} ,display.showName)); y+=23; addLabel(new GuiNpcLabel(11,"gui.title", guiLeft + 5, y + 5)); @@ -56,15 +48,15 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene this.addButton(new GuiNpcButton(1, guiLeft + 50, y,110,20, "selectServer.edit")); addLabel(new GuiNpcLabel(2,"display.size", guiLeft + 175, y + 5)); addTextField(new GuiNpcTextField(2,this, fontRendererObj, guiLeft + 203, y, 40, 20, display.modelSize + "")); - getTextField(2).integersOnly = true; - getTextField(2).setMinMaxDefault(1, CustomNpcs.NpcSizeLimit, 5); - //addLabel(new GuiNpcLabel(3,"(1-30)", guiLeft + 246 , y + 5)); + getTextField(2).numbersOnly = true; + getTextField(2).setMinMaxDefault(1, 30, 5); + addLabel(new GuiNpcLabel(3,"(1-30)", guiLeft + 246 , y + 5)); y+=23; addLabel(new GuiNpcLabel(4,"display.texture", guiLeft + 5, y + 5)); addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 80, y, 200, 20, display.skinType == 0?display.texture:display.url)); this.addButton(new GuiNpcButton(3, guiLeft + 325, y, 38, 20, "mco.template.button.select")); - this.addButton(new GuiNpcButton(2, guiLeft + 283, y, 40, 20, new String[]{"display.texture","display.player", "display.url", "display.urlSix"},display.skinType)); + this.addButton(new GuiNpcButton(2, guiLeft + 283, y, 40, 20, new String[]{"display.texture","display.player", "display.url"},display.skinType)); getButton(3).setEnabled(display.skinType == 0); if(display.skinType == 1 && display.playerProfile != null) getTextField(3).setText(display.playerProfile.getName()); @@ -81,20 +73,18 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene y+=23; addLabel(new GuiNpcLabel(5,"display.livingAnimation", guiLeft + 5, y + 5)); - this.addButton(new GuiNpcButton(5, guiLeft + 120, y, 50, 20, new String[]{"gui.yes","gui.no"}, display.disableLivingAnimation?1:0)); + this.addButton(new GuiNpcButton(5, guiLeft + 120, y, 50, 20, new String[]{"gui.yes","gui.no"},display.disableLivingAnimation?1:0)); - addLabel(new GuiNpcLabel(6,"Collides With Entities", guiLeft + 185, y + 5)); - this.addButton(new GuiNpcButton(6, guiLeft + 300, y, 100, 20, new String[]{"gui.yes","gui.no","Only CNPCs","Only Players","CNPCs & Players"}, display.collidesWith)); - - y+=23; + y+=23; addLabel(new GuiNpcLabel(7,"display.visible", guiLeft + 5, y + 5)); this.addButton(new GuiNpcButton(7, guiLeft + 120, y, 50, 20, new String[]{"gui.yes","gui.no","gui.partly"}, display.visible)); y+=23; addLabel(new GuiNpcLabel(10,"display.bossbar", guiLeft + 5, y + 5)); this.addButton(new GuiNpcButton(10, guiLeft + 120, y, 110, 20, new String[]{"display.hide","display.show","display.showAttacking"}, display.showBossBar)); - - } + + //addExtra(new GuiHoverText(0, "testing", guiLeft, guiTop)); + } @Override public void unFocused(GuiNpcTextField textfield){ @@ -108,10 +98,8 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene display.modelSize = textfield.getInteger(); } else if(textfield.id == 3){ - // SKIN CHANGE - if(display.skinType == 2 || display.skinType == 3){ + if(display.skinType == 2) display.url = textfield.getText(); - } else if(display.skinType == 1){ if(!textfield.isEmpty()){ display.playerProfile = new GameProfile(null, textfield.getText()); @@ -145,11 +133,7 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene } if(button.id == 2){ display.skinType = (byte) button.getValue(); - // System.out.println("Skin Type set to:" + display.skinType); - // SKIN CHANGE - if (display.skinType != 3){ - display.url = ""; - } + display.url = ""; display.playerProfile = null; initGui(); } @@ -159,15 +143,9 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene else if(button.id == 5){ display.disableLivingAnimation = button.getValue() == 1; } - else if(button.id == 6){ - display.collidesWith = button.getValue(); - } else if(button.id == 7){ display.visible = button.getValue(); } - // else if(button.id == 300){ - // display.squareTexture = (byte)button.getValue(); - // } else if(button.id == 8){ NoppesUtil.openGUI(player, new GuiNpcTextureCloaks(npc, this)); } @@ -177,14 +155,6 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene else if(button.id == 10){ display.showBossBar = (byte)button.getValue(); } - else if(button.id == 14){ - String name = display.getRandomName(); - display.setName(name); - getTextField(0).setText(name); - } - else if(button.id == 15){ - setSubGui(new SubGuiNpcName(display)); - } } @Override diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java index 165cf9682..dd4cb0f3e 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java @@ -33,40 +33,39 @@ public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener, super.initGui(); int y = guiTop + 10; addLabel(new GuiNpcLabel(0,"stats.health", guiLeft + 5, y + 5)); - addTextField(new GuiNpcTextField(0,this, guiLeft + 85, y, 50, 18, String.format("%.0f", stats.maxHealth) + "")); - getTextField(0).doublesOnly = true; - getTextField(0).setMinMaxDefaultDouble(0, Double.MAX_VALUE,20); + addTextField(new GuiNpcTextField(0,this, guiLeft + 85, y, 50, 18, stats.maxHealth+"")); + getTextField(0).numbersOnly = true; + getTextField(0).setMinMaxDefault(1, Integer.MAX_VALUE, 20); addLabel(new GuiNpcLabel(1,"stats.aggro", guiLeft + 140, y + 5)); addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft + 220, y, 50, 18, stats.aggroRange+"")); - getTextField(1).integersOnly = true; - getTextField(1).setMinMaxDefault(1, 96, 2); // Doesn't work past 32 technically (MC Limitations) + getTextField(1).numbersOnly = true; + getTextField(1).setMinMaxDefault(1, 64, 2); addLabel(new GuiNpcLabel(34,"stats.creaturetype", guiLeft + 275, y + 5)); addButton(new GuiNpcButton(8,guiLeft + 355, y, 56, 20, new String[]{"stats.normal","stats.undead","stats.arthropod"} ,stats.creatureType.ordinal())); addButton(new GuiNpcButton(0,guiLeft + 82, y+=22, 56, 20, "selectServer.edit")); addLabel(new GuiNpcLabel(2,"stats.respawn", guiLeft + 5, y + 5)); + this.addButton(new GuiNpcButton(2, guiLeft + 82, y+=22, 56, 20, "selectServer.edit")); addLabel(new GuiNpcLabel(5,"stats.meleeproperties", guiLeft + 5, y + 5)); this.addButton(new GuiNpcButton(3, guiLeft + 82, y+=22, 56, 20, "selectServer.edit")); addLabel(new GuiNpcLabel(6,"stats.rangedproperties", guiLeft + 5, y + 5)); this.addButton(new GuiNpcButton(9, guiLeft + 217, y, 56, 20, "selectServer.edit")); addLabel(new GuiNpcLabel(7,"stats.projectileproperties", guiLeft + 140, y + 5)); + + this.addButton(new GuiNpcButton(15, guiLeft + 82, y+=34, 56, 20, "selectServer.edit")); + addLabel(new GuiNpcLabel(15,"potion.resistance", guiLeft + 5, y + 5)); - this.addButton(new GuiNpcButton(15, guiLeft + 82, y+=34, 56, 20, "selectServer.edit")); - addLabel(new GuiNpcLabel(15,"potion.resistance", guiLeft + 5, y + 5)); - - this.addButton(new GuiNpcButton(21, guiLeft + 217, y, 56, 20, new String[]{"gui.no","gui.yes"}, this.stats.resistances.disableDamage? 1:0)); - addLabel(new GuiNpcLabel(21,"stats.disabledamage", guiLeft + 140, y + 5)); - - addButton(new GuiNpcButton(4,guiLeft + 82, y+=34, 56, 20, new String[]{"gui.no","gui.yes"} ,npc.isImmuneToFire()? 1:0)); + + addButton(new GuiNpcButton(4,guiLeft + 82, y+=34, 56, 20, new String[]{"gui.no","gui.yes"} ,npc.isImmuneToFire()? 1:0)); addLabel(new GuiNpcLabel(10,"stats.fireimmune", guiLeft + 5, y + 5)); addButton(new GuiNpcButton(5,guiLeft + 217, y, 56, 20, new String[]{"gui.no","gui.yes"} ,stats.canDrown? 1:0)); addLabel(new GuiNpcLabel(11,"stats.candrown", guiLeft + 140, y + 5)); - addTextField(new GuiNpcTextField(14, this, guiLeft + 355, y, 56, 20, String.format("%.0f", stats.healthRegen) + "").setFloatsOnly()); + addTextField(new GuiNpcTextField(14, this, guiLeft + 355, y, 56, 20, stats.healthRegen + "").setNumbersOnly()); addLabel(new GuiNpcLabel(14,"stats.regenhealth", guiLeft + 275, y + 5)); - addTextField(new GuiNpcTextField(16, this, guiLeft + 355, y+=22, 56, 20, String.format("%.0f", stats.combatRegen) + "").setFloatsOnly()); + addTextField(new GuiNpcTextField(16, this, guiLeft + 355, y+=22, 56, 20, stats.combatRegen + "").setNumbersOnly()); addLabel(new GuiNpcLabel(16,"stats.combatregen", guiLeft + 275, y + 5)); addButton(new GuiNpcButton(6,guiLeft + 82, y, 56, 20, new String[]{"gui.no","gui.yes"} ,stats.burnInSun? 1:0)); addLabel(new GuiNpcLabel(12,"stats.burninsun", guiLeft + 5, y + 5)); @@ -82,17 +81,17 @@ public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener, @Override public void unFocused(GuiNpcTextField textfield){ if(textfield.id == 0){ - stats.maxHealth = Math.floor(Double.parseDouble(textfield.getText())); - npc.heal((float)(stats.maxHealth)); + stats.maxHealth = textfield.getInteger(); + npc.heal(stats.maxHealth); } else if(textfield.id == 1){ stats.aggroRange = textfield.getInteger(); } else if(textfield.id == 14){ - stats.healthRegen = (float)(Math.floor(Float.parseFloat(textfield.getText()))); + stats.healthRegen = textfield.getInteger(); } else if(textfield.id == 16){ - stats.combatRegen = (float)(Math.floor(Float.parseFloat(textfield.getText()))); + stats.combatRegen = textfield.getInteger(); } } @@ -135,9 +134,6 @@ public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener, else if (button.id == 18) { stats.potionImmune = ((GuiNpcButtonYesNo)guibutton).getBoolean(); } - else if(button.id == 21){ - stats.resistances.disableDamage = ((GuiNpcButton)guibutton).getValue() == 1; - } } @Override public void save() { diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java index 8abf61f8a..32bce96c3 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -33,7 +33,6 @@ import noppes.npcs.controllers.PixelmonHelper; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityFakeLiving; import noppes.npcs.entity.EntityNPCInterface; -import org.lwjgl.Sys; public class GuiCreationScreen extends GuiModelInterface implements ICustomScrollListener{ @@ -42,7 +41,7 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol private final String[] ignoredTags = {"CanBreakDoors", "Bred", "PlayerCreated", "Tame", "HasReproduced"}; private GuiNpcButton prev,next; - + private GuiScreen parent; private HashMap mapped = new HashMap(); @@ -62,7 +61,7 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol e.printStackTrace(); } catch (NoSuchMethodException e) { } - } + } list = new ArrayList(data.keySet()); Collections.sort(list,String.CASE_INSENSITIVE_ORDER); } @@ -110,9 +109,6 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol addButton(new GuiNpcButton(7, guiLeft + 50, y += 22, 50, 20, "selectServer.edit")); addLabel(new GuiNpcLabel(4, "Legs", guiLeft, y + 5, 0xFFFFFF)); - - addButton(new GuiNpcButton(250, guiLeft + 50, y += 22, 50, 20, new String[]{"Default","Steve64","Alex"}, this.npc.display.modelType)); - addLabel(new GuiNpcLabel(250, "Model", guiLeft, y + 5, 0xFFFFFF)); addButton(new GuiNpcButton(44, guiLeft + 310, guiTop + 14, 80, 20, "Save Model")); addButton(new GuiNpcButton(45, guiLeft + 310, guiTop + 36, 80, 20, "Load Model")); @@ -252,7 +248,7 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol } if(button.id == 1){ - this.mc.displayGuiScreen(new GuiEntitySelection(this, playerdata, npc)); + this.mc.displayGuiScreen(new GuiEntitySelection(this, playerdata,npc)); } if(button.id == 4){ @@ -267,27 +263,6 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol if(button.id == 7){ this.mc.displayGuiScreen(new GuiModelLegs(this, npc)); } - - // New Button for Changing Models - // URL Swapper - if(button.id == 250){ - if(npc.display.modelType == 0){ - if (npc.display.skinType == 2){ - npc.display.skinType = 3; - } - npc.display.modelType = 1; - } - else if(npc.display.modelType == 1){ - npc.display.modelType = 2; - } - else { - if (npc.display.skinType == 3){ - npc.display.skinType = 2; - } - npc.display.modelType = 0; - } - } - if(button.id == 8){ this.mc.displayGuiScreen(new GuiModelScale(this, playerdata, npc)); } diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java index 727cd19ba..2f10da803 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java @@ -46,9 +46,8 @@ public class GuiEntitySelection extends GuiNPCInterface list.add("CustomNPC"); Collections.sort(list,String.CASE_INSENSITIVE_ORDER); slot = new GuiNPCStringSlot(list,this,false,18); - if(playerdata.getEntityClass() != null){ - slot.selected = (String) EntityList.classToStringMapping.get(playerdata.getEntityClass()); - } + if(playerdata.getEntityClass() != null) + slot.selected = (String) EntityList.classToStringMapping.get(playerdata.getEntityClass()); else{ slot.selected = "CustomNPC"; } @@ -120,7 +119,6 @@ public class GuiEntitySelection extends GuiNPCInterface playerdata.setEntityClass(parent.data.get(slot.selected)); EntityLivingBase entity = playerdata.getEntity(npc); if(entity != null){ - npc.display.modelType = 0; RendererLivingEntity render = (RendererLivingEntity) RenderManager.instance.getEntityRenderObject(entity); npc.display.texture = NPCRendererHelper.getTexture(render,entity); } diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelArms.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelArms.java index 300379079..66e02c257 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelArms.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelArms.java @@ -10,10 +10,7 @@ import noppes.npcs.entity.EntityCustomNpc; public class GuiModelArms extends GuiModelInterface{ - private final String[] arrArm = new String[]{"gui.no","Both","Right","Left"}; - private final String[] arrArmwear = new String[]{"gui.no","Both","Left","Right"}; - private final String[] arrSolidArmwear = new String[]{"gui.no","Both","Left","Right"}; - private final String[] arrClaws = new String[]{"gui.no","Both","Left","Right"}; + private final String[] arrParticles = new String[]{"gui.no","Both","Left","Right"}; private GuiScreen parent; public GuiModelArms(GuiScreen parent, EntityCustomNpc npc){ @@ -27,19 +24,8 @@ public class GuiModelArms extends GuiModelInterface{ super.initGui(); int y = guiTop + 20; - addButton(new GuiNpcButton(30, guiLeft + 50, y += 22, 70, 20, arrArm, playerdata.hideArms)); - addLabel(new GuiNpcLabel(30, "Hide", guiLeft, y + 5, 0xFFFFFF)); - - if (npc.display.modelType == 1 || npc.display.modelType == 2) { - addButton(new GuiNpcButton(8, guiLeft + 50, y += 22, 70, 20, arrArmwear, playerdata.armwear)); - addLabel(new GuiNpcLabel(8, "Armwear", guiLeft, y + 5, 0xFFFFFF)); - - addButton(new GuiNpcButton(9, guiLeft + 50, y += 22, 70, 20, arrSolidArmwear, playerdata.solidArmwear)); - addLabel(new GuiNpcLabel(9, "Solid", guiLeft, y + 5, 0xFFFFFF)); - } - ModelPartData claws = playerdata.getPartData("claws"); - addButton(new GuiNpcButton(0, guiLeft + 50, y += 22, 70, 20, arrClaws, claws == null?0:claws.type + 1)); + addButton(new GuiNpcButton(0, guiLeft + 50, y += 22, 70, 20, arrParticles, claws == null?0:claws.type + 1)); addLabel(new GuiNpcLabel(0, "Claws", guiLeft, y + 5, 0xFFFFFF)); if(claws != null) addButton(new GuiNpcButton(10, guiLeft + 122, y, 40, 20, claws.getColor())); @@ -51,15 +37,6 @@ public class GuiModelArms extends GuiModelInterface{ super.actionPerformed(btn); GuiNpcButton button = (GuiNpcButton) btn; - if(button.id == 8){ - playerdata.armwear = (byte) button.getValue(); - } - if(button.id == 9){ - playerdata.solidArmwear = (byte) button.getValue(); - } - if(button.id == 30){ - playerdata.hideArms = (byte) button.getValue(); - } if(button.id == 0){ if(button.getValue() == 0) playerdata.removePart("claws"); diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelBody.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelBody.java index 89a5e1f96..77d06f17a 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelBody.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelBody.java @@ -11,14 +11,10 @@ import noppes.npcs.entity.EntityCustomNpc; public class GuiModelBody extends GuiModelInterface{ private GuiScreen parent; - private final String[] arrBody = new String[]{"gui.no","gui.yes"}; - private final String[] arrBodywear = new String[]{"gui.no","gui.yes","Solid"}; - private final String[] arrWing = new String[]{"gui.no","Player","Type1","Type2","Type3","Type4","Type5","Type6","Type7","Type8","Type9", - "Type10","Type11","Type12","Type13"}; + private final String[] arrWing = new String[]{"gui.no","Player","Type1","Type2","Type3"}; private final String[] arrBreasts = new String[]{"gui.no","Type1","Type2","Type3"}; - private final String[] arrParticles = new String[]{"gui.no","Player","Type1", "Type2", "Rainbow", "Type3", "Type4", "Type5", "Type6", "Type7"}; - private final String[] arrfins = new String[]{"gui.no","Player","Type1","Type2","Type3","Type4","Type5","Type6"}; - private final String[] arrskirt = new String[]{"gui.no","Player","Type1"}; + private final String[] arrParticles = new String[]{"gui.no","Player","Type1","Type2", "Rainbow"}; + private final String[] arrfins = new String[]{"gui.no","Player","Type1"}; public GuiModelBody(GuiScreen parent, EntityCustomNpc npc){ super(npc); @@ -29,17 +25,7 @@ public class GuiModelBody extends GuiModelInterface{ @Override public void initGui() { super.initGui(); - int y = guiTop + 20; - - addButton(new GuiNpcButton(30, guiLeft + 50, y += 22, 70, 20, arrBody, playerdata.hideBody)); - addLabel(new GuiNpcLabel(30, "Hide", guiLeft, y + 5, 0xFFFFFF)); - - if (npc.display.modelType == 1 || npc.display.modelType == 2) { - addButton(new GuiNpcButton(8, guiLeft + 50, y += 22, 70, 20, arrBodywear, playerdata.bodywear)); - addLabel(new GuiNpcLabel(8, "Bodywear", guiLeft, y + 5, 0xFFFFFF)); - } - addButton(new GuiNpcButton(1, guiLeft + 50, y += 22, 70, 20, arrBreasts, playerdata.breasts)); addLabel(new GuiNpcLabel(1, "Breasts", guiLeft, y + 5, 0xFFFFFF)); @@ -61,56 +47,13 @@ public class GuiModelBody extends GuiModelInterface{ if(fin != null) addButton(new GuiNpcButton(13, guiLeft + 122, y, 40, 20, fin.getColor())); - ModelPartData skirt = playerdata.getPartData("skirt"); - addButton(new GuiNpcButton(4, guiLeft + 50, y += 22, 70, 20, arrskirt, getSkirtindex(skirt))); - addLabel(new GuiNpcLabel(4, "Skirt", guiLeft, y + 5, 0xFFFFFF)); - if(skirt != null) - addButton(new GuiNpcButton(14, guiLeft + 122, y, 40, 20, skirt.getColor())); } private int getFinIndex(ModelPartData fin) { - if(fin == null) - return 0; - if(fin.type == 0){ - if(fin.playerTexture) - return 1; - if(fin.texture.contains("1")) - return 2; - if(fin.texture.contains("2")) - return 3; - if(fin.texture.contains("3")) - return 4; - if(fin.texture.contains("4")) - return 5; - if(fin.texture.contains("5")) - return 6; - if(fin.texture.contains("6")) - return 7; - } - return 0; - } - - private int getSkirtindex(ModelPartData skirt) { - if(skirt == null) - return 0; - if(skirt.type == 0){ - if(skirt.playerTexture) - return 1; - if(skirt.texture.contains("1")) - return 2; - if(skirt.texture.contains("2")) - return 3; - if(skirt.texture.contains("3")) - return 4; - if(skirt.texture.contains("4")) - return 5; - if(skirt.texture.contains("5")) - return 6; - if(skirt.texture.contains("6")) - return 7; - } - return 0; + if(fin == null) + return 0; + return fin.playerTexture?1:2; } private int getParticleIndex(ModelPartData particles) { @@ -123,16 +66,6 @@ public class GuiModelBody extends GuiModelInterface{ return 2; if(particles.texture.contains("2")) return 3; - if(particles.texture.contains("3")) - return 5; - if(particles.texture.contains("4")) - return 6; - if(particles.texture.contains("5")) - return 7; - if(particles.texture.contains("6")) - return 8; - if(particles.texture.contains("7")) - return 9; } if(particles.type == 1){ return 4; @@ -173,66 +106,23 @@ public class GuiModelBody extends GuiModelInterface{ particles.setTexture("particle/type2", 0); if(value == 4) particles.setTexture("", 1); - if(value == 5) - particles.setTexture("particle/type3", 0); - if(value == 6) - particles.setTexture("particle/type4", 0); - if(value == 7) - particles.setTexture("particle/type5", 0); - if(value == 8) - particles.setTexture("particle/type6", 0); - if(value == 9) - particles.setTexture("particle/type7", 0); } initGui(); } if(button.id == 3){ - int value = button.getValue(); - if(value == 0) - playerdata.removePart("fin"); - else{ - ModelPartData particles = playerdata.getOrCreatePart("fin"); - if(value == 1) - particles.setTexture("", 0); - if(value == 2) - particles.setTexture("fin/fin1", 0); - if(value == 3) - particles.setTexture("fin/fin2", 0); - if(value == 4) - particles.setTexture("fin/fin3", 0); - if(value == 5) - particles.setTexture("fin/fin4", 0); - if(value == 6) - particles.setTexture("fin/fin5", 0); - if(value == 7) - particles.setTexture("fin/fin6", 0); - - } - initGui(); + int value = button.getValue(); + if(value == 0) + playerdata.removePart("fin"); + else{ + ModelPartData particles = playerdata.getOrCreatePart("fin"); + if(value == 1) + particles.setTexture("", 0); + if(value == 2) + particles.setTexture("fin/fin1", 0); + } + initGui(); } - if(button.id == 4){ - int value = button.getValue(); - if(value == 0) - playerdata.removePart("skirt"); - else{ - ModelPartData skirt = playerdata.getOrCreatePart("skirt"); - if(value == 1) - skirt.setTexture("", 0); - if(value == 2) - skirt.setTexture("skirt/skirt1", 0); - } - initGui(); - } - - if(button.id == 8){ - playerdata.bodywear = (byte) button.getValue(); - } - - if(button.id == 30){ - playerdata.hideBody = (byte) button.getValue(); - } - if(button.id == 11){ this.mc.displayGuiScreen(new GuiModelColor(this, playerdata.getPartData("wings"), npc)); } @@ -242,9 +132,6 @@ public class GuiModelBody extends GuiModelInterface{ if(button.id == 13){ this.mc.displayGuiScreen(new GuiModelColor(this, playerdata.getPartData("fin"), npc)); } - if(button.id == 14){ - this.mc.displayGuiScreen(new GuiModelColor(this, playerdata.getPartData("skirt"), npc)); - } } @Override diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelHead.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelHead.java index e35836c34..12a795a88 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelHead.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelHead.java @@ -12,16 +12,14 @@ public class GuiModelHead extends GuiModelInterface{ private GuiScreen parent; - private final String[] arrHead = new String[]{"gui.no","gui.yes"}; private final String[] arrHeadwear = new String[]{"gui.no","gui.yes","Solid"}; private final String[] arrHair = new String[]{"gui.no","Player","Long","Thin","Stylish","Ponytail"}; private final String[] arrBeard = new String[]{"gui.no","Player","Standard","Viking","Long","Short"}; - private final String[] arrMohawk = new String[]{"gui.no","Type1","Type2","Type3"}; - private final String[] arrSnout = new String[]{"gui.no","Player Small","Player Medium", "Player Large", "Player Bunny", - "Small1", "Medium1", "Large1", "Bunny1", "Beak1"}; + private final String[] arrMohawk = new String[]{"gui.no","Type1"}; + private final String[] arrSnout = new String[]{"gui.no","Player Small","Player Medium", "Player Large", "Player Bunny", + "Small1", "Medium1", "Large1", "Bunny1"}; private final String[] arrEars = new String[]{"gui.no","Player","Player Bunny","Bunny","Type1"}; - private final String[] arrHorns = new String[]{"gui.no", "Player Bull", "Player Antlers", "Player AntennasB", "Player AntennasF", "Bull", "Antlers", "AntennasB", "AntennasF" }; - + public GuiModelHead(GuiScreen parent, EntityCustomNpc npc){ super(npc); this.parent = parent; @@ -30,52 +28,42 @@ public class GuiModelHead extends GuiModelInterface{ @Override public void initGui() { - super.initGui(); + super.initGui(); int y = guiTop + 20; - - addButton(new GuiNpcButton(30, guiLeft + 50, y += 22, 70, 20, arrHead, playerdata.hideHead)); - addLabel(new GuiNpcLabel(30, "Hide", guiLeft, y + 5, 0xFFFFFF)); - - addButton(new GuiNpcButton(0, guiLeft + 50, y += 22, 70, 20, arrHeadwear, playerdata.headwear)); + + addButton(new GuiNpcButton(0, guiLeft + 50, y += 22, 70, 20, arrHeadwear, playerdata.headwear)); addLabel(new GuiNpcLabel(0, "Headwear", guiLeft, y + 5, 0xFFFFFF)); ModelPartData hair = playerdata.getPartData("hair"); - addButton(new GuiNpcButton(1, guiLeft + 50, y += 22, 70, 20, arrHair, hair == null ? 0 : hair.type + 1)); + addButton(new GuiNpcButton(1, guiLeft + 50, y += 22, 70, 20, arrHair, hair == null?0:hair.type + 1)); addLabel(new GuiNpcLabel(1, "Hair", guiLeft, y + 5, 0xFFFFFF)); - if (hair != null) + if(hair != null) addButton(new GuiNpcButton(11, guiLeft + 122, y, 40, 20, hair.getColor())); ModelPartData mohawk = playerdata.getPartData("mohawk"); - addButton(new GuiNpcButton(2, guiLeft + 50, y += 22, 70, 20, arrMohawk, mohawk == null ? 0 : mohawk.type)); + addButton(new GuiNpcButton(2, guiLeft + 50, y += 22, 70, 20, arrMohawk, mohawk == null?0:mohawk.type)); addLabel(new GuiNpcLabel(2, "Mohawk", guiLeft, y + 5, 0xFFFFFF)); - if (mohawk != null) + if(mohawk != null) addButton(new GuiNpcButton(12, guiLeft + 122, y, 40, 20, mohawk.getColor())); ModelPartData beard = playerdata.getPartData("beard"); - addButton(new GuiNpcButton(3, guiLeft + 50, y += 22, 70, 20, arrBeard, beard == null ? 0 : beard.type + 1)); + addButton(new GuiNpcButton(3, guiLeft + 50, y += 22, 70, 20, arrBeard, beard == null?0:beard.type + 1)); addLabel(new GuiNpcLabel(3, "Beard", guiLeft, y + 5, 0xFFFFFF)); - if (beard != null) + if(beard != null) addButton(new GuiNpcButton(13, guiLeft + 122, y, 40, 20, beard.getColor())); ModelPartData snout = playerdata.getPartData("snout"); - addButton(new GuiNpcButton(4, guiLeft + 50, y += 22, 70, 20, arrSnout, snout == null ? 0 : snout.type + (snout.playerTexture ? 1 : 5))); + addButton(new GuiNpcButton(4, guiLeft + 50, y += 22, 70, 20, arrSnout, snout == null?0:snout.type + (snout.playerTexture?1:5))); addLabel(new GuiNpcLabel(4, "Snout", guiLeft, y + 5, 0xFFFFFF)); - if (snout != null) + if(snout != null) addButton(new GuiNpcButton(14, guiLeft + 122, y, 40, 20, snout.getColor())); ModelPartData ears = playerdata.getPartData("ears"); - addButton(new GuiNpcButton(5, guiLeft + 50, y += 22, 70, 20, arrEars, getEars(ears))); + addButton(new GuiNpcButton(5, guiLeft + 50, y += 22, 70, 20, arrEars, getEars(ears))); addLabel(new GuiNpcLabel(5, "Ears", guiLeft, y + 5, 0xFFFFFF)); - if (ears != null) + if(ears != null) addButton(new GuiNpcButton(15, guiLeft + 122, y, 40, 20, ears.getColor())); - - ModelPartData horns = playerdata.getPartData("horns"); - y += 22;addButton(new GuiNpcButton(6, guiLeft + 50, y, 70, 20, arrHorns, getHorns(horns))); - addLabel(new GuiNpcLabel(6, "Horns", guiLeft, y + 5, 16777215)); - if (horns != null) { - addButton(new GuiNpcButton(16, guiLeft + 122, y, 40, 20, horns.getColor())); - } } @@ -94,15 +82,6 @@ public class GuiModelHead extends GuiModelInterface{ return 0; } - private int getHorns(ModelPartData data) { - if (data == null) - return 0; - if (data.playerTexture) { - return data.type + 1; - } - return data.type + 5; - } - @Override protected void actionPerformed(GuiButton btn) { super.actionPerformed(btn); @@ -112,10 +91,6 @@ public class GuiModelHead extends GuiModelInterface{ playerdata.headwear = (byte) button.getValue(); } - if(button.id == 30){ - playerdata.hideHead = (byte) button.getValue(); - } - if(button.id == 1){ if(button.getValue() == 0) playerdata.removePart("hair"); @@ -149,28 +124,26 @@ public class GuiModelHead extends GuiModelInterface{ initGui(); } - if(button.id == 4){ - if(button.getValue() == 0) - playerdata.removePart("snout"); - else if(button.getValue() < 5){ - ModelPartData data = playerdata.getOrCreatePart("snout"); - data.type = (byte) (button.getValue() - 1); - } - else{ - ModelPartData data = playerdata.getOrCreatePart("snout"); - byte type = 0; - if(button.displayString.startsWith("Medium")) - type = 1; - if(button.displayString.startsWith("Large")) - type = 2; - if(button.displayString.startsWith("Bunny")) - type = 3; - if(button.displayString.startsWith("Beak")) - type = 4; - data.setTexture("snout/" + button.displayString.toLowerCase(), type); - } - initGui(); - } + if(button.id == 4){ + if(button.getValue() == 0) + playerdata.removePart("snout"); + else if(button.getValue() < 5){ + ModelPartData data = playerdata.getOrCreatePart("snout"); + data.type = (byte) (button.getValue() - 1); + } + else{ + ModelPartData data = playerdata.getOrCreatePart("snout"); + byte type = 0; + if(button.displayString.startsWith("Medium")) + type = 1; + if(button.displayString.startsWith("Large")) + type = 2; + if(button.displayString.startsWith("Bunny")) + type = 3; + data.setTexture("snout/" + button.displayString.toLowerCase(), type); + } + initGui(); + } if(button.id == 5){ int value = button.getValue(); @@ -190,26 +163,6 @@ public class GuiModelHead extends GuiModelInterface{ initGui(); } - if(button.id == 6){ - int value = button.getValue(); - if(value == 0) - playerdata.removePart("horns"); - else{ - ModelPartData data = playerdata.getOrCreatePart("horns"); - if(value <= 4) - data.setTexture("", value - 1); - if(value == 5) - data.setTexture("horns/bull", 0); - if(value == 6) - data.setTexture("horns/antlers", 1); - if(value == 7) - data.setTexture("horns/antennas", 2); - if(value == 8) - data.setTexture("horns/antennas", 3); - } - initGui(); - } - if(button.id == 11){ this.mc.displayGuiScreen(new GuiModelColor(this, playerdata.getPartData("hair"), npc)); } @@ -225,9 +178,6 @@ public class GuiModelHead extends GuiModelInterface{ if(button.id == 15){ this.mc.displayGuiScreen(new GuiModelColor(this, playerdata.getPartData("ears"), npc)); } - if(button.id == 16){ - this.mc.displayGuiScreen(new GuiModelColor(this, playerdata.getPartData("horns"), npc)); - } } @Override diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java index e15775b62..660d005dc 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java @@ -11,11 +11,8 @@ import noppes.npcs.entity.EntityCustomNpc; public class GuiModelLegs extends GuiModelInterface{ private GuiScreen parent; - private final String[] arrLeg = new String[]{"gui.no","Both","Right","Left"}; - private final String[] arrLegwear = new String[]{"gui.no","Both","Left","Right"}; - private final String[] arrSolidLegwear = new String[]{"gui.no","Both","Left","Right"}; - private final String[] arrLegs = new String[]{"gui.no","Player","Player Naga","Spider","Horse","Naga", "Mermaid", "Mermaid 2", "Digitigrade"}; - private final String[] arrTail = new String[]{"gui.no","Player", "Player Dragon","Cat","Wolf","Horse","Dragon", "Squirrel", "Fin", "Rodent", "Feather"}; + private final String[] arrLegs = new String[]{"gui.no","Player","Player Naga","Spider","Horse","Naga", "Mermaid","Digitigrade"}; + private final String[] arrTail = new String[]{"gui.no","Player", "Player Dragon","Cat","Wolf","Horse","Dragon", "Squirrel"}; public GuiModelLegs(GuiScreen parent, EntityCustomNpc npc){ super(npc); this.parent = parent; @@ -27,18 +24,7 @@ public class GuiModelLegs extends GuiModelInterface{ super.initGui(); int y = guiTop + 20; - addButton(new GuiNpcButton(30, guiLeft + 50, y += 22, 70, 20, arrLeg, playerdata.hideLegs)); - addLabel(new GuiNpcLabel(30, "Hide", guiLeft, y + 5, 0xFFFFFF)); - - if (npc.display.modelType == 1 || npc.display.modelType == 2) { - addButton(new GuiNpcButton(8, guiLeft + 50, y += 22, 70, 20, arrLegwear, playerdata.legwear)); - addLabel(new GuiNpcLabel(8, "Legwear", guiLeft, y + 5, 0xFFFFFF)); - - addButton(new GuiNpcButton(9, guiLeft + 50, y += 22, 70, 20, arrSolidLegwear, playerdata.solidLegwear)); - addLabel(new GuiNpcLabel(9, "Solid", guiLeft, y + 5, 0xFFFFFF)); - } - - addButton(new GuiNpcButton(1, guiLeft + 50, y += 22, 70, 20, arrLegs, getLegIndex(playerdata.legParts))); + addButton(new GuiNpcButton(1, guiLeft + 50, y += 22, 70, 20, arrLegs, getNagaIndex(playerdata.legParts))); addLabel(new GuiNpcLabel(1, "Legs", guiLeft, y + 5, 0xFFFFFF)); if(playerdata.legParts.type > 0) addButton(new GuiNpcButton(11, guiLeft + 122, y, 40, 20, playerdata.legParts.getColor())); @@ -49,40 +35,33 @@ public class GuiModelLegs extends GuiModelInterface{ if(tail != null) addButton(new GuiNpcButton(12, guiLeft + 122, y, 40, 20, tail.getColor())); } - - private int getLegIndex(ModelPartData data) { + private int getNagaIndex(ModelPartData data) { if(!data.playerTexture && data.type == 1) return 5; if(data.type == 4) return 6; if(data.type == 5) - return 8; + return 7; return data.type + 1; } private int getTailIndex(ModelPartData data){ - if(data == null) - return 0; - if(data.playerTexture && data.type == 0) - return 1; - if(data.type == 0 && data.texture.contains("tail1")) - return 3; - if(data.type == 0 && data.texture.contains("tail2")) - return 4; - if(data.playerTexture && data.type == 1) - return 2; - if(data.type == 1) - return 6; - if(data.type == 2) - return 5; - if(data.type == 3) - return 7; - if(data.type == 4) - return 8; - if(data.type == 5) - return 9; - if(data.type == 6) - return 10; + if(data == null) + return 0; + if(data.playerTexture && data.type == 0) + return 1; + if(data.type == 0 && data.texture.contains("tail1")) + return 3; + if(data.type == 0 && data.texture.contains("tail2")) + return 4; + if(data.playerTexture && data.type == 1) + return 2; + if(data.type == 1) + return 6; + if(data.type == 2) + return 5; + if(data.type == 3) + return 7; return 0; } @@ -92,15 +71,6 @@ public class GuiModelLegs extends GuiModelInterface{ super.actionPerformed(btn); GuiNpcButton button = (GuiNpcButton) btn; - if(button.id == 8){ - playerdata.legwear = (byte) button.getValue(); - } - if(button.id == 9){ - playerdata.solidLegwear = (byte) button.getValue(); - } - if(button.id == 30){ - playerdata.hideLegs = (byte) button.getValue(); - } if(button.id == 1){ ModelPartData data = playerdata.legParts; int value = button.getValue() - 1; @@ -114,53 +84,40 @@ public class GuiModelLegs extends GuiModelInterface{ if(value == 3) data.setTexture("legs/horse1", 3); if(value == 4) - if (npc.display.modelType == 1 || npc.display.modelType == 2){ - data.setTexture("legs/naga2", 1); - } - else{ - data.setTexture("legs/naga1", 1); - } + data.setTexture("legs/naga1", 1); if(value == 5) data.setTexture("legs/mermaid1", 4); - if(value == 6) - data.setTexture("legs/mermaid1", 6); - if(value == 7) + if(value == 6) data.setTexture("", 5); initGui(); } - if(button.id == 2){ + if(button.id == 2){ int value = button.getValue(); - if(value == 0) - playerdata.removePart("tail"); - else{ - ModelPartData data = playerdata.getOrCreatePart("tail"); - if(value == 1) - data.setTexture("", 0); - if(value == 2) - data.setTexture("", 1); - if(value == 3) - data.setTexture("tail/tail1", 0); - if(value == 4) - data.setTexture("tail/tail2", 0); - if(value == 5) - data.setTexture("tail/horse1", 2); - if(value == 6) - data.setTexture("tail/dragon1", 1); - if(value == 7) - data.setTexture("tail/squirrel1", 3); - if(value == 8) - data.setTexture("tail/fin1", 4); - if(value == 9) - data.setTexture("tail/rodent1", 5); - if(value == 10) - data.setTexture("tail/feather1", 6); - - } - initGui(); - } + if(value == 0) + playerdata.removePart("tail"); + else{ + ModelPartData data = playerdata.getOrCreatePart("tail"); + if(value == 1) + data.setTexture("", 0); + if(value == 2) + data.setTexture("", 1); + if(value == 3) + data.setTexture("tail/tail1", 0); + if(value == 4) + data.setTexture("tail/tail2", 0); + if(value == 5) + data.setTexture("tail/horse1", 2); + if(value == 6) + data.setTexture("tail/dragon1", 1); + if(value == 7) + data.setTexture("tail/squirrel1", 3); + + } + initGui(); + } if(button.id == 11){ this.mc.displayGuiScreen(new GuiModelColor(this, playerdata.legParts, npc)); } diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java index b13824472..805bcb1a4 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java @@ -15,11 +15,6 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{ private GuiScreen parent; private int type = 0; - - private GuiNpcSlider scaleWidth; - private GuiNpcSlider scaleHeight; - private GuiNpcSlider scaleDepth; - public GuiModelScale(GuiScreen parent, ModelData data, EntityCustomNpc npc){ super(npc); this.parent = parent; @@ -72,69 +67,29 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{ addButton(new GuiNpcButton(3, guiLeft + 110, y , 60, 20, "Edit")); y += 24; } + } private void drawSlider(int y, ModelPartConfig config){ y += 15; - addLabel(new GuiNpcLabel(10, "Width", guiLeft - 25, y + 5, 0xFFFFFF)); - scaleWidth = new GuiNpcSlider(this, 10, guiLeft + 50, y, config.scaleX - 0.5f); - addSlider(scaleWidth); - addButton(new GuiNpcButton(170, guiLeft + 8, y, 40, 20, "Reset")); + addLabel(new GuiNpcLabel(10, "Width", guiLeft, y + 5, 0xFFFFFF)); + addSlider(new GuiNpcSlider(this, 10, guiLeft + 50, y, config.scaleX - 0.5f)); y += 22; - addLabel(new GuiNpcLabel(11, "Height", guiLeft - 25, y + 5, 0xFFFFFF)); - scaleHeight = new GuiNpcSlider(this, 11, guiLeft + 50, y, config.scaleY - 0.5f); - addSlider(scaleHeight); - addButton(new GuiNpcButton(171, guiLeft + 8, y, 40, 20, "Reset")); + addLabel(new GuiNpcLabel(11, "Height", guiLeft, y + 5, 0xFFFFFF)); + addSlider(new GuiNpcSlider(this, 11, guiLeft + 50, y, config.scaleY - 0.5f)); y += 22; - addLabel(new GuiNpcLabel(12, "Depth", guiLeft - 25, y + 5, 0xFFFFFF)); - scaleDepth = new GuiNpcSlider(this, 12, guiLeft + 50, y, config.scaleZ - 0.5f); - addSlider(scaleDepth); - addButton(new GuiNpcButton(172, guiLeft + 8, y, 40, 20, "Reset")); + addLabel(new GuiNpcLabel(12, "Depth", guiLeft, y + 5, 0xFFFFFF)); + addSlider(new GuiNpcSlider(this, 12, guiLeft + 50, y, config.scaleZ - 0.5f)); } @Override protected void actionPerformed(GuiButton btn) { super.actionPerformed(btn); - if(btn.id < 4){ type = btn.id; initGui(); } - else{ - // Resetting Type - ModelPartConfig config = playerdata.head; - if(type == 1) - config = playerdata.body; - else if(type == 2) - config = playerdata.arms; - else if(type == 3) - config = playerdata.legs; - - if(btn.id == 170){ - config.scaleX = 1.0f; - scaleWidth.sliderValue = 0.5f; - int percent = (int) (50 + scaleWidth.sliderValue * 100); - scaleWidth.setString(percent + "%"); - npc.updateHitbox(); - } - else if(btn.id == 171){ - config.scaleY = 1.0f; - scaleHeight.sliderValue = 0.5f; - int percent = (int) (50 + scaleHeight.sliderValue * 100); - scaleHeight.setString(percent + "%"); - npc.updateHitbox(); - } - else if(btn.id == 172){ - config.scaleZ = 1.0f; - scaleDepth.sliderValue = 0.5f; - int percent = (int) (50 + scaleDepth.sliderValue * 100); - scaleDepth.setString(percent + "%"); - npc.updateHitbox(); - } - } - - } @Override diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java index 20740533c..b6864bb1d 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -64,7 +64,6 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose grabMouse(dialog.showWheel); guiTop = (height - ySize); calculateRowHeight(); - this.drawDefaultBackground = dialog.darkenScreen; } public void grabMouse(boolean grab){ diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java index bccb11d4e..369fcd163 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java @@ -240,7 +240,7 @@ public class GuiMailmanWrite extends GuiContainerNPCInterface implements ITextfi */ public void keyTyped(char par1, int par2) { - if(!GuiNpcTextField.isFieldActive() && canEdit) + if(!GuiNpcTextField.isActive() && canEdit) this.keyTypedInBook(par1, par2); else super.keyTyped(par1, par2); diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java index 40a5cc9ae..201b177d9 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java @@ -10,8 +10,10 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; +import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.GuiNpcTextField; @@ -37,35 +39,29 @@ public class GuiNpcQuestTypeKill extends SubGuiInterface implements ITextfieldLi quest = (QuestKill) q.questInterface; - setBackground("largebg.png"); - bgScale = 1.7F; - bgScaleX = 1.1F; - - xSize = 300; - ySize = 300; + setBackground("menubg.png"); + xSize = 356; + ySize = 216; closeOnEsc = true; } public void initGui() { super.initGui(); - - guiTop -= 20; - int i = 0; - addLabel(new GuiNpcLabel(0, "You can fill in npc or player names too", guiLeft + 4, guiTop + 20)); + addLabel(new GuiNpcLabel(0, "You can fill in npc or player names too", guiLeft + 4, guiTop + 50)); for (String name : quest.targets.keySet()) { - this.addTextField(new GuiNpcTextField(i, this, fontRendererObj, guiLeft + 4, guiTop + 40 + i * 22, 180, 20, name)); - this.addTextField(new GuiNpcTextField(i + 12, this, fontRendererObj, guiLeft + 186, guiTop + 40 + i * 22, 24, 20, quest.targets.get(name) + "")); - this.getTextField(i+12).integersOnly = true; - this.getTextField(i+12).setMinMaxDefault(1, Integer.MAX_VALUE, 1); + this.addTextField(new GuiNpcTextField(i, this, fontRendererObj, guiLeft + 4, guiTop + 70 + i * 22, 180, 20, name)); + this.addTextField(new GuiNpcTextField(i + 3, this, fontRendererObj, guiLeft + 186, guiTop + 70 + i * 22, 24, 20, quest.targets.get(name) + "")); + this.getTextField(i+3).numbersOnly = true; + this.getTextField(i+3).setMinMaxDefault(1, Integer.MAX_VALUE, 1); i++; } - for(;i < 12; i++){ - this.addTextField(new GuiNpcTextField(i, this, fontRendererObj, guiLeft + 4, guiTop + 40 + i * 22, 180, 20, "")); - this.addTextField(new GuiNpcTextField(i + 12, this, fontRendererObj, guiLeft + 186, guiTop + 40 + i * 22, 24, 20, "1")); - this.getTextField(i+12).integersOnly = true; - this.getTextField(i+12).setMinMaxDefault(1, Integer.MAX_VALUE, 1); + for(;i < 3; i++){ + this.addTextField(new GuiNpcTextField(i, this, fontRendererObj, guiLeft + 4, guiTop + 70 + i * 22, 180, 20, "")); + this.addTextField(new GuiNpcTextField(i + 3, this, fontRendererObj, guiLeft + 186, guiTop + 70 + i * 22, 24, 20, "1")); + this.getTextField(i+3).numbersOnly = true; + this.getTextField(i+3).setMinMaxDefault(1, Integer.MAX_VALUE, 1); } Map data = EntityList.stringToClassMapping; ArrayList list = new ArrayList(); @@ -84,15 +80,11 @@ public class GuiNpcQuestTypeKill extends SubGuiInterface implements ITextfieldLi scroll.setList(list); scroll.setSize(130, 198); scroll.guiLeft = guiLeft + 220; - scroll.guiTop = guiTop + 40; + scroll.guiTop = guiTop + 14; addScroll(scroll); + this.addButton(new GuiNpcButton(0, guiLeft + 4, guiTop + 140, 98, 20, "gui.back")); - guiTop += 50; - this.addButton(new GuiNpcButton(0, guiLeft + 4, guiTop + 300, 98, 20, "gui.back")); - this.addButton(new GuiNpcButton(1, guiLeft + 4, guiTop + 260, 98, 20, new String[]{"Any", "NPCs"}, quest.targetType)); - guiTop -= 50; - - scroll.visible = GuiNpcTextField.isFieldActive(); + scroll.visible = GuiNpcTextField.isActive(); } protected void actionPerformed(GuiButton guibutton) { @@ -100,32 +92,29 @@ public class GuiNpcQuestTypeKill extends SubGuiInterface implements ITextfieldLi if (guibutton.id == 0) { close(); } - if (guibutton.id == 1) { - quest.targetType = guibutton.displayString.equals("NPCs") ? 1 : 0; - } } public void mouseClicked(int i, int j, int k) { super.mouseClicked(i, j, k); - scroll.visible = GuiNpcTextField.isFieldActive(); + scroll.visible = GuiNpcTextField.isActive(); } public void save() { } @Override public void unFocused(GuiNpcTextField guiNpcTextField) { - if(guiNpcTextField.id < 12) + if(guiNpcTextField.id < 3) lastSelected = guiNpcTextField; saveTargets(); } private void saveTargets(){ HashMap map = new HashMap(); - for(int i = 0; i< 12; i++){ + for(int i = 0; i< 3; i++){ String name = getTextField(i).getText(); if(name.isEmpty()) continue; - map.put(name, getTextField(i+12).getInteger()); + map.put(name, getTextField(i+3).getInteger()); } quest.targets = map; } diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java index d79ea5025..3414870fc 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java @@ -39,16 +39,16 @@ public class GuiNpcBard extends GuiNPCInterface2 addLabel(new GuiNpcLabel(2,"bard.ondistance", guiLeft + 60, guiTop + 143)); addTextField(new GuiNpcTextField(2,this, this.fontRendererObj, guiLeft+160, guiTop + 138, 40, 20, job.minRange + "")); - getTextField(2).integersOnly = true; - getTextField(2).setMinMaxDefault(2, Integer.MAX_VALUE, 5); + getTextField(2).numbersOnly = true; + getTextField(2).setMinMaxDefault(2, 64, 5); addLabel(new GuiNpcLabel(4,"bard.hasoff", guiLeft + 60, guiTop + 166)); addButton(new GuiNpcButton(4, guiLeft + 160, guiTop + 161, 60, 20, new String[]{"gui.no","gui.yes"}, job.hasOffRange?1:0)); addLabel(new GuiNpcLabel(3,"bard.offdistance", guiLeft + 60, guiTop + 189)); addTextField(new GuiNpcTextField(3,this, this.fontRendererObj, guiLeft+160, guiTop + 184, 40, 20, job.maxRange + "")); - getTextField(3).integersOnly = true; - getTextField(3).setMinMaxDefault(2, Integer.MAX_VALUE, 10); + getTextField(3).numbersOnly = true; + getTextField(3).setMinMaxDefault(2, 64, 10); getLabel(3).enabled = job.hasOffRange; getTextField(3).enabled = job.hasOffRange; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java index 865965a66..f4d016082 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java @@ -42,7 +42,7 @@ public class GuiNpcCompanion extends GuiNPCInterface2 implements ITextfieldListe addLabel(new GuiNpcLabel(2, "companion.age", guiLeft + 4, y + 5)); if(role.canAge){ addTextField(new GuiNpcTextField(2, this, guiLeft + 162, y, 140, 20, role.ticksActive + "")); - getTextField(2).integersOnly = true; + getTextField(2).numbersOnly = true; getTextField(2).setMinMaxDefault(0, Integer.MAX_VALUE, 0); } diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java index c8f64f800..0ddc3641f 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java @@ -48,19 +48,19 @@ public class GuiNpcConversation extends GuiNPCInterface2 implements ITextfieldLi if(i > 0){ this.addTextField(new GuiNpcTextField(i + 14, this, this.fontRendererObj, guiLeft + 164 + offset, guiTop + 13 + i % 7 * 22, 30, 20, line.delay + "")); - this.getTextField(i + 14).integersOnly = true; + this.getTextField(i + 14).numbersOnly = true; this.getTextField(i + 14).setMinMaxDefault(5, 1000, 40); } } addLabel(new GuiNpcLabel(50, "conversation.delay", guiLeft + 202, guiTop + 175)); addTextField(new GuiNpcTextField(50, this, fontRendererObj, guiLeft + 260, guiTop + 170, 40, 20, job.generalDelay + "")); - getTextField(50).integersOnly = true; - getTextField(50).setMinMaxDefault(10, Integer.MAX_VALUE, 12000); + getTextField(50).numbersOnly = true; + getTextField(50).setMinMaxDefault(10, 1000000, 12000); addLabel(new GuiNpcLabel(54, "gui.range", guiLeft + 202, guiTop + 196)); addTextField(new GuiNpcTextField(54, this, fontRendererObj, guiLeft + 260, guiTop + 191, 40, 20, job.range + "")); - getTextField(54).integersOnly = true; - getTextField(54).setMinMaxDefault(4, Integer.MAX_VALUE, 20); + getTextField(54).numbersOnly = true; + getTextField(54).setMinMaxDefault(4, 60, 20); addLabel(new GuiNpcLabel(51, "quest.quest", guiLeft + 13, guiTop + 175)); String title = job.questTitle; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java index 86ad48590..c63388c9f 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java @@ -37,7 +37,7 @@ public class GuiNpcFollowerSetup extends GuiContainerNPCInterface2 int y = guiTop + 37; y += i * 25; GuiNpcTextField tf = new GuiNpcTextField(i,this, fontRendererObj,x, y, 24, 20, "1"); - tf.integersOnly = true; + tf.numbersOnly = true; tf.setMinMaxDefault(1, Integer.MAX_VALUE, 1); addTextField(tf); } diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java index 615efbd12..3fc26ad1a 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java @@ -24,13 +24,13 @@ public class GuiNpcHealer extends GuiNPCInterface2 addLabel(new GuiNpcLabel(1,"Healing Speed:", guiLeft + 60, guiTop + 110)); addTextField(new GuiNpcTextField(1,this, this.fontRendererObj, guiLeft+130, guiTop + 105, 40, 20, job.speed + "")); - getTextField(1).integersOnly = true; - getTextField(1).setMinMaxDefault(1, Integer.MAX_VALUE, 8); + getTextField(1).numbersOnly = true; + getTextField(1).setMinMaxDefault(1, 10, 8); addLabel(new GuiNpcLabel(2,"Range:", guiLeft + 60, guiTop + 133)); addTextField(new GuiNpcTextField(2,this, this.fontRendererObj, guiLeft+130, guiTop + 128, 40, 20, job.range + "")); - getTextField(2).integersOnly = true; - getTextField(2).setMinMaxDefault(2, Integer.MAX_VALUE, 5); + getTextField(2).numbersOnly = true; + getTextField(2).setMinMaxDefault(2, 20, 5); } @Override diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java index cd51ccc11..c5d855632 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcItemGiver.java @@ -34,11 +34,11 @@ public class GuiNpcItemGiver extends GuiContainerNPCInterface2 this.addButton(new GuiNpcButton(1, guiLeft + 6, guiTop + 29, 140,20, new String[]{"Timer","Give Only Once","Daily"},role.cooldownType)); addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft + 55, guiTop + 54, 90, 20, role.cooldown + "")); - getTextField(0).integersOnly = true; + getTextField(0).numbersOnly = true; addLabel(new GuiNpcLabel(0,"Cooldown:", guiLeft + 6, guiTop + 59)); addLabel(new GuiNpcLabel(1,"Items to give", guiLeft + 46, guiTop + 79)); - getTextField(0).integersOnly = true; + getTextField(0).numbersOnly = true; int i = 0; for(String line : role.lines){ diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcPuppet.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcPuppet.java index 7b04d2970..573a6d1ca 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcPuppet.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcPuppet.java @@ -22,10 +22,6 @@ public class GuiNpcPuppet extends GuiModelInterface implements ISliderListener{ private int type = 6; private JobPuppet job; private PartConfig part; - - private GuiNpcSlider rotateX; - private GuiNpcSlider rotateY; - private GuiNpcSlider rotateZ; public GuiNpcPuppet(GuiScreen parent, EntityCustomNpc npc){ super(npc); @@ -122,20 +118,14 @@ public class GuiNpcPuppet extends GuiModelInterface implements ISliderListener{ addButton(new GuiNpcButton(29, guiLeft + 100, y , 80, 20, new String[]{"gui.enabled","gui.disabled"}, config.disabled?1:0)); y += 22; addLabel(new GuiNpcLabel(10, "X", guiLeft, y + 5, 0xFFFFFF)); - rotateX = new GuiNpcSlider(this, 10, guiLeft + 50, y, config.rotationX + 0.5f); - addSlider(rotateX); - addButton(new GuiNpcButton(170, guiLeft + 8, y, 40, 20, "Reset")); + addSlider(new GuiNpcSlider(this, 10, guiLeft + 50, y, config.rotationX + 0.5f)); y += 22; addLabel(new GuiNpcLabel(11, "Y", guiLeft, y + 5, 0xFFFFFF)); - rotateY = new GuiNpcSlider(this, 11, guiLeft + 50, y, config.rotationY + 0.5f); - addSlider(rotateY); - addButton(new GuiNpcButton(171, guiLeft + 8, y, 40, 20, "Reset")); + addSlider(new GuiNpcSlider(this, 11, guiLeft + 50, y, config.rotationY + 0.5f)); y += 22; addLabel(new GuiNpcLabel(12, "Z", guiLeft, y + 5, 0xFFFFFF)); - rotateZ = new GuiNpcSlider(this, 12, guiLeft + 50, y, config.rotationZ + 0.5f); - addSlider(rotateZ); - addButton(new GuiNpcButton(172, guiLeft + 8, y, 40, 20, "Reset")); - } + addSlider(new GuiNpcSlider(this, 12, guiLeft + 50, y, config.rotationZ + 0.5f)); + } @Override @@ -161,29 +151,6 @@ public class GuiNpcPuppet extends GuiModelInterface implements ISliderListener{ if(btn.id == 32){ job.whileAttacking = button.getValue() == 0; } - if(btn.id == 170 || btn.id == 171 || btn.id == 172){ - if(btn.id == 170){ - System.out.println(part.rotationX); - System.out.println(rotateX.sliderValue); - part.rotationX = 0.0f; - rotateX.sliderValue = 0.5f; - int percent = (int) ((rotateX.sliderValue) * 360); - rotateX.setString(percent + "%"); - } - else if(btn.id == 171){ - part.rotationY = 0.0f; - rotateY.sliderValue = 0.5f; - int percent = (int) ((rotateY.sliderValue) * 360); - rotateY.setString(percent + "%"); - } - else{ - part.rotationZ = 0.0f; - rotateZ.sliderValue = 0.5f; - int percent = (int) ((rotateZ.sliderValue) * 360); - rotateZ.setString(percent + "%"); - } - npc.updateHitbox(); - } } @Override diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java index 376288e50..9e7170d7b 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java @@ -5,6 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.Client; import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector; +import noppes.npcs.client.gui.GuiNpcSoundSelection; import noppes.npcs.client.gui.util.GuiNPCInterface2; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; @@ -81,15 +82,15 @@ public class GuiNpcSpawner extends GuiNPCInterface2 implements ITextfieldListene y += 23; addLabel(new GuiNpcLabel(7,StatCollector.translateToLocal("spawner.posoffset")+" X:", guiLeft + 4, y + 5)); addTextField(new GuiNpcTextField(7,this, fontRendererObj, guiLeft + 99, y, 24, 20, job.xOffset + "")); - getTextField(7).integersOnly = true; + getTextField(7).numbersOnly = true; getTextField(7).setMinMaxDefault(-9, 9, 0); addLabel(new GuiNpcLabel(8,"Y:", guiLeft + 125, y + 5)); addTextField(new GuiNpcTextField(8,this, fontRendererObj, guiLeft + 135, y, 24, 20, job.yOffset + "")); - getTextField(8).integersOnly = true; + getTextField(8).numbersOnly = true; getTextField(8).setMinMaxDefault(-9, 9, 0); addLabel(new GuiNpcLabel(9,"Z:", guiLeft + 161, y + 5)); addTextField(new GuiNpcTextField(9,this, fontRendererObj, guiLeft + 171, y, 24, 20, job.zOffset + "")); - getTextField(9).integersOnly = true; + getTextField(9).numbersOnly = true; getTextField(9).setMinMaxDefault(-9, 9, 0); y += 23; diff --git a/src/main/java/noppes/npcs/client/gui/script/EventGuiScriptList.java b/src/main/java/noppes/npcs/client/gui/script/EventGuiScriptList.java deleted file mode 100644 index e3ee8d057..000000000 --- a/src/main/java/noppes/npcs/client/gui/script/EventGuiScriptList.java +++ /dev/null @@ -1,111 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.client.gui.script; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import net.minecraft.client.gui.GuiButton; -import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.client.gui.util.GuiCustomScroll; -import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.client.gui.util.GuiNpcLabel; -import noppes.npcs.client.gui.util.SubGuiInterface; - -public class EventGuiScriptList extends SubGuiInterface { - private GuiCustomScroll scroll1; - private GuiCustomScroll scroll2; - private ScriptContainer container; - private List scripts; - - public EventGuiScriptList(List scripts, ScriptContainer container) { - this.container = container; - this.setBackground("menubg.png"); - this.xSize = 346; - this.ySize = 216; - if(scripts == null) { - scripts = new ArrayList(); - } - - this.scripts = (List)scripts; - } - - public void initGui() { - super.initGui(); - if(this.scroll1 == null) { - this.scroll1 = new GuiCustomScroll(this, 0); - this.scroll1.setSize(140, 180); - } - - this.scroll1.guiLeft = this.guiLeft + 4; - this.scroll1.guiTop = this.guiTop + 14; - this.addScroll(this.scroll1); - this.addLabel(new GuiNpcLabel(1, "script.availableScripts", this.guiLeft + 4, this.guiTop + 4)); - if(this.scroll2 == null) { - this.scroll2 = new GuiCustomScroll(this, 1); - this.scroll2.setSize(140, 180); - } - - this.scroll2.guiLeft = this.guiLeft + 200; - this.scroll2.guiTop = this.guiTop + 14; - this.addScroll(this.scroll2); - this.addLabel(new GuiNpcLabel(2, "script.loadedScripts", this.guiLeft + 200, this.guiTop + 4)); - ArrayList temp = new ArrayList(this.scripts); - temp.removeAll(this.container.scripts); - this.scroll1.setList(temp); - this.scroll2.setList(this.container.scripts); - this.addButton(new GuiNpcButton(1, this.guiLeft + 145, this.guiTop + 40, 55, 20, ">")); - this.addButton(new GuiNpcButton(2, this.guiLeft + 145, this.guiTop + 62, 55, 20, "<")); - this.addButton(new GuiNpcButton(3, this.guiLeft + 145, this.guiTop + 90, 55, 20, ">>")); - this.addButton(new GuiNpcButton(4, this.guiLeft + 145, this.guiTop + 112, 55, 20, "<<")); - this.addButton(new GuiNpcButton(66, this.guiLeft + 260, this.guiTop + 194, 60, 20, "gui.done")); - } - - protected void actionPerformed(GuiButton guibutton) { - GuiNpcButton button = (GuiNpcButton)guibutton; - if(button.id == 1 && this.scroll1.hasSelected()) { - this.container.scripts.add(this.scroll1.getSelected()); - this.scroll1.selected = -1; - this.scroll1.selected = -1; - this.initGui(); - } - - if(button.id == 2 && this.scroll2.hasSelected()) { - this.container.scripts.remove(this.scroll2.getSelected()); - this.scroll2.selected = -1; - this.initGui(); - } - - if(button.id == 3) { - this.container.scripts.clear(); - Iterator var3 = this.scripts.iterator(); - - while(var3.hasNext()) { - String script = (String)var3.next(); - this.container.scripts.add(script); - } - - this.scroll1.selected = -1; - this.scroll1.selected = -1; - this.initGui(); - } - - if(button.id == 4) { - this.container.scripts.clear(); - this.scroll1.selected = -1; - this.scroll1.selected = -1; - this.initGui(); - } - - if(button.id == 66) { - this.close(); - } - - } - - public void save() { - } -} diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java deleted file mode 100644 index de7047c3f..000000000 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java +++ /dev/null @@ -1,31 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.script; - -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.Client; -import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.ForgeDataScript; - -public class GuiScriptForge extends GuiScriptInterface { - private ForgeDataScript script = new ForgeDataScript(); - - public GuiScriptForge() { - this.handler = this.script; - Client.sendData(EnumPacketServer.ScriptForgeGet, new Object[0]); - } - - public void setGuiData(NBTTagCompound compound) { - this.script.readFromNBT(compound); - super.setGuiData(compound); - } - - public void save() { - super.save(); - Client.sendData(EnumPacketServer.ScriptForgeSave, new Object[]{this.script.writeToNBT(new NBTTagCompound())}); - } -} diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptGlobal.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptGlobal.java deleted file mode 100644 index 26bfb2834..000000000 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptGlobal.java +++ /dev/null @@ -1,55 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.script; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.util.GuiNPCInterface; -import noppes.npcs.client.gui.util.GuiNpcButton; -import org.lwjgl.opengl.GL11; - -public class GuiScriptGlobal extends GuiNPCInterface { - private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/smallbg.png"); - - public GuiScriptGlobal() { - this.xSize = 176; - this.ySize = 222; - this.drawDefaultBackground = false; - this.title = ""; - } - - public void initGui() { - super.initGui(); - this.addButton(new GuiNpcButton(0, this.guiLeft + 38, this.guiTop + 20, 100, 20, "Players")); - this.addButton(new GuiNpcButton(1, this.guiLeft + 38, this.guiTop + 50, 100, 20, "Forge")); - } - - public void drawScreen(int i, int j, float f) { - this.drawDefaultBackground(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(this.resource); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); - super.drawScreen(i, j, f); - } - - protected void actionPerformed(GuiButton guibutton) { - if (guibutton.id == 0) { - this.displayGuiScreen(new GuiScriptPlayers()); - } - if (guibutton.id == 1) { - this.displayGuiScreen(new GuiScriptForge()); - } - } - - public void keyTyped(char c, int i) { - if (i == 1 || this.isInventoryKey(i)) { - this.close(); - } - } - - public void save() { - } -} diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java deleted file mode 100644 index dfe0f38d6..000000000 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ /dev/null @@ -1,452 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.client.gui.script; - -import java.io.IOException; -import java.lang.reflect.Modifier; -import java.util.*; -import java.util.Map.Entry; - -import com.google.common.reflect.ClassPath; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiConfirmOpenLink; -import net.minecraft.client.gui.GuiYesNo; -import net.minecraft.client.gui.GuiYesNoCallback; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.event.CommandEvent; -import net.minecraftforge.event.entity.EntityEvent; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.event.world.ChunkDataEvent; -import net.minecraftforge.event.world.ChunkEvent; -import net.minecraftforge.event.world.ChunkWatchEvent; -import net.minecraftforge.event.world.WorldEvent; -import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.NoppesStringUtils; -import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.swing.GuiJTextArea; -import noppes.npcs.client.gui.util.*; -import noppes.npcs.controllers.IScriptHandler; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.ForgeDataScript; -import noppes.npcs.controllers.data.PlayerDataScript; -import org.apache.commons.lang3.StringUtils; - -public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { - private int activeTab = 0; - public IScriptHandler handler; - public Map> languages = new HashMap(); - private int scriptLimit = 1; - - public GuiScriptInterface() { - this.drawDefaultBackground = true; - this.closeOnEsc = true; - this.xSize = 420; - this.setBackground("menubg.png"); - } - - public void initGui() { - //this.xSize = (int)((double)this.width * 0.88D); - this.ySize = (int)((double)this.xSize * 0.56D); - if((double)this.ySize > (double)this.height * 0.95D) { - this.ySize = (int)((double)this.height * 0.95D); - this.xSize = (int)((double)this.ySize / 0.56D); - } - - this.bgScale = (float)this.xSize / 400.0F; - super.initGui(); - this.guiTop += 10; - int yoffset = (int)((double)this.ySize * 0.02D); - GuiMenuTopButton top; - this.addTopButton(top = new GuiMenuTopButton(0, this.guiLeft + 4, this.guiTop - 17, "gui.settings")); - - int topXoffset = 0; - int topYoffset = 0; - for(int ta = 0; ta < this.handler.getScripts().size(); ++ta) { - if(ta%20 == 0 && ta > 0) { - topYoffset -= 20; - topXoffset -= top.width+20*22; - } - this.addTopButton(top = new GuiMenuTopButton(ta + 1, top.xPosition+top.width + topXoffset, top.yPosition + topYoffset, ta + 1 + "")); - topXoffset = 0; - topYoffset = 0; - scriptLimit = ta + 2; - } - - if(this.handler.getScripts().size() < 100) - this.addTopButton(new GuiMenuTopButton(scriptLimit, top.xPosition+top.width, top.yPosition, "+")); - - top = this.getTopButton(this.activeTab); - if(top == null) { - this.activeTab = 0; - top = this.getTopButton(0); - } - - top.active = true; - if(this.activeTab > 0) { - List hookList = new ArrayList(); - - GuiCustomScroll hooks = new GuiCustomScroll(this, 1); - hooks.allowUserInput = false; - hooks.setSize(108, 198); - hooks.guiLeft = guiLeft - 110; - hooks.guiTop = guiTop + 14; - - if(handler instanceof PlayerDataScript) { - hookList.add("init"); - hookList.add("tick"); - hookList.add("interact"); - hookList.add("damagedEntity"); - hookList.add("damaged"); - hookList.add("kills"); - hookList.add("killed"); - hookList.add("drop"); - hookList.add("respawn"); - hookList.add("breakBlock"); - hookList.add("chat"); - hookList.add("login"); - hookList.add("logout"); - hookList.add("keyPressed"); - hookList.add("mouseClicked"); - hookList.add("toss"); - hookList.add("pickUp"); - hookList.add("pickupXP"); - hookList.add("rangedCharge"); - hookList.add("rangedLaunched"); - hookList.add("timer"); - hookList.add("startItem"); - hookList.add("usingItem"); - hookList.add("stopItem"); - hookList.add("finishItem"); - hookList.add("containerOpen"); - hookList.add("useHoe"); - hookList.add("bonemeal"); - hookList.add("fillBucket"); - hookList.add("jump"); - hookList.add("fall"); - hookList.add("wakeUp"); - hookList.add("sleep"); - hookList.add("playSound"); - hookList.add("lightning"); - hookList.add("changedDim"); - hookList.add("questStart"); - hookList.add("questCompleted"); - hookList.add("questTurnIn"); - hookList.add("factionPoints"); - hookList.add("dialogOpen"); - hookList.add("dialogOption"); - hookList.add("dialogClose"); - hookList.add("customGuiClosed"); - hookList.add("customGuiButton"); - hookList.add("customGuiSlot"); - hookList.add("customGuiScroll"); - hookList.add("customGuiTextfield"); - } - else if(handler instanceof ForgeDataScript) { - hooks.setSize(238, 198); - hooks.guiLeft = guiLeft - 240; - - hookList.add("init"); - - ArrayList list = new ArrayList(); - try { - list.addAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("cpw.mods.fml.common.gameevent")); - list.addAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("net.minecraftforge.event")); - list.removeAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("net.minecraftforge.event.terraingen")); - } catch (IOException e) { - e.printStackTrace(); - } - - for(ClassPath.ClassInfo e1 : list){ - ClassPath.ClassInfo classLoader = e1; - Class infoClass = classLoader.load(); - ArrayList c = new ArrayList(Arrays.asList(infoClass.getDeclaredClasses())); - if(c.isEmpty()) { - c.add(infoClass); - } - Iterator var10 = c.iterator(); - while(var10.hasNext()) { - Class c1 = (Class) var10.next(); - if(!EntityEvent.EntityConstructing.class.isAssignableFrom(c1) && !WorldEvent.PotentialSpawns.class.isAssignableFrom(c1) && !TickEvent.RenderTickEvent.class.isAssignableFrom(c1) && !TickEvent.ClientTickEvent.class.isAssignableFrom(c1) && !FMLNetworkEvent.ClientCustomPacketEvent.class.isAssignableFrom(c1) && !ItemTooltipEvent.class.isAssignableFrom(c1) && Event.class.isAssignableFrom(c1) && !Modifier.isAbstract(c1.getModifiers()) && Modifier.isPublic(c1.getModifiers()) && !ChunkEvent.class.isAssignableFrom(c1) && !ChunkWatchEvent.class.isAssignableFrom(c1) && !ChunkDataEvent.class.isAssignableFrom(c1)) { - String eventName = c1.getName(); - int i = eventName.lastIndexOf("."); - eventName = StringUtils.uncapitalize(eventName.substring(i + 1).replace("$", "")); - - hookList.add(eventName); - } - } - } - } - hooks.setUnsortedList(hookList); - addScroll(hooks); - - GuiNpcLabel hookLabel = new GuiNpcLabel(0, "script.hooks", hooks.guiLeft, guiTop + 5); - hookLabel.color = 0xaaaaaa; - addLabel(hookLabel); - - ScriptContainer var7 = (ScriptContainer)this.handler.getScripts().get(this.activeTab - 1); - GuiNpcTextArea left = new GuiNpcTextArea(2, this, this.guiLeft + yoffset, this.guiTop + yoffset, this.xSize - 110 - yoffset, (int)((double)this.ySize * 0.96D) - yoffset * 2, var7 == null?"":var7.script); - this.addTextField(left); - int left1 = this.guiLeft + this.xSize - 104; - this.addButton(new GuiNpcButton(102, left1, this.guiTop + yoffset, 60, 20, "gui.clear")); - this.addButton(new GuiNpcButton(101, left1 + 61, this.guiTop + yoffset, 60, 20, "gui.paste")); - this.addButton(new GuiNpcButton(100, left1, this.guiTop + 21 + yoffset, 60, 20, "gui.copy")); - this.addButton(new GuiNpcButton(105, left1 + 61, this.guiTop + 21 + yoffset, 60, 20, "gui.remove")); - this.addButton(new GuiNpcButton(107, left1, this.guiTop + 66 + yoffset, 80, 20, "script.loadscript")); - GuiCustomScroll scroll = (new GuiCustomScroll(this, 0)).setUnselectable(); - scroll.setSize(100, (int)((double)this.ySize * 0.54D) - yoffset * 2); - scroll.guiLeft = left1; - scroll.guiTop = this.guiTop + 88 + yoffset; - if(var7 != null) { - scroll.setList(var7.scripts); - } - - this.addScroll(scroll); - } else { - GuiNpcTextArea var8 = new GuiNpcTextArea(2, this, this.guiLeft + 4 + yoffset, this.guiTop + 6 + yoffset, this.xSize - 160 - yoffset, (int)((float)this.ySize * 0.92F) - yoffset * 2, this.getConsoleText()); - var8.enabled = false; - this.addTextField(var8); - int var9 = this.guiLeft + this.xSize - 150; - this.addButton(new GuiNpcButton(100, var9, this.guiTop + 125, 60, 20, "gui.copy")); - this.addButton(new GuiNpcButton(102, var9, this.guiTop + 146, 60, 20, "gui.clear")); - this.addLabel(new GuiNpcLabel(1, "script.language", var9, this.guiTop + 15)); - this.addButton(new GuiNpcButton(103, var9 + 60, this.guiTop + 10, 80, 20, (String[])this.languages.keySet().toArray(new String[this.languages.keySet().size()]), this.getScriptIndex())); - this.getButton(103).enabled = this.languages.size() > 0; - this.addLabel(new GuiNpcLabel(2, "gui.enabled", var9, this.guiTop + 36)); - this.addButton(new GuiNpcButton(104, var9 + 60, this.guiTop + 31, 50, 20, new String[]{"gui.no", "gui.yes"}, this.handler.getEnabled()?1:0)); - if(this.player.worldObj.isRemote) { - this.addButton(new GuiNpcButton(106, var9, this.guiTop + 55, 150, 20, "script.openfolder")); - } - - this.addButton(new GuiNpcButton(109, var9, this.guiTop + 78, 80, 20, "gui.website")); - this.addButton(new GuiNpcButton(112, var9 + 81, this.guiTop + 78, 80, 20, "gui.forum")); - this.addButton(new GuiNpcButton(110, var9, this.guiTop + 99, 80, 20, "script.apidoc")); - this.addButton(new GuiNpcButton(111, var9 + 81, this.guiTop + 99, 80, 20, "script.apisrc")); - } - - this.xSize = 420; - this.ySize = 256; - } - - public String previousHookClicked = ""; - @Override - public void customScrollClicked(int i, int j, int k, GuiCustomScroll scroll) { - String hook = scroll.getSelected(); - if(previousHookClicked.equals(hook)){ - String addString = ""; - if(!this.getTextField(2).getText().isEmpty()) - addString += "\n"; - addString += "function "+hook+"(event) {\n \n}\n"; - - this.getTextField(2).setText(this.getTextField(2).getText()+addString); - previousHookClicked = ""; - } else { - previousHookClicked = hook; - } - } - - @Override - public void unFocused(GuiNpcTextField textfield) { - - } - - private String getConsoleText() { - Map map = this.handler.getConsoleText(); - StringBuilder builder = new StringBuilder(); - Iterator var3 = map.entrySet().iterator(); - - while(var3.hasNext()) { - Entry entry = (Entry)var3.next(); - builder.insert(0, new Date((Long)entry.getKey()) + (String)entry.getValue() + "\n"); - } - - return builder.toString(); - } - - private int getScriptIndex() { - int i = 0; - - for(Iterator var2 = this.languages.keySet().iterator(); var2.hasNext(); ++i) { - String language = (String)var2.next(); - if(language.equalsIgnoreCase(this.handler.getLanguage())) { - return i; - } - } - - return 0; - } - - public void confirmClicked(boolean flag, int i) { - if(flag) { - if(i == 0) { - this.openLink("http://www.kodevelopment.nl/minecraft/customnpcs/scripting"); - } - - if(i == 1) { - this.openLink("http://www.kodevelopment.nl/customnpcs/api/"); - } - - if(i == 2) { - this.openLink("http://www.kodevelopment.nl/minecraft/customnpcs/scripting"); - } - - if(i == 3) { - this.openLink("http://www.minecraftforge.net/forum/index.php/board,122.0.html"); - } - - if(i == 10) { - this.handler.getScripts().remove(this.activeTab - 1); - this.activeTab = 0; - } - } - - this.displayGuiScreen(this); - } - - @Override - protected void actionPerformed(GuiButton guibutton) { - if(guibutton.id >= 0 && guibutton.id < scriptLimit) { - this.setScript(); - this.activeTab = guibutton.id; - this.initGui(); - } - - if(guibutton.id == scriptLimit) { - this.handler.getScripts().add(new ScriptContainer(this.handler)); - this.activeTab = this.handler.getScripts().size(); - this.initGui(); - } - - if(guibutton.id == 109) { - this.displayGuiScreen(new GuiConfirmOpenLink(this, "http://www.kodevelopment.nl/minecraft/customnpcs/scripting", 0, true)); - } - - if(guibutton.id == 110) { - this.displayGuiScreen(new GuiConfirmOpenLink(this, "http://www.kodevelopment.nl/customnpcs/api/", 1, true)); - } - - if(guibutton.id == 111) { - this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://github.com/Noppes/CustomNPCsAPI", 2, true)); - } - - if(guibutton.id == 112) { - this.displayGuiScreen(new GuiConfirmOpenLink(this, "http://www.minecraftforge.net/forum/index.php/board,122.0.html", 3, true)); - } - - if(guibutton.id == 100) { - NoppesStringUtils.setClipboardContents((this.getTextField(2)).getText()); - } - - if(guibutton.id == 101) { - (this.getTextField(2)).setText(NoppesStringUtils.getClipboardContents()); - } - - ScriptContainer container; - if(guibutton.id == 102) { - if(this.activeTab > 0) { - container = (ScriptContainer)this.handler.getScripts().get(this.activeTab - 1); - container.script = ""; - } else { - this.handler.clearConsole(); - } - - this.initGui(); - } - - if(guibutton.id == 103) { - this.handler.setLanguage(((GuiNpcButton)guibutton).displayString); - } - - if(guibutton.id == 104) { - this.handler.setEnabled((((GuiNpcButton)guibutton).getValue() == 1)); - } - - if(guibutton.id == 105) { - GuiYesNo container1 = new GuiYesNo(this, "", ((GuiNpcButton)guibutton).displayString, 10); - this.displayGuiScreen(container1); - } - - if(guibutton.id == 106) { - NoppesUtil.openFolder(ScriptController.Instance.dir); - } - - if(guibutton.id == 107) { - container = (ScriptContainer)this.handler.getScripts().get(this.activeTab - 1); - if(container == null) { - this.handler.getScripts().add(container = new ScriptContainer(this.handler)); - } - - this.setSubGui(new EventGuiScriptList((List)this.languages.get(this.handler.getLanguage()), container)); - } - - if(guibutton.id == 108) { - container = (ScriptContainer)this.handler.getScripts().get(this.activeTab - 1); - if(container != null) { - this.setScript(); - this.AWTWindow = new GuiJTextArea(container.script).setListener(this); - } - } - - } - - private void setScript() { - if(this.activeTab > 0) { - ScriptContainer container = (ScriptContainer)this.handler.getScripts().get(this.activeTab - 1); - if(container == null) { - this.handler.getScripts().add(container = new ScriptContainer(this.handler)); - } - - String text = (this.getTextField(2)).getText(); - text = text.replace("\r\n", "\n"); - text = text.replace("\r", "\n"); - container.script = text; - } - - } - - public void setGuiData(NBTTagCompound compound) { - NBTTagList data = compound.getTagList("Languages", 10); - HashMap languages = new HashMap(); - - for(int i = 0; i < data.tagCount(); ++i) { - NBTTagCompound comp = data.getCompoundTagAt(i); - ArrayList scripts = new ArrayList(); - NBTTagList list = comp.getTagList("Scripts", 8); - - for(int j = 0; j < list.tagCount(); ++j) { - scripts.add(list.getStringTagAt(j)); - } - - languages.put(comp.getString("Language"), scripts); - } - - this.languages = languages; - this.initGui(); - } - - public void save() { - this.setScript(); - } - - public void textUpdate(String text) { - ScriptContainer container = (ScriptContainer)this.handler.getScripts().get(this.activeTab - 1); - if(container != null) { - container.script = text; - } - - } - - @Override - public void saveText(String text) { - ScriptContainer container = handler.getScripts().get(activeTab); - if(container != null) - container.script = text; - initGui(); - } -} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java deleted file mode 100644 index 1637260f8..000000000 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java +++ /dev/null @@ -1,37 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.script; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.Client; -import noppes.npcs.constants.EnumPacketServer; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.PlayerDataScript; - -public class GuiScriptPlayers extends GuiScriptInterface { - private PlayerDataScript script = new PlayerDataScript((EntityPlayer)null); - - public GuiScriptPlayers() { - this.handler = this.script; - Client.sendData(EnumPacketServer.ScriptPlayerGet, new Object[0]); - } - - public void setGuiData(NBTTagCompound compound) { - this.script.readFromNBT(compound); - super.setGuiData(compound); - } - - public void save() { - super.save(); - Client.sendData(EnumPacketServer.ScriptPlayerSave, new Object[]{this.script.writeToNBT(new NBTTagCompound())}); - } - - public void close() { - super.close(); - ScriptController.Instance.playerScripts.errored.clear(); - } -} diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java index 236556aa3..dbfa56b76 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiContainerNPCInterface.java @@ -109,7 +109,7 @@ public abstract class GuiContainerNPCInterface extends GuiContainer for(GuiNpcTextField tf : new ArrayList(textfields.values())) tf.textboxKeyTyped(c, i); - if (closeOnEsc && (i == 1 || i == mc.gameSettings.keyBindInventory.getKeyCode() && !GuiNpcTextField.isFieldActive())) + if (closeOnEsc && (i == 1 || i == mc.gameSettings.keyBindInventory.getKeyCode() && !GuiNpcTextField.isActive())) close(); } } diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java index f29428838..f567c7043 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java @@ -20,7 +20,7 @@ public class GuiCustomScroll extends GuiScreen public int id; public int guiLeft = 0; public int guiTop = 0; - public int xSize, ySize; + private int xSize, ySize; public int selected; private HashSet selectedList; private int hover; @@ -280,7 +280,4 @@ public class GuiCustomScroll extends GuiScreen return this; } - public boolean isMouseOver(int x, int y) { - return x >= this.guiLeft && x <= this.guiLeft + this.xSize && y >= this.guiTop && y <= this.guiTop + this.ySize; - } } diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java index 1e896158f..9adce5233 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java @@ -45,10 +45,7 @@ public abstract class GuiNPCInterface extends GuiScreen public int mouseX, mouseY; public float bgScale = 1; - public float bgScaleX = 1; - public float bgScaleY = 1; - public float bgScaleZ = 1; - + public GuiNPCInterface(EntityNPCInterface npc) { this.player = Minecraft.getMinecraft().thePlayer; @@ -105,7 +102,7 @@ public abstract class GuiNPCInterface extends GuiScreen gui.setWorldAndResolution(mc, 350, 250); extra.put(gui.id, gui); } - + public void mouseClicked(int i, int j, int k) { if(AWTWindow != null) @@ -147,7 +144,7 @@ public abstract class GuiNPCInterface extends GuiScreen for(GuiNpcTextField tf : textfields.values()) tf.textboxKeyTyped(c, i); - if (closeOnEsc && (i == 1 || !GuiNpcTextField.isFieldActive() && isInventoryKey(i))){ + if (closeOnEsc && (i == 1 || !GuiNpcTextField.isActive() && isInventoryKey(i))){ close(); } } @@ -205,11 +202,11 @@ public abstract class GuiNPCInterface extends GuiScreen scrolls.put(scroll.id, scroll); } public GuiCustomScroll getScroll(int id){ - return scrolls.get(id); + return scrolls.get(id); } - + public abstract void save(); - + @Override public void drawScreen(int i, int j, float f){ if(AWTWindow != null){ @@ -226,12 +223,12 @@ public abstract class GuiNPCInterface extends GuiScreen mouseY = j; if(drawDefaultBackground && subgui == null) drawDefaultBackground(); - + if(background != null && mc.renderEngine != null){ GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glPushMatrix(); GL11.glTranslatef(guiLeft, guiTop, 0); - GL11.glScalef(bgScale*bgScaleX, bgScale*bgScaleY, bgScale*bgScaleZ); + GL11.glScalef(bgScale, bgScale, bgScale); mc.renderEngine.bindTexture(background); if(xSize > 256){ drawTexturedModalRect(0, 0, 0, 0, 250, ySize); diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcSlider.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcSlider.java index ccb0ab861..6e7751aa6 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcSlider.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcSlider.java @@ -23,14 +23,6 @@ public class GuiNpcSlider extends GuiButton { if(parent instanceof ISliderListener) listener = (ISliderListener) parent; } - - public GuiNpcSlider(GuiScreen parent, int id, int xPos, int yPos, int width, int height, String displayString, float sliderValue) { - super(id, xPos, yPos, width, height, NoppesStringUtils.translate(displayString)); - this.id = id; - this.sliderValue = sliderValue; - if(parent instanceof ISliderListener) - listener = (ISliderListener) parent; - } public GuiNpcSlider(GuiScreen parent, int id, int xPos, int yPos, float sliderValue) { this(parent, id, xPos, yPos, "", sliderValue); diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java index e7560b25c..07837b115 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextArea.java @@ -15,7 +15,7 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -public class GuiNpcTextArea extends GuiNpcTextField implements IGui{ +public class GuiNpcTextArea extends GuiNpcTextField{ public boolean inMenu = true; public boolean numbersOnly = false; private int posX,posY,width,height; @@ -307,24 +307,4 @@ public class GuiNpcTextArea extends GuiNpcTextField implements IGui{ } drawTexturedModalRect(x, y, width, 11, 5, 1); } - - @Override - public int getID() { - return 0; - } - - @Override - public void drawScreen(int var1, int var2) { - - } - - @Override - public void updateScreen() { - - } - - @Override - public boolean isActive() { - return isFieldActive(); - } } diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextField.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextField.java index 6060d5cea..4aef50d55 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextField.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcTextField.java @@ -8,14 +8,10 @@ import net.minecraft.client.gui.GuiTextField; public class GuiNpcTextField extends GuiTextField{ public boolean enabled = true; public boolean inMenu = true; - public boolean integersOnly = false; - public boolean doublesOnly = false; - public boolean floatsOnly = false; + public boolean numbersOnly = false; private ITextfieldListener listener; public int id; public int min = 0,max = Integer.MAX_VALUE,def = 0; - public double minDouble = 0, maxDouble = Double.MAX_VALUE, defDouble = 0; - public float minFloat = 0, maxFloat = Float.MAX_VALUE, defFloat = 0; private static GuiNpcTextField activeTextfield = null; public boolean canEdit = true; @@ -31,7 +27,7 @@ public class GuiNpcTextField extends GuiTextField{ listener = (ITextfieldListener) parent; } - public static boolean isFieldActive(){ + public static boolean isActive(){ return activeTextfield != null; } @@ -41,7 +37,7 @@ public class GuiNpcTextField extends GuiTextField{ } private boolean charAllowed(char c, int i){ - if(!integersOnly || Character.isDigit(c)) + if(!numbersOnly || Character.isDigit(c)) return true; for(int j : allowedSpecialChars) if(j == i) @@ -65,7 +61,6 @@ public class GuiNpcTextField extends GuiTextField{ public int getInteger(){ return Integer.parseInt(getText()); } - public boolean isInteger(){ try{ Integer.parseInt(getText()); @@ -74,33 +69,6 @@ public class GuiNpcTextField extends GuiTextField{ return false; } } - - public double getDouble(){ - return Double.parseDouble(getText()); - } - - public boolean isDouble() { - try{ - Double.parseDouble(getText()); - return true; - }catch(NumberFormatException e){ - return false; - } - } - - public float getFloat(){ - return Float.parseFloat(getText()); - } - - public boolean isFloat() { - try{ - Float.parseFloat(getText()); - return true; - }catch(NumberFormatException e){ - return false; - } - } - @Override public void mouseClicked(int i, int j, int k){ if(!canEdit) @@ -117,58 +85,30 @@ public class GuiNpcTextField extends GuiTextField{ } public void unFocused(){ - if(integersOnly && !doublesOnly && !floatsOnly){ + if(numbersOnly){ if(isEmpty() || !isInteger()) - setText(def+""); - else if(getInteger() < min) + setText(def + ""); + else if( getInteger() < min) setText(min+""); else if(getInteger() > max) setText(max+""); } - else if(doublesOnly && !floatsOnly){ - if (isEmpty() || !isDouble()) - setText(defDouble + ""); - else if (getDouble() < minDouble) - setText(minDouble + ""); - else if (getDouble() > maxDouble) - setText(maxDouble + ""); - } - else if(floatsOnly){ - if(isEmpty() || !isFloat()) - setText(defFloat +""); - else if(getFloat() < minFloat) - setText(minFloat +""); - else if(getFloat() > maxFloat) - setText(maxFloat +""); - } - if(listener != null) listener.unFocused(this); if(this == activeTextfield) activeTextfield = null; } - @Override public void drawTextBox() { if(enabled) super.drawTextBox(); } - public void setMinMaxDefault(int min, int max, int def) { - this.min = min; - this.max = max; - this.def = def; - } - public void setMinMaxDefaultDouble(double min, double max, double def) { - minDouble = min; - maxDouble = max; - defDouble = def; - } - public void setMinMaxDefaultFloat(float min, float max, float def) { - minFloat = min; - maxFloat = max; - defFloat = def; + public void setMinMaxDefault(int i, int j, int k) { + min = i; + max = j; + def = k; } public static void unfocus() { GuiNpcTextField prev = activeTextfield; @@ -182,17 +122,8 @@ public class GuiNpcTextField extends GuiTextField{ drawTextBox(); } - public GuiNpcTextField setIntegersOnly() { - integersOnly = true; - return this; - } - - public GuiNpcTextField setDoublesOnly() { - doublesOnly = true; - return this; - } - public GuiNpcTextField setFloatsOnly() { - floatsOnly = true; + public GuiNpcTextField setNumbersOnly() { + numbersOnly = true; return this; } diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiTextArea.java deleted file mode 100644 index 5103da22e..000000000 --- a/src/main/java/noppes/npcs/client/gui/util/GuiTextArea.java +++ /dev/null @@ -1,473 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.client.gui.util; - -import java.awt.Font; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.regex.Matcher; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.util.ChatAllowedCharacters; -import net.minecraftforge.client.GuiIngameForge; -import noppes.npcs.CustomNpcs; -import noppes.npcs.NoppesStringUtils; -import noppes.npcs.client.gui.util.TextContainer.LineData; -import noppes.npcs.config.TrueTypeFont; -import org.lwjgl.input.Mouse; - -public class GuiTextArea extends Gui implements IGui, IKeyListener, IMouseListener { - public int id; - public int x; - public int y; - public int width; - public int height; - private int cursorCounter; - private ITextChangeListener listener; - private static TrueTypeFont font; - public String text = null; - private TextContainer container = null; - public boolean active = false; - public boolean enabled = true; - public boolean visible = true; - public boolean clicked = false; - public boolean doubleClicked = false; - public boolean clickScrolling = false; - private int startSelection; - private int endSelection; - private int cursorPosition; - private int scrolledLine = 0; - private boolean enableCodeHighlighting = false; - private static final char colorChar = '\uffff'; - public List undoList = new ArrayList(); - public List redoList = new ArrayList(); - public boolean undoing = false; - private long lastClicked = 0L; - - public GuiTextArea(int id, int x, int y, int width, int height, String text) { - this.id = id; - this.x = x; - this.y = y; - this.width = width; - this.height = height; - this.undoing = true; - this.setText(text); - this.undoing = false; - font.setSpecial('\uffff'); - } - - public void drawScreen(int xMouse, int yMouse) { - if(this.visible) { - drawRect(this.x - 1, this.y - 1, this.x + this.width + 1, this.y + this.height + 1, -6250336); - drawRect(this.x, this.y, this.x + this.width, this.y + this.height, -16777216); - this.container.visibleLines = this.height / this.container.lineHeight; - int startBracket; - if(this.clicked) { - this.clicked = Mouse.isButtonDown(0); - startBracket = this.getSelectionPos(xMouse, yMouse); - if(startBracket != this.cursorPosition) { - if(this.doubleClicked) { - this.startSelection = this.endSelection = this.cursorPosition; - this.doubleClicked = false; - } - - this.setCursor(startBracket, true); - } - } else if(this.doubleClicked) { - this.doubleClicked = false; - } - - if(this.clickScrolling) { - this.clickScrolling = Mouse.isButtonDown(0); - startBracket = this.container.linesCount - this.container.visibleLines; - this.scrolledLine = Math.min(Math.max((int)(1.0F * (float)startBracket * (float)(yMouse - this.y) / (float)this.height), 0), startBracket); - } - - startBracket = 0; - int endBracket = 0; - if(this.endSelection - this.startSelection == 1 || this.startSelection == this.endSelection && this.startSelection < this.text.length()) { - char list = this.text.charAt(this.startSelection); - int wordHightLight = 0; - if(list == 123) { - wordHightLight = this.findClosingBracket(this.text.substring(this.startSelection), '{', '}'); - } else if(list == 91) { - wordHightLight = this.findClosingBracket(this.text.substring(this.startSelection), '[', ']'); - } else if(list == 40) { - wordHightLight = this.findClosingBracket(this.text.substring(this.startSelection), '(', ')'); - } else if(list == 125) { - wordHightLight = this.findOpeningBracket(this.text.substring(0, this.startSelection + 1), '{', '}'); - } else if(list == 93) { - wordHightLight = this.findOpeningBracket(this.text.substring(0, this.startSelection + 1), '[', ']'); - } else if(list == 41) { - wordHightLight = this.findOpeningBracket(this.text.substring(0, this.startSelection + 1), '(', ')'); - } - - if(wordHightLight != 0) { - startBracket = this.startSelection; - endBracket = this.startSelection + wordHightLight; - } - } - - ArrayList var15 = new ArrayList(this.container.lines); - String var18 = null; - if(this.startSelection != this.endSelection) { - Matcher sbSize = this.container.regexWord.matcher(this.text); - - while(sbSize.find()) { - if(sbSize.start() == this.startSelection && sbSize.end() == this.endSelection) { - var18 = this.text.substring(this.startSelection, this.endSelection); - } - } - } - - int var16; - for(var16 = 0; var16 < var15.size(); ++var16) { - LineData posX = (LineData)var15.get(var16); - String posY = posX.text; - int w = posY.length(); - int yPos; - int posX1; - int posY1; - if(startBracket != endBracket) { - if(startBracket >= posX.start && startBracket < posX.end) { - yPos = font.width(posY.substring(0, startBracket - posX.start)); - posX1 = font.width(posY.substring(0, startBracket - posX.start + 1)) + 1; - posY1 = this.y + 1 + (var16 - this.scrolledLine) * this.container.lineHeight; - drawRect(this.x + 1 + yPos, posY1, this.x + 1 + posX1, posY1 + this.container.lineHeight + 1, -1728001024); - } - - if(endBracket >= posX.start && endBracket < posX.end) { - yPos = font.width(posY.substring(0, endBracket - posX.start)); - posX1 = font.width(posY.substring(0, endBracket - posX.start + 1)) + 1; - posY1 = this.y + 1 + (var16 - this.scrolledLine) * this.container.lineHeight; - drawRect(this.x + 1 + yPos, posY1, this.x + 1 + posX1, posY1 + this.container.lineHeight + 1, -1728001024); - } - } - - if(var16 >= this.scrolledLine && var16 < this.scrolledLine + this.container.visibleLines) { - if(var18 != null) { - Matcher var20 = this.container.regexWord.matcher(posY); - - while(var20.find()) { - if(posY.substring(var20.start(), var20.end()).equals(var18)) { - posX1 = font.width(posY.substring(0, var20.start())); - posY1 = font.width(posY.substring(0, var20.end())) + 1; - int posY2 = this.y + 1 + (var16 - this.scrolledLine) * this.container.lineHeight; - drawRect(this.x + 1 + posX1, posY2, this.x + 1 + posY1, posY2 + this.container.lineHeight + 1, -1728033792); - } - } - } - - if(this.startSelection != this.endSelection && this.endSelection > posX.start && this.startSelection <= posX.end && this.startSelection < posX.end) { - yPos = font.width(posY.substring(0, Math.max(this.startSelection - posX.start, 0))); - posX1 = font.width(posY.substring(0, Math.min(this.endSelection - posX.start, w))) + 1; - posY1 = this.y + 1 + (var16 - this.scrolledLine) * this.container.lineHeight; - drawRect(this.x + 1 + yPos, posY1, this.x + 1 + posX1, posY1 + this.container.lineHeight + 1, -1728052993); - } - - yPos = this.y + (var16 - this.scrolledLine) * this.container.lineHeight + 1; - font.draw(posX.getFormattedString(), (float)(this.x + 1), (float)yPos, -2039584); - if(this.active && this.isEnabled() && this.cursorCounter / 6 % 2 == 0 && this.cursorPosition >= posX.start && this.cursorPosition < posX.end) { - posX1 = this.x + font.width(posY.substring(0, this.cursorPosition - posX.start)); - drawRect(posX1 + 1, yPos, posX1 + 2, yPos + 1 + this.container.lineHeight, -3092272); - } - } - } - - if(this.hasVerticalScrollbar()) { - Minecraft.getMinecraft().renderEngine.bindTexture(GuiCustomScroll.resource); - - var16 = Math.max((int)(1.0F * (float)this.container.visibleLines / (float)this.container.linesCount * (float)this.height), 2); - int var17 = this.x + this.width - 6; - int var19 = (int)((float)this.y + 1.0F * (float)this.scrolledLine / (float)this.container.linesCount * (float)(this.height - 4)) + 1; - drawRect(var17, var19, var17 + 5, var19 + var16, -2039584); - } - - } - } - - private int findClosingBracket(String str, char s, char e) { - int found = 0; - char[] chars = str.toCharArray(); - - for(int i = 0; i < chars.length; ++i) { - char c = chars[i]; - if(c == s) { - ++found; - } else if(c == e) { - --found; - if(found == 0) { - return i; - } - } - } - - return 0; - } - - private int findOpeningBracket(String str, char s, char e) { - int found = 0; - char[] chars = str.toCharArray(); - - for(int i = chars.length - 1; i >= 0; --i) { - char c = chars[i]; - if(c == e) { - ++found; - } else if(c == s) { - --found; - if(found == 0) { - return i - chars.length + 1; - } - } - } - - return 0; - } - - private int getSelectionPos(int xMouse, int yMouse) { - xMouse -= this.x + 1; - yMouse -= this.y + 1; - ArrayList list = new ArrayList(this.container.lines); - - for(int i = 0; i < list.size(); ++i) { - LineData data = (LineData)list.get(i); - if(i >= this.scrolledLine && i < this.scrolledLine + this.container.visibleLines) { - int yPos = (i - this.scrolledLine) * this.container.lineHeight; - if(yMouse >= yPos && yMouse < yPos + this.container.lineHeight) { - int lineWidth = 0; - char[] chars = data.text.toCharArray(); - - for(int j = 1; j <= chars.length; ++j) { - int w = font.width(data.text.substring(0, j)); - if(xMouse < lineWidth + (w - lineWidth) / 2) { - return data.start + j - 1; - } - - lineWidth = w; - } - - return data.end - 1; - } - } - } - - return this.container.text.length(); - } - - public int getID() { - return this.id; - } - - - public void keyTyped(char c, int i) { - if(this.active && this.isEnabled()) { - if(i == 15) { - this.addText(" "); - } - - if(i == 28) { - this.addText(Character.toString('\n') + this.getIndentCurrentLine()); - } - - if(ChatAllowedCharacters.isAllowedCharacter(c)) { - this.addText(Character.toString(c)); - } - } - } - - private String getIndentCurrentLine() { - Iterator var1 = this.container.lines.iterator(); - - LineData data; - do { - if(!var1.hasNext()) { - return ""; - } - - data = (LineData)var1.next(); - } while(this.cursorPosition <= data.start || this.cursorPosition > data.end); - - int i; - for(i = 0; i < data.text.length() && data.text.charAt(i) == 32; ++i) { - ; - } - - return data.text.substring(0, i); - } - - private void setCursor(int i, boolean select) { - i = Math.min(Math.max(i, 0), this.text.length()); - if(i != this.cursorPosition) { - if(!select) { - this.endSelection = this.startSelection = this.cursorPosition = i; - } else { - int diff = this.cursorPosition - i; - if(this.cursorPosition == this.startSelection) { - this.startSelection -= diff; - } else if(this.cursorPosition == this.endSelection) { - this.endSelection -= diff; - } - - if(this.startSelection > this.endSelection) { - int j = this.endSelection; - this.endSelection = this.startSelection; - this.startSelection = j; - } - - this.cursorPosition = i; - } - } - } - - private void addText(String s) { - this.setText(this.getSelectionBeforeText() + s + this.getSelectionAfterText()); - this.endSelection = this.startSelection = this.cursorPosition = this.startSelection + s.length(); - } - - private int cursorUp() { - for(int i = 0; i < this.container.lines.size(); ++i) { - LineData data = (LineData)this.container.lines.get(i); - if(this.cursorPosition >= data.start && this.cursorPosition < data.end) { - if(i == 0) { - return 0; - } - - int var10000 = this.cursorPosition - data.start; - return this.getSelectionPos(this.x + 1 + font.width(data.text.substring(0, this.cursorPosition - data.start)), this.y + 1 + (i - 1 - this.scrolledLine) * this.container.lineHeight); - } - } - - return 0; - } - - private int cursorDown() { - for(int i = 0; i < this.container.lines.size(); ++i) { - LineData data = (LineData)this.container.lines.get(i); - if(this.cursorPosition >= data.start && this.cursorPosition < data.end) { - int var10000 = this.cursorPosition - data.start; - return this.getSelectionPos(this.x + 1 + font.width(data.text.substring(0, this.cursorPosition - data.start)), this.y + 1 + (i + 1 - this.scrolledLine) * this.container.lineHeight); - } - } - - return this.text.length(); - } - - public String getSelectionBeforeText() { - return this.startSelection == 0?"":this.text.substring(0, this.startSelection); - } - - public String getSelectionAfterText() { - return this.text.substring(this.endSelection); - } - - public boolean mouseClicked(int xMouse, int yMouse, int mouseButton) { - this.active = xMouse >= this.x && xMouse < this.x + this.width && yMouse >= this.y && yMouse < this.y + this.height; - if(this.active) { - this.startSelection = this.endSelection = this.cursorPosition = this.getSelectionPos(xMouse, yMouse); - this.clicked = mouseButton == 0; - this.doubleClicked = false; - long time = System.currentTimeMillis(); - if(this.clicked && this.container.linesCount * this.container.lineHeight > this.height && xMouse > this.x + this.width - 8) { - this.clicked = false; - this.clickScrolling = true; - } else if(time - this.lastClicked < 500L) { - this.doubleClicked = true; - Matcher m = this.container.regexWord.matcher(this.text); - - while(m.find()) { - if(this.cursorPosition > m.start() && this.cursorPosition < m.end()) { - this.startSelection = m.start(); - this.endSelection = m.end(); - break; - } - } - } - - this.lastClicked = time; - } - - return this.active; - } - - public void updateScreen() { - ++this.cursorCounter; - int k2 = Mouse.getDWheel(); - if(k2 != 0) { - this.scrolledLine += k2 > 0?-1:1; - this.scrolledLine = Math.max(Math.min(this.scrolledLine, this.container.linesCount - this.height / this.container.lineHeight), 0); - } - - } - - public void setText(String text) { - text = text.replace("\r", ""); - if(this.text == null || !this.text.equals(text)) { - if(this.listener != null) { - this.listener.textUpdate(text); - } - - if(!this.undoing) { - this.undoList.add(new GuiTextArea.UndoData(this.text, this.cursorPosition)); - this.redoList.clear(); - } - - this.text = text; - this.container = new TextContainer(text); - this.container.init(font, this.width, this.height); - if(this.enableCodeHighlighting) { - this.container.formatCodeText(); - } - - if(this.scrolledLine > this.container.linesCount - this.container.visibleLines) { - this.scrolledLine = Math.max(0, this.container.linesCount - this.container.visibleLines); - } - - } - } - - public String getText() { - return this.text; - } - - public boolean isEnabled() { - return this.enabled && this.visible; - } - - public boolean hasVerticalScrollbar() { - return this.container.visibleLines < this.container.linesCount; - } - - public void enableCodeHighlighting() { - this.enableCodeHighlighting = true; - this.container.formatCodeText(); - } - - public void setListener(ITextChangeListener listener) { - this.listener = listener; - } - - public boolean isActive() { - return this.active; - } - - static { - font = new TrueTypeFont(new Font("Arial Unicode MS", 0, CustomNpcs.FontSize), 1.0F); - } - - class UndoData { - public String text; - public int cursorPosition; - - public UndoData(String text, int cursorPosition) { - this.text = text; - this.cursorPosition = cursorPosition; - } - } -} diff --git a/src/main/java/noppes/npcs/client/gui/util/IGui.java b/src/main/java/noppes/npcs/client/gui/util/IGui.java deleted file mode 100644 index cc0d20135..000000000 --- a/src/main/java/noppes/npcs/client/gui/util/IGui.java +++ /dev/null @@ -1,16 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.client.gui.util; - -public interface IGui { - int getID(); - - void drawScreen(int var1, int var2); - - void updateScreen(); - - boolean isActive(); -} diff --git a/src/main/java/noppes/npcs/client/gui/util/IKeyListener.java b/src/main/java/noppes/npcs/client/gui/util/IKeyListener.java deleted file mode 100644 index 643352735..000000000 --- a/src/main/java/noppes/npcs/client/gui/util/IKeyListener.java +++ /dev/null @@ -1,10 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.client.gui.util; - -public interface IKeyListener { - void keyTyped(char var1, int var2); -} diff --git a/src/main/java/noppes/npcs/client/gui/util/IMouseListener.java b/src/main/java/noppes/npcs/client/gui/util/IMouseListener.java deleted file mode 100644 index 7204139b4..000000000 --- a/src/main/java/noppes/npcs/client/gui/util/IMouseListener.java +++ /dev/null @@ -1,10 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.client.gui.util; - -public interface IMouseListener { - boolean mouseClicked(int var1, int var2, int var3); -} diff --git a/src/main/java/noppes/npcs/client/gui/util/ITextChangeListener.java b/src/main/java/noppes/npcs/client/gui/util/ITextChangeListener.java deleted file mode 100644 index 7a5a2d302..000000000 --- a/src/main/java/noppes/npcs/client/gui/util/ITextChangeListener.java +++ /dev/null @@ -1,10 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.client.gui.util; - -public interface ITextChangeListener { - void textUpdate(String var1); -} diff --git a/src/main/java/noppes/npcs/client/gui/util/TextContainer.java b/src/main/java/noppes/npcs/client/gui/util/TextContainer.java deleted file mode 100644 index 8d8fc3b6d..000000000 --- a/src/main/java/noppes/npcs/client/gui/util/TextContainer.java +++ /dev/null @@ -1,225 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.client.gui.util; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import noppes.npcs.config.TrueTypeFont; - -public class TextContainer { - private static final char colorChar = '\uffff'; - private static final Comparator MarkUpComparator = (o1, o2) -> { - return o1.start > o2.start?1:(o1.start < o2.start?-1:0); - }; - public final Pattern regexString = Pattern.compile("([\"\'])(?:(?=(\\\\?))\\2.)*?\\1", 8); - public final Pattern regexFunction = Pattern.compile("\\b(if|else|switch|with|for|while|in|var|const|let|throw|then|function|continue|break|foreach|return|try|catch|finally|do|this|typeof|instanceof|new)(?=[^\\w])"); - public final Pattern regexWord = Pattern.compile("[\\p{L}-]+|\\n|$"); - public final Pattern regexNumber = Pattern.compile("\\b-?(?:0[xX][\\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+|\\d*\\.?\\d+(?:[Ee][+-]?\\d+)?(?:[fFbBdDlLsS])?|NaN|null|Infinity|unidentified|true|false)\\b"); - public final Pattern regexComment = Pattern.compile("\\/\\*[\\s\\S]*?(?:\\*\\/|$)|\\/\\/.*|#.*"); - public String text; - public List makeup = new ArrayList(); - public List lines = new ArrayList(); - private TrueTypeFont font; - public int lineHeight; - public int totalHeight; - public int visibleLines = 1; - public int linesCount; - - public TextContainer(String text) { - this.text = text; - text.replaceAll("\\r?\\n|\\r", "\n"); - double l = 1.0D; - } - - public void init(TrueTypeFont font, int width, int height) { - this.font = font; - this.lineHeight = font.height(this.text); - if(this.lineHeight == 0) { - this.lineHeight = 12; - } - - String[] split = this.text.split("\n"); - int totalChars = 0; - String[] var6 = split; - int var7 = split.length; - - for(int var8 = 0; var8 < var7; ++var8) { - String l = var6[var8]; - StringBuilder line = new StringBuilder(); - Matcher m = this.regexWord.matcher(l); - - for(int i = 0; m.find(); i = m.start()) { - String word = l.substring(i, m.start()); - if(font.width(line + word) > width - 10) { - this.lines.add(new TextContainer.LineData(line.toString(), totalChars, totalChars + line.length())); - totalChars += line.length(); - line = new StringBuilder(); - } - - line.append(word); - } - - this.lines.add(new TextContainer.LineData(line.toString(), totalChars, totalChars + line.length() + 1)); - totalChars += line.length() + 1; - } - - this.linesCount = this.lines.size(); - this.totalHeight = this.linesCount * this.lineHeight; - this.visibleLines = Math.max(height / this.lineHeight, 1); - } - - public void formatCodeText() { - TextContainer.MarkUp markup = null; - - for(int start = 0; (markup = this.getNextMatching(start)) != null; start = markup.end) { - this.makeup.add(markup); - } - - } - - private TextContainer.MarkUp getNextMatching(int start) { - TextContainer.MarkUp markup = null; - String s = this.text.substring(start); - Matcher matcher = this.regexNumber.matcher(s); - if(matcher.find()) { - markup = new TextContainer.MarkUp(matcher.start(), matcher.end(), '6', 0); - } - - matcher = this.regexFunction.matcher(s); - TextContainer.MarkUp markup2; - if(matcher.find()) { - markup2 = new TextContainer.MarkUp(matcher.start(), matcher.end(), '2', 0); - if(this.compareMarkUps(markup, markup2)) { - markup = markup2; - } - } - - matcher = this.regexString.matcher(s); - if(matcher.find()) { - markup2 = new TextContainer.MarkUp(matcher.start(), matcher.end(), '4', 7); - if(this.compareMarkUps(markup, markup2)) { - markup = markup2; - } - } - - matcher = this.regexComment.matcher(s); - if(matcher.find()) { - markup2 = new TextContainer.MarkUp(matcher.start(), matcher.end(), '8', 7); - if(this.compareMarkUps(markup, markup2)) { - markup = markup2; - } - } - - if(markup != null) { - markup.start += start; - markup.end += start; - } - - return markup; - } - - public boolean compareMarkUps(TextContainer.MarkUp mu1, TextContainer.MarkUp mu2) { - return mu1 == null?true:mu1.start > mu2.start; - } - - public void addMakeUp(int start, int end, char c, int level) { - if(this.removeConflictingMarkUp(start, end, level)) { - this.makeup.add(new TextContainer.MarkUp(start, end, c, level)); - } - } - - private boolean removeConflictingMarkUp(int start, int end, int level) { - ArrayList conflicting = new ArrayList(); - Iterator var5 = this.makeup.iterator(); - - while(true) { - TextContainer.MarkUp m; - do { - if(!var5.hasNext()) { - this.makeup.removeAll(conflicting); - return true; - } - - m = (TextContainer.MarkUp)var5.next(); - } while((start < m.start || start > m.end) && (end < m.start || end > m.end) && (start >= m.start || end <= m.start)); - - if(level < m.level || level == m.level && m.start <= start) { - return false; - } - - conflicting.add(m); - } - } - - public String getFormattedString() { - StringBuilder builder = new StringBuilder(this.text); - Iterator var2 = this.makeup.iterator(); - - while(var2.hasNext()) { - TextContainer.MarkUp entry = (TextContainer.MarkUp)var2.next(); - builder.insert(entry.start, Character.toString('\uffff') + Character.toString(entry.c)); - builder.insert(entry.end, Character.toString('\uffff') + Character.toString('r')); - } - - return builder.toString(); - } - - class MarkUp { - public int start; - public int end; - public int level; - public char c; - - public MarkUp(int start, int end, char c, int level) { - this.start = start; - this.end = end; - this.c = c; - this.level = level; - } - } - - class LineData { - public String text; - public int start; - public int end; - - public LineData(String text, int start, int end) { - this.text = text; - this.start = start; - this.end = end; - } - - public String getFormattedString() { - StringBuilder builder = new StringBuilder(this.text); - int found = 0; - Iterator var3 = TextContainer.this.makeup.iterator(); - - while(var3.hasNext()) { - TextContainer.MarkUp entry = (TextContainer.MarkUp)var3.next(); - if(entry.start >= this.start && entry.start < this.end) { - builder.insert(entry.start - this.start + found * 2, Character.toString('\uffff') + Character.toString(entry.c)); - ++found; - } - - if(entry.start < this.start && entry.end > this.start) { - builder.insert(0, Character.toString('\uffff') + Character.toString(entry.c)); - ++found; - } - - if(entry.end >= this.start && entry.end < this.end) { - builder.insert(entry.end - this.start + found * 2, Character.toString('\uffff') + Character.toString('r')); - ++found; - } - } - - return builder.toString(); - } - } -} diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java index c5c50a4d8..405a17de2 100644 --- a/src/main/java/noppes/npcs/client/model/ModelMPM.java +++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java @@ -8,15 +8,24 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MathHelper; -import noppes.npcs.CustomItems; import noppes.npcs.ModelPartConfig; import noppes.npcs.ModelPartData; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.model.animation.AniCrawling; import noppes.npcs.client.model.animation.AniHug; -import noppes.npcs.client.model.part.*; +import noppes.npcs.client.model.part.ModelBeard; +import noppes.npcs.client.model.part.ModelBreasts; +import noppes.npcs.client.model.part.ModelClaws; +import noppes.npcs.client.model.part.ModelEars; +import noppes.npcs.client.model.part.ModelFin; +import noppes.npcs.client.model.part.ModelHair; +import noppes.npcs.client.model.part.ModelHeadwear; +import noppes.npcs.client.model.part.ModelLegs; +import noppes.npcs.client.model.part.ModelMohawk; +import noppes.npcs.client.model.part.ModelSnout; +import noppes.npcs.client.model.part.ModelTail; +import noppes.npcs.client.model.part.ModelWings; import noppes.npcs.client.model.util.ModelPartInterface; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; @@ -35,261 +44,91 @@ public class ModelMPM extends ModelNPCMale{ private ModelPartInterface snout; private ModelPartInterface ears; private ModelPartInterface fin; - private ModelPartInterface skirt; - private ModelPartInterface horns; private ModelPartInterface clawsR; private ModelPartInterface clawsL; - - // New - public ModelRenderer bipedBodywear; - public ModelRenderer bipedRightArmWear; - public ModelRenderer bipedLeftArmwear; - public ModelRenderer bipedRightLegWear; - public ModelRenderer bipedLeftLegWear; - + private ModelLegs legs; private ModelScaleRenderer headwear; - private ModelScaleRenderer bodywear; - private final ModelScaleRenderer solidLeftArmWear; - private final ModelScaleRenderer solidRightArmWear; - private final ModelScaleRenderer solidLeftLegWear; - private final ModelScaleRenderer solidRightLegWear; - private ModelTail tail; public ModelBase entityModel; public EntityLivingBase entity; - + public boolean currentlyPlayerTexture; - + public boolean isArmor; + public float alpha = 1; - // Check Legacy Code for Old Version - - // Updated False = 64x32 Skin - // Steve 64x64 and Alex 64x64 - public ModelMPM(float par1, boolean arms) { - - super(par1, arms); - isArmor = par1 > 0; - float par2 = 0; - - this.bipedCloak = new ModelRenderer(this, 0, 0); - this.bipedCloak.setTextureSize(64,32); - this.bipedCloak.addBox(-5.0F, 0.0F, -1.0F, 10, 16, 1, par1); - - this.bipedEars = new ModelRenderer(this, 24, 0); - this.bipedEars.addBox(-3.0F, -6.0F, -1.0F, 6, 6, 1, par1); - - this.bipedHead = (new ModelScaleRenderer(this, 0, 0)); - this.bipedHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1); - this.bipedHead.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - - this.bipedHeadwear = (new ModelScaleRenderer(this, 32, 0)); - this.bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1 + 0.5F); - this.bipedHeadwear.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - - this.bipedBody = (new ModelScaleRenderer(this, 16, 16)); - this.bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, par1); - this.bipedBody.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - - // New Extension - this.bipedBodywear = (new ModelScaleRenderer(this, 16, 32)); - this.bipedBodywear.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, par1 + 0.5F); - this.bipedBody.addChild(this.bipedBodywear); - // this.bipedBodywear.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - - // Steve 64x64 Model or Alex 64x64 Model - if (arms){ - // Alex Version - this.bipedRightArm = (new ModelScaleRenderer(this, 40, 16)); - this.bipedRightArm.addBox(-2.0F, -2.0F, -2.0F, 3, 12, 4, par1); - // this.bipedRightArm.setRotationPoint(-5.0F, 2.5F + par2, 0.0F); - - this.bipedLeftArm = new ModelScaleRenderer(this, 32, 48); - this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 3, 12, 4, par1); - this.bipedLeftArm.setRotationPoint(5.0F, 2.5F + par2, 0.0F); - - this.bipedRightArmWear = (new ModelScaleRenderer(this, 40, 32)); - this.bipedRightArmWear.addBox(-2.0F, -2.0F, -2.0F, 3, 12, 4, par1 + 0.25F); - this.bipedRightArm.addChild(this.bipedRightArmWear); - this.solidRightArmWear = new ModelLimbWear(this,"arm","right"); - this.bipedRightArm.addChild(this.solidRightArmWear); - - this.bipedLeftArmwear = new ModelScaleRenderer(this, 48, 48); - this.bipedLeftArmwear.addBox(-1.0F, -2.0F, -2.0F, 3, 12, 4, par1 + 0.25F); - this.bipedLeftArm.addChild(this.bipedLeftArmwear); - this.solidLeftArmWear = new ModelLimbWear(this,"arm","left"); - this.bipedLeftArm.addChild(this.solidLeftArmWear); - } - else{ - // Steve Version - this.bipedRightArm = (new ModelScaleRenderer(this, 40, 16)); - this.bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, par1); - this.bipedRightArm.setRotationPoint(-5.0F, 2.0F + par2, 0.0F); - - this.bipedLeftArm = new ModelScaleRenderer(this, 32, 48); - this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1); - this.bipedLeftArm.setRotationPoint(5.0F, 2.0F + par2, 0.0F); - - this.bipedRightArmWear = (new ModelScaleRenderer(this, 40, 32)); - this.bipedRightArmWear.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedRightArm.addChild(this.bipedRightArmWear); - this.solidRightArmWear = new ModelLimbWear(this,"arm","right"); - this.bipedRightArm.addChild(this.solidRightArmWear); - - this.bipedLeftArmwear = new ModelScaleRenderer(this, 48, 48); - this.bipedLeftArmwear.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedLeftArm.addChild(this.bipedLeftArmwear); - this.solidLeftArmWear = new ModelLimbWear(this,"arm","left"); - this.bipedLeftArm.addChild(this.solidLeftArmWear); - } - - this.bipedRightLeg = (new ModelScaleRenderer(this, 0, 16)); - this.bipedRightLeg.addBox(-2.08F, 0.0F, -2.0F, 4, 12, 4, par1); - this.bipedRightLeg.setRotationPoint(-1.9F, 12.0F + par2, 0.0F); - - this.bipedLeftLeg = new ModelScaleRenderer(this, 16, 48); - this.bipedLeftLeg.addBox(-1.92F, 0.0F, -2.0F, 4, 12, 4, par1); - this.bipedLeftLeg.setRotationPoint(1.9F, 12.0F + par2, 0.0F); - - this.bipedRightLegWear = (new ModelScaleRenderer(this, 0, 32)); - this.bipedRightLegWear.addBox(-2.08F, 0.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedRightLeg.addChild(this.bipedRightLegWear); - this.solidRightLegWear = new ModelLimbWear(this,"leg","right"); - this.bipedRightLeg.addChild(this.solidRightLegWear); - - this.bipedLeftLegWear = new ModelScaleRenderer(this, 0, 48); - this.bipedLeftLegWear.addBox(-1.92F, 0.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedLeftLeg.addChild(this.bipedLeftLegWear); - this.solidLeftLegWear = new ModelLimbWear(this,"leg","left"); - this.bipedLeftLeg.addChild(this.solidLeftLegWear); - - - headwear = new ModelHeadwear(this); - legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg, 64, 64); - bodywear = new ModelBodywear(this); - - this.bipedBody.addChild(breasts = new ModelBreasts(this, 64, 64)); - if(!isArmor){ - this.bipedHead.addChild(ears = new ModelEars(this)); - this.bipedHead.addChild(mohawk = new ModelMohawk(this)); - this.bipedHead.addChild(hair = new ModelHair(this)); - this.bipedHead.addChild(beard = new ModelBeard(this)); - - // Completed - this.bipedHead.addChild(snout = new ModelSnout(this)); - this.bipedHead.addChild(horns = new ModelHorns(this)); - - // Completed - tail = new ModelTail(this); - - this.bipedBody.addChild(wings = new ModelWings(this)); - this.bipedBody.addChild(fin = new ModelFin(this)); - - // Fix This - this.bipedBody.addChild(skirt = new ModelSkirt(this)); - this.bipedLeftArm.addChild(clawsL = new ModelClaws(this, false)); - this.bipedRightArm.addChild(clawsR = new ModelClaws(this, true)); - } - } - - // Steve 64x32 public ModelMPM(float par1) { - super(par1); isArmor = par1 > 0; float par2 = 0; - - this.bipedCloak = new ModelRenderer(this, 0, 0); - this.bipedCloak.setTextureSize(64,32); - this.bipedCloak.addBox(-5.0F, 0.0F, -1.0F, 10, 16, 1, par1); - - this.bipedEars = new ModelRenderer(this, 24, 0); - this.bipedEars.addBox(-3.0F, -6.0F, -1.0F, 6, 6, 1, par1); - - this.bipedHead = (new ModelScaleRenderer(this, 0, 0)); - this.bipedHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1); - this.bipedHead.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - - this.bipedHeadwear = (new ModelScaleRenderer(this, 32, 0)); - this.bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1 + 0.5F); - this.bipedHeadwear.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - - this.bipedBody = (new ModelScaleRenderer(this, 16, 16)); - this.bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, par1); - this.bipedBody.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - - this.bipedRightArm = new ModelScaleRenderer(this, 40, 16); - this.bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, par1); - this.bipedRightArm.setRotationPoint(-5.0F, 2.0F + par2, 0.0F); - - this.bipedLeftArm = new ModelScaleRenderer(this, 40, 16); - this.bipedLeftArm.mirror = true; - this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1); - this.bipedLeftArm.setRotationPoint(5.0F, 2.0F + par2, 0.0F); - - this.bipedRightLeg = new ModelScaleRenderer(this, 0, 16); - this.bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); - this.bipedRightLeg.setRotationPoint(-1.9F, 12.0F + par2, 0.0F); - - this.bipedLeftLeg = new ModelScaleRenderer(this, 0, 16); - this.bipedLeftLeg.mirror = true; - this.bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); - this.bipedLeftLeg.setRotationPoint(1.9F, 12.0F + par2, 0.0F); - - // Body - this.bipedBodywear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedBody.addChild(this.bipedBodywear); - - // Arms - this.bipedRightArmWear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedRightArm.addChild(this.bipedRightArmWear); - this.solidRightArmWear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedRightArm.addChild(this.solidRightArmWear); - this.bipedLeftArmwear = new ModelScaleRenderer(this, 0, 0); - this.bipedLeftArm.addChild(this.bipedLeftArmwear); - this.solidLeftArmWear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedLeftArm.addChild(this.solidLeftArmWear); - - // Legs - this.bipedRightLegWear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedRightLeg.addChild(this.bipedRightLegWear); - this.solidRightLegWear = new ModelScaleRenderer(this, 0, 0); - this.bipedRightLeg.addChild(this.solidRightLegWear); - this.bipedLeftLegWear = new ModelScaleRenderer(this, 0, 0); - this.bipedLeftLeg.addChild(this.bipedLeftLegWear); - this.solidLeftLegWear = new ModelScaleRenderer(this, 0, 0); - this.bipedLeftLeg.addChild(this.solidLeftLegWear); - - headwear = new ModelHeadwear(this, true); - legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg, 64, 32); - - this.bipedBody.addChild(breasts = new ModelBreasts(this, 64, 32)); + this.bipedCloak = new ModelRenderer(this, 0, 0); + this.bipedCloak.addBox(-5.0F, 0.0F, -1.0F, 10, 16, 1, par1); + this.bipedEars = new ModelRenderer(this, 24, 0); + this.bipedEars.addBox(-3.0F, -6.0F, -1.0F, 6, 6, 1, par1); + this.bipedHead = new ModelScaleRenderer(this, 0, 0); + this.bipedHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1); + this.bipedHead.setRotationPoint(0.0F, 0.0F + par2, 0.0F); + this.bipedHeadwear = new ModelScaleRenderer(this, 32, 0); + this.bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1 + 0.5F); + this.bipedHeadwear.setRotationPoint(0.0F, 0.0F + par2, 0.0F); + this.bipedBody = new ModelScaleRenderer(this, 16, 16); + this.bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, par1); + this.bipedBody.setRotationPoint(0.0F, 0.0F + par2, 0.0F); + this.bipedRightArm = new ModelScaleRenderer(this, 40, 16); + this.bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, par1); + this.bipedRightArm.setRotationPoint(-5.0F, 2.0F + par2, 0.0F); + this.bipedLeftArm = new ModelScaleRenderer(this, 40, 16); + this.bipedLeftArm.mirror = true; + this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1); + this.bipedLeftArm.setRotationPoint(5.0F, 2.0F + par2, 0.0F); + this.bipedRightLeg = new ModelScaleRenderer(this, 0, 16); + this.bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); + this.bipedRightLeg.setRotationPoint(-1.9F, 12.0F + par2, 0.0F); + this.bipedLeftLeg = new ModelScaleRenderer(this, 0, 16); + this.bipedLeftLeg.mirror = true; + this.bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); + this.bipedLeftLeg.setRotationPoint(1.9F, 12.0F + par2, 0.0F); + + headwear = new ModelHeadwear(this); + legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg); + + breasts = new ModelBreasts(this); + this.bipedBody.addChild(breasts); if(!isArmor){ - this.bipedHead.addChild(ears = new ModelEars(this)); - this.bipedHead.addChild(mohawk = new ModelMohawk(this)); - this.bipedHead.addChild(hair = new ModelHair(this)); - this.bipedHead.addChild(beard = new ModelBeard(this)); - - // Completed - this.bipedHead.addChild(snout = new ModelSnout(this)); - this.bipedHead.addChild(horns = new ModelHorns(this)); - - // Completed + ears = new ModelEars(this); + this.bipedHead.addChild(ears); + + mohawk = new ModelMohawk(this); + this.bipedHead.addChild(mohawk); + + hair = new ModelHair(this); + this.bipedHead.addChild(hair); + + beard = new ModelBeard(this); + this.bipedHead.addChild(beard); + + snout = new ModelSnout(this); + this.bipedHead.addChild(snout); + tail = new ModelTail(this); + + wings = new ModelWings(this); + this.bipedBody.addChild(wings); + + fin = new ModelFin(this); + this.bipedBody.addChild(fin); + + clawsL = new ModelClaws(this, false); + this.bipedLeftArm.addChild(clawsL); - this.bipedBody.addChild(wings = new ModelWings(this)); - this.bipedBody.addChild(fin = new ModelFin(this)); - - // Fix This - this.bipedBody.addChild(skirt = new ModelSkirt(this)); - this.bipedLeftArm.addChild(clawsL = new ModelClaws(this, false)); - this.bipedRightArm.addChild(clawsR = new ModelClaws(this, true)); + clawsR = new ModelClaws(this, true); + this.bipedRightArm.addChild(clawsR); } } - + private void setPlayerData(EntityCustomNpc entity){ if(!isArmor){ mohawk.setData(entity.modelData, entity); @@ -302,20 +141,15 @@ public class ModelMPM extends ModelNPCMale{ ears.setData(entity.modelData, entity); clawsL.setData(entity.modelData, entity); clawsR.setData(entity.modelData, entity); - skirt.setData(entity.modelData, entity); - horns.setData(entity.modelData, entity); } breasts.setData(entity.modelData, entity); legs.setData(entity); } - - - @Override - public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7){ - EntityCustomNpc npc = (EntityCustomNpc) par1Entity; - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - if(npc.scriptInvisibleToPlayer(Minecraft.getMinecraft().thePlayer) && (player.getHeldItem() == null || player.getHeldItem().getItem() != CustomItems.wand)) - return; + + + @Override + public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7){ + EntityCustomNpc npc = (EntityCustomNpc) par1Entity; if(entityModel != null){ if(!isArmor){ @@ -333,173 +167,151 @@ public class ModelMPM extends ModelNPCMale{ } } else{ - alpha = npc.isInvisible() && !npc.isInvisibleToPlayer(player) ? 0.15f : 1; + alpha = npc.isInvisible() && !npc.isInvisibleToPlayer(Minecraft.getMinecraft().thePlayer)?0.15f:1; + setPlayerData(npc); + currentlyPlayerTexture = true; + setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); + if(npc.advanced.job == EnumJobType.Puppet){ + JobPuppet job = (JobPuppet) npc.jobInterface; + if(job.isActive()){ + float pi = (float) Math.PI; + + if(!job.head.disabled){ + bipedHeadwear.rotateAngleX = bipedHead.rotateAngleX = job.head.rotationX * pi; + bipedHeadwear.rotateAngleY = bipedHead.rotateAngleY = job.head.rotationY * pi; + bipedHeadwear.rotateAngleZ = bipedHead.rotateAngleZ = job.head.rotationZ * pi; + } - setPlayerData(npc); - currentlyPlayerTexture = true; - setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); - if(npc.advanced.job == EnumJobType.Puppet){ - JobPuppet job = (JobPuppet) npc.jobInterface; - if(job.isActive()){ - float pi = (float) Math.PI; + if(!job.body.disabled){ + bipedBody.rotateAngleX = job.body.rotationX * pi; + bipedBody.rotateAngleY = job.body.rotationY * pi; + bipedBody.rotateAngleZ = job.body.rotationZ * pi; + } - if(!job.head.disabled){ - bipedHeadwear.rotateAngleX = bipedHead.rotateAngleX = job.head.rotationX * pi; - bipedHeadwear.rotateAngleY = bipedHead.rotateAngleY = job.head.rotationY * pi; - bipedHeadwear.rotateAngleZ = bipedHead.rotateAngleZ = job.head.rotationZ * pi; - } + if(!job.larm.disabled){ + bipedLeftArm.rotateAngleX = job.larm.rotationX * pi; + bipedLeftArm.rotateAngleY = job.larm.rotationY * pi; + bipedLeftArm.rotateAngleZ = job.larm.rotationZ * pi; + + if(!npc.display.disableLivingAnimation){ + this.bipedLeftArm.rotateAngleZ -= MathHelper.cos(par3 * 0.09F) * 0.05F + 0.05F; + this.bipedLeftArm.rotateAngleX -= MathHelper.sin(par3 * 0.067F) * 0.05F; + } + } - if(!job.body.disabled){ - bipedBody.rotateAngleX = job.body.rotationX * pi; - bipedBody.rotateAngleY = job.body.rotationY * pi; - bipedBody.rotateAngleZ = job.body.rotationZ * pi; - } + if(!job.rarm.disabled){ + bipedRightArm.rotateAngleX = job.rarm.rotationX * pi; + bipedRightArm.rotateAngleY = job.rarm.rotationY * pi; + bipedRightArm.rotateAngleZ = job.rarm.rotationZ * pi; - if(!job.larm.disabled){ - bipedLeftArm.rotateAngleX = job.larm.rotationX * pi; - bipedLeftArm.rotateAngleY = job.larm.rotationY * pi; - bipedLeftArm.rotateAngleZ = job.larm.rotationZ * pi; + if(!npc.display.disableLivingAnimation){ + this.bipedRightArm.rotateAngleZ += MathHelper.cos(par3 * 0.09F) * 0.05F + 0.05F; + this.bipedRightArm.rotateAngleX += MathHelper.sin(par3 * 0.067F) * 0.05F; + } + } - if(!npc.display.disableLivingAnimation){ - this.bipedLeftArm.rotateAngleZ -= MathHelper.cos(par3 * 0.09F) * 0.05F + 0.05F; - this.bipedLeftArm.rotateAngleX -= MathHelper.sin(par3 * 0.067F) * 0.05F; - } - } + if(!job.rleg.disabled){ + bipedRightLeg.rotateAngleX = job.rleg.rotationX * pi; + bipedRightLeg.rotateAngleY = job.rleg.rotationY * pi; + bipedRightLeg.rotateAngleZ = job.rleg.rotationZ * pi; + } - if(!job.rarm.disabled){ - bipedRightArm.rotateAngleX = job.rarm.rotationX * pi; - bipedRightArm.rotateAngleY = job.rarm.rotationY * pi; - bipedRightArm.rotateAngleZ = job.rarm.rotationZ * pi; - - if(!npc.display.disableLivingAnimation){ - this.bipedRightArm.rotateAngleZ += MathHelper.cos(par3 * 0.09F) * 0.05F + 0.05F; - this.bipedRightArm.rotateAngleX += MathHelper.sin(par3 * 0.067F) * 0.05F; - } - } - - if(!job.rleg.disabled){ - bipedRightLeg.rotateAngleX = job.rleg.rotationX * pi; - bipedRightLeg.rotateAngleY = job.rleg.rotationY * pi; - bipedRightLeg.rotateAngleZ = job.rleg.rotationZ * pi; - } - - if(!job.lleg.disabled){ - bipedLeftLeg.rotateAngleX = job.lleg.rotationX * pi; - bipedLeftLeg.rotateAngleY = job.lleg.rotationY * pi; - bipedLeftLeg.rotateAngleZ = job.lleg.rotationZ * pi; - } - } - } - renderHead(npc, par7); - renderArms(npc, par7,false); - renderBody(npc, par7); - renderLegs(npc, par7); + if(!job.lleg.disabled){ + bipedLeftLeg.rotateAngleX = job.lleg.rotationX * pi; + bipedLeftLeg.rotateAngleY = job.lleg.rotationY * pi; + bipedLeftLeg.rotateAngleZ = job.lleg.rotationZ * pi; + } + } + } + renderHead(npc, par7); + renderArms(npc, par7,false); + renderBody(npc, par7); + renderLegs(npc, par7); } - - } - @Override - public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6, Entity entity) - { - EntityCustomNpc npc = (EntityCustomNpc) entity; + + } + @Override + public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6, Entity entity) + { + EntityCustomNpc npc = (EntityCustomNpc) entity; isRiding = npc.isRiding(); - if(isSneak && (npc.currentAnimation == EnumAnimation.CRAWLING || npc.currentAnimation == EnumAnimation.LYING)) - isSneak = false; - - // Body Rotations - this.bipedBody.rotationPointX = 0; - this.bipedBody.rotationPointY = 0; - this.bipedBody.rotationPointZ = 0; + if(isSneak && (npc.currentAnimation == EnumAnimation.CRAWLING || npc.currentAnimation == EnumAnimation.LYING)) + isSneak = false; + this.bipedBody.rotationPointX = 0; + this.bipedBody.rotationPointY = 0; + this.bipedBody.rotationPointZ = 0; this.bipedBody.rotateAngleX = 0; this.bipedBody.rotateAngleY = 0; this.bipedBody.rotateAngleZ = 0; - - this.bipedBodywear.rotationPointX = 0; - this.bipedBodywear.rotationPointY = 0; - this.bipedBodywear.rotationPointZ = 0; - this.bipedBodywear.rotateAngleX = 0; - this.bipedBodywear.rotateAngleY = 0; - this.bipedBodywear.rotateAngleZ = 0; - - // Head Rotations this.bipedHead.rotateAngleZ = 0; this.bipedHeadwear.rotateAngleZ = 0; - - // Leg Rotations this.bipedLeftLeg.rotateAngleX = 0; this.bipedLeftLeg.rotateAngleY = 0; this.bipedLeftLeg.rotateAngleZ = 0; - this.bipedRightLeg.rotateAngleX = 0; this.bipedRightLeg.rotateAngleY = 0; this.bipedRightLeg.rotateAngleZ = 0; - - // Arm Rotations this.bipedLeftArm.rotationPointY = 2; this.bipedLeftArm.rotationPointZ = 0; - this.bipedRightArm.rotationPointY = 2; this.bipedRightArm.rotationPointZ = 0; - - super.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); + + super.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); if(!isArmor){ - hair.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); - beard.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); - wings.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); - tail.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); - skirt.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); + hair.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); + beard.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); + wings.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); + tail.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); } - legs.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); + legs.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); + + if(isSleeping(entity)){ + if(bipedHead.rotateAngleX < 0){ + bipedHead.rotateAngleX = 0; + bipedHeadwear.rotateAngleX = 0; + } + } + else if(npc.currentAnimation == EnumAnimation.CRY) + bipedHeadwear.rotateAngleX = bipedHead.rotateAngleX = 0.7f; + else if(npc.currentAnimation == EnumAnimation.HUG){ + AniHug.setRotationAngles(par1, par2, par3, par4, par5, par6, entity, this); + } + else if(npc.currentAnimation == EnumAnimation.CRAWLING) + AniCrawling.setRotationAngles(par1, par2, par3, par4, par5, par6, entity, this); + else if(npc.currentAnimation == EnumAnimation.WAVING){ + bipedRightArm.rotateAngleX = -0.1f; + bipedRightArm.rotateAngleY = 0; + bipedRightArm.rotateAngleZ = (float) (Math.PI - 1f - Math.sin(entity.ticksExisted * 0.27f) * 0.5f ); + } + else if(isSneak) + this.bipedBody.rotateAngleX = 0.5F / npc.modelData.body.scaleY; + + + } - if(isSleeping(entity)){ - if(bipedHead.rotateAngleX < 0){ - bipedHead.rotateAngleX = 0; - bipedHeadwear.rotateAngleX = 0; - } - } - else if(npc.currentAnimation == EnumAnimation.CRY) - bipedHeadwear.rotateAngleX = bipedHead.rotateAngleX = 0.7f; - - else if(npc.currentAnimation == EnumAnimation.HUG){ - AniHug.setRotationAngles(par1, par2, par3, par4, par5, par6, entity, this); - } - - else if(npc.currentAnimation == EnumAnimation.CRAWLING) - AniCrawling.setRotationAngles(par1, par2, par3, par4, par5, par6, entity, this); - - else if(npc.currentAnimation == EnumAnimation.WAVING){ - bipedRightArm.rotateAngleX = -0.1f; - bipedRightArm.rotateAngleY = 0; - bipedRightArm.rotateAngleZ = (float) (Math.PI - 1f - Math.sin(entity.ticksExisted * 0.27f) * 0.5f ); - } - else if(isSneak){ - this.bipedBody.rotateAngleX = 0.5F / npc.modelData.body.scaleY; - } - - } - - public void setLivingAnimations(EntityLivingBase par1EntityLivingBase, float par2, float par3, float par4) - { + public void setLivingAnimations(EntityLivingBase par1EntityLivingBase, float par2, float par3, float par4) + { if(entityModel != null){ entityModel.setLivingAnimations(entity, par2, par3, par4); } else{ - EntityCustomNpc npc = (EntityCustomNpc) par1EntityLivingBase; + EntityCustomNpc npc = (EntityCustomNpc) par1EntityLivingBase; if(!isArmor){ - ModelPartData partData = npc.modelData.getPartData("tail"); - if(partData != null) - tail.setLivingAnimations(partData, par1EntityLivingBase, par2, par3, par4); + ModelPartData partData = npc.modelData.getPartData("tail"); + if(partData != null) + tail.setLivingAnimations(partData, par1EntityLivingBase, par2, par3, par4); } } - } + } - public void loadPlayerTexture(EntityCustomNpc npc){ + public void loadPlayerTexture(EntityCustomNpc npc){ if(!isArmor && !currentlyPlayerTexture){ - ClientProxy.bindTexture(npc.textureLocation); - currentlyPlayerTexture = true; + ClientProxy.bindTexture(npc.textureLocation); + currentlyPlayerTexture = true; } - } - + } + private void renderHead(EntityCustomNpc entity, float f) { loadPlayerTexture(entity); float x = 0; @@ -507,15 +319,11 @@ public class ModelMPM extends ModelNPCMale{ float z = 0; GL11.glPushMatrix(); - if(entity.currentAnimation == EnumAnimation.DANCING){ - float dancing = entity.ticksExisted / 4f; - GL11.glTranslatef((float)Math.sin(dancing) * 0.075F, (float)Math.abs(Math.cos(dancing)) * 0.125F - 0.02F, (float)(-Math.abs(Math.cos(dancing))) * 0.075F); - } + if(entity.currentAnimation == EnumAnimation.DANCING){ + float dancing = entity.ticksExisted / 4f; + GL11.glTranslatef((float)Math.sin(dancing) * 0.075F, (float)Math.abs(Math.cos(dancing)) * 0.125F - 0.02F, (float)(-Math.abs(Math.cos(dancing))) * 0.075F); + } ModelPartConfig head = entity.modelData.head; - - // Hide Head - ((ModelScaleRenderer)this.bipedHead).isHidden = entity.modelData.hideHead == 1; - if(bipedHeadwear.showModel && !bipedHeadwear.isHidden){ if(entity.modelData.headwear == 1 || isArmor){ ((ModelScaleRenderer)this.bipedHeadwear).setConfig(head,x,y,z); @@ -537,7 +345,7 @@ public class ModelMPM extends ModelNPCMale{ GL11.glPopMatrix(); } - + private void renderBody(EntityCustomNpc entity, float f) { loadPlayerTexture(entity); float x = 0; @@ -545,40 +353,16 @@ public class ModelMPM extends ModelNPCMale{ float z = 0; GL11.glPushMatrix(); - if(entity.currentAnimation == EnumAnimation.DANCING){ + if(entity.currentAnimation == EnumAnimation.DANCING){ float dancing = entity.ticksExisted / 4f; - GL11.glTranslatef((float)Math.sin(dancing) * 0.015F, 0.0F, 0.0F); - } - + GL11.glTranslatef((float)Math.sin(dancing) * 0.015F, 0.0F, 0.0F); + } + ModelPartConfig body = entity.modelData.body; - - // Hide Body - ((ModelScaleRenderer)this.bipedBody).isHidden = entity.modelData.hideBody == 1; - - // Hide Bodywear - ((ModelScaleRenderer)this.bipedBodywear).isHidden = entity.modelData.bodywear == 0; - - if(bipedBodywear.showModel && !bipedBodywear.isHidden){ - if(entity.modelData.bodywear == 1 || isArmor){ - ((ModelScaleRenderer)this.bipedBodywear).setConfig(entity.modelData.body,x,y,z); - ((ModelScaleRenderer)this.bipedBodywear).render(f); - } - else if(entity.modelData.bodywear == 2){ - this.bodywear.rotateAngleX = bipedBodywear.rotateAngleX; - this.bodywear.rotateAngleY = bipedBodywear.rotateAngleY; - this.bodywear.rotateAngleZ = bipedBodywear.rotateAngleZ; - this.bodywear.rotationPointX = bipedBodywear.rotationPointX; - this.bodywear.rotationPointY = bipedBodywear.rotationPointY; - this.bodywear.rotationPointZ = bipedBodywear.rotationPointZ; - this.bodywear.setConfig(entity.modelData.body,x,y,z); - this.bodywear.render(f); - } - } - ((ModelScaleRenderer)this.bipedBody).setConfig(body,x,y,z); ((ModelScaleRenderer)this.bipedBody).render(f); GL11.glPopMatrix(); - + } public void renderArms(EntityCustomNpc entity, float f, boolean bo){ loadPlayerTexture(entity); @@ -590,58 +374,11 @@ public class ModelMPM extends ModelNPCMale{ GL11.glPushMatrix(); - if(entity.currentAnimation == EnumAnimation.DANCING){ + if(entity.currentAnimation == EnumAnimation.DANCING){ float dancing = entity.ticksExisted / 4f; - GL11.glTranslatef((float)Math.sin(dancing) * 0.025F, (float)Math.abs(Math.cos(dancing)) * 0.125F - 0.02F, 0.0F); - } - - // Hide Arms - if(entity.modelData.hideArms == 1){ - ((ModelScaleRenderer)this.bipedRightArm).isHidden = true; - ((ModelScaleRenderer)this.bipedLeftArm).isHidden = true; - } - else if(entity.modelData.hideArms == 2){ - ((ModelScaleRenderer)this.bipedRightArm).isHidden = true; - ((ModelScaleRenderer)this.bipedLeftArm).isHidden = false; - } - else if(entity.modelData.hideArms == 3){ - ((ModelScaleRenderer)this.bipedRightArm).isHidden = false; - ((ModelScaleRenderer)this.bipedLeftArm).isHidden = true; - } - else{ - ((ModelScaleRenderer)this.bipedRightArm).isHidden = false; - ((ModelScaleRenderer)this.bipedLeftArm).isHidden = false; - } - - // Hide Armwear - if(entity.modelData.armwear == 1){ - ((ModelScaleRenderer)this.bipedRightArmWear).isHidden = entity.modelData.solidArmwear == 1 || entity.modelData.solidArmwear == 3; - ((ModelScaleRenderer)this.bipedLeftArmwear).isHidden = entity.modelData.solidArmwear == 1 || entity.modelData.solidArmwear == 2; - - this.solidRightArmWear.isHidden = entity.modelData.solidArmwear == 0 || entity.modelData.solidArmwear == 2; - this.solidLeftArmWear.isHidden = entity.modelData.solidArmwear == 0 || entity.modelData.solidArmwear == 3; - } - else if(entity.modelData.armwear == 2){ - ((ModelScaleRenderer)this.bipedRightArmWear).isHidden = true; - ((ModelScaleRenderer)this.bipedLeftArmwear).isHidden = entity.modelData.solidArmwear == 1 || entity.modelData.solidArmwear == 2; - - this.solidRightArmWear.isHidden = true; - this.solidLeftArmWear.isHidden = entity.modelData.solidArmwear == 0 || entity.modelData.solidArmwear == 3; - } - else if(entity.modelData.armwear == 3){ - ((ModelScaleRenderer)this.bipedRightArmWear).isHidden = entity.modelData.solidArmwear == 1 || entity.modelData.solidArmwear == 3; - ((ModelScaleRenderer)this.bipedLeftArmwear).isHidden = true; - - this.solidRightArmWear.isHidden = entity.modelData.solidArmwear == 0 || entity.modelData.solidArmwear == 2; - this.solidLeftArmWear.isHidden = true; - } - else{ - ((ModelScaleRenderer)this.bipedRightArmWear).isHidden = true; - ((ModelScaleRenderer)this.bipedLeftArmwear).isHidden = true; - this.solidRightArmWear.isHidden = true; - this.solidLeftArmWear.isHidden = true; - } - + GL11.glTranslatef((float)Math.sin(dancing) * 0.025F, (float)Math.abs(Math.cos(dancing)) * 0.125F - 0.02F, 0.0F); + } + if(!bo){ ((ModelScaleRenderer)this.bipedLeftArm).setConfig(arms,-x,y,z); ((ModelScaleRenderer)this.bipedLeftArm).render(f); @@ -664,55 +401,6 @@ public class ModelMPM extends ModelNPCMale{ float z = 0; GL11.glPushMatrix(); - - - // Hide Legs - if(entity.modelData.hideLegs == 1){ - ((ModelScaleRenderer)this.bipedRightLeg).isHidden = true; - ((ModelScaleRenderer)this.bipedLeftLeg).isHidden = true; - } - else if(entity.modelData.hideLegs == 2){ - ((ModelScaleRenderer)this.bipedRightLeg).isHidden = true; - ((ModelScaleRenderer)this.bipedLeftLeg).isHidden = false; - } - else if(entity.modelData.hideLegs == 3){ - ((ModelScaleRenderer)this.bipedRightLeg).isHidden = false; - ((ModelScaleRenderer)this.bipedLeftLeg).isHidden = true; - } - else{ - ((ModelScaleRenderer)this.bipedRightLeg).isHidden = false; - ((ModelScaleRenderer)this.bipedLeftLeg).isHidden = false; - } - - // Hide Legwear - if(entity.modelData.legwear == 1){ - ((ModelScaleRenderer)this.bipedRightLegWear).isHidden = entity.modelData.solidLegwear == 1 || entity.modelData.solidLegwear == 3; - ((ModelScaleRenderer)this.bipedLeftLegWear).isHidden = entity.modelData.solidLegwear == 1 || entity.modelData.solidLegwear == 2; - - this.solidRightLegWear.isHidden = entity.modelData.solidLegwear == 0 || entity.modelData.solidLegwear == 2; - this.solidLeftLegWear.isHidden = entity.modelData.solidLegwear == 0 || entity.modelData.solidLegwear == 3; - } - else if(entity.modelData.legwear == 2){ - ((ModelScaleRenderer)this.bipedRightLegWear).isHidden = true; - ((ModelScaleRenderer)this.bipedLeftLegWear).isHidden = entity.modelData.solidLegwear == 1 || entity.modelData.solidLegwear == 2; - - this.solidRightLegWear.isHidden = true; - this.solidLeftLegWear.isHidden = entity.modelData.solidLegwear == 0 || entity.modelData.solidLegwear == 3; - } - else if(entity.modelData.legwear == 3){ - ((ModelScaleRenderer)this.bipedRightLegWear).isHidden = entity.modelData.solidLegwear == 1 || entity.modelData.solidLegwear == 3; - ((ModelScaleRenderer)this.bipedLeftLegWear).isHidden = true; - - this.solidRightLegWear.isHidden = entity.modelData.solidLegwear == 0 || entity.modelData.solidLegwear == 2; - this.solidLeftLegWear.isHidden = true; - } - else{ - ((ModelScaleRenderer)this.bipedRightLegWear).isHidden = true; - ((ModelScaleRenderer)this.bipedLeftLegWear).isHidden = true; - this.solidRightLegWear.isHidden = true; - this.solidLeftLegWear.isHidden = true; - } - this.legs.setConfig(legs,x,y,z); this.legs.render(f); if(!isArmor){ @@ -722,22 +410,22 @@ public class ModelMPM extends ModelNPCMale{ GL11.glPopMatrix(); } @Override - public ModelRenderer getRandomModelBox(Random par1Random) - { + public ModelRenderer getRandomModelBox(Random par1Random) + { int random = par1Random.nextInt(5); switch(random){ - case 0: - return bipedRightLeg; - case 1: - return bipedHead; - case 2: - return bipedLeftArm; - case 3: - return bipedRightArm; - case 4: - return bipedLeftLeg; + case 0: + return bipedRightLeg; + case 1: + return bipedHead; + case 2: + return bipedLeftArm; + case 3: + return bipedRightArm; + case 4: + return bipedLeftLeg; } return bipedBody; - } + } } diff --git a/src/main/java/noppes/npcs/client/model/ModelNPCMale.java b/src/main/java/noppes/npcs/client/model/ModelNPCMale.java index dd9202135..f26676198 100644 --- a/src/main/java/noppes/npcs/client/model/ModelNPCMale.java +++ b/src/main/java/noppes/npcs/client/model/ModelNPCMale.java @@ -8,7 +8,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MathHelper; import noppes.npcs.CustomNpcs; -import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityNPCInterface; @@ -18,110 +17,36 @@ public class ModelNPCMale extends ModelBiped { public boolean isDancing; public boolean isSleeping; - + public float animationTick; public float dancingTicks; - public ModelNPCMale(float f) { - init(f, 0.0F); + init(f, 0.0F); } - - public ModelNPCMale(float f, boolean arms) - { - super(f, 0.0F, 64, 64); - init(f, 0.0F, arms); - } - @Override public void setLivingAnimations(EntityLivingBase par1EntityLiving, float f6, float f5, float par9){ - animationTick += par9; - dancingTicks = CustomNpcs.ticks / 3.978873F; + animationTick += par9; + dancingTicks = CustomNpcs.ticks / 3.978873F; } - - - // 64x64 Skin - public void init(float f, float f1, boolean arms) - { - - heldItemLeft = 0; - heldItemRight = 0; - isSneak = false; - aimedBow = false; - - // Changed - bipedCloak = new ModelRenderer(this, 0, 0); - bipedCloak.setTextureSize(64, 32); - bipedCloak.addBox(-5.0F, 0.0F, -1.0F, 10, 16, 1, f); - - // Same - bipedEars = new ModelRenderer(this, 24, 0); - bipedEars.setTextureSize(64, 32); // NEW LINE - bipedEars.addBox(-3F, -6F, -1F, 6, 6, 1, f); - - bipedHead = new ModelRenderer(this, 0, 0); - bipedHead.addBox(-4F, -8F, -4F, 8, 8, 8, f); - bipedHead.setRotationPoint(0.0F, 0.0F + f1, 0.0F); - - bipedHeadwear = new ModelRenderer(this, 32, 0); - bipedHeadwear.addBox(-4F, -8F, -4F, 8, 8, 8, f + 0.5F); - bipedHeadwear.setRotationPoint(0.0F, 0.0F + f1, 0.0F); - - bipedBody = new ModelRenderer(this, 16, 16); - bipedBody.addBox(-4F, 0.0F, -2F, 8, 12, 4, f); - bipedBody.setRotationPoint(0.0F, 0.0F + f1, 0.0F); - - if (arms){ - // Alex Version - bipedRightArm = (new ModelScaleRenderer(this, 40, 16)); - bipedRightArm.addBox(-2.0F, -2.0F, -2.0F, 3, 12, 4, f); - bipedRightArm.setRotationPoint(-5.0F, 2.5F + f1, 0.0F); - - bipedLeftArm = new ModelScaleRenderer(this, 32, 48); - bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 3, 12, 4, f); - bipedLeftArm.setRotationPoint(5.0F, 2.5F + f1, 0.0F); - } - else{ - // Steve Version - bipedRightArm = new ModelRenderer(this, 40, 16); - bipedRightArm.addBox(-3F, -2F, -2F, 4, 12, 4, f); - bipedRightArm.setRotationPoint(-5F, 2.0F + f1, 0.0F); - - bipedLeftArm = new ModelRenderer(this, 32, 48); - bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, f); - bipedLeftArm.setRotationPoint(5.0F, 2.0F + f1, 0.0F); - } - - bipedRightLeg = new ModelRenderer(this, 0, 16); - bipedRightLeg.addBox(-2F, 0.0F, -2F, 4, 12, 4, f); - bipedRightLeg.setRotationPoint(-2F, 12F + f1, 0.0F); - - bipedLeftLeg = new ModelRenderer(this, 16, 48); - bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, f); - bipedLeftLeg.setRotationPoint(1.9F, 12.0F + f1, 0.0F); - - } - - // 64x32 public void init(float f, float f1) { heldItemLeft = 0; heldItemRight = 0; isSneak = false; aimedBow = false; - bipedCloak = new ModelRenderer(this, 0, 0); bipedCloak.textureHeight = 32; bipedCloak.addBox(-5F, 0.0F, -1F, 10, 16, 1, f); - + bipedEars = new ModelRenderer(this, 24, 0); bipedEars.addBox(-3F, -6F, -1F, 6, 6, 1, f); - + bipedHead = new ModelRenderer(this, 0, 0); bipedHead.addBox(-4F, -8F, -4F, 8, 8, 8, f); bipedHead.setRotationPoint(0.0F, 0.0F + f1, 0.0F); - + bipedHeadwear = new ModelRenderer(this, 32, 0); bipedHeadwear.addBox(-4F, -8F, -4F, 8, 8, 8, f + 0.5F); bipedHeadwear.setRotationPoint(0.0F, 0.0F + f1, 0.0F); @@ -142,95 +67,92 @@ public class ModelNPCMale extends ModelBiped bipedLeftLeg.mirror = true; bipedLeftLeg.addBox(-2F, 0.0F, -2F, 4, 12, 4, f); bipedLeftLeg.setRotationPoint(2.0F, 12F + f1, 0.0F); - + } - - - @Override public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7){ setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); - if(!isDancing){ - bipedHead.render(par7); - bipedBody.render(par7); - bipedRightArm.render(par7); - bipedLeftArm.render(par7); - bipedRightLeg.render(par7); - bipedLeftLeg.render(par7); - bipedHeadwear.render(par7); - } - else{ - renderHead(par1Entity, par7); - renderArms(par1Entity, par7); - renderBody(par1Entity, par7); - renderLegs(par1Entity, par7); - } + if(!isDancing){ + bipedHead.render(par7); + bipedBody.render(par7); + bipedRightArm.render(par7); + bipedLeftArm.render(par7); + bipedRightLeg.render(par7); + bipedLeftLeg.render(par7); + bipedHeadwear.render(par7); + } + else{ + renderHead(par1Entity, par7); + renderArms(par1Entity, par7); + renderBody(par1Entity, par7); + renderLegs(par1Entity, par7); + } } public void renderHead(Entity entityliving,float par7){ - if(isDancing){ - GL11.glPushMatrix(); - GL11.glTranslatef((float)Math.sin(dancingTicks) * 0.075F, (float)Math.abs(Math.cos(dancingTicks)) * 0.125F - 0.02F, (float)(-Math.abs(Math.cos(dancingTicks))) * 0.075F); - bipedHead.render(par7); - bipedHeadwear.render(par7); - GL11.glPopMatrix(); - } - else{ - bipedHead.render(par7); - bipedHeadwear.render(par7); - } + if(isDancing){ + GL11.glPushMatrix(); + GL11.glTranslatef((float)Math.sin(dancingTicks) * 0.075F, (float)Math.abs(Math.cos(dancingTicks)) * 0.125F - 0.02F, (float)(-Math.abs(Math.cos(dancingTicks))) * 0.075F); + bipedHead.render(par7); + bipedHeadwear.render(par7); + GL11.glPopMatrix(); + } + else{ + bipedHead.render(par7); + bipedHeadwear.render(par7); + } } public void renderLeftArm(Entity entityliving,float par7){ - if(isDancing){ - GL11.glPushMatrix(); - GL11.glTranslatef((float)Math.sin(dancingTicks) * 0.025F, (float)Math.abs(Math.cos(dancingTicks)) * 0.125F - 0.02F, 0.0F); - bipedLeftArm.render(par7); - GL11.glPopMatrix(); - } - else{ - bipedLeftArm.render(par7); - } + if(isDancing){ + GL11.glPushMatrix(); + GL11.glTranslatef((float)Math.sin(dancingTicks) * 0.025F, (float)Math.abs(Math.cos(dancingTicks)) * 0.125F - 0.02F, 0.0F); + bipedLeftArm.render(par7); + GL11.glPopMatrix(); + } + else{ + bipedLeftArm.render(par7); + } } public void renderArms(Entity entity,float par7){ - renderLeftArm(entity,par7); - renderRightArm(entity,par7); + renderLeftArm(entity,par7); + renderRightArm(entity,par7); } public void renderRightArm(Entity entityliving,float par7){ - if(isDancing){ - GL11.glPushMatrix(); - GL11.glTranslatef((float)Math.sin(dancingTicks) * 0.025F, (float)Math.abs(Math.cos(dancingTicks)) * 0.125F - 0.02F, 0.0F); - bipedRightArm.render(par7); - GL11.glPopMatrix(); - } - else{ - bipedRightArm.render(par7); - } + if(isDancing){ + GL11.glPushMatrix(); + GL11.glTranslatef((float)Math.sin(dancingTicks) * 0.025F, (float)Math.abs(Math.cos(dancingTicks)) * 0.125F - 0.02F, 0.0F); + bipedRightArm.render(par7); + GL11.glPopMatrix(); + } + else{ + bipedRightArm.render(par7); + } } public void renderBody(Entity entityliving,float par7){ - if(isDancing){ - GL11.glPushMatrix(); - GL11.glTranslatef((float)Math.sin(dancingTicks) * 0.015F, 0.0F, 0.0F); - bipedBody.render(par7); - GL11.glPopMatrix(); - } - else{ - bipedBody.render(par7); - } + if(isDancing){ + GL11.glPushMatrix(); + GL11.glTranslatef((float)Math.sin(dancingTicks) * 0.015F, 0.0F, 0.0F); + bipedBody.render(par7); + GL11.glPopMatrix(); + } + else{ + bipedBody.render(par7); + } } public void renderLegs(Entity entityliving,float par7){ bipedRightLeg.render(par7); bipedLeftLeg.render(par7); } - + public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6, Entity entity) { - EntityNPCInterface npc = (EntityNPCInterface) entity; - isRiding = npc.isRiding(); - - - if(isSneak && (npc.currentAnimation == EnumAnimation.CRAWLING || npc.currentAnimation == EnumAnimation.LYING)) - isSneak = false; + EntityNPCInterface npc = (EntityNPCInterface) entity; + isRiding = npc.isRiding(); + + + if(isSneak && (npc.currentAnimation == EnumAnimation.CRAWLING || npc.currentAnimation == EnumAnimation.LYING)) + isSneak = false; bipedHead.rotateAngleY = par4 / (180F / (float)Math.PI); bipedHead.rotateAngleX = par5 / (180F / (float)Math.PI); bipedHeadwear.rotateAngleY = bipedHead.rotateAngleY; @@ -243,7 +165,7 @@ public class ModelNPCMale extends ModelBiped bipedLeftLeg.rotateAngleX = MathHelper.cos(par1 * 0.6662F + (float)Math.PI) * 1.4F * par2; bipedRightLeg.rotateAngleY = 0.0F; bipedLeftLeg.rotateAngleY = 0.0F; - + if (isRiding) { bipedRightArm.rotateAngleX += -((float)Math.PI / 5F); @@ -347,19 +269,19 @@ public class ModelNPCMale extends ModelBiped public void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; } - + public void renderCloak(float f) { bipedCloak.render(f); } - public boolean isSleeping(Entity entity) { - if(entity instanceof EntityPlayer && ((EntityPlayer)entity).isPlayerSleeping()) - return true; - return ((EntityNPCInterface)entity).currentAnimation == EnumAnimation.LYING; - } + public boolean isSleeping(Entity entity) { + if(entity instanceof EntityPlayer && ((EntityPlayer)entity).isPlayerSleeping()) + return true; + return ((EntityNPCInterface)entity).currentAnimation == EnumAnimation.LYING; + } } diff --git a/src/main/java/noppes/npcs/client/model/part/ModelBodywear.java b/src/main/java/noppes/npcs/client/model/part/ModelBodywear.java deleted file mode 100644 index b11a90d20..000000000 --- a/src/main/java/noppes/npcs/client/model/part/ModelBodywear.java +++ /dev/null @@ -1,65 +0,0 @@ -package noppes.npcs.client.model.part; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import noppes.npcs.client.model.util.Model2DRenderer; -import noppes.npcs.client.model.util.ModelScaleRenderer; - -public class ModelBodywear extends ModelScaleRenderer{ - - public ModelBodywear(ModelBase base) { - super(base); - - float thick = 0.50f; - - Model2DRenderer front = new Model2DRenderer(base, 20, 36, 8, 12, 64, 64); - front.setRotationPoint(-4.53f, 12.535f, -2.52f); - front.setScale(0.85f,0.8175f); - front.setThickness(thick); - setRotation(front, 0, 0, 0); - this.addChild(front); - - Model2DRenderer back = new Model2DRenderer(base, 32, 36, 8, 12, 64, 64); - back.setRotationPoint(4.53f, 12.535f, 2.52f); - back.setScale(0.85f,0.8175f); - back.setThickness(thick); - setRotation(back, 0, (float)(Math.PI), 0); - this.addChild(back); - - Model2DRenderer right = new Model2DRenderer(base, 28, 36, 4, 12, 64, 64); - right.setRotationPoint(4.03f, 12.55f, 2.55f); - right.setScale(0.96f,0.82f); - right.setThickness(thick); - setRotation(right, 0, (float)(Math.PI/2f), 0); - this.addChild(right); - - Model2DRenderer left = new Model2DRenderer(base, 16, 36, 4, 12, 64, 64); - left.setRotationPoint(-4.03f, 12.55f, -2.55f); - left.setScale(0.96f,0.82f); - left.setThickness(thick); - setRotation(left, 0, (float)(Math.PI/-2f), 0); - this.addChild(left); - - - Model2DRenderer top = new Model2DRenderer(base, 20, 32, 8, 4, 64, 64); - top.setRotationPoint(-4.5f, -0.6f, -2.525f); - top.setScale(0.2815f,0.315f); - top.setThickness(thick); - setRotation(top, (float)(Math.PI / -2), 0, 0); - this.addChild(top); - - Model2DRenderer bottom = new Model2DRenderer(base, 28, 32, 8, 4, 64, 64); - bottom.setRotationPoint(-4.5f, 12.11f, -2.525f); - bottom.setScale(0.2815f,0.315f); - bottom.setThickness(thick); - setRotation(bottom, (float)(Math.PI / -2), 0, 0); - this.addChild(bottom); - } - - public void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java b/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java index 0e2b969a2..2d9310e9a 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java @@ -12,22 +12,19 @@ public class ModelBreasts extends ModelPartInterface { private ModelRenderer breasts2; private ModelRenderer breasts3; - public ModelBreasts(ModelMPM base, int width, int height) { + public ModelBreasts(ModelMPM base) { super(base); - breasts = new Model2DRenderer(base, 20f, 22, 8, 3, width, height); - breasts.setTextureSize(width, height); + breasts = new Model2DRenderer(base, 20f, 22, 8, 3, 64, 32); breasts.setRotationPoint(-3.6F, 5.2f, -3f); breasts.setScale(0.17f, 0.19f); breasts.setThickness(1); this.addChild(breasts); breasts2 = new ModelRenderer(base); - breasts2.setTextureSize(width, height); this.addChild(breasts2); - Model2DRenderer bottom = new Model2DRenderer(base, 20f, 22, 8, 4, width, height); - bottom.setTextureSize(width, height); + Model2DRenderer bottom = new Model2DRenderer(base, 20f, 22, 8, 4, 64, 32); bottom.setRotationPoint(-3.6F, 5f, -3.1f); bottom.setScale(0.225f, 0.20f); bottom.setThickness(2f); @@ -35,65 +32,56 @@ public class ModelBreasts extends ModelPartInterface { breasts2.addChild(bottom); breasts3 = new ModelRenderer(base); - breasts3.setTextureSize(width, height); this.addChild(breasts3); - Model2DRenderer right = new Model2DRenderer(base, 20f, 22, 3, 2, width, height); - right.setTextureSize(width, height); + Model2DRenderer right = new Model2DRenderer(base, 20f, 22, 3, 2, 64, 32); right.setRotationPoint(-3.8F, 5.3f, -3.6f); right.setScale(0.12f, 0.14f); right.setThickness(1.75f); breasts3.addChild(right); - Model2DRenderer right2 = new Model2DRenderer(base, 20f, 22, 3, 1, width, height); - right2.setTextureSize(width, height); + Model2DRenderer right2 = new Model2DRenderer(base, 20f, 22, 3, 1, 64, 32); right2.setRotationPoint(-3.8F, 4.1f, -3.14f); right2.setScale(0.06f, 0.07f); right2.setThickness(1.75f); right2.rotateAngleX = (float) (Math.PI / 9); breasts3.addChild(right2); - Model2DRenderer right3 = new Model2DRenderer(base, 20f, 24, 3, 1, width, height); - right3.setTextureSize(width, height); + Model2DRenderer right3 = new Model2DRenderer(base, 20f, 24, 3, 1, 64, 32); right3.setRotationPoint(-3.8F, 5.3f, -3.6f); right3.setScale(0.06f, 0.07f); right3.setThickness(1.75f); right3.rotateAngleX = (float) (-Math.PI / 9); breasts3.addChild(right3); - Model2DRenderer right4 = new Model2DRenderer(base, 23f, 22, 1, 2, width, height); - right4.setTextureSize(width, height); + Model2DRenderer right4 = new Model2DRenderer(base, 23f, 22, 1, 2, 64, 32); right4.setRotationPoint(-1.8f, 5.3f, -3.14f); right4.setScale(0.12f, 0.14f); right4.setThickness(1.75f); right4.rotateAngleY = (float) (Math.PI / 9); breasts3.addChild(right4); - Model2DRenderer left = new Model2DRenderer(base, 25f, 22, 3, 2, width, height); - left.setTextureSize(width, height); + Model2DRenderer left = new Model2DRenderer(base, 25f, 22, 3, 2, 64, 32); left.setRotationPoint(0.8F, 5.3f, -3.6f); left.setScale(0.12f, 0.14f); left.setThickness(1.75f); breasts3.addChild(left); - Model2DRenderer left2 = new Model2DRenderer(base, 25f, 22, 3, 1, width, height); - left2.setTextureSize(width, height); + Model2DRenderer left2 = new Model2DRenderer(base, 25f, 22, 3, 1, 64, 32); left2.setRotationPoint(0.8F, 4.1f, -3.18f); left2.setScale(0.06f, 0.07f); left2.setThickness(1.75f); left2.rotateAngleX = (float) (Math.PI / 9); breasts3.addChild(left2); - Model2DRenderer left3 = new Model2DRenderer(base, 25f, 24, 3, 1, width, height); - left3.setTextureSize(width, height); + Model2DRenderer left3 = new Model2DRenderer(base, 25f, 24, 3, 1, 64, 32); left3.setRotationPoint(0.8F, 5.3f, -3.6f); left3.setScale(0.06f, 0.07f); left3.setThickness(1.75f); left3.rotateAngleX = (float) (-Math.PI / 9); breasts3.addChild(left3); - Model2DRenderer left4 = new Model2DRenderer(base, 24f, 22, 1, 2, width, height); - left4.setTextureSize(width, height); + Model2DRenderer left4 = new Model2DRenderer(base, 24f, 22, 1, 2, 64, 32); left4.setRotationPoint(0.8f, 5.3f, -3.6f); left4.setScale(0.12f, 0.14f); left4.setThickness(1.75f); diff --git a/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java b/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java deleted file mode 100644 index acadd0262..000000000 --- a/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java +++ /dev/null @@ -1,85 +0,0 @@ -package noppes.npcs.client.model.part; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import noppes.npcs.client.model.ModelMPM; -import noppes.npcs.client.model.util.ModelPartInterface; - -public class ModelDuckBeak extends ModelRenderer { - ModelRenderer Top3; - ModelRenderer Top2; - ModelRenderer Bottom; - ModelRenderer Left; - ModelRenderer Right; - ModelRenderer Middle; - ModelRenderer Top; - - public ModelDuckBeak(ModelMPM base) { - super(base); - - Top3 = new ModelRenderer(base, 14, 0); - Top3.setTextureSize(64,32); - Top3.addBox(0F, 0F, 0F, 2, 1, 3); - Top3.setRotationPoint(-1F, -2F, -5F); - setRotation(Top3, 0.3346075F, 0F, 0F); - addChild(Top3); - - Top2 = new ModelRenderer(base, 0, 0); - Top2.setTextureSize(64,32); - Top2.addBox(0F, 0F, -0.4F, 4, 1, 3); - Top2.setRotationPoint(-2F, -3F, -2F); - setRotation(Top2, 0.3346075F, 0F, 0F); - addChild(Top2); - - Bottom = new ModelRenderer(base, 24, 0); - Bottom.setTextureSize(64,32); - Bottom.addBox(0F, 0F, 0F, 2, 1, 5); - Bottom.setRotationPoint(-1F, -1F, -5F); - addChild(Bottom); - - Left = new ModelRenderer(base, 0, 4); - Left.setTextureSize(64,32); - Left.mirror = true; - Left.addBox(0F, 0F, 0F, 1, 3, 2); - Left.setRotationPoint(0.98F, -3F, -2F); - addChild(Left); - - Right = new ModelRenderer(base, 0, 4); - Right.setTextureSize(64,32); - Right.addBox(0F, 0F, 0F, 1, 3, 2); - Right.setRotationPoint(-1.98F, -3F, -2F); - addChild(Right); - - Middle = new ModelRenderer(base, 3, 0); - Middle.setTextureSize(64,32); - Middle.addBox(0F, 0F, 0F, 2, 1, 3); - Middle.setRotationPoint(-1F, -2F, -5F); - addChild(Middle); - - Top = new ModelRenderer(base, 6, 4); - Top.setTextureSize(64,32); - Top.addBox(0F, 0F, 0F, 2, 2, 1); - Top.setRotationPoint(-1F, -4.4F, -1F); - addChild(Top); - } - - @Override - public void render(float f) - { - GL11.glPushMatrix(); - GL11.glTranslatef(0, 0, -1f * f); - GL11.glScalef(0.82f, 0.82f, 0.70f); - super.render(f); - GL11.glPopMatrix(); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/src/main/java/noppes/npcs/client/model/part/ModelFin.java b/src/main/java/noppes/npcs/client/model/part/ModelFin.java index c8f79c9fc..e8bbae8fa 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelFin.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelFin.java @@ -13,7 +13,7 @@ public class ModelFin extends ModelPartInterface { public ModelFin(ModelMPM base) { super(base); - model = new Model2DRenderer(base, 48, 8, 16, 24, 64, 32); + model = new Model2DRenderer(base, 56, 20, 8, 12, 64, 32); model.setRotationPoint(-0.5F, 12, 10); model.setScale(0.74f); model.rotateAngleY = (float)Math.PI / 2; diff --git a/src/main/java/noppes/npcs/client/model/part/ModelHeadwear.java b/src/main/java/noppes/npcs/client/model/part/ModelHeadwear.java index bed9137a8..a5f3cc479 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelHeadwear.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelHeadwear.java @@ -6,94 +6,49 @@ import noppes.npcs.client.model.util.Model2DRenderer; import noppes.npcs.client.model.util.ModelScaleRenderer; public class ModelHeadwear extends ModelScaleRenderer{ - + public ModelHeadwear(ModelBase base) { - super(base); - Model2DRenderer right = new Model2DRenderer(base, 32, 8, 8, 8, 64, 64); - right.setRotationPoint(-4.641F, .8f, 4.64f); - right.setScale(0.58f); - right.setThickness(0.65f); - setRotation(right, 0, (float)(Math.PI/2f), 0); - this.addChild(right); - - Model2DRenderer left = new Model2DRenderer(base, 48, 8, 8, 8, 64, 64); - left.setRotationPoint(4.639F, .8f, -4.64f); - left.setScale(0.58f); - left.setThickness(0.65f); - setRotation(left, 0, (float)(Math.PI/-2f), 0); - this.addChild(left); - - Model2DRenderer front = new Model2DRenderer(base, 40, 8, 8, 8, 64, 64); - front.setRotationPoint(-4.64F, .801f, -4.641f); - front.setScale(0.58f); - front.setThickness(0.65f); - setRotation(front, 0, 0, 0); - this.addChild(front); - - Model2DRenderer back = new Model2DRenderer(base, 56, 8, 8, 8, 64, 64); - back.setRotationPoint(4.64F, .801f, 4.639f); - back.setScale(0.58f); - back.setThickness(0.65f); - setRotation(back, 0, (float)(Math.PI), 0); - this.addChild(back); - - Model2DRenderer top = new Model2DRenderer(base, 40, 0, 8, 8, 64, 64); - top.setRotationPoint(-4.64F, -8.5f, -4.64f); - top.setScale(0.5799f); - top.setThickness(0.65f); - setRotation(top, (float)(Math.PI / -2), 0, 0); - this.addChild(top); - - Model2DRenderer bottom = new Model2DRenderer(base, 48, 0, 8, 8, 64, 64); - bottom.setRotationPoint(-4.64F, 0f, -4.64f); - bottom.setScale(0.5799f); - bottom.setThickness(0.65f); - setRotation(bottom, (float)(Math.PI / -2), 0, 0); - this.addChild(bottom); - } - - public ModelHeadwear(ModelBase base, boolean steve32) { - super(base); + super(base); Model2DRenderer right = new Model2DRenderer(base, 32, 8, 8, 8, 64, 32); right.setRotationPoint(-4.641F, .8f, 4.64f); right.setScale(0.58f); right.setThickness(0.65f); - setRotation(right, 0, (float)(Math.PI/2f), 0); + setRotation(right, 0, (float)(Math.PI/2f), 0); this.addChild(right); - + Model2DRenderer left = new Model2DRenderer(base, 48, 8, 8, 8, 64, 32); left.setRotationPoint(4.639F, .8f, -4.64f); left.setScale(0.58f); left.setThickness(0.65f); - setRotation(left, 0, (float)(Math.PI/-2f), 0); + setRotation(left, 0, (float)(Math.PI/-2f), 0); this.addChild(left); - + Model2DRenderer front = new Model2DRenderer(base, 40, 8, 8, 8, 64, 32); front.setRotationPoint(-4.64F, .801f, -4.641f); front.setScale(0.58f); front.setThickness(0.65f); - setRotation(front, 0, 0, 0); + setRotation(front, 0, 0, 0); this.addChild(front); - + Model2DRenderer back = new Model2DRenderer(base, 56, 8, 8, 8, 64, 32); back.setRotationPoint(4.64F, .801f, 4.639f); back.setScale(0.58f); back.setThickness(0.65f); - setRotation(back, 0, (float)(Math.PI), 0); + setRotation(back, 0, (float)(Math.PI), 0); this.addChild(back); - + Model2DRenderer top = new Model2DRenderer(base, 40, 0, 8, 8, 64, 32); top.setRotationPoint(-4.64F, -8.5f, -4.64f); top.setScale(0.5799f); top.setThickness(0.65f); - setRotation(top, (float)(Math.PI / -2), 0, 0); + setRotation(top, (float)(Math.PI / -2), 0, 0); this.addChild(top); - + Model2DRenderer bottom = new Model2DRenderer(base, 48, 0, 8, 8, 64, 32); bottom.setRotationPoint(-4.64F, 0f, -4.64f); bottom.setScale(0.5799f); bottom.setThickness(0.65f); - setRotation(bottom, (float)(Math.PI / -2), 0, 0); + setRotation(bottom, (float)(Math.PI / -2), 0, 0); this.addChild(bottom); } diff --git a/src/main/java/noppes/npcs/client/model/part/ModelHorns.java b/src/main/java/noppes/npcs/client/model/part/ModelHorns.java deleted file mode 100644 index 0b7fe1612..000000000 --- a/src/main/java/noppes/npcs/client/model/part/ModelHorns.java +++ /dev/null @@ -1,58 +0,0 @@ -package noppes.npcs.client.model.part; - -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.ModelPartData; -import noppes.npcs.ModelData; -import noppes.npcs.client.model.ModelMPM; -import noppes.npcs.client.model.util.ModelPartInterface; -import noppes.npcs.client.model.part.horns.ModelAntennasBack; -import noppes.npcs.client.model.part.horns.ModelAntennasFront; -import noppes.npcs.client.model.part.horns.ModelAntlerHorns; -import noppes.npcs.client.model.part.horns.ModelBullHorns; - -public class ModelHorns extends ModelPartInterface { - private ModelRenderer bull; - private ModelRenderer antlers; - private ModelRenderer antennasBack; - private ModelRenderer antennasFront; - - public ModelHorns(ModelMPM base) { - super(base); - - this.addChild(bull = new ModelBullHorns(base)); - this.addChild(antlers = new ModelAntlerHorns(base)); - this.addChild(antennasBack = new ModelAntennasBack(base)); - this.addChild(antennasFront = new ModelAntennasFront(base)); - } - - @Override - public void setRotationAngles(float par1, float par2, float par3, - float par4, float par5, float par6, Entity entity) { - - } - - @Override - public void initData(ModelData data) { - ModelPartData config = data.getPartData("horns"); - if(config == null) - { - isHidden = true; - return; - } - color = config.color; - isHidden = false; - - bull.isHidden = config.type != 0; - antlers.isHidden = config.type != 1; - antennasBack.isHidden = config.type != 2; - antennasFront.isHidden = config.type != 3; - - if(!config.playerTexture){ - location = config.getResource(); - } - else - location = null; - } -} diff --git a/src/main/java/noppes/npcs/client/model/part/ModelLegs.java b/src/main/java/noppes/npcs/client/model/part/ModelLegs.java index 1209fc518..a4c834263 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelLegs.java @@ -12,7 +12,6 @@ import noppes.npcs.client.ClientProxy; import noppes.npcs.client.model.ModelMPM; import noppes.npcs.client.model.part.legs.ModelDigitigradeLegs; import noppes.npcs.client.model.part.legs.ModelMermaidLegs; -import noppes.npcs.client.model.part.legs.ModelMermaidLegs2; import noppes.npcs.client.model.part.legs.ModelNagaLegs; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; @@ -28,7 +27,6 @@ public class ModelLegs extends ModelScaleRenderer{ private ModelNagaLegs naga; private ModelDigitigradeLegs digitigrade; private ModelMermaidLegs mermaid; - private ModelMermaidLegs2 mermaid2; private ModelRenderer spiderLeg1; private ModelRenderer spiderLeg2; @@ -59,9 +57,8 @@ public class ModelLegs extends ModelScaleRenderer{ private ModelMPM base; - public ModelLegs(ModelMPM base, ModelScaleRenderer leg1, ModelScaleRenderer leg2, int textWidth, int textHeight) { + public ModelLegs(ModelMPM base, ModelScaleRenderer leg1, ModelScaleRenderer leg2) { super(base); - this.base = base; this.leg1 = leg1; this.leg2 = leg2; @@ -74,61 +71,51 @@ public class ModelLegs extends ModelScaleRenderer{ float var1 = 0.0F; byte var2 = 15; spiderNeck = new ModelRenderer(base, 0, 0); - spiderNeck.setTextureSize(64,32); spiderNeck.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6, var1); spiderNeck.setRotationPoint(0.0F, (float)var2, 2.0F); spider.addChild(spiderNeck); spiderBody = new ModelRenderer(base, 0, 12); - spiderBody.setTextureSize(64,32); spiderBody.addBox(-5.0F, -4.0F, -6.0F, 10, 8, 12, var1); spiderBody.setRotationPoint(0.0F, (float)var2, 11.0F); spider.addChild(spiderBody); this.spiderLeg1 = new ModelRenderer(base, 18, 0); - this.spiderLeg1.setTextureSize(64,32); this.spiderLeg1.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, var1); this.spiderLeg1.setRotationPoint(-4.0F, (float)var2, 4.0F); spider.addChild(spiderLeg1); this.spiderLeg2 = new ModelRenderer(base, 18, 0); - this.spiderLeg2.setTextureSize(64,32); this.spiderLeg2.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, var1); this.spiderLeg2.setRotationPoint(4.0F, (float)var2, 4.0F); spider.addChild(spiderLeg2); this.spiderLeg3 = new ModelRenderer(base, 18, 0); - this.spiderLeg3.setTextureSize(64,32); this.spiderLeg3.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, var1); this.spiderLeg3.setRotationPoint(-4.0F, (float)var2, 3.0F); spider.addChild(spiderLeg3); this.spiderLeg4 = new ModelRenderer(base, 18, 0); - this.spiderLeg4.setTextureSize(64,32); this.spiderLeg4.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, var1); this.spiderLeg4.setRotationPoint(4.0F, (float)var2, 3.0F); spider.addChild(spiderLeg4); this.spiderLeg5 = new ModelRenderer(base, 18, 0); - this.spiderLeg5.setTextureSize(64,32); this.spiderLeg5.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, var1); this.spiderLeg5.setRotationPoint(-4.0F, (float)var2, 2.0F); spider.addChild(spiderLeg5); this.spiderLeg6 = new ModelRenderer(base, 18, 0); - this.spiderLeg6.setTextureSize(64,32); this.spiderLeg6.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, var1); this.spiderLeg6.setRotationPoint(4.0F, (float)var2, 2.0F); spider.addChild(spiderLeg6); this.spiderLeg7 = new ModelRenderer(base, 18, 0); - this.spiderLeg7.setTextureSize(64,32); this.spiderLeg7.addBox(-15.0F, -1.0F, -1.0F, 16, 2, 2, var1); this.spiderLeg7.setRotationPoint(-4.0F, (float)var2, 1.0F); spider.addChild(spiderLeg7); this.spiderLeg8 = new ModelRenderer(base, 18, 0); - this.spiderLeg8.setTextureSize(64,32); this.spiderLeg8.addBox(-1.0F, -1.0F, -1.0F, 16, 2, 2, var1); this.spiderLeg8.setRotationPoint(4.0F, (float)var2, 1.0F); spider.addChild(spiderLeg8); @@ -212,19 +199,10 @@ public class ModelLegs extends ModelScaleRenderer{ naga = new ModelNagaLegs(base); this.addChild(naga); - // Add Mermaid Legs mermaid = new ModelMermaidLegs(base); - mermaid2 = new ModelMermaidLegs2(base); this.addChild(mermaid); - this.addChild(mermaid2); - - boolean mirror = false; - if(textHeight != textWidth){ - mirror = true; - } - - digitigrade = new ModelDigitigradeLegs(base, mirror, textWidth, textHeight); - + + digitigrade = new ModelDigitigradeLegs(base); this.addChild(digitigrade); } public void setRotation(ModelRenderer model, float x, float y, float z) { @@ -318,18 +296,9 @@ public class ModelLegs extends ModelScaleRenderer{ naga.isSneaking = base.isSneak; naga.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); } - else if(part.type == 4 || part.type == 6){ - mermaid.isRiding = base.isRiding; - mermaid.isSleeping = base.isSleeping(entity); - mermaid.isCrawling = this.entity.currentAnimation == EnumAnimation.CRAWLING; - mermaid.isSneaking = base.isSneak; - mermaid2.isRiding = base.isRiding; - mermaid2.isSleeping = base.isSleeping(entity); - mermaid2.isCrawling = this.entity.currentAnimation == EnumAnimation.CRAWLING; - mermaid2.isSneaking = base.isSneak; - mermaid.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); - mermaid2.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); - } + else if(part.type == 4){ + mermaid.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); + } else if(part.type == 5){ digitigrade.setRotationAngles(par1, par2, par3, par4, par5, par6, entity); } @@ -345,7 +314,7 @@ public class ModelLegs extends ModelScaleRenderer{ return; GL11.glPushMatrix(); if(part.type == 4) - part.playerTexture = false; + part.playerTexture = !entity.isInWater(); if(!base.isArmor){ if(!part.playerTexture){ ClientProxy.bindTexture(part.getResource()); @@ -356,19 +325,18 @@ public class ModelLegs extends ModelScaleRenderer{ base.currentlyPlayerTexture = true; } } - if(part.type == 0){ - leg1.setConfig(config, x, y, z); - leg1.render(par1); - leg2.setConfig(config, -x, y, z); - leg2.render(par1); - } + if(part.type == 0 || part.type == 4 && !entity.isInWater()){ + leg1.setConfig(config, x, y, z); + leg1.render(par1); + leg2.setConfig(config, -x, y, z); + leg2.render(par1); + } if(!base.isArmor){ naga.isHidden = part.type != 1; spider.isHidden = part.type != 2; horse.isHidden = part.type != 3; - mermaid.isHidden = part.type != 4; - mermaid2.isHidden = part.type != 6; + mermaid.isHidden = part.type != 4 || !entity.isInWater(); digitigrade.isHidden = part.type != 5; if(!horse.isHidden){ @@ -384,7 +352,7 @@ public class ModelLegs extends ModelScaleRenderer{ x = 0; y *= 2f; } - else if(!mermaid.isHidden || !mermaid2.isHidden || !digitigrade.isHidden){ + else if(!mermaid.isHidden || !digitigrade.isHidden){ x = 0; y *= 2f; } diff --git a/src/main/java/noppes/npcs/client/model/part/ModelLimbWear.java b/src/main/java/noppes/npcs/client/model/part/ModelLimbWear.java deleted file mode 100644 index 62a325ee5..000000000 --- a/src/main/java/noppes/npcs/client/model/part/ModelLimbWear.java +++ /dev/null @@ -1,235 +0,0 @@ -package noppes.npcs.client.model.part; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import noppes.npcs.client.model.util.Model2DRenderer; -import noppes.npcs.client.model.util.ModelScaleRenderer; - -public class ModelLimbWear extends ModelScaleRenderer { - public ModelLimbWear(ModelBase base, String limb, String side) { - super(base); - - float thick = 0.55f; - switch (limb){ - case "arm": - switch (side){ - case "right": - rightArm(base,thick); - break; - case "left": - leftArm(base,thick); - break; - } - break; - case "leg": - switch (side){ - case "right": - rightLeg(base,thick); - break; - case "left": - leftLeg(base,thick); - break; - } - break; - } - - - } - - public void rightArm(ModelBase base, float thick){ - float x = 0.95f; - float y = -2.0f; - - Model2DRenderer front = new Model2DRenderer(base, 44, 36, 4, 12, 64, 64); - front.setRotationPoint(-4.52f+x, 12.535f+y, -2.58f); - front.setScale(0.96f,0.8175f); - front.setThickness(thick); - setRotation(front, 0, 0, 0); - this.addChild(front); - - Model2DRenderer back = new Model2DRenderer(base, 52, 36, 4, 12, 64, 64); - back.setRotationPoint(0.6f+x, 12.535f+y, 2.58f); - back.setScale(0.96f,0.8175f); - back.setThickness(thick); - setRotation(back, 0, (float)(Math.PI), 0); - this.addChild(back); - - Model2DRenderer right = new Model2DRenderer(base, 48, 36, 4, 12, 64, 64); - right.setRotationPoint(0.1f+x, 12.55f+y, 2.55f); - right.setScale(0.96f,0.82f); - right.setThickness(thick); - setRotation(right, 0, (float)(Math.PI/2f), 0); - this.addChild(right); - - Model2DRenderer left = new Model2DRenderer(base, 40, 36, 4, 12, 64, 64); - left.setRotationPoint(-3.98f+x, 12.55f+y, -2.55f); - left.setScale(0.96f,0.82f); - left.setThickness(thick); - setRotation(left, 0, (float)(Math.PI/-2f), 0); - this.addChild(left); - - Model2DRenderer top = new Model2DRenderer(base, 44, 32, 4, 4, 64, 64); - top.setRotationPoint(-4.525f+x, -0.6f+y, -2.55f); - top.setScale(0.32f); - top.setThickness(thick); - setRotation(top, (float)(Math.PI / -2), 0, 0); - this.addChild(top); - - Model2DRenderer bottom = new Model2DRenderer(base, 48, 32, 4, 4, 64, 64); - bottom.setRotationPoint(-4.5f+x, 12.0f+y, -2.525f); - bottom.setScale(0.32f); - bottom.setThickness(thick); - setRotation(bottom, (float)(Math.PI / -2), 0, 0); - this.addChild(bottom); - } - - public void leftArm(ModelBase base,float thick){ - float x = 2.95f; - float y = -2.0f; - - Model2DRenderer front = new Model2DRenderer(base, 52, 52, 4, 12, 64, 64); - front.setRotationPoint(-4.52f+x, 12.535f+y, -2.58f); - front.setScale(0.96f,0.8175f); - front.setThickness(thick); - setRotation(front, 0, 0, 0); - this.addChild(front); - - Model2DRenderer back = new Model2DRenderer(base, 60, 52, 4, 12, 64, 64); - back.setRotationPoint(0.6f+x, 12.535f+y, 2.58f); - back.setScale(0.96f,0.8175f); - back.setThickness(thick); - setRotation(back, 0, (float)(Math.PI), 0); - this.addChild(back); - - Model2DRenderer right = new Model2DRenderer(base, 56, 52, 4, 12, 64, 64); - right.setRotationPoint(0.06f+x, 12.55f+y, 2.55f); - right.setScale(0.96f,0.82f); - right.setThickness(thick); - setRotation(right, 0, (float)(Math.PI/2f), 0); - this.addChild(right); - - Model2DRenderer left = new Model2DRenderer(base, 48, 52, 4, 12, 64, 64); - left.setRotationPoint(-4.03f+x, 12.55f+y, -2.55f); - left.setScale(0.96f,0.82f); - left.setThickness(thick); - setRotation(left, 0, (float)(Math.PI/-2f), 0); - this.addChild(left); - - - Model2DRenderer top = new Model2DRenderer(base, 52, 48, 4, 4, 64, 64); - top.setRotationPoint(-4.525f+x, -0.6f+y, -2.55f); - top.setScale(0.32f); - top.setThickness(thick); - setRotation(top, (float)(Math.PI / -2), 0, 0); - this.addChild(top); - - Model2DRenderer bottom = new Model2DRenderer(base, 56, 48, 4, 4, 64, 64); - bottom.setRotationPoint(-4.56f+x, 12.0f+y, -2.55f); - bottom.setScale(0.32f); - bottom.setThickness(thick); - setRotation(bottom, (float)(Math.PI / -2), 0, 0); - this.addChild(bottom); - } - - public void rightLeg(ModelBase base, float thick){ - float x = 1.8f; - float y = 0.0f; - - Model2DRenderer front = new Model2DRenderer(base, 4, 36, 4, 12, 64, 64); - front.setRotationPoint(-4.52f+x, 12.535f+y, -2.58f); - front.setScale(0.96f,0.8175f); - front.setThickness(thick); - setRotation(front, 0, 0, 0); - this.addChild(front); - - Model2DRenderer back = new Model2DRenderer(base, 12, 36, 4, 12, 64, 64); - back.setRotationPoint(0.6f+x, 12.535f+y, 2.58f); - back.setScale(0.96f,0.8175f); - back.setThickness(thick); - setRotation(back, 0, (float)(Math.PI), 0); - this.addChild(back); - - Model2DRenderer right = new Model2DRenderer(base, 8, 36, 4, 12, 64, 64); - right.setRotationPoint(0.15f+x, 12.55f+y, 2.55f); - right.setScale(0.96f,0.82f); - right.setThickness(thick); - setRotation(right, 0, (float)(Math.PI/2f), 0); - this.addChild(right); - - Model2DRenderer left = new Model2DRenderer(base, 0, 36, 4, 12, 64, 64); - left.setRotationPoint(-4.03f+x, 12.55f+y, -2.55f); - left.setScale(0.96f,0.82f); - left.setThickness(thick); - setRotation(left, 0, (float)(Math.PI/-2f), 0); - this.addChild(left); - - - Model2DRenderer top = new Model2DRenderer(base, 4, 32, 4, 4, 64, 64); - top.setRotationPoint(-4.525f+x, -0.6f+y, -2.55f); - top.setScale(0.32f); - top.setThickness(thick); - setRotation(top, (float)(Math.PI / -2), 0, 0); - this.addChild(top); - - Model2DRenderer bottom = new Model2DRenderer(base, 8, 32, 4, 4, 64, 64); - bottom.setRotationPoint(-4.5f+x, 12.11f+y, -2.525f); - bottom.setScale(0.32f); - bottom.setThickness(thick); - setRotation(bottom, (float)(Math.PI / -2), 0, 0); - this.addChild(bottom); - } - - public void leftLeg(ModelBase base,float thick){ - float x = 2.05f; - float y = 0.0f; - - Model2DRenderer front = new Model2DRenderer(base, 4, 52, 4, 12, 64, 64); - front.setRotationPoint(-4.52f+x, 12.535f+y, -2.58f); - front.setScale(0.96f,0.8175f); - front.setThickness(thick); - setRotation(front, 0, 0, 0); - this.addChild(front); - - Model2DRenderer back = new Model2DRenderer(base, 12, 52, 4, 12, 64, 64); - back.setRotationPoint(0.6f+x, 12.535f+y, 2.58f); - back.setScale(0.96f,0.8175f); - back.setThickness(thick); - setRotation(back, 0, (float)(Math.PI), 0); - this.addChild(back); - - Model2DRenderer right = new Model2DRenderer(base, 8, 52, 4, 12, 64, 64); - right.setRotationPoint(0.15f+x, 12.55f+y, 2.55f); - right.setScale(0.96f,0.82f); - right.setThickness(thick); - setRotation(right, 0, (float)(Math.PI/2f), 0); - this.addChild(right); - - Model2DRenderer left = new Model2DRenderer(base, 0, 52, 4, 12, 64, 64); - left.setRotationPoint(-4.03f+x, 12.55f+y, -2.55f); - left.setScale(0.96f,0.82f); - left.setThickness(thick); - setRotation(left, 0, (float)(Math.PI/-2f), 0); - this.addChild(left); - - - Model2DRenderer top = new Model2DRenderer(base, 4, 48, 4, 4, 64, 64); - top.setRotationPoint(-4.525f+x, -0.6f+y, -2.55f); - top.setScale(0.32f); - top.setThickness(thick); - setRotation(top, (float)(Math.PI / -2), 0, 0); - this.addChild(top); - - Model2DRenderer bottom = new Model2DRenderer(base, 8, 48, 4, 4, 64, 64); - bottom.setRotationPoint(-4.5f+x, 12.11f+y, -2.525f); - bottom.setScale(0.32f); - bottom.setThickness(thick); - setRotation(bottom, (float)(Math.PI / -2), 0, 0); - this.addChild(bottom); - } - - public void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/noppes/npcs/client/model/part/ModelSkirt.java b/src/main/java/noppes/npcs/client/model/part/ModelSkirt.java deleted file mode 100644 index 09d03200d..000000000 --- a/src/main/java/noppes/npcs/client/model/part/ModelSkirt.java +++ /dev/null @@ -1,77 +0,0 @@ -package noppes.npcs.client.model.part; - -import java.util.List; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.ModelData; -import noppes.npcs.ModelPartData; -import noppes.npcs.client.model.ModelMPM; -import noppes.npcs.client.model.util.ModelPartInterface; -import noppes.npcs.client.model.util.ModelPlane; -import noppes.npcs.client.model.util.ModelPlaneRenderer; - -public class ModelSkirt extends ModelPartInterface { - private ModelPlaneRenderer Shape1; - public ModelSkirt(ModelMPM base) { - super(base); - float pi = (float) (Math.PI / 5); - - textureWidth = 64; - textureHeight = 32; - - Shape1 = new ModelPlaneRenderer(base, 58, 18); - Shape1.setTextureSize(64,32); - Shape1.addSidePlane(0, 0, 0, 9, 2); - - ModelPlaneRenderer part1 = new ModelPlaneRenderer(base, 58, 18); - part1.setTextureSize(64,32); - part1.addSidePlane(2, 0, 0, 9, 2); - part1.rotateAngleY = -(float) (Math.PI/2); - Shape1.addChild(part1); - - Shape1.setRotationPoint(2.4F, 8.8F, 0F); - setRotation(Shape1, 0.3F, -0.2f, -0.2F); - } - public void render(float par1) - { - if (this.isHidden || !this.showModel) - return; - GL11.glPushMatrix(); - GL11.glScalef(1.7f, 1.04f, 1.6f); - super.render(par1); - GL11.glPopMatrix(); - } - public void renderParts(float par1) { - for(int i = 0; i < 10; i++){ - GL11.glRotatef(36, 0, 1, 0); - Shape1.render(par1); - } - } - - public void setRotationAngles(float par1, float par2, float par3, - float par4, float par5, float par6, Entity entity) { - setRotation(Shape1, 0.3F, -0.2f, -0.2F); - Shape1.rotateAngleX += base.bipedLeftArm.rotateAngleX * 0.04f; - Shape1.rotateAngleZ += base.bipedLeftArm.rotateAngleX * 0.06f; - //this.Shape1.rotateAngleX -= MathHelper.sin(par3 * 0.067F) * 0.05F; - this.Shape1.rotateAngleZ -= MathHelper.cos(par3 * 0.09F) * 0.04F - 0.05F; - } - - @Override - public void initData(ModelData data) { - ModelPartData config = data.getPartData("skirt"); - if(config == null) - { - isHidden = true; - return; - } - color = config.color; - isHidden = false; - location = (ResourceLocation) config.getResource(); - } -} diff --git a/src/main/java/noppes/npcs/client/model/part/ModelSnout.java b/src/main/java/noppes/npcs/client/model/part/ModelSnout.java index b15165f2c..7fbee6551 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelSnout.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelSnout.java @@ -13,45 +13,34 @@ public class ModelSnout extends ModelPartInterface { private ModelRenderer medium; private ModelRenderer large; private ModelRenderer bunny; - private ModelRenderer beak; public ModelSnout(ModelMPM base) { super(base); small = new ModelRenderer(base, 24, 0); - small.setTextureSize(64,32); small.addBox(0F, 0F, 0F, 4, 3, 1); small.setRotationPoint(-2F, -3F, -5F); this.addChild(small); medium = new ModelRenderer(base, 24, 0); - medium.setTextureSize(64,32); medium.addBox(0F, 0F, 0F, 4, 3, 2); medium.setRotationPoint(-2F, -3F, -6F); this.addChild(medium); large = new ModelRenderer(base, 24, 0); - large.setTextureSize(64,32); large.addBox(0F, 0F, 0F, 4, 3, 3); large.setRotationPoint(-2F, -3F, -7F); this.addChild(large); bunny = new ModelRenderer(base, 24, 0); - bunny.setTextureSize(64,32); bunny.addBox(1F, 1F, 0F, 4, 2, 1); bunny.setRotationPoint(-3F, -4F, -5F); this.addChild(bunny); ModelRenderer tooth = new ModelRenderer(base, 24, 3); - tooth.setTextureSize(64,32); tooth.addBox(2F, 3f, 0F, 2, 1, 1); tooth.setRotationPoint(0F, 0F, 0F); bunny.addChild(tooth); - - beak = new ModelDuckBeak(base); - beak.setTextureSize(64,32); - beak.setRotationPoint(0, 0, -4F); - this.addChild(beak); } @Override @@ -75,7 +64,6 @@ public class ModelSnout extends ModelPartInterface { medium.isHidden = config.type != 1; large.isHidden = config.type != 2; bunny.isHidden = config.type != 3; - beak.isHidden = config.type != 4; if(!config.playerTexture){ location = config.getResource(); diff --git a/src/main/java/noppes/npcs/client/model/part/ModelTail.java b/src/main/java/noppes/npcs/client/model/part/ModelTail.java index 86c056087..8456637cd 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelTail.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelTail.java @@ -10,7 +10,8 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.ModelPartData; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.model.ModelMPM; -import noppes.npcs.client.model.part.tails.*; +import noppes.npcs.client.model.part.tails.ModelDragonTail; +import noppes.npcs.client.model.part.tails.ModelSquirrelTail; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityCustomNpc; @@ -25,9 +26,6 @@ public class ModelTail extends ModelScaleRenderer { private ModelRenderer dragon; private ModelRenderer squirrel; private ModelRenderer horse; - private ModelRenderer fin; - private ModelRenderer rodent; - private ModelRenderer feather; private int color = 0xFFFFFF; @@ -39,7 +37,6 @@ public class ModelTail extends ModelScaleRenderer { this.rotationPointY = 11; tail = new ModelRenderer(base, 56, 21); - tail.setTextureSize(64, 32); tail.addBox(-1F, 0F, 0F, 2, 9, 2); tail.setRotationPoint(0F, 0, 1F); setRotation(tail, 0.8714253F, 0F, 0F); @@ -71,11 +68,6 @@ public class ModelTail extends ModelScaleRenderer { this.addChild(dragon = new ModelDragonTail(base)); this.addChild(squirrel = new ModelSquirrelTail(base)); - - this.addChild(fin = new ModelTailFin(base)); - this.addChild(rodent = new ModelRodentTail(base)); - - this.addChild(feather = new ModelFeatherTail(base)); } public void setData(EntityCustomNpc entity) { @@ -126,9 +118,6 @@ public class ModelTail extends ModelScaleRenderer { dragon.isHidden = config.type != 1; horse.isHidden = config.type != 2; squirrel.isHidden = config.type != 3; - fin.isHidden = config.type != 4; - rodent.isHidden = config.type != 5; - feather.isHidden = config.type != 6; if(!config.playerTexture){ location = config.getResource(); } diff --git a/src/main/java/noppes/npcs/client/model/part/ModelWings.java b/src/main/java/noppes/npcs/client/model/part/ModelWings.java index f9550baa3..511038fba 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelWings.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelWings.java @@ -17,14 +17,14 @@ public class ModelWings extends ModelPartInterface { public ModelWings(ModelMPM base) { super(base); - lWing = new Model2DRenderer(base, 48, 32, 16, 32, 64, 32); + lWing = new Model2DRenderer(base, 56, 16, 8, 16, 64, 32); lWing.mirror = true; lWing.setRotationPoint(2F, 4, 2F); lWing.setRotationOffset(-16, -12); setRotation(lWing, 0.7141593F, -0.5235988F, -0.5090659F); this.addChild(lWing); - rWing = new Model2DRenderer(base, 48, 32, 16, 32, 64, 32); + rWing = new Model2DRenderer(base, 56, 16, 8, 16, 64, 32); rWing.setRotationPoint(-2F, 4F, 2F); rWing.setRotationOffset(-16, -12); setRotation(rWing, 0.7141593F, 0.5235988F, 0.5090659F); diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java deleted file mode 100644 index 45dc32564..000000000 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java +++ /dev/null @@ -1,49 +0,0 @@ -package noppes.npcs.client.model.part.horns; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import noppes.npcs.client.model.ModelMPM; - -public class ModelAntennasBack extends ModelRenderer { - - public ModelAntennasBack(ModelMPM base) { - super(base); - - ModelRenderer rightantenna1 = new ModelRenderer(base, 36, 0); - rightantenna1.setTextureSize(64,32); - rightantenna1.addBox(-1F, 0F, 0F, 1, 4, 1); - rightantenna1.setRotationPoint(3F, -10.9F, 0F); - setRotation(rightantenna1, -0.7504916F, 0.0698132F, 0.0698132F); - addChild(rightantenna1); - - ModelRenderer leftantenna1 = new ModelRenderer(base, 32, 0); - leftantenna1.setTextureSize(64,32); - leftantenna1.mirror = true; - leftantenna1.addBox(0F, 0F, 0F, 1, 4, 1); - leftantenna1.setRotationPoint(-3F, -10.9F, 0F); - setRotation(leftantenna1, -0.7504916F, -0.0698132F, -0.0698132F); - addChild(leftantenna1); - - ModelRenderer rightantenna2 = new ModelRenderer(base, 36, 0); - rightantenna2.setTextureSize(64,32); - rightantenna2.addBox(-1F, 0F, 0F, 1, 4, 1); - rightantenna2.setRotationPoint(4.6F, -12.2F, 3.4F); - setRotation(rightantenna2, -1.22173F, 0.4363323F, 0.0698132F); - addChild(rightantenna2); - - ModelRenderer leftantenna2 = new ModelRenderer(base, 32, 0); - leftantenna2.setTextureSize(64,32); - leftantenna2.mirror = true; - leftantenna2.addBox(0F, 0F, 0F, 1, 4, 1); - leftantenna2.setRotationPoint(-4.6F, -12.2F, 3.4F); - setRotation(leftantenna2, -1.22173F, -0.4363323F, -0.0698132F); - addChild(leftantenna2); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java deleted file mode 100644 index e0aadfe73..000000000 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java +++ /dev/null @@ -1,49 +0,0 @@ -package noppes.npcs.client.model.part.horns; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import noppes.npcs.client.model.ModelMPM; - -public class ModelAntennasFront extends ModelRenderer { - - public ModelAntennasFront(ModelMPM base) { - super(base); - - ModelRenderer rightantenna1 = new ModelRenderer(base, 36, 0); - rightantenna1.setTextureSize(64,32); - rightantenna1.addBox(0F, 0F, 0F, 1, 4, 1); - rightantenna1.setRotationPoint(2F, -9.4F, -2F); - setRotation(rightantenna1, 0.4014257F, 0.0698132F, 0.0698132F); - addChild(rightantenna1); - - ModelRenderer leftantenna1 = new ModelRenderer(base, 32, 0); - leftantenna1.setTextureSize(64,32); - leftantenna1.mirror = true; - leftantenna1.addBox(-1F, 0F, 0F, 1, 4, 1); - leftantenna1.setRotationPoint(-2F, -9.4F, -2F); - setRotation(leftantenna1, 0.4014257F, -0.0698132F, -0.0698132F); - addChild(leftantenna1); - - ModelRenderer rightantenna2 = new ModelRenderer(base, 36, 0); - rightantenna2.setTextureSize(64,32); - rightantenna2.addBox(0F, 0F, 0F, 1, 4, 1); - rightantenna2.setRotationPoint(3F, -10.2F, -5.3F); - setRotation(rightantenna2, 1.22173F, -0.2094395F, 0.0698132F); - addChild(rightantenna2); - - ModelRenderer leftantenna2 = new ModelRenderer(base, 32, 0); - leftantenna2.setTextureSize(64,32); - leftantenna2.mirror = true; - leftantenna2.addBox(-1F, 0F, 0F, 1, 4, 1); - leftantenna2.setRotationPoint(-3F, -10.2F, -5.3F); - setRotation(leftantenna2, 1.22173F, 0.2094395F, -0.0698132F); - addChild(leftantenna2); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java deleted file mode 100644 index 6d0142f74..000000000 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java +++ /dev/null @@ -1,92 +0,0 @@ -package noppes.npcs.client.model.part.horns; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import noppes.npcs.client.model.ModelMPM; - -public class ModelAntlerHorns extends ModelRenderer { - - public ModelAntlerHorns(ModelMPM base) { - super(base); - - textureWidth = 64; - textureHeight = 32; - - ModelRenderer right_base_horn = new ModelRenderer(base, 58, 20); - right_base_horn.setTextureSize(64,32); - right_base_horn.addBox(0F, -5F, 0F, 1, 6, 1); - right_base_horn.setRotationPoint(-2.5F, -6F, -1F); - setRotation(right_base_horn, 0F, 0F, -0.2F); - addChild(right_base_horn); - - ModelRenderer right_horn1 = new ModelRenderer(base, 58, 20); - right_horn1.setTextureSize(64,32); - right_horn1.addBox(0F, -5F, 0F, 1, 5, 1); - right_horn1.setRotationPoint(0F, -4F, 0F); - setRotation(right_horn1, 1F, 0F, -1F); - right_base_horn.addChild(right_horn1); - - ModelRenderer right_horn2 = new ModelRenderer(base, 58, 20); - right_horn2.setTextureSize(64,32); - right_horn2.addBox(0F, -4F, 0F, 1, 5, 1); - right_horn2.setRotationPoint(-0F, -6F, -0F); - setRotation(right_horn2, -0.5F, -0.5F, 0F); - right_base_horn.addChild(right_horn2); - - ModelRenderer things1 = new ModelRenderer(base, 58, 20); - things1.setTextureSize(64,32); - things1.addBox(0F, -5F, 0F, 1, 5, 1); - things1.setRotationPoint(0F, -3F, 1F); - setRotation(things1, 2F, 0.5f, 0.5f); - right_horn2.addChild(things1); - - ModelRenderer things2 = new ModelRenderer(base, 58, 20); - things2.setTextureSize(64,32); - things2.addBox(0F, -5F, 0F, 1, 5, 1); - things2.setRotationPoint(0F, -3F, 1F); - setRotation(things2, 2F, -0.5f, -0.5f); - right_horn2.addChild(things2); - - ModelRenderer left_base_horn = new ModelRenderer(base, 58, 20); - left_base_horn.setTextureSize(64,32); - left_base_horn.addBox(0F, -5F, 0F, 1, 6, 1); - left_base_horn.setRotationPoint(1.5F, -6F, -1F); - setRotation(left_base_horn, 0F, 0F, 0.2F); - addChild(left_base_horn); - - ModelRenderer left_horn1 = new ModelRenderer(base, 58, 20); - left_horn1.setTextureSize(64,32); - left_horn1.addBox(0F, -5F, 0F, 1, 5, 1); - left_horn1.setRotationPoint(0F, -5F, 0F); - setRotation(left_horn1, 1F, 0F, 1F); - left_base_horn.addChild(left_horn1); - - ModelRenderer left_horn2 = new ModelRenderer(base, 58, 20); - left_horn2.setTextureSize(64,32); - left_horn2.addBox(0F, -4F, 0F, 1, 5, 1); - left_horn2.setRotationPoint(0F, -6F, 1F); - setRotation(left_horn2, -0.5F, 0.5F, 0F); - left_base_horn.addChild(left_horn2); - - ModelRenderer things8 = new ModelRenderer(base, 58, 20); - things8.setTextureSize(64,32); - things8.addBox(0F, -5F, 0F, 1, 5, 1); - things8.setRotationPoint(0F, -3F, 1F); - setRotation(things8, 2F, -0.5f, -0.5f); - left_horn2.addChild(things8); - - ModelRenderer things4 = new ModelRenderer(base, 58, 20); - things4.setTextureSize(64,32); - things4.addBox(0F, -5F, 0F, 1, 5, 1); - things4.setRotationPoint(0F, -3F, 1F); - setRotation(things4, 2F, 0.5f, 0.5f); - left_horn2.addChild(things4); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelBullHorns.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelBullHorns.java deleted file mode 100644 index b1fe8e393..000000000 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelBullHorns.java +++ /dev/null @@ -1,63 +0,0 @@ -package noppes.npcs.client.model.part.horns; - -import net.minecraft.client.model.ModelRenderer; -import noppes.npcs.client.model.ModelMPM; - -public class ModelBullHorns extends ModelRenderer { - - public ModelBullHorns(ModelMPM base) { - super(base); - - textureWidth = 64; - textureHeight = 32; - - ModelRenderer Left1 = new ModelRenderer(base, 36, 16); - Left1.setTextureSize(64,32); - Left1.mirror = true; - Left1.addBox(0F, 0F, 0F, 2, 2, 2); - Left1.setRotationPoint(4F, -8F, -2F); - addChild(Left1); - - ModelRenderer Right1 = new ModelRenderer(base, 36, 16); - Right1.setTextureSize(64,32); - Right1.addBox(-3F, 0F, 0F, 2, 2, 2); - Right1.setRotationPoint(-3F, -8F, -2F); - addChild(Right1); - - ModelRenderer Left2 = new ModelRenderer(base, 12, 16); - Left2.setTextureSize(64,32); - Left2.mirror = true; - Left2.addBox(0F, 0F, 0F, 2, 2, 2); - Left2.setRotationPoint(5F, -8F, -2F); - setRotation(Left2, 0.0371786F, 0.3346075F, -0.2602503F); - addChild(Left2); - - ModelRenderer Right2 = new ModelRenderer(base, 12, 16); - Right2.setTextureSize(64,32); - Right2.addBox(-2F, 0F, 0F, 2, 2, 2); - Right2.setRotationPoint(-5F, -8F, -2F); - setRotation(Right2, 0.0371786F, -0.3346075F, 0.2602503F); - addChild(Right2); - - ModelRenderer Left3 = new ModelRenderer(base, 13, 17); - Left3.setTextureSize(64,32); - Left3.mirror = true; - Left3.addBox(-1F, 0F, 0F, 2, 1, 1); - Left3.setRotationPoint(7F, -8F, -2F); - setRotation(Left3, 0.2602503F, 0.8551081F, -0.4089647F); - addChild(Left3); - - ModelRenderer Right3 = new ModelRenderer(base, 13, 17); - Right3.setTextureSize(64,32); - Right3.addBox(-1F, 0F, 0F, 2, 1, 1); - Right3.setRotationPoint(-7F, -8F, -2F); - setRotation(Right3, -0.2602503F, -0.8551081F, 0.4089647F); - addChild(Right3); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java b/src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java index 5b401cb73..6f02c6086 100644 --- a/src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java @@ -22,40 +22,34 @@ public class ModelDigitigradeLegs extends ModelRenderer { private ModelMPM base; - public ModelDigitigradeLegs(ModelMPM base, boolean mirror, int textWidth, int textHeight) { + public ModelDigitigradeLegs(ModelMPM base) { super(base); this.base = base; - rightleg = new ModelRenderer(base, 0, 16); - rightleg.setTextureSize(textWidth, textHeight); rightleg.addBox(-2F, 0F, -2F, 4, 6, 4); rightleg.setRotationPoint(-2.1F, 11F, 0F); setRotation(rightleg, -0.3F, 0F, 0F); this.addChild(rightleg); rightleg2 = new ModelRenderer(base, 0, 20); - rightleg2.setTextureSize(textWidth, textHeight); rightleg2.addBox(-1.5F, -1F, -2F, 3, 7, 3); rightleg2.setRotationPoint(0F, 4.1F, 0F); setRotation(rightleg2, 1.1f, 0F, 0F); rightleg.addChild(rightleg2); rightleglow = new ModelRenderer(base, 0, 24); - rightleglow.setTextureSize(textWidth, textHeight); rightleglow.addBox(-1.5F, 0F, -1F, 3, 5, 2); rightleglow.setRotationPoint(0F, 5F, 0F); setRotation(rightleglow, -1.35F, 0F, 0F); rightleg2.addChild(rightleglow); rightfoot = new ModelRenderer(base, 1, 26); - rightfoot.setTextureSize(textWidth, textHeight); rightfoot.addBox(-1.5F, 0F, -5F, 3, 2, 4); rightfoot.setRotationPoint(0F, 3.7F, 1.2F); setRotation(rightfoot, 0.55F, 0F, 0F); rightleglow.addChild(rightfoot); leftleg = new ModelRenderer(base, 0, 16); - leftleg.setTextureSize(textWidth, textHeight); leftleg.mirror = true; leftleg.addBox(-2F, 0F, -2F, 4, 6, 4); leftleg.setRotationPoint(2.1F, 11F, 0F); @@ -63,7 +57,6 @@ public class ModelDigitigradeLegs extends ModelRenderer { this.addChild(leftleg); leftleg2 = new ModelRenderer(base, 0, 20); - leftleg2.setTextureSize(textWidth, textHeight); leftleg2.mirror = true; leftleg2.addBox(-1.5F, -1F, -2F, 3, 7, 3); leftleg2.setRotationPoint(0F, 4.1F, 0F); @@ -71,7 +64,6 @@ public class ModelDigitigradeLegs extends ModelRenderer { leftleg.addChild(leftleg2); leftleglow = new ModelRenderer(base, 0, 24); - leftleglow.setTextureSize(textWidth, textHeight); leftleglow.mirror = true; leftleglow.addBox(-1.5F, 0F, -1F, 3, 5, 2); leftleglow.setRotationPoint(0F, 5F, 0F); @@ -79,7 +71,6 @@ public class ModelDigitigradeLegs extends ModelRenderer { leftleg2.addChild(leftleglow); leftfoot = new ModelRenderer(base, 1, 26); - leftfoot.setTextureSize(textWidth, textHeight); leftfoot.mirror = true; leftfoot.addBox(-1.5F, 0F, -5F, 3, 2, 4); leftfoot.setRotationPoint(0F, 3.7F, 1.2F); diff --git a/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs.java b/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs.java index 9de42c1a7..817709eec 100644 --- a/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs.java @@ -4,11 +4,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; -import noppes.npcs.CustomNpcs; -import noppes.npcs.ModelData; -import noppes.npcs.constants.EnumAnimation; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.entity.EntityCustomNpc; public class ModelMermaidLegs extends ModelRenderer { @@ -18,52 +13,42 @@ public class ModelMermaidLegs extends ModelRenderer { ModelRenderer fin1; ModelRenderer fin2; - public boolean isRiding = false; - public boolean isSneaking = false; - public boolean isSleeping = false; - public boolean isCrawling = false; - public ModelMermaidLegs(ModelBase base) { - super(base); - textureWidth = 64; - textureHeight = 32; + super(base); + textureWidth = 64; + textureHeight = 32; - top = new ModelRenderer(base, 0, 16); - top.setTextureSize(64,32); - top.addBox(-2F, -2.5F, -2F, 8, 9, 4); - top.setRotationPoint(-2F, 14F, 1F); - setRotation(top, 0.26F, 0F, 0F); + top = new ModelRenderer(base, 0, 16); + top.addBox(-2F, -2.5F, -2F, 8, 9, 4); + top.setRotationPoint(-2F, 14F, 1F); + setRotation(top, 0.26F, 0F, 0F); - middle = new ModelRenderer(base, 28, 0); - middle.setTextureSize(64,32); - middle.addBox(0F, 0F, 0F, 7, 6, 4); - middle.setRotationPoint(-1.5F, 6.5F, -1F); - setRotation(middle, 0.86f, 0F, 0F); - top.addChild(middle); + middle = new ModelRenderer(base, 28, 0); + middle.addBox(0F, 0F, 0F, 7, 6, 4); + middle.setRotationPoint(-1.5F, 6.5F, -1F); + setRotation(middle, 0.86f, 0F, 0F); + top.addChild(middle); - bottom = new ModelRenderer(base, 24, 16); - bottom.setTextureSize(64,32); - bottom.addBox(0F, 0F, 0F, 6, 7, 3); - bottom.setRotationPoint(0.5F, 6F, 0.5f); - setRotation(bottom, 0.15f, 0F, 0F); - middle.addChild(bottom); + bottom = new ModelRenderer(base, 24, 16); + bottom.addBox(0F, 0F, 0F, 6, 7, 3); + bottom.setRotationPoint(0.5F, 6F, 0.5f); + setRotation(bottom, 0.15f, 0F, 0F); + middle.addChild(bottom); - fin1 = new ModelRenderer(base, 0, 0); - fin1.setTextureSize(64,32); - fin1.addBox(0F, 0F, 0F, 5, 9, 1); - fin1.setRotationPoint(0F, 4.5F, 1F); - setRotation(fin1, 0.05f, 0, 0.5911399F); - bottom.addChild(fin1); + fin1 = new ModelRenderer(base, 0, 0); + fin1.addBox(0F, 0F, 0F, 5, 9, 1); + fin1.setRotationPoint(0F, 4.5F, 1F); + setRotation(fin1, 0.05f, 0, 0.5911399F); + bottom.addChild(fin1); + + fin2 = new ModelRenderer(base, 0, 0); + fin2.mirror = true; + fin2.addBox(-5F, 0F, 0F, 5, 9, 1); + fin2.setRotationPoint(6F, 4.5F, 1F); + setRotation(fin2, 0.05f, 0, -0.591143F); + bottom.addChild(fin2); - fin2 = new ModelRenderer(base, 0, 0); - fin2.setTextureSize(64,32); - fin2.mirror = true; - fin2.addBox(-5F, 0F, 0F, 5, 9, 1); - fin2.setRotationPoint(6F, 4.5F, 1F); - setRotation(fin2, 0.05f, 0, -0.591143F); - bottom.addChild(fin2); - - } + } @Override public void render(float f5) { @@ -81,21 +66,12 @@ public class ModelMermaidLegs extends ModelRenderer { public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6, Entity entity) { float ani = MathHelper.sin(par1 * 0.6662F); - top.setRotationPoint(-2F, 14F, 1F); if(ani > 0.2) ani /= 3f; - if(this.isSleeping || this.isCrawling){ - top.rotateAngleX = middle.rotateAngleX = bottom.rotateAngleX = fin2.rotateAngleX = 0; - } - else{ - top.rotateAngleX = 0.26F - ani * 0.2F * par2; - middle.rotateAngleX = 0.86f - ani * 0.24F * par2; - bottom.rotateAngleX = 0.15f - ani * 0.28F * par2; - fin2.rotateAngleX = fin1.rotateAngleX = 0.05f - ani * 0.35F * par2; - - if(entity.isSneaking()){ - top.setRotationPoint(-2F, 12F, 6F); - } - } + top.rotateAngleX = 0.26F - ani * 0.2F * par2; + middle.rotateAngleX = 0.86f - ani * 0.24F * par2; + bottom.rotateAngleX = 0.15f - ani * 0.28F * par2; + fin2.rotateAngleX = fin1.rotateAngleX = 0.05f - ani * 0.35F * par2; + } } diff --git a/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs2.java b/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs2.java deleted file mode 100644 index ed1ea7b16..000000000 --- a/src/main/java/noppes/npcs/client/model/part/legs/ModelMermaidLegs2.java +++ /dev/null @@ -1,122 +0,0 @@ -package noppes.npcs.client.model.part.legs; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; -import noppes.npcs.ModelData; -import noppes.npcs.constants.EnumAnimation; - -public class ModelMermaidLegs2 extends ModelRenderer { - - ModelRenderer Tail1; - ModelRenderer Tail2; - ModelRenderer Tail3; - ModelRenderer Tail4; - ModelRenderer Tail5; - ModelRenderer Tail6; - ModelRenderer Tail7; - ModelRenderer Tail8; - - public boolean isRiding = false; - public boolean isSneaking = false; - public boolean isSleeping = false; - public boolean isCrawling = false; - - public ModelMermaidLegs2(ModelBase base) { - super(base); - textureWidth = 64; - textureHeight = 32; - - Tail1 = new ModelRenderer(base, 0, 18); - Tail1.setTextureSize(64,32); - Tail1.addBox(0F, 0F, 0F, 8, 6, 4); - Tail1.setRotationPoint(-4F, 12F, -2F); - setRotation(Tail1, 0.075F, 0F, 0F); - - Tail2 = new ModelRenderer(base, 0, 18); - Tail2.setTextureSize(64,32); - Tail2.addBox(0F, 0F, 0F, 6, 5, 3); - Tail2.setRotationPoint(1F, 5.5F, 0.3F); - setRotation(Tail2, 0.56F, 0F, 0F); - Tail1.addChild(Tail2); - - Tail3 = new ModelRenderer(base, 0, 18); - Tail3.setTextureSize(64,32); - Tail3.addBox(0F, 0F, 0F, 5, 5, 2); - Tail3.setRotationPoint(5.5F, 4F, 2.5F); - setRotation(Tail3, -0.37818F, 3.141593F, 0F); - Tail2.addChild(Tail3); - - Tail4 = new ModelRenderer(base, 0, 20); - Tail4.setTextureSize(64,32); - Tail4.addBox(0F, 0F, 0F, 4, 3, 1); - Tail4.setRotationPoint(0.5F, 4.5F, 0.5F); - setRotation(Tail4, -0.1f, 0, 0F); - Tail3.addChild(Tail4); - - Tail5 = new ModelRenderer(base, 0, 20); - Tail5.setTextureSize(64,32); - Tail5.addBox(0F, 0F, 0F, 1, 3, 1); - Tail5.setRotationPoint(-1F, 1.5F, 0F); - setRotation(Tail5, 0, 0, 0F); - Tail4.addChild(Tail5); - - Tail6 = new ModelRenderer(base, 0, 20); - Tail6.setTextureSize(64,32); - Tail6.addBox(0F, 0F, 0F, 1, 3, 1); - Tail6.setRotationPoint(-2F, 3F, 0F); - setRotation(Tail6, 0, 0, 0F); - Tail4.addChild(Tail6); - - Tail7 = new ModelRenderer(base, 0, 20); - Tail7.setTextureSize(64,32); - Tail7.addBox(0F, 0F, 0F, 1, 3, 1); - Tail7.setRotationPoint(4F, 1.5F, 0F); - setRotation(Tail7, 0, 0, 0F); - Tail4.addChild(Tail7); - - Tail8 = new ModelRenderer(base, 0, 20); - Tail8.setTextureSize(64,32); - Tail8.addBox(0F, 0F, 0F, 1, 3, 1); - Tail8.setRotationPoint(5F, 3F, 0F); - setRotation(Tail8, 0, 0, 0F); - Tail4.addChild(Tail8); - - } - - @Override - public void render(float f5) { - if (isHidden || !showModel) - return; - Tail1.render(f5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6, - Entity entity) { - Tail1.setRotationPoint(-4F, 12F, -2F); - float ani = MathHelper.sin(par1 * 0.6662F); - if (ani > 0.2) - ani /= 3f; - if(this.isSleeping || this.isCrawling){ - Tail1.rotateAngleX = Tail2.rotateAngleX = Tail3.rotateAngleX = Tail4.rotateAngleX = 0; - } - else{ - Tail1.rotateAngleX = 0.2F - ani * 0.2F * par2; - Tail2.rotateAngleX = 0.56F - ani * 0.24F * par2; - Tail3.rotateAngleX = -0.4F + ani * 0.24F * par2; - Tail4.rotateAngleX = -0.1f + ani * 0.10F * par2; - - if(entity.isSneaking()){ - Tail1.setRotationPoint(-4F, 10F, 3F); - } - } - - } -} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java b/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java index f45c8699f..238971fd5 100644 --- a/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java @@ -25,11 +25,8 @@ public class ModelNagaLegs extends ModelRenderer{ super(base); nagaPart1 = new ModelRenderer(base,0,0); -// nagaPart1.setTextureSize(64,32); ModelRenderer legPart = new ModelRenderer(base,0,16); -// legPart.setTextureSize(64,32); - legPart.addBox(0, -2, -2, 4, 4, 4); legPart.setRotationPoint(-4, 0, 0); nagaPart1.addChild(legPart); @@ -39,11 +36,9 @@ public class ModelNagaLegs extends ModelRenderer{ nagaPart1.addChild(legPart); nagaPart2 = new ModelRenderer(base,0,0); -// nagaPart2.setTextureSize(64,32); nagaPart2.childModels = nagaPart1.childModels; nagaPart3 = new ModelRenderer(base,0,0); -// nagaPart3.setTextureSize(64,32); ModelPlaneRenderer plane = new ModelPlaneRenderer(base, 4, 24); plane.addBackPlane(0,-2, 0, 4, 4); @@ -94,11 +89,9 @@ public class ModelNagaLegs extends ModelRenderer{ nagaPart3.addChild(plane); nagaPart4 = new ModelRenderer(base,0,0); -// nagaPart4.setTextureSize(64,32); nagaPart4.childModels = nagaPart3.childModels; nagaPart5 = new ModelRenderer(base,0,0); -// nagaPart5.setTextureSize(64,32); legPart = new ModelRenderer(base,56,20); legPart.addBox(0, 0, -2, 2, 5, 2); diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelDragonTail.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelDragonTail.java index 8516d385d..ee356aaba 100644 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelDragonTail.java +++ b/src/main/java/noppes/npcs/client/model/part/tails/ModelDragonTail.java @@ -14,49 +14,38 @@ public class ModelDragonTail extends ModelRenderer { int y = 16; ModelRenderer dragon = new ModelRenderer(base, x, y); - dragon.setTextureSize(64,32); dragon.setRotationPoint(0F, 0F, 3F); this.addChild(dragon); ModelRenderer DragonTail2 = new ModelRenderer(base, x, y); - DragonTail2.setTextureSize(64, 32); DragonTail2.setRotationPoint(0F, 2F, 2F); ModelRenderer DragonTail3 = new ModelRenderer(base, x, y); - DragonTail3.setTextureSize(64, 32); DragonTail3.setRotationPoint(0F, 4.5F, 4F); ModelRenderer DragonTail4 = new ModelRenderer(base, x, y); - DragonTail4.setTextureSize(64, 32); DragonTail4.setRotationPoint(0F, 7F, 5.75F); ModelRenderer DragonTail5 = new ModelRenderer(base, x, y); - DragonTail5.setTextureSize(64, 32); DragonTail5.setRotationPoint(0F, 9F, 8F); ModelPlaneRenderer planeLeft = new ModelPlaneRenderer(base, x, y); - planeLeft.setTextureSize(64, 32); planeLeft.addSidePlane(-1.5F, -1.5F, -1.5F, 3, 3); ModelPlaneRenderer planeRight = new ModelPlaneRenderer(base, x, y); - planeRight.setTextureSize(64, 32); planeRight.addSidePlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeRight, (float)Math.PI, (float)Math.PI ,0); ModelPlaneRenderer planeTop = new ModelPlaneRenderer(base, x, y); - planeTop.setTextureSize(64, 32); planeTop.addTopPlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeTop, 0 ,-(float)Math.PI / 2,0); ModelPlaneRenderer planeBottom = new ModelPlaneRenderer(base, x, y); - planeBottom.setTextureSize(64, 32); planeBottom.addTopPlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeBottom, 0 ,-(float)Math.PI / 2, (float)Math.PI); ModelPlaneRenderer planeBack = new ModelPlaneRenderer(base, x, y); - planeBack.setTextureSize(64, 32); planeBack.addBackPlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeBack, 0, 0 ,(float)Math.PI / 2); ModelPlaneRenderer planeFront = new ModelPlaneRenderer(base, x, y); - planeFront.setTextureSize(64, 32); planeFront.addBackPlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeFront, 0, (float)Math.PI ,-(float)Math.PI / 2); diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java deleted file mode 100644 index 5f2feac0c..000000000 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java +++ /dev/null @@ -1,66 +0,0 @@ -package noppes.npcs.client.model.part.tails; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelFeatherTail extends ModelRenderer { - ModelRenderer feather1; - ModelRenderer feather2; - ModelRenderer feather3; - ModelRenderer feather4; - ModelRenderer feather5; - - public ModelFeatherTail(ModelBiped base) { - super(base); - - int x = 56; - int y = 16; - - feather1 = new ModelRenderer(base, x, y); - feather1.setTextureSize(64,32); - feather1.addBox(-1.5F, 0F, 0F, 3, 8, 0); - feather1.setRotationPoint(1F, -0.5F, 2F); - setRotation(feather1, 1.482807F, 0.2602503F, 0.1487144F); - addChild(feather1); - - feather2 = new ModelRenderer(base, x, y); - feather2.setTextureSize(64,32); - feather2.addBox(-1.5F, 0F, 0F, 3, 8, 0); - feather2.setRotationPoint(0F, -0.5F, 1F); - setRotation(feather2, 1.200559F, 0.3717861F, 0.1858931F); - addChild(feather2); - - feather3 = new ModelRenderer(base, x, y); - feather3.setTextureSize(64,32); - feather3.mirror = true; - feather3.addBox(-1.5F, -0.5F, 0F, 3, 8, 0); - feather3.setRotationPoint(-1F, 0, 2F); - setRotation(feather3, 1.256389F, -0.4089647F, -0.4833219F); - addChild(feather3); - - feather4 = new ModelRenderer(base, x, y); - feather4.setTextureSize(64,32); - feather4.addBox(-1.5F, 0F, 0F, 3, 8, 0); - feather4.setRotationPoint(0F, -0.5F, 2F); - setRotation(feather4, 1.786329F, 0F, 0F); - addChild(feather4); - - feather5 = new ModelRenderer(base, x, y); - feather5.setTextureSize(64,32); - feather5.mirror = true; - feather5.addBox(-1.5F, 0F, 0F, 3, 8, 0); - feather5.setRotationPoint(-1F, -0.5F, 2F); - setRotation(feather5, 1.570073F, -0.2602503F, -0.2230717F); - addChild(feather5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} - diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java deleted file mode 100644 index bd9a1d811..000000000 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java +++ /dev/null @@ -1,35 +0,0 @@ -package noppes.npcs.client.model.part.tails; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import noppes.npcs.client.model.ModelMPM; - -public class ModelRodentTail extends ModelRenderer { - ModelRenderer Shape1; - ModelRenderer Shape2; - - public ModelRodentTail(ModelMPM base) { - super(base); - - Shape1 = new ModelRenderer(base, 0, 0); - Shape1.setTextureSize(64,32); - Shape1.addBox(-0.5333334F, -0.4666667F, -1F, 1, 1, 6); - Shape1.setRotationPoint(0F, 0F, 2F); - setRotation(Shape1, -0.9294653F, 0F, 0F); - addChild(Shape1); - - Shape2 = new ModelRenderer(base, 1, 1); - Shape2.setTextureSize(64,32); - Shape2.addBox(-0.5F, -0.1666667F, 1F, 1, 1, 5); - Shape2.setRotationPoint(0F, 3F, 4F); - setRotation(Shape2, -0.4833219F, 0F, 0F); - addChild(Shape2); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelSquirrelTail.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelSquirrelTail.java index bfce7c823..fbd72b42d 100644 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelSquirrelTail.java +++ b/src/main/java/noppes/npcs/client/model/part/tails/ModelSquirrelTail.java @@ -16,35 +16,30 @@ public class ModelSquirrelTail extends ModelRenderer { textureHeight = 32; ModelRenderer Shape1 = new ModelRenderer(base, 0, 0); - Shape1.setTextureSize(64,32); Shape1.addBox(-1F, -1F, -1F, 2, 2, 3); Shape1.setRotationPoint(0F, -1F, 3F); setRotation(Shape1, 0F, 0F, 0F); this.addChild(Shape1); ModelRenderer Shape2 = new ModelRenderer(base, 0, 9); - Shape2.setTextureSize(64,32); Shape2.addBox(-2F, -5F, -1F, 4, 5, 3); Shape2.setRotationPoint(0F, 0F, 1F); setRotation(Shape2, -0.37F, 0F, 0F); Shape1.addChild(Shape2); ModelRenderer Shape3 = new ModelRenderer(base, 0, 18); - Shape3.setTextureSize(64,32); Shape3.addBox(-2.466667F, -6F, -1F, 5, 7, 3); Shape3.setRotationPoint(0F, -5F, 0F); setRotation(Shape3, 0.3f, 0F, 0F); Shape2.addChild(Shape3); ModelRenderer Shape4 = new ModelRenderer(base, 25, 0); - Shape4.setTextureSize(64,32); Shape4.addBox(-3F, -0.6F, -1F, 6, 5, 3); Shape4.setRotationPoint(0F, -5F, 1F); setRotation(Shape4, 2.5F, 0F, 0F); Shape3.addChild(Shape4); ModelRenderer Shape5 = new ModelRenderer(base, 25, 10); - Shape5.setTextureSize(64,32); Shape5.addBox(-3F, -2F, -1F, 6, 3, 5); Shape5.setRotationPoint(0F, 3.5F, 0F); setRotation(Shape5, -2.5F, 0F, 0F); diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java deleted file mode 100644 index b89691ea0..000000000 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java +++ /dev/null @@ -1,52 +0,0 @@ -package noppes.npcs.client.model.part.tails; - -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import noppes.npcs.client.model.ModelMPM; - -public class ModelTailFin extends ModelRenderer { - - public ModelTailFin(ModelMPM base) { - super(base); - - textureWidth = 64; - textureHeight = 32; - - ModelRenderer Shape1 = new ModelRenderer(base, 0, 0); - Shape1.setTextureSize(64,32); - Shape1.addBox(-2F, -2F, -2F, 3, 3, 8); - Shape1.setRotationPoint(0.5F, 0F, 1F); - setRotation(Shape1, -0.669215F, 0F, 0F); - addChild(Shape1); - - ModelRenderer Shape2 = new ModelRenderer(base, 2, 2); - Shape2.setTextureSize(64,32); - Shape2.addBox(-1F, -1F, 1F, 3, 2, 6); - Shape2.setRotationPoint(-0.5F, 3F, 4.5F); - setRotation(Shape2, -0.2602503F, 0F, 0F); - addChild(Shape2); - - ModelRenderer Shape3 = new ModelRenderer(base, 0, 11); - Shape3.setTextureSize(64,32); - Shape3.addBox(-1F, -1F, -1F, 3, 1, 6); - Shape3.setRotationPoint(0.5F, 5F, 12F); - setRotation(Shape3, 0F, 1.07818F, 0F); - addChild(Shape3); - - ModelRenderer Shape4 = new ModelRenderer(base, 0, 11); - Shape4.setTextureSize(64,32); - Shape4.mirror = true; - Shape4.addBox(-2F, 0F, -1F, 3, 1, 6); - Shape4.setRotationPoint(-0.5F, 4F, 12F); - setRotation(Shape4, 0F, -1.003822F, 0F); - addChild(Shape4); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - -} diff --git a/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java b/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java index 5ff467ac4..9c4091dd8 100644 --- a/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java +++ b/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java @@ -3,62 +3,42 @@ package noppes.npcs.client.renderer; import java.awt.Graphics; import java.awt.image.BufferedImage; import java.awt.image.DataBufferInt; -import java.awt.image.ImageObserver; import net.minecraft.client.renderer.ImageBufferDownload; -public class ImageBufferDownloadAlt extends ImageBufferDownload { +public class ImageBufferDownloadAlt extends ImageBufferDownload +{ private int imageData[]; private int imageWidth; private int imageHeight; - private boolean version; - - // If Version == true, use 64 Loader - public ImageBufferDownloadAlt(boolean ver){ - this.version = ver; - } @Override - public BufferedImage parseUserSkin(BufferedImage bufferedimage) { - - if(this.version){ - imageWidth = bufferedimage.getWidth(null); - imageHeight = bufferedimage.getHeight(null); - - BufferedImage bufferedimage1 = new BufferedImage(imageWidth, imageHeight, 2); - Graphics g = bufferedimage1.getGraphics(); - g.drawImage(bufferedimage, 0, 0, null); - g.dispose(); - - imageData = ((DataBufferInt) bufferedimage1.getRaster().getDataBuffer()).getData(); - setAreaTransparent(imageWidth / 2, 0, imageWidth, imageHeight / 4); - return bufferedimage1; - } - - else{ - imageWidth = bufferedimage.getWidth(null); - imageHeight = imageWidth / 2; - - BufferedImage bufferedimage1 = new BufferedImage(imageWidth, imageHeight, 2); - Graphics g = bufferedimage1.getGraphics(); - g.drawImage(bufferedimage, 0, 0, null); - g.dispose(); - imageData = ((DataBufferInt)bufferedimage1.getRaster().getDataBuffer()).getData(); - - setAreaTransparent(imageWidth / 2, 0, imageWidth, imageHeight / 2); - return bufferedimage1; - } + public BufferedImage parseUserSkin(BufferedImage bufferedimage) + { + imageWidth = bufferedimage.getWidth(null); + imageHeight = imageWidth / 2; + + BufferedImage bufferedimage1 = new BufferedImage(imageWidth, imageHeight, 2); + Graphics g = bufferedimage1.getGraphics(); + g.drawImage(bufferedimage, 0, 0, null); + g.dispose(); + imageData = ((DataBufferInt)bufferedimage1.getRaster().getDataBuffer()).getData(); + setAreaTransparent(imageWidth / 2, 0, imageWidth, imageHeight / 2); + return bufferedimage1; } - /** * Makes the given area of the image transparent if it was previously completely opaque (used to remove the outer * layer of a skin around the head if it was saved all opaque; this would be redundant so it's assumed that the skin * maker is just using an image editor without an alpha channel) */ - private void setAreaTransparent(int par1, int par2, int par3, int par4) { - if (!this.hasTransparency(par1, par2, par3, par4)) { - for (int i1 = par1; i1 < par3; ++i1) { - for (int j1 = par2; j1 < par4; ++j1) { + private void setAreaTransparent(int par1, int par2, int par3, int par4) + { + if (!this.hasTransparency(par1, par2, par3, par4)) + { + for (int i1 = par1; i1 < par3; ++i1) + { + for (int j1 = par2; j1 < par4; ++j1) + { this.imageData[i1 + j1 * this.imageWidth] &= 16777215; } } @@ -68,12 +48,16 @@ public class ImageBufferDownloadAlt extends ImageBufferDownload { /** * Returns true if the given area of the image contains transparent pixels */ - private boolean hasTransparency(int par1, int par2, int par3, int par4) { - for (int i1 = par1; i1 < par3; ++i1) { - for (int j1 = par2; j1 < par4; ++j1) { + private boolean hasTransparency(int par1, int par2, int par3, int par4) + { + for (int i1 = par1; i1 < par3; ++i1) + { + for (int j1 = par2; j1 < par4; ++j1) + { int k1 = this.imageData[i1 + j1 * this.imageWidth]; - if ((k1 >> 24 & 255) < 128) { + if ((k1 >> 24 & 255) < 128) + { return true; } } @@ -81,4 +65,191 @@ public class ImageBufferDownloadAlt extends ImageBufferDownload { return false; } -} \ No newline at end of file +// +// private boolean loadPlayerData(BufferedImage bufferedimage,EntityPlayer player) { +// if(player == null) +// return false; +// PlayerData data = RenderMorePlayer.getPlayerData(player); +// data.setPlayerModel(checkSkin(bufferedimage,player.username)); +// data.isChanged = true; +// return data.model != null; +// } +// public static ModelData checkSkin(BufferedImage bufferedimage,String player){ +// if(bufferedimage == null) +// return null; +// +// if (!new Color(bufferedimage.getRGB(0, 0), true).equals(new Color(128, 128, 128, 255))) { +// return null; +// } +// ModelData data = new ModelData(); +// Color type = new Color(bufferedimage.getRGB(1, 0), true); +// if (type.equals(new Color(255, 0, 255, 255))) { +// data.type = EnumPlayerModelType.HUMANFEMALE; +// data.mainModel = new ModelHumanFemale(data,0); +// data.modelArmor = new ModelHumanFemale(data,0.3f); +// data.modelArmorChestplate = new ModelHumanFemale(data,0.8f); +// data.scaleX = 0.9075f; +// data.scaleY = 0.9075f; +// data.scaleZ = 0.9075f; +// } else if (type.equals(new Color(128, 0, 0, 255))) { +// data.type = EnumPlayerModelType.DWARFMALE; +// data.mainModel = new ModelDwarfMale(data,0); +// data.modelArmor = new ModelDwarfMale(data,0.3f); +// data.modelArmorChestplate = new ModelDwarfMale(data,0.8f); +// data.scaleX = 0.85f; +// data.scaleY = 0.6875f; +// data.scaleZ = 0.85f; +// } else if (type.equals(new Color(255, 0, 0, 255))) { +// data.type = EnumPlayerModelType.DWARFFEMALE; +// data.mainModel = new ModelDwarfFemale(data,0); +// data.modelArmor = new ModelDwarfFemale(data,0.3f); +// data.modelArmorChestplate = new ModelDwarfFemale(data,0.8f); +// data.scaleX = 0.75f; +// data.scaleY = 0.6275f; +// data.scaleZ = 0.75f; +// } else if (type.equals(new Color(0, 128, 0, 255))) { +// data.type = EnumPlayerModelType.ORCMALE; +// data.mainModel = new ModelOrcMale(data,0); +// data.modelArmor = new ModelOrcMale(data,0.3f); +// data.modelArmorChestplate = new ModelOrcMale(data,0.8f); +// data.scaleX = 1.2f; +// data.scaleY = 1f; +// data.scaleZ = 1.2f; +// } else if (type.equals(new Color(0, 255, 0, 255))) { +// data.type = EnumPlayerModelType.ORCFEMALE; +// data.mainModel = new ModelOrcFemale(data,0); +// data.modelArmor = new ModelOrcFemale(data,0.3f); +// data.modelArmorChestplate = new ModelOrcFemale(data,0.8f); +// } else if (type.equals(new Color(0, 0, 128, 255))) { +// data.type = EnumPlayerModelType.FURRYMALE; +// data.mainModel = new ModelFurryMale(data,0); +// data.modelArmor = new ModelFurryMale(data,0.3f); +// data.modelArmorChestplate = new ModelFurryMale(data,0.8f); +// } else if (type.equals(new Color(0, 0, 255, 255))) { +// data.type = EnumPlayerModelType.FURRYFEMALE; +// data.mainModel = new ModelFurryFemale(data,0); +// data.modelArmor = new ModelFurryFemale(data,0.3f); +// data.modelArmorChestplate = new ModelFurryFemale(data,0.8f); +// data.scaleX = 0.9075f; +// data.scaleY = 0.9075f; +// data.scaleZ = 0.9075f; +// }else if (type.equals(new Color(255, 128, 0, 255))) { +// data.type = EnumPlayerModelType.MONSTERMALE; +// data.mainModel = new ModelMonsterMale(data,0); +// data.modelArmor = new ModelMonsterMale(data,0.3f); +// data.modelArmorChestplate = new ModelMonsterMale(data,0.8f); +// } else if (type.equals(new Color(255, 255, 0, 255))) { +// data.type = EnumPlayerModelType.MONSTERFEMALE; +// data.mainModel = new ModelMonsterFemale(data,0); +// data.modelArmor = new ModelMonsterFemale(data,0.3f); +// data.modelArmorChestplate = new ModelMonsterFemale(data,0.8f); +// data.scaleX = 0.9075f; +// data.scaleY = 0.9075f; +// data.scaleZ = 0.9075f; +// }else if (type.equals(new Color(0,255, 128, 255))) { +// data.type = EnumPlayerModelType.ELFMALE; +// data.mainModel = new ModelElfMale(data,0); +// data.modelArmor = new ModelElfMale(data,0.3f); +// data.modelArmorChestplate = new ModelElfMale(data,0.8f); +// data.scaleX = 0.85f; +// data.scaleY = 1.07f; +// data.scaleZ = 0.85f; +// } else if (type.equals(new Color(0, 255, 255, 255))) { +// data.type = EnumPlayerModelType.ELFFEMALE; +// data.mainModel = new ModelElfFemale(data,0); +// data.modelArmor = new ModelElfFemale(data,0.3f); +// data.modelArmorChestplate = new ModelElfFemale(data,0.8f); +// data.scaleX = 0.8f; +// data.scaleY = 1f; +// data.scaleZ = 0.8f; +// } else if (type.equals(new Color(32, 32, 32, 255))) { +// data.type = EnumPlayerModelType.ENDER; +// data.mainModel = new ModelEnderChibi(data,0); +// data.modelArmor = new ModelEnderChibi(data,0.3f); +// data.modelArmorChestplate = new ModelEnderChibi(data,0.8f); +// } +// else if (type.equals(new Color(128, 255, 0, 255))) { +// data.type = EnumPlayerModelType.NAGAMALE; +// data.mainModel = new ModelNagaMale(data,0); +// data.modelArmor = new ModelNagaMale(data,0.3f); +// data.modelArmorChestplate = new ModelNagaMale(data,0.8f); +// } +// else if (type.equals(new Color(128, 128, 0, 255))) { +// data.type = EnumPlayerModelType.NAGAFEMALE; +// data.mainModel = new ModelNagaFemale(data,0); +// data.modelArmor = new ModelNagaFemale(data,0.3f); +// data.modelArmorChestplate = new ModelNagaFemale(data,0.8f); +// } +// else if(RenderMorePlayer.superUsers.contains(player)){ +// if (type.equals(new Color(66, 66, 66, 255))){ +// data.mainModel = new ModelCrystal(data,0); +// data.modelArmor = new ModelCrystal(data,0.3f); +// data.modelArmorChestplate = new ModelCrystal(data,0.8f); +// } +// else if (type.equals(new Color(13, 13, 13, 255))){ +// data.mainModel = new ModelFail(data); +// } +// } +// +// Color sizeColor = new Color(bufferedimage.getRGB(2, 0), true); +// int size = 3; +// if (sizeColor.equals(new Color(255, 0, 0, 255))) +// size = 4; +// else if (sizeColor.equals(new Color(0, 255, 0, 255))) +// size = 2; +// else if (sizeColor.equals(new Color(0, 0, 255, 255))) +// size = 1; +// else if (sizeColor.equals(new Color(255, 0, 255, 255))) +// size = 0; +// data.size = size; +// +// Color headVissible = new Color(bufferedimage.getRGB(3, 0), true); +// if (headVissible.equals(new Color(255, 0, 0, 255))) +// data.showHelmet = false; +// else if (headVissible.equals(new Color(0, 255, 0, 255))) +// data.showHeadwear = false; +// else if (headVissible.equals(new Color(255, 255, 0, 255))){ +// data.showHeadwear = false; +// data.showHelmet = false; +// } +// +// +// int extraOption1 = getValue(new Color(bufferedimage.getRGB(7, 0), true)); +// data.mainModel.setExtraOption1(extraOption1); +// data.modelArmorChestplate.setExtraOption1(extraOption1); +// data.modelArmor.setExtraOption1(extraOption1); +// +// int extraOption2 = getValue(new Color(bufferedimage.getRGB(7, 1), true)); +// data.mainModel.setExtraOption2(extraOption2); +// data.modelArmorChestplate.setExtraOption2(extraOption2); +// data.modelArmor.setExtraOption2(extraOption2); +// +// int extraOption3 = getValue(new Color(bufferedimage.getRGB(7, 2), true)); +// data.mainModel.setExtraOption3(extraOption3); +// data.modelArmorChestplate.setExtraOption3(extraOption3); +// data.modelArmor.setExtraOption3(extraOption3); +// +// Color color = new Color(bufferedimage.getRGB(7, 3), true); +// data.mainModel.setExtraColor(color); +// +// Color claws = new Color(bufferedimage.getRGB(0, 1), true); +// if (claws.equals(new Color(255, 0, 0, 255))) +// ((ModelInterface)data.mainModel).addClaws(); +// +// data.headSize = getValue(new Color(bufferedimage.getRGB(1, 1), true)); +// +// data.bellySize = getValue(new Color(bufferedimage.getRGB(2, 1), true)); +// return data; +// } +// private static int getValue(Color color){ +// if (color.equals(new Color(255, 0, 0, 255))) +// return 1; +// else if (color.equals(new Color(0, 255, 0, 255))) +// return 2; +// else if (color.equals(new Color(0, 0, 255, 255))) +// return 3; +// else if (color.equals(new Color(255, 0, 255, 255))) +// return 4; +// return 0; +// } +} diff --git a/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java b/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java index 51a0ff9aa..3d390b075 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java @@ -2,7 +2,6 @@ package noppes.npcs.client.renderer; import java.lang.reflect.Method; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.NPCRendererHelper; import net.minecraft.client.renderer.entity.RenderManager; @@ -10,10 +9,8 @@ import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.boss.BossStatus; import noppes.npcs.client.model.ModelMPM; import noppes.npcs.client.model.util.ModelRenderPassHelper; -import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.PixelmonHelper; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; @@ -24,14 +21,13 @@ public class RenderCustomNpc extends RenderNPCHumanMale{ private RendererLivingEntity renderEntity; private EntityLivingBase entity; - + private ModelRenderPassHelper renderpass = new ModelRenderPassHelper(); - - // Default Renderer + public RenderCustomNpc() { super(new ModelMPM(0), new ModelMPM(1), new ModelMPM(0.5f)); } - + @Override public void renderPlayer(EntityNPCInterface npcInterface, double d, double d1, double d2, float f, float f1){ EntityCustomNpc npc = (EntityCustomNpc) npcInterface; @@ -110,11 +106,6 @@ public class RenderCustomNpc extends RenderNPCHumanMale{ super.preRenderCallback(entityliving, f); } - @Override - public void doRender(EntityLiving entityliving, double d, double d1, double d2, float f, float f1){ - super.doRender(entityliving, d, d1, d2, f, f1); - } - @Override protected float handleRotationFloat(EntityLivingBase par1EntityLivingBase, float par2){ if(renderEntity != null){ diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java index 37c1817d3..630e2107b 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java @@ -2,8 +2,8 @@ package noppes.npcs.client.renderer; import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; - import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; @@ -12,13 +12,15 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; -import noppes.npcs.client.model.ModelMPM; import noppes.npcs.client.model.ModelNPCMale; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.entity.EntityCustomNpc; @@ -35,15 +37,10 @@ public class RenderNPCHumanMale extends RenderNPCInterface protected ModelNPCMale modelArmorChestplate; protected ModelNPCMale modelArmor; - protected final ModelNPCMale originalBipedMain; - protected final ModelMPM steve = new ModelMPM(0, false); - protected final ModelMPM alex = new ModelMPM(0, true); - public RenderNPCHumanMale(ModelNPCMale mainmodel, ModelNPCMale armorChest, ModelNPCMale armor) { super(mainmodel, 0.5F); modelBipedMain = mainmodel; - originalBipedMain = mainmodel; modelArmorChestplate = armorChest; modelArmor = armor; } @@ -113,29 +110,6 @@ public class RenderNPCHumanMale extends RenderNPCInterface public void renderPlayer(EntityNPCInterface npc, double d, double d1, double d2, float f, float f1) { - // SEEMS TO WORK FOR NOW. Keeps NPC from outsyncing with Creature Models - if(npc instanceof EntityCustomNpc){ - EntityCustomNpc test = (EntityCustomNpc) npc; - if(test.modelData.entityClass == null){ - int modelVal = npc.display.modelType; - if(modelVal == 1){ - this.mainModel = steve; - this.modelBipedMain = steve; - } - else if(modelVal == 2){ - this.mainModel = alex; - this.modelBipedMain = alex; - } - else{ - ((EntityCustomNpc) npc).modelData.bodywear = 0; - ((EntityCustomNpc) npc).modelData.armwear = 0; - ((EntityCustomNpc) npc).modelData.legwear = 0; - this.mainModel = originalModel; - this.modelBipedMain = originalBipedMain; - } - } - } - ItemStack itemstack = npc.getHeldItem(); modelArmorChestplate.heldItemRight = modelArmor.heldItemRight = modelBipedMain.heldItemRight = itemstack == null ? 0 : npc.hurtResistantTime > 0 ? 3 : 1; @@ -269,8 +243,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); GL11.glScalef(-var6, -var6, var6); } - // CHANGE HERE - else if (itemstack2.getItem() instanceof ItemBow) + else if (itemstack2.getItem() == Items.bow) { var6 = 0.625F; GL11.glTranslatef(0.0F, 0.125F, 0.3125F); @@ -348,11 +321,11 @@ public class RenderNPCHumanMale extends RenderNPCInterface IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(itemstack2, EQUIPPED); boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(EQUIPPED, itemstack2, BLOCK_3D)); - - Class clazz = itemstack2.getItem().getClass(); - if(clazz.getSimpleName().equals("ItemShield") || clazz.getSimpleName().equals("ItemRotatedShield") || clazz.getSimpleName().equals("ItemClaw")) + + if(itemstack2.getItem() instanceof ItemShield || itemstack2.getItem() instanceof ItemClaw) GL11.glTranslatef(0.30f, 0, 0f); + if (itemstack2.getItem() instanceof ItemBlock && (is3D || RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemstack2.getItem()).getRenderType()))) { var6 = 0.5F; @@ -362,7 +335,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); GL11.glScalef(var6, -var6, var6); } - else if (itemstack2.getItem() instanceof ItemBow) + else if (itemstack2.getItem() == Items.bow) { var6 = 0.625F; GL11.glTranslatef(0.0F, 0.125F, 0.3125F); diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java index a65fbd801..0f1071f57 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java @@ -34,14 +34,10 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; public class RenderNPCInterface extends RenderLiving{ public static long LastTextureTick = 0; - - public ModelBase originalModel; - public RenderNPCInterface(ModelBase model, float f){ super(model, f); - this.originalModel = model; } - + protected void renderName(EntityNPCInterface npc, double d, double d1, double d2) { if (!this.func_110813_b(npc)) return; @@ -73,7 +69,7 @@ public class RenderNPCInterface extends RenderLiving{ public void doRenderShadowAndFire(Entity par1Entity, double par2, double par4, double par6, float par8, float par9){ EntityNPCInterface npc = (EntityNPCInterface) par1Entity; - if(!npc.isKilled() && !npc.scriptInvisibleToPlayer(Minecraft.getMinecraft().thePlayer)) + if(!npc.isKilled()) super.doRenderShadowAndFire(par1Entity, par2, par4, par6, par8, par9); } @@ -179,6 +175,29 @@ public class RenderNPCInterface extends RenderLiving{ } else { super.rotateCorpse(npc, f, f1, f2); +// if(npc.deathTime > 0) +// { +// float x = (float) -Math.cos(Math.toRadians(180 - f1)); +// float y = (float) -Math.sin(Math.toRadians(f1)); +// x = (x/ 5f) * npc.getModelSize(); +// y = (y/ 5f) * npc.getModelSize(); +// GL11.glTranslatef(x, 0, y); +// +// +// float f3 = ((((float)npc.deathTime+ f2) - 1.0F) / 20F) * 1.6F; +// f3 = MathHelper.sqrt_float(f3); +// if(f3 > 1.0F) +// { +// f3 = 1.0F; +// } +// GL11.glRotatef(f1, 0.0F, 1.0F, 0.0F); +// GL11.glRotatef(f3 * getDeathMaxRotation(npc), 0.0F, 0.0F, 1.0F); +// GL11.glRotatef(180F - f1, 0.0F, 1.0F, 0.0F); +// } +// else +// { +// GL11.glRotatef(180F - f1, 0.0F, 1.0F, 0.0F); +// } } } @@ -195,7 +214,6 @@ public class RenderNPCInterface extends RenderLiving{ @Override public void doRender(EntityLiving entityliving, double d, double d1, double d2, float f, float f1){ EntityNPCInterface npc = (EntityNPCInterface) entityliving; - if(npc.isKilled() && npc.stats.hideKilledBody && npc.deathTime > 20){ return; } @@ -207,7 +225,7 @@ public class RenderNPCInterface extends RenderLiving{ } super.doRender(entityliving, d, d1, d2, f, f1); } - + protected void renderModel(EntityLivingBase entityliving, float par2, float par3, float par4, float par5, float par6, float par7){ super.renderModel(entityliving, par2, par3, par4, par5, par6, par7); EntityNPCInterface npc = (EntityNPCInterface) entityliving; @@ -264,26 +282,22 @@ public class RenderNPCInterface extends RenderLiving{ @Override public ResourceLocation getEntityTexture(Entity entity) { - EntityNPCInterface npc = (EntityNPCInterface) entity; if(npc.textureLocation == null){ - if(npc.display.skinType == 0) { - if (!(npc.display.texture).equals("")) { - npc.textureLocation = new ResourceLocation(npc.display.texture); - } - } + if(npc.display.skinType == 0) + npc.textureLocation = new ResourceLocation(npc.display.texture); else if(LastTextureTick < 5){ //fixes request flood somewhat return AbstractClientPlayer.locationStevePng; } else if(npc.display.skinType == 1 && npc.display.playerProfile != null){ Minecraft minecraft = Minecraft.getMinecraft(); - Map map = minecraft.func_152342_ad().func_152788_a(npc.display.playerProfile); + Map map = minecraft.func_152342_ad().func_152788_a(npc.display.playerProfile); if (map.containsKey(Type.SKIN)){ npc.textureLocation = minecraft.func_152342_ad().func_152792_a((MinecraftProfileTexture)map.get(Type.SKIN), Type.SKIN); } LastTextureTick = 0; } - else if(npc.display.skinType == 2 || npc.display.skinType == 3){ + else if(npc.display.skinType == 2){ try{ MessageDigest digest = MessageDigest.getInstance("MD5"); byte[] hash = digest.digest(npc.display.url.getBytes("UTF-8")); @@ -291,19 +305,12 @@ public class RenderNPCInterface extends RenderLiving{ for(byte b : hash){ sb.append(String.format("%02x", b&0xff)); } - // SKIN CHANGE - if(npc.display.skinType == 2){ - npc.textureLocation = new ResourceLocation("skins/" + sb.toString()); - loadSkin(null, npc.textureLocation, npc.display.url, false); - } - else{ - npc.textureLocation = new ResourceLocation("skins64/" + sb.toString()); - loadSkin(null, npc.textureLocation, npc.display.url, true); - } + npc.textureLocation = new ResourceLocation("skins/" + sb.toString()); + func_110301_a(null, npc.textureLocation, npc.display.url); LastTextureTick = 0; } catch(Exception ex){ - + } } } @@ -312,11 +319,9 @@ public class RenderNPCInterface extends RenderLiving{ return npc.textureLocation; } - // 64x64 Skin is True - private void loadSkin(File file, ResourceLocation resource, String par1Str, boolean version){ + private void func_110301_a(File file, ResourceLocation resource, String par1Str){ TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - ITextureObject object = new ImageDownloadAlt(file, par1Str, SkinManager.field_152793_a, new ImageBufferDownloadAlt(version)); + ITextureObject object = new ImageDownloadAlt(file, par1Str, SkinManager.field_152793_a, new ImageBufferDownloadAlt()); texturemanager.loadTexture(resource, object); } - } diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java index 013a77b8c..17e236858 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java @@ -17,8 +17,11 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.model.ModelPony; import noppes.npcs.client.model.ModelPonyArmor; @@ -219,8 +222,7 @@ public class RenderNPCPony extends RenderNPCInterface float f4 = 0.375F * f; GL11.glScalef(f4, -f4, f4); } else - // CHANGE HERE - if(itemstack.getItem() instanceof ItemBow) + if(itemstack.getItem() == Items.bow) { GL11.glTranslatef(0.0F, 0.125F, 0.3125F); GL11.glRotatef(-20F, 0.0F, 1.0F, 0.0F); diff --git a/src/main/java/noppes/npcs/config/GlyphCache.java b/src/main/java/noppes/npcs/config/GlyphCache.java index 6c3f38f01..b72e499e2 100644 --- a/src/main/java/noppes/npcs/config/GlyphCache.java +++ b/src/main/java/noppes/npcs/config/GlyphCache.java @@ -290,6 +290,12 @@ public class GlyphCache return font.deriveFont(style, fontSize); } } + + Font fa = new Font("Arial Unicode MS", Font.PLAIN, fontSize); + if(fa.canDisplayUpTo(text, start, limit) != start){ + usedFonts.add(fa); + return fa; + } /* If still not found, try searching through all fonts installed on the system for the first that can layout this string */ iterator = allFonts.iterator(); diff --git a/src/main/java/noppes/npcs/config/TrueTypeFont.java b/src/main/java/noppes/npcs/config/TrueTypeFont.java deleted file mode 100644 index 15cbd65dd..000000000 --- a/src/main/java/noppes/npcs/config/TrueTypeFont.java +++ /dev/null @@ -1,340 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.config; - -import java.awt.Font; -import java.awt.FontFormatException; -import java.awt.FontMetrics; -import java.awt.Graphics2D; -import java.awt.GraphicsEnvironment; -import java.awt.RenderingHints; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.util.LRUHashMap; -import org.lwjgl.opengl.GL11; - -public class TrueTypeFont { - private static final int MaxWidth = 512; - private static final List allFonts = Arrays.asList(GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts()); - private List usedFonts = new ArrayList(); - private LinkedHashMap textcache = new LRUHashMap(100); - private Map glyphcache = new HashMap(); - private List textures = new ArrayList(); - private Font font; - private int lineHeight = 1; - private Graphics2D globalG = (Graphics2D)(new BufferedImage(1, 1, 2)).getGraphics(); - public float scale = 1.0F; - private int specialChar = 167; - - public TrueTypeFont(Font font, float scale) { - this.font = font; - this.scale = scale; - this.globalG.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - this.lineHeight = this.globalG.getFontMetrics(font).getHeight(); - } - - public TrueTypeFont(ResourceLocation resource, int fontSize, float scale) throws IOException, FontFormatException { - InputStream stream = Minecraft.getMinecraft().getResourceManager().getResource(resource).getInputStream(); - GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); - Font font = Font.createFont(0, stream); - ge.registerFont(font); - this.font = font.deriveFont(0, (float)fontSize); - this.scale = scale; - this.globalG.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - this.lineHeight = this.globalG.getFontMetrics(font).getHeight(); - } - - public void setSpecial(char c) { - this.specialChar = c; - } - - public void draw(String text, float x, float y, int color) { - TrueTypeFont.GlyphCache cache = this.getOrCreateCache(text); - float r = (float)(color >> 16 & 255) / 255.0F; - float g = (float)(color >> 8 & 255) / 255.0F; - float b = (float)(color & 255) / 255.0F; - GL11.glColor4f(r, g, b, 1.0F); - //GlStateManager.func_179147_l(); - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, 0.0F); - GL11.glScalef(this.scale, this.scale, 1.0F); - float i = 0.0F; - Iterator var10 = cache.glyphs.iterator(); - - while(var10.hasNext()) { - TrueTypeFont.Glyph gl = (TrueTypeFont.Glyph)var10.next(); - if(gl.type != TrueTypeFont.GlyphType.NORMAL) { - if(gl.type == TrueTypeFont.GlyphType.RESET) { - GL11.glColor4f(r, g, b, 1.0F); - } else if(gl.type == TrueTypeFont.GlyphType.COLOR) { - GL11.glColor4f((float) (gl.color >> 16 & 255) / 255.0F, (float) (gl.color >> 8 & 255) / 255.0F, (float) (gl.color & 255) / 255.0F, 1.0F); - } - } else { - GL11.glBindTexture(gl.texture, gl.texture); - this.drawTexturedModalRect(i, 0.0F, (float)gl.x * this.textureScale(), (float)gl.y * this.textureScale(), (float)gl.width * this.textureScale(), (float)gl.height * this.textureScale()); - i += (float)gl.width * this.textureScale(); - } - } - - //GlStateManager.func_179084_k(); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - - private TrueTypeFont.GlyphCache getOrCreateCache(String text) { - TrueTypeFont.GlyphCache cache = (TrueTypeFont.GlyphCache)this.textcache.get(text); - if(cache != null) { - return cache; - } else { - cache = new TrueTypeFont.GlyphCache(); - - for(int i = 0; i < text.length(); ++i) { - char c = text.charAt(i); - if(c == this.specialChar && i + 1 < text.length()) { - char g = text.toLowerCase(Locale.ENGLISH).charAt(i + 1); - int index = "0123456789abcdefklmnor".indexOf(g); - if(index >= 0) { - TrueTypeFont.Glyph g1 = new TrueTypeFont.Glyph(); - if(index < 16) { - g1.type = TrueTypeFont.GlyphType.COLOR; - //g1.color = Minecraft.getMinecraft().fontRenderer.func_175064_b(g); - g1.color = 0; - } else if(index == 16) { - g1.type = TrueTypeFont.GlyphType.RANDOM; - } else if(index == 17) { - g1.type = TrueTypeFont.GlyphType.BOLD; - } else if(index == 18) { - g1.type = TrueTypeFont.GlyphType.STRIKETHROUGH; - } else if(index == 19) { - g1.type = TrueTypeFont.GlyphType.UNDERLINE; - } else if(index == 20) { - g1.type = TrueTypeFont.GlyphType.ITALIC; - } else { - g1.type = TrueTypeFont.GlyphType.RESET; - } - - cache.glyphs.add(g1); - ++i; - continue; - } - } - - TrueTypeFont.Glyph var8 = this.getOrCreateGlyph(c); - cache.glyphs.add(var8); - cache.width += var8.width; - cache.height = Math.max(cache.height, var8.height); - } - - this.textcache.put(text, cache); - return cache; - } - } - - private TrueTypeFont.Glyph getOrCreateGlyph(char c) { - TrueTypeFont.Glyph g = (TrueTypeFont.Glyph)this.glyphcache.get(Character.valueOf(c)); - if(g != null) { - return g; - } else { - TrueTypeFont.TextureCache cache = this.getCurrentTexture(); - Font font = this.getFontForChar(c); - FontMetrics metrics = this.globalG.getFontMetrics(font); - g = new TrueTypeFont.Glyph(); - g.width = Math.max(metrics.charWidth(c), 1); - g.height = Math.max(metrics.getHeight(), 1); - if(cache.x + g.width >= 512) { - cache.x = 0; - cache.y += this.lineHeight + 1; - if(cache.y >= 512) { - cache.full = true; - cache = this.getCurrentTexture(); - } - } - - g.x = cache.x; - g.y = cache.y; - cache.x += g.width + 3; - this.lineHeight = Math.max(this.lineHeight, g.height); - cache.g.setFont(font); - cache.g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - cache.g.drawString(c + "", g.x, g.y + metrics.getAscent()); - g.texture = cache.textureId; - TextureUtil.uploadTextureImage(cache.textureId, cache.bufferedImage); - this.glyphcache.put(Character.valueOf(c), g); - return g; - } - } - - private TrueTypeFont.TextureCache getCurrentTexture() { - TrueTypeFont.TextureCache cache = null; - Iterator var2 = this.textures.iterator(); - - while(var2.hasNext()) { - TrueTypeFont.TextureCache t = (TrueTypeFont.TextureCache)var2.next(); - if(!t.full) { - cache = t; - break; - } - } - - if(cache == null) { - this.textures.add(cache = new TrueTypeFont.TextureCache()); - } - - return cache; - } - - public void drawCentered(String text, float x, float y, int color) { - this.draw(text, x - (float)this.width(text) / 2.0F, y, color); - } - - private Font getFontForChar(char c) { - if(this.font.canDisplay(c)) { - return this.font; - } else { - Iterator fa = this.usedFonts.iterator(); - - Font f; - do { - if(!fa.hasNext()) { - Font fa1 = new Font("Arial Unicode MS", 0, this.font.getSize()); - if(fa1.canDisplay(c)) { - return fa1; - } - - Iterator f2 = allFonts.iterator(); - - Font f1; - do { - if(!f2.hasNext()) { - return this.font; - } - - f1 = (Font)f2.next(); - } while(!f1.canDisplay(c)); - - this.usedFonts.add(f1 = f1.deriveFont(0, (float)this.font.getSize())); - return f1; - } - - f = (Font)fa.next(); - } while(!f.canDisplay(c)); - - return f; - } - } - - public void drawTexturedModalRect(float p_73729_1_, float p_73729_2_, float p_73729_3_, float p_73729_4_, float p_73729_5_, float p_73729_6_) - { - float f = 0.00390625F; - float f1 = 0.00390625F; - byte zLevel = 0; - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + p_73729_6_), (double)zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + p_73729_6_), (double)zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + p_73729_6_) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + p_73729_5_), (double)(p_73729_2_ + 0), (double)zLevel, (double)((float)(p_73729_3_ + p_73729_5_) * f), (double)((float)(p_73729_4_ + 0) * f1)); - tessellator.addVertexWithUV((double)(p_73729_1_ + 0), (double)(p_73729_2_ + 0), (double)zLevel, (double)((float)(p_73729_3_ + 0) * f), (double)((float)(p_73729_4_ + 0) * f1)); - tessellator.draw(); - } - - public int width(String text) { - TrueTypeFont.GlyphCache cache = this.getOrCreateCache(text); - return (int)((float)cache.width * this.scale * this.textureScale()); - } - - public int height(String text) { - if(text != null && !text.trim().isEmpty()) { - TrueTypeFont.GlyphCache cache = this.getOrCreateCache(text); - return Math.max(1, (int)((float)cache.height * this.scale * this.textureScale())); - } else { - return (int)((float)this.lineHeight * this.scale * this.textureScale()); - } - } - - private float textureScale() { - return 0.5F; - } - - public void dispose() { - Iterator var1 = this.textures.iterator(); - - while(var1.hasNext()) { - TrueTypeFont.TextureCache cache = (TrueTypeFont.TextureCache)var1.next(); - GL11.glDeleteTextures(cache.textureId); - } - - this.textcache.clear(); - } - - public String getFontName() { - return this.font.getFontName(); - } - - class GlyphCache { - public int width; - public int height; - List glyphs = new ArrayList(); - - GlyphCache() { - } - } - - class Glyph { - TrueTypeFont.GlyphType type; - int color; - int x; - int y; - int height; - int width; - int texture; - - Glyph() { - this.type = TrueTypeFont.GlyphType.NORMAL; - this.color = -1; - } - } - - class TextureCache { - int x; - int y; - int textureId = GL11.glGenTextures(); - BufferedImage bufferedImage = new BufferedImage(512, 512, 2); - Graphics2D g; - boolean full; - - TextureCache() { - this.g = (Graphics2D)this.bufferedImage.getGraphics(); - } - } - - static enum GlyphType { - NORMAL, - COLOR, - RANDOM, - BOLD, - STRIKETHROUGH, - UNDERLINE, - ITALIC, - RESET, - OTHER; - - private GlyphType() { - } - } -} diff --git a/src/main/java/noppes/npcs/constants/EnumGuiType.java b/src/main/java/noppes/npcs/constants/EnumGuiType.java index eb58809b6..4f1e0b7fa 100644 --- a/src/main/java/noppes/npcs/constants/EnumGuiType.java +++ b/src/main/java/noppes/npcs/constants/EnumGuiType.java @@ -1,5 +1,5 @@ package noppes.npcs.constants; public enum EnumGuiType { - MainMenuDisplay, MainMenuInv, MainMenuStats, ManageFactions, MainMenuAdvanced, MainMenuGlobal, PlayerBankSmall, PlayerFollowerHire, PlayerFollower, SetupItemGiver, SetupTrader, SetupFollower, PlayerTrader, PlayerTransporter, RedstoneBlock, SetupTransporter, ManageTransport, ManageBanks, MobSpawner, SetupBank, ManageDialogs, ManageQuests, PlayerAnvil, QuestReward, ManageRecipes, QuestItem, NpcRemote, ScriptEvent, MoneyBag, MainMenuAI, MovingPath, PlayerBankUnlock, PlayerBankUprade, PlayerBankLarge, MobSpawnerAdd, PlayerMailbox, PlayerMailman, Waypoint, MerchantAdd, MobSpawnerMounter, Crate, NpcDimensions, Border, BigSign, Script, Companion, CompanionInv, CompanionTalent, CompanionTrader, ManageLinked, CustomGui; + MainMenuDisplay, MainMenuInv, MainMenuStats, ManageFactions, MainMenuAdvanced, MainMenuGlobal, PlayerBankSmall, PlayerFollowerHire, PlayerFollower, SetupItemGiver, SetupTrader, SetupFollower, PlayerTrader, PlayerTransporter, RedstoneBlock, SetupTransporter, ManageTransport, ManageBanks, MobSpawner, SetupBank, ManageDialogs, ManageQuests, PlayerAnvil, QuestReward, ManageRecipes, QuestItem, NpcRemote, MoneyBag, MainMenuAI, MovingPath, PlayerBankUnlock, PlayerBankUprade, PlayerBankLarge, MobSpawnerAdd, PlayerMailbox, PlayerMailman, Waypoint, MerchantAdd, MobSpawnerMounter, Crate, NpcDimensions, Border, BigSign, Script, Companion, CompanionInv, CompanionTalent, CompanionTrader, ManageLinked } diff --git a/src/main/java/noppes/npcs/constants/EnumPacketClient.java b/src/main/java/noppes/npcs/constants/EnumPacketClient.java index 243674a9a..c392e5e51 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketClient.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketClient.java @@ -1,6 +1,6 @@ package noppes.npcs.constants; public enum EnumPacketClient { - CHAT, MESSAGE, SYNCRECIPES_ADD, SYNCRECIPES_WORKBENCH, DIALOG, QUEST_COMPLETION, EDIT_NPC, PLAY_SOUND, PLAY_MUSIC, UPDATE_NPC, ROLE, GUI, SCRIPTED_PARTICLE, PARTICLE, DELETE_NPC, SCROLL_LIST, SCROLL_DATA, SCROLL_DATA_PART, SCROLL_SELECTED, GUI_REDSTONE, GUI_WAYPOINT, GUI_DATA, GUI_ERROR, GUI_CLOSE, VILLAGER_LIST, CHATBUBBLE, SYNCRECIPES_CARPENTRYBENCH, CLONE, OPEN_BOOK, DIALOG_DUMMY, CONFIG, ISGUIOPEN, OVERLAY_DATA, OVERLAY_CLOSE + CHAT, MESSAGE, SYNCRECIPES_ADD, SYNCRECIPES_WORKBENCH, DIALOG, QUEST_COMPLETION, EDIT_NPC, PLAY_SOUND, PLAY_MUSIC, UPDATE_NPC, ROLE, GUI, PARTICLE, DELETE_NPC, SCROLL_LIST, SCROLL_DATA, SCROLL_DATA_PART, SCROLL_SELECTED, GUI_REDSTONE, GUI_WAYPOINT, GUI_DATA, GUI_ERROR, GUI_CLOSE, VILLAGER_LIST, CHATBUBBLE, SYNCRECIPES_CARPENTRYBENCH, CLONE, OPEN_BOOK, DIALOG_DUMMY, CONFIG } diff --git a/src/main/java/noppes/npcs/constants/EnumPacketServer.java b/src/main/java/noppes/npcs/constants/EnumPacketServer.java index 4591be8c4..c15f88eda 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketServer.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketServer.java @@ -34,12 +34,6 @@ public enum EnumPacketServer { ClonePreSave(CustomNpcsPermissions.NPC_CLONE), CloneSave(CustomNpcsPermissions.NPC_CLONE), CloneRemove(CustomNpcsPermissions.NPC_CLONE), CloneList, - ScriptPlayerSave(CustomNpcsPermissions.TOOL_SCRIPTER, false), - ScriptPlayerGet(false), - - ScriptForgeSave(CustomNpcsPermissions.TOOL_SCRIPTER, false), - ScriptForgeGet(false), - LinkedGetAll, LinkedRemove(CustomNpcsPermissions.GLOBAL_LINKED), LinkedAdd(CustomNpcsPermissions.GLOBAL_LINKED), ScriptDataSave(CustomNpcsPermissions.TOOL_SCRIPTER, true), ScriptDataGet(true), PlayerDataRemove(CustomNpcsPermissions.GLOBAL_PLAYERDATA), @@ -76,9 +70,7 @@ public enum EnumPacketServer { RemoteTpToNpc,QuestGet, QuestCategoryGet, SaveTileEntity, NaturalSpawnGetAll, MailOpenSetup, - DimensionsGet, DimensionTeleport, GetTileEntity, Gui, IsGuiOpen, - - CustomGuiButton,CustomGuiSlotChange,CustomGuiScrollClick,CustomGuiClose,CustomGuiUnfocused; + DimensionsGet, DimensionTeleport, GetTileEntity, Gui, ; public CustomNpcsPermissions.Permission permission = null; public boolean needsNpc = false; diff --git a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java index e1a1b95e2..c891d3d78 100644 --- a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java +++ b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java @@ -1,5 +1,5 @@ package noppes.npcs.constants; public enum EnumPlayerPacket { - FollowerHire,FollowerExtend,Trader, FollowerState, Transport, BankUnlock, BankUpgrade, Dialog, QuestLog, QuestCompletion, CheckQuestCompletion, BankSlotOpen, FactionsGet, MailGet, MailDelete, MailSend, MailRead, MailboxOpenMail, SignSave, SaveBook, CompanionOpenInv, RoleGet, KeyPressed, MouseClicked, CompanionTalentExp + FollowerHire,FollowerExtend,Trader, FollowerState, Transport, BankUnlock, BankUpgrade, Dialog, QuestLog, QuestCompletion, CheckQuestCompletion, BankSlotOpen, FactionsGet, MailGet, MailDelete, MailSend, MailRead, MailboxOpenMail, SignSave, SaveBook, CompanionOpenInv, RoleGet, CompanionTalentExp } diff --git a/src/main/java/noppes/npcs/constants/EnumScriptType.java b/src/main/java/noppes/npcs/constants/EnumScriptType.java index a103ba293..424a4e62d 100644 --- a/src/main/java/noppes/npcs/constants/EnumScriptType.java +++ b/src/main/java/noppes/npcs/constants/EnumScriptType.java @@ -1,89 +1,5 @@ package noppes.npcs.constants; public enum EnumScriptType { - INIT("init"), - TICK("tick"), - INTERACT("interact"), - DIALOG("dialog"), - DAMAGED("damaged"), - KILLED("killed"), - ATTACK("attack"), - TARGET("target"), - COLLIDE("collide"), - KILLS("kills"), - DIALOG_CLOSE("dialogClose"), - TIMER("timer"), - - ATTACK_MELEE("meleeAttack"), - TARGET_LOST("targetLost"), - ROLE("role"), - RANGED_CHARGE("rangedCharge"), - RANGED_LAUNCHED("rangedLaunched"), - CLICKED("clicked"), - FALLEN_UPON("fallenUpon"), - RAIN_FILLED("rainFilled"), - BROKEN("broken"), - HARVESTED("harvested"), - EXPLODED("exploded"), - NEIGHBOR_CHANGED("neighborChanged"), - REDSTONE("redstone"), - DOOR_TOGGLE("doorToggle"), - TOSS("toss"), - DROP("drop"), - CONTAINER_OPEN("containerOpen"), - CONTAINER_CLOSED("containerClosed"), - LOGIN("login"), - LOGOUT("logout"), - CHAT("chat"), - DAMAGED_ENTITY("damagedEntity"), - SPAWN("spawn"), - TOSSED("tossed"), - PICKEDUP("pickedUp"), - PICKUP("pickUp"), - PROJECTILE_TICK("projectileTick"), - PROJECTILE_IMPACT("projectileImpact"), - LEVEL_UP("levelUp"), - KEY_PRESSED("keyPressed"), - QUEST_START("questStart"), - QUEST_COMPLETED("questCompleted"), - QUEST_TURNIN("questTurnIn"), - FACTION_POINTS("factionPoints"), - DIALOG_OPEN("dialogOpen"), - DIALOG_OPTION("dialogOption"), - CUSTOM_CHEST_CLOSED("customChestClosed"), - CUSTOM_CHEST_CLICKED("customChestClicked"), - SCRIPT_COMMAND("scriptCommand"), - CUSTOM_GUI_CLOSED("customGuiClosed"), - CUSTOM_GUI_BUTTON("customGuiButton"), - CUSTOM_GUI_SLOT("customGuiSlot"), - CUSTOM_GUI_SCROLL("customGuiScroll"), - CUSTOM_GUI_TEXTFIELD("customGuiTextfield"), - PICKUP_XP("pickupXP"), - MOUSE_CLICKED("mouseClicked"), - START_USING_ITEM("startItem"), - USING_ITEM("usingItem"), - STOP_USING_ITEM("stopItem"), - FINISH_USING_ITEM("finishItem"), - USE_HOE("useHoe"), - SLEEP("sleep"), - WAKE_UP("wakeUp"), - FILL_BUCKET("fillBucket"), - BONEMEAL("bonemeal"), - ACHIEVEMENT("achievement"), - FALL("fall"), - JUMP("jump"), - LIGHTNING("lightning"), - PLAYSOUND("playSound"), - RESPAWN("respawn"), - CHANGED_DIM("changedDim"), - BREAK_BLOCK("breakBlock"), - FORGE_INIT("forgeInit"), - FORGE_ENTITY("forgeEntity"), - FORGE_WORLD("forgeWorld"); - - public String function; - - private EnumScriptType(String function) { - this.function = function; - } -} \ No newline at end of file + INIT, TICK, INTERACT, DIALOG, DAMAGED, KILLED, ATTACK, TARGET, COLLIDE, KILLS, DIALOG_OPTION +} diff --git a/src/main/java/noppes/npcs/containers/ContainerCustomGui.java b/src/main/java/noppes/npcs/containers/ContainerCustomGui.java deleted file mode 100644 index c16a4cc91..000000000 --- a/src/main/java/noppes/npcs/containers/ContainerCustomGui.java +++ /dev/null @@ -1,103 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.containers; - -import java.util.Iterator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import noppes.npcs.scripted.interfaces.IItemSlot; -import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.client.gui.custom.components.CustomGuiSlot; - -public class ContainerCustomGui extends Container { - public ScriptGui customGui; - public IInventory guiInventory; - int slotCount = 0; - - public int playerInvX; - public int playerInvY; - - public ContainerCustomGui(IInventory inventory) { - this.guiInventory = inventory; - } - - public void setGui(ScriptGui gui, EntityPlayer player) { - this.customGui = gui; - - if (this.customGui.getShowPlayerInv()) { - this.addPlayerInventory(player, this.customGui.getPlayerInvX(), this.customGui.getPlayerInvY()); - } - - Iterator var3 = this.customGui.getSlots().iterator(); - - while(var3.hasNext()) { - IItemSlot slot = (IItemSlot)var3.next(); - if (slot.hasStack()) { - this.addSlot(slot.getPosX(), slot.getPosY(), slot.getStack().getMCItemStack(), player.worldObj.isRemote); - } else { - this.addSlot(slot.getPosX(), slot.getPosY(), player.worldObj.isRemote); - } - } - } - - public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) { - ItemStack itemstack = null; - Slot slot = (Slot)this.inventorySlots.get(index); - if (slot != null && slot.getHasStack()) { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - if (index < this.guiInventory.getSizeInventory()) { - if (!this.mergeItemStack(itemstack1, this.guiInventory.getSizeInventory(), this.inventorySlots.size(), true)) { - return null; - } - } else if (!this.mergeItemStack(itemstack1, 0, this.guiInventory.getSizeInventory(), false)) { - return null; - } - - if (itemstack1.stackSize <= 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - - return itemstack; - } - - void addSlot(int x, int y, boolean clientSide) { - this.addSlotToContainer(new CustomGuiSlot(this.guiInventory, this.slotCount++, x, y, clientSide)); - } - - void addSlot(int x, int y, ItemStack itemStack, boolean clientSide) { - this.guiInventory.setInventorySlotContents(this.slotCount, itemStack); - this.addSlotToContainer(new CustomGuiSlot(this.guiInventory, this.slotCount++, x, y, clientSide)); - } - - void addPlayerInventory(EntityPlayer player, int x, int y) { - this.playerInvX = x; - this.playerInvY = y; - - int row; - for(row = 0; row < 3; ++row) { - for(int col = 0; col < 9; ++col) { - this.addSlotToContainer(new Slot(player.inventory, col + row * 9 + 9, x + col * 18, y + row * 18)); - } - } - - for(row = 0; row < 9; ++row) { - this.addSlotToContainer(new Slot(player.inventory, row, x + row * 18, y + 58)); - } - } - - public boolean canInteractWith(EntityPlayer p_75145_1_) { - return true; - } - - public boolean canDragIntoSlot(Slot p_94531_1_) { return true; } -} diff --git a/src/main/java/noppes/npcs/containers/ContainerNPCInv.java b/src/main/java/noppes/npcs/containers/ContainerNPCInv.java index 00186b177..8b51da54e 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNPCInv.java +++ b/src/main/java/noppes/npcs/containers/ContainerNPCInv.java @@ -16,16 +16,15 @@ public class ContainerNPCInv extends Container{ addSlotToContainer(new Slot(npc.inventory, 5, 81, 40)); addSlotToContainer(new Slot(npc.inventory, 6, 81, 58)); - for(int c = 0; c < 4; c++) { - for (int r = 0; r < 9; r++) { - addSlotToContainer(new Slot(npc.inventory, c*9 + r + 7, 191 + (c%2)*90, 16 + r * 21)); - } + for(int l = 0; l < 9; l++){ + addSlotToContainer(new Slot(npc.inventory, l + 7 , 191 , 16 + l * 21)); } for(int i1 = 0; i1 < 3; i1++){ for(int l1 = 0; l1 < 9; l1++){ addSlotToContainer(new Slot(player.inventory, l1 + i1 * 9 + 9, l1 * 18 + 8, 113 + i1 * 18)); } + } for(int j1 = 0; j1 < 9; j1++){ diff --git a/src/main/java/noppes/npcs/containers/ContainerNpcInterface.java b/src/main/java/noppes/npcs/containers/ContainerNpcInterface.java index 9996ec51f..5577cd847 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNpcInterface.java +++ b/src/main/java/noppes/npcs/containers/ContainerNpcInterface.java @@ -3,13 +3,9 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.util.MathHelper; -import noppes.npcs.scripted.interfaces.IContainer; -import noppes.npcs.scripted.ScriptContainer; public class ContainerNpcInterface extends Container{ private int posX, posZ; - public EntityPlayer player; - public IContainer scriptContainer; public ContainerNpcInterface(EntityPlayer player){ posX = MathHelper.floor_double(player.posX); @@ -22,11 +18,4 @@ public class ContainerNpcInterface extends Container{ return !player.isDead && posX == MathHelper.floor_double(player.posX) && posZ == MathHelper.floor_double(player.posZ); } - public static IContainer getOrCreateIContainer(ContainerNpcInterface container) { - if (container.scriptContainer != null) { - return container.scriptContainer; - } else { - return container.scriptContainer = new ScriptContainer(container); - } - } } diff --git a/src/main/java/noppes/npcs/controllers/Availability.java b/src/main/java/noppes/npcs/controllers/Availability.java index e378717dd..518ccd995 100644 --- a/src/main/java/noppes/npcs/controllers/Availability.java +++ b/src/main/java/noppes/npcs/controllers/Availability.java @@ -2,7 +2,6 @@ package noppes.npcs.controllers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; import noppes.npcs.constants.EnumAvailabilityDialog; @@ -10,11 +9,8 @@ import noppes.npcs.constants.EnumAvailabilityFaction; import noppes.npcs.constants.EnumAvailabilityFactionType; import noppes.npcs.constants.EnumAvailabilityQuest; import noppes.npcs.constants.EnumDayTime; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IAvailability; -import noppes.npcs.scripted.interfaces.IPlayer; -public class Availability implements ICompatibilty, IAvailability { +public class Availability implements ICompatibilty { public int version = VersionCompatibility.ModRev; public EnumAvailabilityDialog dialogAvailable = EnumAvailabilityDialog.Always; @@ -182,7 +178,7 @@ public class Availability implements ICompatibilty, IAvailability { if(available == EnumAvailabilityFactionType.Always) return true; - Faction faction = FactionController.getInstance().get(id); + Faction faction = FactionController.getInstance().getFaction(id); if(faction == null) return true; @@ -237,170 +233,4 @@ public class Availability implements ICompatibilty, IAvailability { public void setVersion(int version) { this.version = version; } - - public boolean isAvailable(IPlayer player) { - return this.isAvailable((EntityPlayer)player.getMCEntity()); - } - - public int getDaytime() { - return this.daytime.ordinal(); - } - - public void setDaytime(int type) { - this.daytime = EnumDayTime.values()[MathHelper.clamp_int(type, 0, 2)]; - } - - public int getMinPlayerLevel() { - return this.minPlayerLevel; - } - - public void setMinPlayerLevel(int level) { - this.minPlayerLevel = level; - } - - public int getDialog(int i) { - if (i < 0 && i > 3) { - throw new CustomNPCsException(i + " isnt between 0 and 3", new Object[0]); - } else if (i == 0) { - return this.dialogId; - } else if (i == 1) { - return this.dialog2Id; - } else { - return i == 2 ? this.dialog3Id : this.dialog4Id; - } - } - - public void setDialog(int i, int id, int type) { - if (i < 0 && i > 3) { - throw new CustomNPCsException(i + " isnt between 0 and 3", new Object[0]); - } else { - EnumAvailabilityDialog e = EnumAvailabilityDialog.values()[MathHelper.clamp_int(type, 0, 2)]; - if (i == 0) { - this.dialogId = id; - this.dialogAvailable = e; - } else if (i == 1) { - this.dialog2Id = id; - this.dialog2Available = e; - } else if (i == 2) { - this.dialog3Id = id; - this.dialog3Available = e; - } else if (i == 3) { - this.dialog4Id = id; - this.dialog4Available = e; - } - - } - } - - public void removeDialog(int i) { - if (i < 0 && i > 3) { - throw new CustomNPCsException(i + " isnt between 0 and 3", new Object[0]); - } else { - if (i == 0) { - this.dialogId = -1; - this.dialogAvailable = EnumAvailabilityDialog.Always; - } else if (i == 1) { - this.dialog2Id = -1; - this.dialog2Available = EnumAvailabilityDialog.Always; - } else if (i == 2) { - this.dialog3Id = -1; - this.dialog3Available = EnumAvailabilityDialog.Always; - } else if (i == 3) { - this.dialog4Id = -1; - this.dialog4Available = EnumAvailabilityDialog.Always; - } - - } - } - - public int getQuest(int i) { - if (i < 0 && i > 3) { - throw new CustomNPCsException(i + " isnt between 0 and 3", new Object[0]); - } else if (i == 0) { - return this.questId; - } else if (i == 1) { - return this.quest2Id; - } else { - return i == 2 ? this.quest3Id : this.quest4Id; - } - } - - public void setQuest(int i, int id, int type) { - if (i < 0 && i > 3) { - throw new CustomNPCsException(i + " isnt between 0 and 3", new Object[0]); - } else { - EnumAvailabilityQuest e = EnumAvailabilityQuest.values()[MathHelper.clamp_int(type, 0, 5)]; - if (i == 0) { - this.questId = id; - this.questAvailable = e; - } else if (i == 1) { - this.quest2Id = id; - this.quest2Available = e; - } else if (i == 2) { - this.quest3Id = id; - this.quest3Available = e; - } else if (i == 3) { - this.quest4Id = id; - this.quest4Available = e; - } - - } - } - - public void removeQuest(int i) { - if (i < 0 && i > 3) { - throw new CustomNPCsException(i + " isnt between 0 and 3", new Object[0]); - } else { - if (i == 0) { - this.questId = -1; - this.questAvailable = EnumAvailabilityQuest.Always; - } else if (i == 1) { - this.quest2Id = -1; - this.quest2Available = EnumAvailabilityQuest.Always; - } else if (i == 2) { - this.quest3Id = -1; - this.quest3Available = EnumAvailabilityQuest.Always; - } else if (i == 3) { - this.quest4Id = -1; - this.quest4Available = EnumAvailabilityQuest.Always; - } - - } - } - - public void setFaction(int i, int id, int type, int stance) { - if (i < 0 && i > 1) { - throw new CustomNPCsException(i + " isnt between 0 and 1", new Object[0]); - } else { - EnumAvailabilityFactionType e = EnumAvailabilityFactionType.values()[MathHelper.clamp_int(type, 0, 2)]; - EnumAvailabilityFaction ee = EnumAvailabilityFaction.values()[MathHelper.clamp_int(stance, 0, 2)]; - if (i == 0) { - this.factionId = id; - this.factionAvailable = e; - this.factionStance = ee; - } else if (i == 1) { - this.faction2Id = id; - this.faction2Available = e; - this.faction2Stance = ee; - } - - } - } - - public void removeFaction(int i) { - if (i < 0 && i > 1) { - throw new CustomNPCsException(i + " isnt between 0 and 1", new Object[0]); - } else { - if (i == 0) { - this.factionId = -1; - this.factionAvailable = EnumAvailabilityFactionType.Always; - this.factionStance = EnumAvailabilityFaction.Friendly; - } else if (i == 1) { - this.faction2Id = -1; - this.faction2Available = EnumAvailabilityFactionType.Always; - this.faction2Stance = EnumAvailabilityFaction.Friendly; - } - - } - } } diff --git a/src/main/java/noppes/npcs/controllers/CustomGuiController.java b/src/main/java/noppes/npcs/controllers/CustomGuiController.java deleted file mode 100644 index 53cbc932d..000000000 --- a/src/main/java/noppes/npcs/controllers/CustomGuiController.java +++ /dev/null @@ -1,138 +0,0 @@ -package noppes.npcs.controllers; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagList; -import noppes.npcs.CustomNpcs; -import noppes.npcs.Server; -import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.constants.EnumScriptType; -import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.CustomGuiEvent; -import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.overlay.ScriptOverlay; -import noppes.npcs.scripted.wrapper.WrapperNpcAPI; - -import java.io.IOException; - -public class CustomGuiController { - public CustomGuiController() { - } - - public static void openGui(ScriptPlayer player, ScriptGui gui) { - EntityPlayerMP entityPlayerMP = (EntityPlayerMP) player.getMCEntity(); - entityPlayerMP.openGui(CustomNpcs.instance, EnumGuiType.CustomGui.ordinal(), player.getWorld().getMCWorld(), gui.getSlots().size(), 0, 0); - ((ContainerCustomGui)((EntityPlayerMP)player.getMCEntity()).openContainer).setGui(gui, (EntityPlayer)player.getMCEntity()); - Server.sendData((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.GUI_DATA, new Object[]{gui.toNBT()}); - } - - public static boolean updateGui(ScriptPlayer player, ScriptGui gui) { - if (((EntityPlayerMP)player.getMCEntity()).openContainer instanceof ContainerCustomGui) { - Server.sendData((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.GUI_DATA, new Object[]{gui.toNBT()}); - return true; - } else { - return false; - } - } - - public static void openOverlay(ScriptPlayer player, ScriptOverlay gui) { - Server.sendData((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.OVERLAY_DATA, new Object[]{gui.toNBT()}); - } - - public static boolean updateOverlay(ScriptPlayer player, ScriptOverlay gui) { - Server.sendData((EntityPlayerMP)player.getMCEntity(), EnumPacketClient.OVERLAY_DATA, new Object[]{gui.toNBT()}); - return true; - } - - static boolean checkGui(CustomGuiEvent event) { - EntityPlayer player = (EntityPlayer) event.player.getMCEntity(); - if (!(player.openContainer instanceof ContainerCustomGui)) { - return false; - } else { - return ((ContainerCustomGui)player.openContainer).customGui.getID() == event.gui.getID(); - } - } - - public static IItemStack[] getSlotContents(EntityPlayer player) { - IItemStack[] slotContents = new IItemStack[0]; - if (player.openContainer instanceof ContainerCustomGui) { - ContainerCustomGui container = (ContainerCustomGui)player.openContainer; - slotContents = new IItemStack[container.guiInventory.getSizeInventory()]; - - for(int i = 0; i < container.guiInventory.getSizeInventory(); ++i) { - slotContents[i] = NpcAPI.Instance().getIItemStack(container.guiInventory.getStackInSlot(i)); - } - } - - return slotContents; - } - - public static void onButton(CustomGuiEvent.ButtonEvent event) { - EntityPlayer player = (EntityPlayer) event.player.getMCEntity(); - if (checkGui(event) && getOpenGui(player).getScriptHandler() != null) { - getOpenGui(player).getScriptHandler().callScript(EnumScriptType.CUSTOM_GUI_BUTTON, event); - } - - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onSlotChange(CustomGuiEvent.SlotEvent event) { - EntityPlayer player = (EntityPlayer) event.player.getMCEntity(); - if (checkGui(event) && getOpenGui(player).getScriptHandler() != null) { - getOpenGui(player).getScriptHandler().callScript(EnumScriptType.CUSTOM_GUI_SLOT, event); - } - - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onCustomGuiUnfocused(CustomGuiEvent.UnfocusedEvent event) { - EntityPlayer player = (EntityPlayer) event.player.getMCEntity(); - if (checkGui(event) && getOpenGui(player).getScriptHandler() != null) { - getOpenGui(player).getScriptHandler().callScript(EnumScriptType.CUSTOM_GUI_TEXTFIELD, event); - } - - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onScrollClick(CustomGuiEvent.ScrollEvent event) { - EntityPlayer player = (EntityPlayer) event.player.getMCEntity(); - if (checkGui(event) && getOpenGui(player).getScriptHandler() != null) { - getOpenGui(player).getScriptHandler().callScript(EnumScriptType.CUSTOM_GUI_SCROLL, event); - } - - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static void onClose(CustomGuiEvent.CloseEvent event) { - if (ScriptController.Instance.playerScripts != null) { - ScriptController.Instance.playerScripts.callScript(EnumScriptType.CUSTOM_GUI_CLOSED, event); - } - - WrapperNpcAPI.EVENT_BUS.post(event); - } - - public static ScriptGui getOpenGui(EntityPlayer player) { - return player.openContainer instanceof ContainerCustomGui ? ((ContainerCustomGui)player.openContainer).customGui : null; - } - - public static String[] readScrollSelection(ByteBuf buffer) { - try { - NBTTagList list = Server.readNBT(buffer).getTagList("selection", 8); - String[] selection = new String[list.tagCount()]; - - for(int i = 0; i < list.tagCount(); ++i) { - selection[i] = list.getStringTagAt(i); - } - - return selection; - } catch (IOException var4) { - var4.printStackTrace(); - return null; - } - } -} diff --git a/src/main/java/noppes/npcs/controllers/Dialog.java b/src/main/java/noppes/npcs/controllers/Dialog.java index 05155e347..8351f69cc 100644 --- a/src/main/java/noppes/npcs/controllers/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/Dialog.java @@ -1,8 +1,6 @@ package noppes.npcs.controllers; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -10,10 +8,8 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; import noppes.npcs.constants.EnumOptionType; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.*; -public class Dialog implements ICompatibilty, IDialog { +public class Dialog implements ICompatibilty { public int version = VersionCompatibility.ModRev; public int id = -1; public String title = ""; @@ -30,7 +26,6 @@ public class Dialog implements ICompatibilty, IDialog { public boolean hideNPC = false; public boolean showWheel = false; public boolean disableEsc = false; - public boolean darkenScreen = true; public boolean hasDialogs(EntityPlayer player) { for(DialogOption option: options.values()) @@ -60,18 +55,7 @@ public class Dialog implements ICompatibilty, IDialog { else showWheel = true; disableEsc = compound.getBoolean("DialogDisableEsc"); - - if(compound.hasKey("DialogDarkScreen")) { - darkenScreen = compound.getBoolean("DialogDarkScreen"); - } - else { - darkenScreen = true; - } - // Temporary Remove after Few Versions - if(compound.hasKey("DialogDarkenScreen")){ - compound.removeTag("DialogDarkenScreen"); - } - + NBTTagList options = compound.getTagList("Options", 10); HashMap newoptions = new HashMap(); for(int iii = 0; iii < options.tagCount();iii++){ @@ -102,12 +86,6 @@ public class Dialog implements ICompatibilty, IDialog { compound.setBoolean("DialogHideNPC", hideNPC); compound.setBoolean("DialogShowWheel", showWheel); compound.setBoolean("DialogDisableEsc", disableEsc); - - compound.setBoolean("DialogDarkScreen", darkenScreen); - // Temporary Remove after Few Versions - if(compound.hasKey("DialogDarkenScreen")){ - compound.removeTag("DialogDarkenScreen"); - } if(sound != null && !sound.isEmpty()) compound.setString("DialogSound", sound); @@ -130,7 +108,9 @@ public class Dialog implements ICompatibilty, IDialog { public boolean hasQuest() { return getQuest() != null; } - + public Quest getQuest() { + return QuestController.instance.quests.get(quest); + } public boolean hasOtherOptions() { for(DialogOption option: options.values()) if(option != null && option.optionType != EnumOptionType.Disabled) @@ -151,7 +131,6 @@ public class Dialog implements ICompatibilty, IDialog { dialog.hideNPC = hideNPC; dialog.showWheel = showWheel; dialog.disableEsc = disableEsc; - dialog.darkenScreen = darkenScreen; for(int slot : options.keySet()){ DialogOption option = options.get(slot); @@ -169,109 +148,5 @@ public class Dialog implements ICompatibilty, IDialog { public void setVersion(int version) { this.version = version; } - - public int getId() { - return this.id; - } - - public String getName() { - return this.title; - } - - public List getOptions() { - return new ArrayList(this.options.values()); - } - - public IDialogOption getOption(int slot) { - IDialogOption option = (IDialogOption)this.options.get(slot); - if (option == null) { - throw new CustomNPCsException("There is no DialogOption for slot: " + slot, new Object[0]); - } else { - return option; - } - } - - public IAvailability getAvailability() { - return this.availability; - } - - public IDialogCategory getCategory() { - return this.category; - } - - public void save() { - DialogController.instance.saveDialog(this.category.id, this); - } - - public void setName(String name) { - this.title = name; - } - - public String getText() { - return this.text; - } - - public void setText(String text) { - this.text = text; - } - - public void setQuest(IQuest quest) { - if (quest == null) { - this.quest = -1; - } else { - if (quest.getId() < 0) { - throw new CustomNPCsException("Quest id is lower than 0", new Object[0]); - } - - this.quest = quest.getId(); - } - - } - - public Quest getQuest() { - return QuestController.instance == null ? null : (Quest)QuestController.instance.quests.get(this.quest); - } - - public String getCommand() { - return this.command; - } - - public void setCommand(String command) { - this.command = command; - } - - public void setDarkenScreen(boolean darkenScreen) { - this.darkenScreen = darkenScreen; - } - public boolean getDarkenScreen() { - return this.darkenScreen; - } - - public void setDisableEsc(boolean disableEsc) { - this.disableEsc = disableEsc; - } - public boolean getDisableEsc() { - return this.disableEsc; - } - - public void setShowWheel(boolean showWheel) { - this.showWheel = showWheel; - } - public boolean getShowWheel() { - return this.showWheel; - } - - public void setHideNPC(boolean hideNPC) { - this.hideNPC = hideNPC; - } - public boolean getHideNPC() { - return this.hideNPC; - } - - public void setSound(String sound) { - this.sound = sound; - } - public String getSound() { - return this.sound; - } + } diff --git a/src/main/java/noppes/npcs/controllers/DialogCategory.java b/src/main/java/noppes/npcs/controllers/DialogCategory.java index d6314ad88..7bbb64288 100644 --- a/src/main/java/noppes/npcs/controllers/DialogCategory.java +++ b/src/main/java/noppes/npcs/controllers/DialogCategory.java @@ -1,15 +1,11 @@ package noppes.npcs.controllers; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.scripted.handler.data.IDialog; -import noppes.npcs.scripted.handler.data.IDialogCategory; -public class DialogCategory implements IDialogCategory { +public class DialogCategory { public int id = -1; public String title = ""; @@ -47,18 +43,4 @@ public class DialogCategory implements IDialogCategory { nbtfactions.setTag("Dialogs", dialogs); return nbtfactions; } - - public List dialogs() { - return new ArrayList(this.dialogs.values()); - } - - public String getName() { - return this.title; - } - - public IDialog create() { - Dialog dialog = new Dialog(); - dialog.category = this; - return dialog; - } } diff --git a/src/main/java/noppes/npcs/controllers/DialogController.java b/src/main/java/noppes/npcs/controllers/DialogController.java index 69156b429..5b8e8f765 100644 --- a/src/main/java/noppes/npcs/controllers/DialogController.java +++ b/src/main/java/noppes/npcs/controllers/DialogController.java @@ -2,7 +2,9 @@ package noppes.npcs.controllers; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -11,12 +13,9 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesStringUtils; import noppes.npcs.constants.EnumOptionType; -import noppes.npcs.scripted.handler.IDialogHandler; -import noppes.npcs.scripted.handler.data.IDialog; -import noppes.npcs.scripted.handler.data.IDialogCategory; import noppes.npcs.util.NBTJsonUtil; -public class DialogController implements IDialogHandler { +public class DialogController { public HashMap categories = new HashMap(); public HashMap dialogs = new HashMap(); public static DialogController instance; @@ -313,12 +312,4 @@ public class DialogController implements IDialogHandler { } return map; } - - public List categories() { - return new ArrayList(this.categories.values()); - } - - public IDialog get(int id) { - return (IDialog)this.dialogs.get(id); - } } diff --git a/src/main/java/noppes/npcs/controllers/Faction.java b/src/main/java/noppes/npcs/controllers/Faction.java index 7a7ace55e..d97eb4fdb 100644 --- a/src/main/java/noppes/npcs/controllers/Faction.java +++ b/src/main/java/noppes/npcs/controllers/Faction.java @@ -1,18 +1,13 @@ package noppes.npcs.controllers; import java.util.HashSet; -import java.util.Iterator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IFaction; -import noppes.npcs.scripted.interfaces.ICustomNpc; -import noppes.npcs.scripted.interfaces.IPlayer; -public class Faction implements IFaction { +public class Faction { public String name = ""; public int color = Integer.parseInt("FF00", 16); @@ -90,90 +85,4 @@ public class Faction implements IFaction { public boolean isAggressiveToNpc(EntityNPCInterface entity) { return attackFactions.contains(entity.faction.id); } - - public int getId() { - return this.id; - } - - public String getName() { - return this.name; - } - - public int getDefaultPoints() { - return this.defaultPoints; - } - - public int getColor() { - return this.color; - } - - public int playerStatus(IPlayer player) { - PlayerFactionData data = PlayerData.get((EntityPlayer) player.getMCEntity()).factionData; - int points = data.getFactionPoints(this.id); - if (points >= this.friendlyPoints) { - return 1; - } else { - return points < this.neutralPoints ? -1 : 0; - } - } - - public boolean hostileToNpc(ICustomNpc npc) { - return this.attackFactions.contains(npc.getFaction().getId()); - } - - public void setDefaultPoints(int points) { - this.defaultPoints = points; - } - - public boolean hostileToFaction(int factionId) { - return this.attackFactions.contains(factionId); - } - - public int[] getHostileList() { - int[] a = new int[this.attackFactions.size()]; - int i = 0; - - Integer val; - for(Iterator var3 = this.attackFactions.iterator(); var3.hasNext(); a[i++] = val) { - val = (Integer)var3.next(); - } - - return a; - } - - public void addHostile(int id) { - if (this.attackFactions.contains(id)) { - throw new CustomNPCsException("Faction " + this.id + " is already hostile to " + id, new Object[0]); - } else { - this.attackFactions.add(id); - } - } - - public void removeHostile(int id) { - this.attackFactions.remove(id); - } - - public boolean hasHostile(int id) { - return this.attackFactions.contains(id); - } - - public boolean getIsHidden() { - return this.hideFaction; - } - - public void setIsHidden(boolean bo) { - this.hideFaction = bo; - } - - public boolean getAttackedByMobs() { - return this.getsAttacked; - } - - public void setAttackedByMobs(boolean bo) { - this.getsAttacked = bo; - } - - public void save() { - FactionController.getInstance().saveFaction(this); - } } diff --git a/src/main/java/noppes/npcs/controllers/FactionController.java b/src/main/java/noppes/npcs/controllers/FactionController.java index 36b2db79c..77a57a352 100644 --- a/src/main/java/noppes/npcs/controllers/FactionController.java +++ b/src/main/java/noppes/npcs/controllers/FactionController.java @@ -6,9 +6,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.zip.GZIPInputStream; @@ -17,12 +15,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; -import noppes.npcs.Server; -import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.scripted.handler.IFactionHandler; -import noppes.npcs.scripted.handler.data.IFaction; -public class FactionController implements IFactionHandler { +public class FactionController { public HashMap factions; private static FactionController instance; @@ -130,16 +124,12 @@ public class FactionController implements IFactionHandler { } } - public Faction get(int faction) { + public Faction getFaction(int faction) { return factions.get(faction); } - public List list() { - return new ArrayList(this.factions.values()); - } - public void saveFaction(Faction faction) { - + if(faction.id < 0){ faction.id = getUnusedId(); while(hasName(faction.name)) @@ -155,19 +145,6 @@ public class FactionController implements IFactionHandler { factions.put(faction.id, faction); saveFactions(); } - - public Faction create(Faction faction) { - this.saveFaction(faction); - return faction; - } - - public Faction create(String name, int color) { - Faction faction = new Faction(); - faction.name = name; - faction.color = color; - this.saveFaction(faction); - return faction; - } public int getUnusedId(){ if(lastUsedID == 0){ @@ -178,20 +155,11 @@ public class FactionController implements IFactionHandler { lastUsedID++; return lastUsedID; } - public IFaction delete(int id) { - if (id >= 0 && this.factions.size() > 1) { - Faction faction = (Faction)this.factions.remove(id); - saveFactions(); - if (faction == null) { - return null; - } else { - this.saveFactions(); - faction.id = -1; - return faction; - } - } else { - return null; - } + public void removeFaction(int id) { + if(id < 0 || factions.size() <= 1) + return; + factions.remove(id); + saveFactions(); } public int getFirstFactionId() { diff --git a/src/main/java/noppes/npcs/controllers/FactionOptions.java b/src/main/java/noppes/npcs/controllers/FactionOptions.java index 9e07aef0e..046b398ad 100644 --- a/src/main/java/noppes/npcs/controllers/FactionOptions.java +++ b/src/main/java/noppes/npcs/controllers/FactionOptions.java @@ -1,12 +1,8 @@ package noppes.npcs.controllers; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; -import noppes.npcs.EventHooks; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.FactionEvent; public class FactionOptions { @@ -56,16 +52,16 @@ public class FactionOptions { addPoints(player, data, faction2Id, decreaseFaction2Points, faction2Points); } private void addPoints(EntityPlayer player, PlayerFactionData data, int factionId, boolean decrease, int points) { - Faction faction = FactionController.getInstance().get(factionId); + Faction faction = FactionController.getInstance().getFaction(factionId); if(faction == null) return; - + if(!faction.hideFaction){ String message = decrease?"faction.decreasepoints":"faction.increasepoints"; player.addChatMessage(new ChatComponentTranslation(message, faction.name, points)); } - data.increasePoints(factionId, decrease?-points:points,player); + data.increasePoints(factionId, decrease?-points:points); } } diff --git a/src/main/java/noppes/npcs/controllers/IScriptHandler.java b/src/main/java/noppes/npcs/controllers/IScriptHandler.java deleted file mode 100644 index 4ece1fbca..000000000 --- a/src/main/java/noppes/npcs/controllers/IScriptHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.controllers; - -import java.util.List; -import java.util.Map; -import cpw.mods.fml.common.eventhandler.Event; -import noppes.npcs.constants.EnumScriptType; - -public interface IScriptHandler { - void callScript(EnumScriptType var1, Event var2); - - boolean isClient(); - - boolean getEnabled(); - - void setEnabled(boolean var1); - - String getLanguage(); - - void setLanguage(String var1); - - List getScripts(); - - String noticeString(); - - Map getConsoleText(); - - void clearConsole(); -} diff --git a/src/main/java/noppes/npcs/controllers/PlayerData.java b/src/main/java/noppes/npcs/controllers/PlayerData.java index 28b018239..675c0d089 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/PlayerData.java @@ -2,23 +2,13 @@ package noppes.npcs.controllers; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.IExtendedEntityProperties; -import noppes.npcs.CustomNpcs; -import noppes.npcs.LogWriter; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.controllers.data.PlayerDataScript; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.entity.data.DataTimers; import noppes.npcs.roles.RoleCompanion; -import noppes.npcs.util.NBTJsonUtil; - -import java.io.File; -import java.io.FileInputStream; public class PlayerData implements IExtendedEntityProperties{ public PlayerDialogData dialogData = new PlayerDialogData(); @@ -28,8 +18,7 @@ public class PlayerData implements IExtendedEntityProperties{ public PlayerFactionData factionData = new PlayerFactionData(); public PlayerItemGiverData itemgiverData = new PlayerItemGiverData(); public PlayerMailData mailData = new PlayerMailData(); - public DataTimers timers = new DataTimers(this); - + public EntityNPCInterface editingNpc; public NBTTagCompound cloned; @@ -37,12 +26,10 @@ public class PlayerData implements IExtendedEntityProperties{ public String playername = ""; public String uuid = ""; - + private EntityNPCInterface activeCompanion = null; public int companionID = 0; - public boolean isGUIOpen = false; - @Override public void saveNBTData(NBTTagCompound compound) { PlayerDataController.instance.savePlayerData(this); @@ -64,8 +51,8 @@ public class PlayerData implements IExtendedEntityProperties{ transportData.loadNBTData(data); factionData.loadNBTData(data); itemgiverData.loadNBTData(data); - mailData.loadNBTData(data); - timers.readFromNBT(data); + mailData.loadNBTData(data); + if(player != null){ playername = player.getCommandSenderName(); @@ -86,7 +73,6 @@ public class PlayerData implements IExtendedEntityProperties{ player.worldObj.spawnEntityInWorld(npc); } } - isGUIOpen = data.getBoolean("isGUIOpen"); } public NBTTagCompound getNBT() { if(player != null){ @@ -101,12 +87,10 @@ public class PlayerData implements IExtendedEntityProperties{ factionData.saveNBTData(compound); itemgiverData.saveNBTData(compound); mailData.saveNBTData(compound); - timers.writeToNBT(compound); - + compound.setString("PlayerName", playername); compound.setString("UUID", uuid); compound.setInteger("PlayerCompanionId", companionID); - compound.setBoolean("isGUIOpen",isGUIOpen); if(hasCompanion()){ NBTTagCompound nbt = new NBTTagCompound(); @@ -120,17 +104,7 @@ public class PlayerData implements IExtendedEntityProperties{ public void init(Entity entity, World world) { } - - public void setGUIOpen(boolean bool) { - isGUIOpen = bool; - saveNBTData(null); - } - - public boolean getGUIOpen() { - loadNBTData(null); - return isGUIOpen; - } - + public boolean hasCompanion(){ return activeCompanion != null && !activeCompanion.isDead; } @@ -164,82 +138,4 @@ public class PlayerData implements IExtendedEntityProperties{ world.spawnEntityInWorld(npc); } - public static NBTTagCompound loadPlayerDataOld(String player) { - File saveDir = CustomNpcs.getWorldSaveDirectory("playerdata"); - String filename = player; - if (player.isEmpty()) { - filename = "noplayername"; - } - - filename = filename + ".dat"; - - File file; - try { - file = new File(saveDir, filename); - if (file.exists()) { - NBTTagCompound comp = CompressedStreamTools.readCompressed(new FileInputStream(file)); - file.delete(); - file = new File(saveDir, filename + "_old"); - if (file.exists()) { - file.delete(); - } - - return comp; - } - } catch (Exception var6) { - LogWriter.except(var6); - } - - try { - file = new File(saveDir, filename + "_old"); - if (file.exists()) { - return CompressedStreamTools.readCompressed(new FileInputStream(file)); - } - } catch (Exception var5) { - LogWriter.except(var5); - } - - return new NBTTagCompound(); - } - - public static NBTTagCompound loadPlayerData(String player) { - File saveDir = CustomNpcs.getWorldSaveDirectory("playerdata"); - String filename = player; - if (player.isEmpty()) { - filename = "noplayername"; - } - - filename = filename + ".json"; - File file = null; - - try { - file = new File(saveDir, filename); - if (file.exists()) { - return NBTJsonUtil.LoadFile(file); - } - } catch (Exception var5) { - LogWriter.error("Error loading: " + file.getAbsolutePath(), var5); - } - - return new NBTTagCompound(); - } - - public static PlayerData get(EntityPlayer player) { - if(player.worldObj.isRemote) { - return CustomNpcs.proxy.getPlayerData(player); - } else { - PlayerData data = new PlayerData(); - if (data.player == null) { - data.player = player; - NBTTagCompound compound = loadPlayerData(player.getPersistentID().toString()); - if (compound.hasNoTags()) { - compound = loadPlayerDataOld(player.getCommandSenderName()); - } - - data.setNBT(compound); - } - - return data; - } - } } diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index 4c72212d7..c33db9ab7 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -14,13 +14,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; +import noppes.npcs.util.CustomNPCsScheduler; import noppes.npcs.util.NBTJsonUtil; public class PlayerDataController { public static PlayerDataController instance; + public Map nameUUIDs; public PlayerDataController(){ instance = this; + nameUUIDs = getUsernameData(); } public File getSaveDir(){ try{ @@ -72,11 +75,10 @@ public class PlayerDataController { String filename = player; if(filename.isEmpty()) filename = "noplayername"; - filename += ".json"; try { - File file = new File(saveDir, filename); + File file = new File(saveDir, filename + ".json"); if(file.exists()){ - return NBTJsonUtil.LoadFile(file); + return NBTJsonUtil.LoadFile(file); } } catch (Exception e) { LogWriter.error("Error loading: " + filename, e); @@ -86,20 +88,26 @@ public class PlayerDataController { } public void savePlayerData(PlayerData data){ - NBTTagCompound compound = data.getNBT(); - String filename = data.uuid + ".json"; - try { - File saveDir = getSaveDir(); - File file = new File(saveDir, filename+"_new"); - File file1 = new File(saveDir, filename); - NBTJsonUtil.SaveFile(file, compound); - if(file1.exists()){ - file1.delete(); - } - file.renameTo(file1); - } catch (Exception e) { - LogWriter.except(e); - } + final NBTTagCompound compound = data.getNBT(); + final String filename = data.uuid + ".json"; + nameUUIDs.put(data.playername, data.uuid); + CustomNPCsScheduler.runTack(new Runnable(){ + @Override + public void run() { + try { + File saveDir = getSaveDir(); + File file = new File(saveDir, filename+"_new"); + File file1 = new File(saveDir, filename); + NBTJsonUtil.SaveFile(file, compound); + if(file1.exists()){ + file1.delete(); + } + file.renameTo(file1); + } catch (Exception e) { + LogWriter.except(e); + } + } + }); } public PlayerBankData getBankData(EntityPlayer player, int bankId) { @@ -122,7 +130,7 @@ public class PlayerDataController { return data; } public String hasPlayer(String username) { - for(String name : getUsernameData().keySet()){ + for(String name : nameUUIDs.keySet()){ if(name.equalsIgnoreCase(username)) return name; } @@ -134,11 +142,10 @@ public class PlayerDataController { EntityPlayer player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(username); PlayerData data = null; if(player == null){ - Map map = getUsernameData(); - for(String name : map.keySet()){ + for(String name : nameUUIDs.keySet()){ if(name.equalsIgnoreCase(username)){ data = new PlayerData(); - data.setNBT(map.get(name)); + data.setNBT(loadPlayerData(nameUUIDs.get(name))); break; } } @@ -158,15 +165,15 @@ public class PlayerDataController { savePlayerData(data); } - public Map getUsernameData(){ - Map map = new HashMap(); + private Map getUsernameData(){ + Map map = new HashMap(); for(File file : getSaveDir().listFiles()){ if(file.isDirectory() || !file.getName().endsWith(".json")) continue; try { NBTTagCompound compound = NBTJsonUtil.LoadFile(file); if(compound.hasKey("PlayerName")){ - map.put(compound.getString("PlayerName"), compound); + map.put(compound.getString("PlayerName"), file.getName().substring(0, file.getName().length() - 5)); } } catch (Exception e) { LogWriter.error("Error loading: " + file.getAbsolutePath(), e); diff --git a/src/main/java/noppes/npcs/controllers/PlayerFactionData.java b/src/main/java/noppes/npcs/controllers/PlayerFactionData.java index 3455f4bf6..59d600710 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerFactionData.java +++ b/src/main/java/noppes/npcs/controllers/PlayerFactionData.java @@ -2,13 +2,8 @@ package noppes.npcs.controllers; import java.util.HashMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.EventHooks; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.FactionEvent; public class PlayerFactionData { public HashMap factionData = new HashMap(); @@ -44,16 +39,15 @@ public class PlayerFactionData { public int getFactionPoints(int id) { if(!factionData.containsKey(id)){ - Faction faction = FactionController.getInstance().get(id); + Faction faction = FactionController.getInstance().getFaction(id); factionData.put(id, faction == null? -1 : faction.defaultPoints); } return factionData.get(id); } - public void increasePoints(int factionId, int points, EntityPlayer player) { - EventHooks.onFactionPoints(new FactionEvent.FactionPoints(new ScriptPlayer((EntityPlayerMP) player), FactionController.getInstance().get(factionId), points < 0, points)); + public void increasePoints(int factionId, int points) { if(!factionData.containsKey(factionId)){ - Faction faction = FactionController.getInstance().get(factionId); + Faction faction = FactionController.getInstance().getFaction(factionId); factionData.put(factionId, faction == null? -1 : faction.defaultPoints); } factionData.put(factionId, factionData.get(factionId) + points); @@ -65,7 +59,7 @@ public class PlayerFactionData { NBTTagList list = new NBTTagList(); for(int id : factionData.keySet()){ - Faction faction = FactionController.getInstance().get(id); + Faction faction = FactionController.getInstance().getFaction(id); if(faction == null || faction.hideFaction) continue; NBTTagCompound com = new NBTTagCompound(); diff --git a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java index 0a4172b7c..3c843d187 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java @@ -4,7 +4,6 @@ import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import noppes.npcs.EventHooks; import noppes.npcs.Server; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestRepeat; @@ -31,10 +30,6 @@ public class PlayerQuestController { public static void addActiveQuest(Quest quest, EntityPlayer player) { PlayerQuestData data = PlayerDataController.instance.getPlayerData(player).questData; if(canQuestBeAccepted(quest, player)){ - if (EventHooks.onQuestStarted(player, quest)) { - return; - } - data.activeQuests.put(quest.id,new QuestData(quest)); Server.sendData((EntityPlayerMP)player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title); Server.sendData((EntityPlayerMP)player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title); diff --git a/src/main/java/noppes/npcs/controllers/PlayerQuestData.java b/src/main/java/noppes/npcs/controllers/PlayerQuestData.java index 4523f9ba0..2450f1562 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerQuestData.java +++ b/src/main/java/noppes/npcs/controllers/PlayerQuestData.java @@ -6,7 +6,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.EventHooks; import noppes.npcs.Server; import noppes.npcs.constants.EnumPacketClient; import noppes.npcs.constants.EnumQuestCompletion; @@ -79,26 +78,24 @@ public class PlayerQuestData { } public QuestData getQuestCompletion(EntityPlayer player,EntityNPCInterface npc) { - PlayerData playerData = PlayerDataController.instance.getPlayerData(player); for(QuestData data : activeQuests.values()){ Quest quest = data.quest; - if(quest != null && quest.completion == EnumQuestCompletion.Npc && quest.completerNpc.equals(npc.getCommandSenderName()) && quest.questInterface.isCompleted(playerData)){ + if(quest != null && quest.completion == EnumQuestCompletion.Npc && quest.completerNpc.equals(npc.getCommandSenderName()) && quest.questInterface.isCompleted(player)){ return data; } } return null; } - public boolean checkQuestCompletion(PlayerData playerData,EnumQuestType type) { + public boolean checkQuestCompletion(EntityPlayer player,EnumQuestType type) { boolean bo = false; - EntityPlayer player = playerData.player; for(QuestData data : this.activeQuests.values()){ if(data.quest.type != type && type != null) continue; QuestInterface inter = data.quest.questInterface; - - if(inter.isCompleted(playerData)){ + + if(inter.isCompleted(player)){ if(!data.isCompleted){ if(!data.quest.complete(player,data)){ Server.sendData((EntityPlayerMP)player, EnumPacketClient.MESSAGE, "quest.completed", data.quest.title); @@ -106,7 +103,6 @@ public class PlayerQuestData { } data.isCompleted = true; bo = true; - EventHooks.onQuestFinished(player,data.quest); } } else diff --git a/src/main/java/noppes/npcs/controllers/Quest.java b/src/main/java/noppes/npcs/controllers/Quest.java index 3205d3073..ddd8e2f73 100644 --- a/src/main/java/noppes/npcs/controllers/Quest.java +++ b/src/main/java/noppes/npcs/controllers/Quest.java @@ -16,16 +16,8 @@ import noppes.npcs.quests.QuestInterface; import noppes.npcs.quests.QuestItem; import noppes.npcs.quests.QuestKill; import noppes.npcs.quests.QuestLocation; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.handler.data.IQuestCategory; -import noppes.npcs.scripted.handler.data.IQuestInterface; -import noppes.npcs.scripted.handler.data.IQuestObjective; -import noppes.npcs.scripted.interfaces.IContainer; -import noppes.npcs.scripted.interfaces.IPlayer; -public class Quest implements ICompatibilty, IQuest { +public class Quest implements ICompatibilty { public int version = VersionCompatibility.ModRev; public int id = -1; public EnumQuestType type = EnumQuestType.Item; @@ -156,95 +148,4 @@ public class Quest implements ICompatibilty, IQuest { public void setVersion(int version) { this.version = version; } - - public int getId() { - return this.id; - } - - public String getName() { - return this.title; - } - - public int getType() { - return this.type.ordinal(); - } - - public void setType(int questType) { - if(questType < 0 || questType >= EnumQuestType.values().length) - return; - - EnumQuestType type = EnumQuestType.values()[questType]; - setType(type); - } - - public IQuestCategory getCategory() { - return this.category; - } - - public void save() { - QuestController.instance.saveQuest(this.category.id, this); - } - - public void setName(String name) { - this.title = name; - } - - public String getLogText() { - return this.logText; - } - - public void setLogText(String text) { - this.logText = text; - } - - public String getCompleteText() { - return this.completeText; - } - - public void setCompleteText(String text) { - this.completeText = text; - } - - public void setNextQuest(IQuest quest) { - if (quest == null) { - this.nextQuestid = -1; - this.nextQuestTitle = ""; - } else { - if (quest.getId() < 0) { - throw new CustomNPCsException("Quest id is lower than 0", new Object[0]); - } - - this.nextQuestid = quest.getId(); - this.nextQuestTitle = quest.getName(); - } - - } - - public String getNpcName() { - return this.completerNpc; - } - - public void setNpcName(String name) { - this.completerNpc = name; - } - - public IQuestObjective[] getObjectives(IPlayer player) { - if (!player.hasActiveQuest(this.id)) { - throw new CustomNPCsException("Player doesnt have this quest active.", new Object[0]); - } else { - return this.questInterface.getObjectives((EntityPlayer) player.getMCEntity()); - } - } - - public boolean getIsRepeatable() { - return this.repeat != EnumQuestRepeat.NONE; - } - - public IContainer getRewards() { - return NpcAPI.Instance().getIContainer(this.rewardItems); - } - - public IQuestInterface getQuestInterface(){ - return this.questInterface; - } } diff --git a/src/main/java/noppes/npcs/controllers/QuestCategory.java b/src/main/java/noppes/npcs/controllers/QuestCategory.java index c4dac8490..a20ef1699 100644 --- a/src/main/java/noppes/npcs/controllers/QuestCategory.java +++ b/src/main/java/noppes/npcs/controllers/QuestCategory.java @@ -1,15 +1,11 @@ package noppes.npcs.controllers; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.handler.data.IQuestCategory; -public class QuestCategory implements IQuestCategory { +public class QuestCategory { public HashMap quests; public int id = -1; public String title = ""; @@ -47,18 +43,4 @@ public class QuestCategory implements IQuestCategory { return nbttagcompound; } - - public List quests() { - return new ArrayList(this.quests.values()); - } - - public String getName() { - return this.title; - } - - public IQuest create() { - Quest quest = new Quest(); - quest.category = this; - return quest; - } } diff --git a/src/main/java/noppes/npcs/controllers/QuestController.java b/src/main/java/noppes/npcs/controllers/QuestController.java index 2e8c664d9..f25355d52 100644 --- a/src/main/java/noppes/npcs/controllers/QuestController.java +++ b/src/main/java/noppes/npcs/controllers/QuestController.java @@ -2,7 +2,9 @@ package noppes.npcs.controllers; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -10,12 +12,9 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.NoppesStringUtils; -import noppes.npcs.scripted.handler.IQuestHandler; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.handler.data.IQuestCategory; import noppes.npcs.util.NBTJsonUtil; -public class QuestController implements IQuestHandler { +public class QuestController { public HashMap categories = new HashMap(); public HashMap quests = new HashMap(); @@ -233,12 +232,5 @@ public class QuestController implements IQuestHandler { private File getDir(){ return new File(CustomNpcs.getWorldSaveDirectory(), "quests"); } - - public List categories() { - return new ArrayList(this.categories.values()); - } - - public IQuest get(int id) { - return (IQuest)this.quests.get(id); - } + } diff --git a/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java b/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java index 58089d2eb..243332d7b 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java +++ b/src/main/java/noppes/npcs/controllers/RecipeCarpentry.java @@ -1,24 +1,20 @@ package noppes.npcs.controllers; -import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import noppes.npcs.NBTTags; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.scripted.handler.data.IRecipe; -public class RecipeCarpentry extends ShapedRecipes implements IRecipe { +public class RecipeCarpentry extends ShapedRecipes{ public int id = -1; public String name = ""; public Availability availability = new Availability(); @@ -226,64 +222,4 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { } return false; } - - public String getName() { - return this.name; - } - - public ItemStack getResult() { - return this.getRecipeOutput(); - } - - public boolean isGlobal() { - return this.isGlobal; - } - - public void setIsGlobal(boolean bo) { - this.isGlobal = bo; - } - - public boolean getIgnoreNBT() { - return this.ignoreNBT; - } - - public void setIgnoreNBT(boolean bo) { - this.ignoreNBT = bo; - } - - public boolean getIgnoreDamage() { - return this.ignoreDamage; - } - - public void setIgnoreDamage(boolean bo) { - this.ignoreDamage = bo; - } - - public int getWidth() { - return this.recipeWidth; - } - - public int getHeight() { - return this.recipeHeight; - } - - public void save() { - try { - RecipeController.instance.saveRecipe(this.writeNBT()); - } catch (IOException var2) { - } - - } - - public void delete() { - RecipeController.instance.delete(this.id); - } - - public ItemStack[] getRecipe() { - return this.recipeItems; - } - - public int getId() { - return this.id; - } } diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index a028f938f..cbe56242a 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -4,7 +4,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -13,10 +16,8 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; -import noppes.npcs.scripted.handler.IRecipeHandler; -import noppes.npcs.scripted.handler.data.IRecipe; -public class RecipeController implements IRecipeHandler { +public class RecipeController { private static Collection prevRecipes; public HashMap globalRecipes = new HashMap(); public HashMap anvilRecipes = new HashMap(); @@ -197,7 +198,7 @@ public class RecipeController implements IRecipeHandler { return false; } - public RecipeCarpentry delete(int id) { + public RecipeCarpentry removeRecipe(int id) { RecipeCarpentry recipe = getRecipe(id); globalRecipes.remove(recipe.id); anvilRecipes.remove(recipe.id); @@ -213,46 +214,4 @@ public class RecipeController implements IRecipeHandler { RecipeController.instance.globalRecipes.put(recipeAnvil.id, recipeAnvil); } } - - public List getGlobalList() { - return new ArrayList(this.globalRecipes.values()); - } - - public List getCarpentryList() { - return new ArrayList(this.anvilRecipes.values()); - } - - public void addRecipe(String name, boolean global, ItemStack result, Object... objects) { - RecipeCarpentry recipe = new RecipeCarpentry(name); - recipe.isGlobal = global; - recipe = RecipeCarpentry.saveRecipe(recipe, result, objects); - - try { - this.saveRecipe(recipe.writeNBT()); - } catch (Exception var7) { - var7.printStackTrace(); - } - } - - public void addRecipe(String name, boolean global, ItemStack result, int width, int height, ItemStack... objects) { - ArrayList list = new ArrayList<>(); - int var9 = objects.length; - - for(int var10 = 0; var10 < var9; ++var10) { - ItemStack item = objects[var10]; - if (item.stackSize > 0) { - list.add(item); - } - } - - RecipeCarpentry recipe = new RecipeCarpentry(width, height, list.toArray(new ItemStack[0]), result); - recipe.isGlobal = global; - recipe.name = name; - - try { - this.saveRecipe(recipe.writeNBT()); - } catch (IOException var12) { - var12.printStackTrace(); - } - } } diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index 806be0e3e..6b8d0aef2 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -1,181 +1,94 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - package noppes.npcs.controllers; import java.io.PrintWriter; import java.io.StringWriter; -import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import javax.script.Compilable; import javax.script.CompiledScript; -import javax.script.Invocable; import javax.script.ScriptEngine; +import javax.script.ScriptException; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; import noppes.npcs.NBTTags; -import noppes.npcs.NoppesUtilServer; -import noppes.npcs.constants.EnumScriptType; -import noppes.npcs.scripted.NpcAPI; -import scala.Char; public class ScriptContainer { - private static final String lock = "lock"; - public static ScriptContainer Current; - private static String CurrentType; - private static final HashMap Data = new HashMap(); - public String fullscript = ""; - public String script = ""; - public TreeMap console = new TreeMap(); - public boolean errored = false; - public List scripts = new ArrayList(); - private HashSet unknownFunctions = new HashSet(); - public long lastCreated = 0L; - private String currentScriptLanguage = null; - public ScriptEngine engine = null; - private IScriptHandler handler = null; - private boolean init = false; - private static Method luaCoerce; - private static Method luaCall; - private CompiledScript compScript = null; + public String fullscript = ""; + public String script = ""; + public String console = ""; + public boolean errored = false; + public List scripts = new ArrayList(); + private long lastCreated = 0; + private CompiledScript compScript = null; + private String currentScriptLanguage = null; + public ScriptEngine engine = null; - public ScriptContainer(IScriptHandler handler) { - this.handler = handler; - } + public void readFromNBT(NBTTagCompound compound) { + script = compound.getString("Script"); + console = compound.getString("ScriptConsole"); + scripts = NBTTags.getStringList(compound.getTagList("ScriptList", 10)); + lastCreated = 0; + } - public void readFromNBT(NBTTagCompound compound) { - this.script = compound.getString("Script"); - //this.type = compound.getString("Type"); - this.console = NBTTags.GetLongStringMap(compound.getTagList("Console", 10)); - this.scripts = NBTTags.getStringList(compound.getTagList("ScriptList", 10)); - this.lastCreated = 0L; - } + public void writeToNBT(NBTTagCompound compound) { + compound.setString("Script", script); + compound.setString("ScriptConsole", console); + compound.setTag("ScriptList", NBTTags.nbtStringList(scripts)); + } - public NBTTagCompound writeToNBT(NBTTagCompound compound) { - compound.setString("Script", this.script); - //compound.setString("Type", this.type); - compound.setTag("Console", NBTTags.NBTLongStringMap(this.console)); - compound.setTag("ScriptList", NBTTags.nbtStringList(this.scripts)); - return compound; - } + public String getCode() { + if(ScriptController.Instance.lastLoaded > lastCreated){ + lastCreated = ScriptController.Instance.lastLoaded; + fullscript = script; + if(!fullscript.isEmpty()) + fullscript += "\n"; + for(String loc : scripts){ + String code = ScriptController.Instance.scripts.get(loc); + if(code != null && !code.isEmpty()) + fullscript += code + "\n"; + } + compScript = null; + } + return fullscript; + } + + public void run(ScriptEngine engine){ + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + engine.getContext().setWriter(pw); + engine.getContext().setErrorWriter(pw); + try { + if(compScript == null && engine instanceof Compilable) + compScript = ((Compilable)engine).compile(getCode()); + + if(compScript != null){ + compScript.eval(engine.getContext()); + } + else + engine.eval(getCode()); + + } catch (Exception e) { + errored = true; + appandConsole(e.getMessage()); + } + appandConsole(sw.getBuffer().toString().trim()); + } - private String getFullCode() { - if(!this.init) { - this.fullscript = this.script; - if(!this.fullscript.isEmpty()) { - this.fullscript = this.fullscript + "\n"; - } + public void appandConsole(String message) { + if(message == null || message.isEmpty()) + return; + console = message + "\n" + console; + } - Iterator var1 = this.scripts.iterator(); + public boolean hasCode() { + return !getCode().isEmpty(); + } - while(var1.hasNext()) { - String loc = (String)var1.next(); - String code = (String)ScriptController.Instance.scripts.get(loc); - if(code != null && !code.isEmpty()) { - this.fullscript = this.fullscript + code + "\n"; - } - } - } - - return this.fullscript; - } - - public void run(ScriptEngine engine){ - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - this.engine.getContext().setWriter(pw); - this.engine.getContext().setErrorWriter(pw); - - try { - if(compScript == null && engine instanceof Compilable) - compScript = ((Compilable)engine).compile(getFullCode()); - - if(compScript != null){ - compScript.eval(engine.getContext()); - } - else - engine.eval(getFullCode()); - } catch (Throwable var14) { - this.errored = true; - var14.printStackTrace(pw); - } finally { - String errorString = sw.getBuffer().toString().trim(); - this.appandConsole(errorString); - pw.close(); - } - } - - public void run(EnumScriptType type, Event event) { - this.run((String)type.function, (Object)event); - } - - public void run(String type, Object event) { - if (!this.errored && this.hasCode() && !this.unknownFunctions.contains(type)) { - this.setEngine(this.handler.getLanguage()); - if (this.engine != null) { - if (ScriptController.Instance.lastLoaded > this.lastCreated) { - this.lastCreated = ScriptController.Instance.lastLoaded; - this.init = false; - } - - engine.put("API", NpcAPI.Instance()); - - Current = this; - CurrentType = type; - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - this.engine.getContext().setWriter(pw); - this.engine.getContext().setErrorWriter(pw); - - try { - if (!this.init) { - this.engine.eval(this.getFullCode()); - this.init = true; - } - - ((Invocable)this.engine).invokeFunction(type, new Object[]{event}); - } catch (NoSuchMethodException var13) { - this.unknownFunctions.add(type); - } catch (Throwable var14) { - this.errored = true; - var14.printStackTrace(pw); - } finally { - String errorString = sw.getBuffer().toString().trim(); - this.appandConsole(errorString); - pw.close(); - Current = null; - } - } - } - } - - public void appandConsole(String message) { - if (message != null && !message.isEmpty()) { - long time = System.currentTimeMillis(); - if (this.console.containsKey(time)) { - message = (String)this.console.get(time) + "\n" + message; - } - - this.console.put(time, message); - - while(this.console.size() > 40) { - this.console.remove(this.console.firstKey()); - } - } - } - - public boolean hasCode() { - return !this.getFullCode().isEmpty(); - } - - public void setEngine(String scriptLanguage) { - if(currentScriptLanguage != null && currentScriptLanguage.equals(scriptLanguage)) - return; - engine = ScriptController.Instance.getEngineByName(scriptLanguage.toLowerCase()); - currentScriptLanguage = scriptLanguage; - } + public void setEngine(String scriptLanguage) { + if(currentScriptLanguage != null && currentScriptLanguage.equals(scriptLanguage)) + return; + engine = ScriptController.Instance.getEngineByName(scriptLanguage.toLowerCase()); + currentScriptLanguage = scriptLanguage; + } } diff --git a/src/main/java/noppes/npcs/controllers/ScriptController.java b/src/main/java/noppes/npcs/controllers/ScriptController.java index e27828a06..37f6df1e4 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptController.java +++ b/src/main/java/noppes/npcs/controllers/ScriptController.java @@ -19,7 +19,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityTameable; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -28,17 +27,20 @@ import net.minecraft.server.MinecraftServer; import net.minecraftforge.event.world.WorldEvent; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; -import noppes.npcs.controllers.data.ForgeDataScript; -import noppes.npcs.controllers.data.PlayerDataScript; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.entity.*; +import noppes.npcs.scripted.ScriptAnimal; +import noppes.npcs.scripted.ScriptEntity; +import noppes.npcs.scripted.ScriptLiving; +import noppes.npcs.scripted.ScriptLivingBase; +import noppes.npcs.scripted.ScriptMonster; +import noppes.npcs.scripted.ScriptPixelmon; +import noppes.npcs.scripted.ScriptPlayer; import noppes.npcs.scripted.ScriptWorld; -import noppes.npcs.util.JsonException; import noppes.npcs.util.NBTJsonUtil; import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ScriptController { - + public static ScriptController Instance; public static boolean HasStart = false; private ScriptEngineManager manager; @@ -47,15 +49,10 @@ public class ScriptController { public long lastLoaded = 0; public File dir; public NBTTagCompound compound = new NBTTagCompound(); - + private boolean loaded = false; public boolean shouldSave = false; - - public PlayerDataScript playerScripts = new PlayerDataScript((EntityPlayer)null); - public long lastPlayerUpdate = 0L; - - public ForgeDataScript forgeScripts = new ForgeDataScript(); - + public ScriptController(){ loaded = false; Instance = this; @@ -71,78 +68,6 @@ public class ScriptController { } } - private File forgeScriptsFile() { - return new File(this.dir, "forge_scripts.json"); - } - - public boolean loadForgeScripts() { - this.forgeScripts.clear(); - File file = this.forgeScriptsFile(); - - try { - if(!file.exists()) { - return false; - } else { - this.forgeScripts.readFromNBT(NBTJsonUtil.LoadFile(file)); - return true; - } - } catch (Exception var3) { - LogWriter.error("Error loading: " + file.getAbsolutePath(), var3); - return false; - } - } - - public void setForgeScripts(NBTTagCompound compound) { - this.forgeScripts.readFromNBT(compound); - File file = this.forgeScriptsFile(); - - try { - NBTJsonUtil.SaveFile(file, compound); - this.forgeScripts.lastInited = -1L; - } catch (IOException var4) { - var4.printStackTrace(); - } catch (JsonException var5) { - var5.printStackTrace(); - } - - } - - private File playerScriptsFile() { - return new File(dir, "player_scripts.json"); - } - - public boolean loadPlayerScripts() { - this.playerScripts.clear(); - File file = this.playerScriptsFile(); - - try { - if(!file.exists()) { - return false; - } else { - this.playerScripts.readFromNBT(NBTJsonUtil.LoadFile(file)); - shouldSave = false; - return true; - } - } catch (Exception var3) { - LogWriter.error("Error loading: " + file.getAbsolutePath(), var3); - return false; - } - } - - public void setPlayerScripts(NBTTagCompound compound) { - this.playerScripts.readFromNBT(compound); - File file = this.playerScriptsFile(); - - try { - NBTJsonUtil.SaveFile(file, compound); - this.lastPlayerUpdate = System.currentTimeMillis(); - } catch (IOException var4) { - var4.printStackTrace(); - } catch (JsonException var5) { - var5.printStackTrace(); - } - } - private void loadCategories(){ dir = new File(CustomNpcs.getWorldSaveDirectory(), "scripts"); if(!dir.exists()) @@ -178,40 +103,39 @@ public class ScriptController { } } public boolean loadStoredData(){ - loadCategories(); - File file = getSavedFile(); - try { - if(!file.exists()) - return false; - this.compound = NBTJsonUtil.LoadFile(file); - shouldSave = false; - } - catch (Exception e) { + loadCategories(); + File file = getSavedFile(); + try { + if(!file.exists()) + return false; + this.compound = NBTJsonUtil.LoadFile(file); + shouldSave = false; + } + catch (Exception e) { LogWriter.error("Error loading: " + file.getAbsolutePath(), e); - return false; - } - return true; + return false; + } + return true; } - + private File getSavedFile(){ return new File(dir, "world_data.json"); } - private String readFile(File file) throws IOException { - BufferedReader br = new BufferedReader(new FileReader(file)); - try { - StringBuilder sb = new StringBuilder(); - String line = br.readLine(); + BufferedReader br = new BufferedReader(new FileReader(file)); + try { + StringBuilder sb = new StringBuilder(); + String line = br.readLine(); - while (line != null) { - sb.append(line); - sb.append("\n"); - line = br.readLine(); - } - return sb.toString(); - } finally { - br.close(); - } + while (line != null) { + sb.append(line); + sb.append("\n"); + line = br.readLine(); + } + return sb.toString(); + } finally { + br.close(); + } } public ScriptEngine getEngineByName(String language) { @@ -232,7 +156,7 @@ public class ScriptController { } return list; } - + private List getScripts(String language){ List list = new ArrayList(); String ext = languages.get(language); @@ -250,7 +174,7 @@ public class ScriptController { if(entity == null) return null; if(entity instanceof EntityNPCInterface) - return (ScriptNpc)((EntityNPCInterface) entity).script.dummyNpc; + return ((EntityNPCInterface) entity).script.dummyNpc; else{ ScriptEntityData data = (ScriptEntityData) entity.getExtendedProperties("ScriptedObject"); if(data != null) @@ -278,14 +202,14 @@ public class ScriptController { public void saveWorld(WorldEvent.Save event){ if(!shouldSave || event.world.isRemote || event.world != MinecraftServer.getServer().worldServers[0]) return; - + try { NBTJsonUtil.SaveFile(getSavedFile(), compound); - } + } catch (Exception e) { LogWriter.except(e); - } - + } + shouldSave = false; } -} \ No newline at end of file +} diff --git a/src/main/java/noppes/npcs/controllers/ScriptEntityData.java b/src/main/java/noppes/npcs/controllers/ScriptEntityData.java index 08c4e152d..3f283f1f7 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptEntityData.java +++ b/src/main/java/noppes/npcs/controllers/ScriptEntityData.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.IExtendedEntityProperties; -import noppes.npcs.scripted.entity.ScriptEntity; +import noppes.npcs.scripted.ScriptEntity; public class ScriptEntityData implements IExtendedEntityProperties{ public ScriptEntity base; diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java index 5d369d159..e04f397ba 100644 --- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java +++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java @@ -13,7 +13,6 @@ import java.util.Map; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -21,17 +20,11 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ChatComponentText; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; -import noppes.npcs.NoppesUtilServer; import noppes.npcs.controllers.LinkedNpcController.LinkedData; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.handler.ICloneHandler; -import noppes.npcs.scripted.interfaces.IEntity; -import noppes.npcs.scripted.interfaces.IWorld; import noppes.npcs.util.JsonException; import noppes.npcs.util.NBTJsonUtil; -public class ServerCloneController implements ICloneHandler { +public class ServerCloneController { public static ServerCloneController Instance; public ServerCloneController(){ @@ -200,39 +193,4 @@ public class ServerCloneController implements ICloneHandler { nbttagcompound.setTag("TransformAI", adv); } } - - public IEntity spawn(double x, double y, double z, int tab, String name, IWorld world) { - NBTTagCompound compound = this.getCloneData((ICommandSender)null, name, tab); - if (compound == null) { - throw new CustomNPCsException("Unknown clone tab:" + tab + " name:" + name, new Object[0]); - } else { - Entity entity = NoppesUtilServer.spawnClone(compound, (int)x, (int)y, (int)z, world.getMCWorld()); - return entity == null ? null : NpcAPI.Instance().getIEntity(entity); - } - } - - public IEntity get(int tab, String name, IWorld world) { - NBTTagCompound compound = this.getCloneData((ICommandSender)null, name, tab); - if (compound == null) { - throw new CustomNPCsException("Unknown clone tab:" + tab + " name:" + name, new Object[0]); - } else { - Instance.cleanTags(compound); - Entity entity = EntityList.createEntityFromNBT(compound, world.getMCWorld()); - return entity == null ? null : NpcAPI.Instance().getIEntity(entity); - } - } - - public void set(int tab, String name, IEntity entity) { - NBTTagCompound compound = new NBTTagCompound(); - if (!entity.getMCEntity().isEntityAlive()) { - throw new CustomNPCsException("Cannot save dead entities", new Object[0]); - } else { - this.cleanTags(compound); - this.saveClone(tab, name, compound); - } - } - - public void remove(int tab, String name) { - this.removeClone(name, tab); - } } diff --git a/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java b/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java deleted file mode 100644 index 839211186..000000000 --- a/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java +++ /dev/null @@ -1,138 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.controllers.data; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.Map.Entry; - -import cpw.mods.fml.common.eventhandler.Event; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.EventHooks; -import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.NBTTags; -import noppes.npcs.constants.EnumScriptType; -import noppes.npcs.controllers.IScriptHandler; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.wrapper.WrapperNpcAPI; - -import javax.script.ScriptEngine; - -public class ForgeDataScript implements IScriptHandler { - private List scripts = new ArrayList(); - private String scriptLanguage = "ECMAScript"; - public long lastInited = -1L; - private boolean enabled = false; - - public ForgeDataScript() { - } - - public void clear() { - this.scripts = new ArrayList(); - } - - public void readFromNBT(NBTTagCompound compound) { - this.scripts = NBTTags.GetScript(compound.getTagList("Scripts", 10), this); - this.scriptLanguage = compound.getString("ScriptLanguage"); - this.enabled = compound.getBoolean("ScriptEnabled"); - } - - public NBTTagCompound writeToNBT(NBTTagCompound compound) { - compound.setTag("Scripts", NBTTags.NBTScript(this.scripts)); - compound.setString("ScriptLanguage", this.scriptLanguage); - compound.setBoolean("ScriptEnabled", this.enabled); - return compound; - } - - @Override - public void callScript(EnumScriptType var1, Event var2) { - callScript(var1.function, var2); - } - - public void callScript(String type, Event event) { - if(this.isEnabled()) { - //Minecraft.getMinecraft().func_152344_a(() -> { - if (ScriptController.Instance.lastLoaded > this.lastInited) { - this.lastInited = ScriptController.Instance.lastLoaded; - if (!type.equals("init")) { - EventHooks.onForgeInit(this); - } - } - - Iterator var3 = this.scripts.iterator(); - - while(var3.hasNext()) { - ScriptContainer script = (ScriptContainer)var3.next(); - script.run(type, event); - } - //}); - } - } - - public boolean isEnabled() { - return this.enabled && ScriptController.HasStart && this.scripts.size() > 0; - } - - public boolean isClient() { - return false; - } - - public boolean getEnabled() { - return this.enabled; - } - - public void setEnabled(boolean bo) { - this.enabled = bo; - } - - public String getLanguage() { - return this.scriptLanguage; - } - - public void setLanguage(String lang) { - this.scriptLanguage = lang; - } - - public List getScripts() { - return this.scripts; - } - - public String noticeString() { - return "ForgeScript"; - } - - public Map getConsoleText() { - TreeMap map = new TreeMap(); - int tab = 0; - Iterator var3 = this.getScripts().iterator(); - - while(var3.hasNext()) { - ScriptContainer script = (ScriptContainer)var3.next(); - ++tab; - Iterator var5 = script.console.entrySet().iterator(); - - while(var5.hasNext()) { - Entry entry = (Entry)var5.next(); - map.put(entry.getKey(), " tab " + tab + ":\n" + (String)entry.getValue()); - } - } - - return map; - } - - public void clearConsole() { - Iterator var1 = this.getScripts().iterator(); - - while(var1.hasNext()) { - ScriptContainer script = (ScriptContainer)var1.next(); - script.console.clear(); - } - - } -} diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java deleted file mode 100644 index b3614e6b9..000000000 --- a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java +++ /dev/null @@ -1,314 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// -package noppes.npcs.controllers.data; -import java.lang.reflect.Array; -import java.util.*; -import java.util.Map.Entry; -import com.google.common.base.Preconditions; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; -import cpw.mods.fml.common.eventhandler.Event; -import net.minecraft.world.WorldServer; -import noppes.npcs.EventHooks; -import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.NBTTags; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.constants.EnumScriptType; -import noppes.npcs.controllers.IScriptHandler; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.event.PlayerEvent; -import noppes.npcs.scripted.interfaces.IPlayer; -import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.scripted.wrapper.WrapperNpcAPI; -import javax.annotation.CheckForNull; -import javax.script.ScriptEngine; -public class PlayerDataScript implements IScriptHandler { - public List scripts = new ArrayList(); - public String scriptLanguage = "ECMAScript"; - private EntityPlayer player; - private IPlayer playerAPI; - private long lastPlayerUpdate = 0L; - public long lastInited = -1L; - public boolean enabled = false; - private Map console = new TreeMap(); - public List errored = new ArrayList(); - - public PlayerDataScript(EntityPlayer player) { - if(player != null) { - this.player = player; - } - } - public void clear() { - this.console = new TreeMap(); - this.errored = new ArrayList(); - this.scripts = new ArrayList(); - } - public void readFromNBT(NBTTagCompound compound) { - this.scripts = NBTTags.GetScript(compound.getTagList("Scripts", 10), this); - this.scriptLanguage = compound.getString("ScriptLanguage"); - this.enabled = compound.getBoolean("ScriptEnabled"); - this.console = NBTTags.GetLongStringMap(compound.getTagList("ScriptConsole", 10)); - } - public NBTTagCompound writeToNBT(NBTTagCompound compound) { - compound.setTag("Scripts", NBTTags.NBTScript(this.scripts)); - compound.setString("ScriptLanguage", this.scriptLanguage); - compound.setBoolean("ScriptEnabled", this.enabled); - compound.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.console)); - return compound; - } - - public void callScript(EnumScriptType type, Event event) { - if (this.isEnabled()) { - ScriptContainer script; - if (ScriptController.Instance.lastLoaded > this.lastInited || ScriptController.Instance.lastPlayerUpdate > this.lastPlayerUpdate) { - this.lastInited = ScriptController.Instance.lastLoaded; - errored.clear(); - - this.lastPlayerUpdate = ScriptController.Instance.lastPlayerUpdate; - - if (type != EnumScriptType.INIT) { - noppes.npcs.scripted.event.PlayerEvent playerEvent = (noppes.npcs.scripted.event.PlayerEvent)event; - EventHooks.onPlayerInit(this, (ScriptPlayer) playerEvent.player); - } - } - - for(int i = 0; i < ScriptController.Instance.playerScripts.scripts.size(); ++i) { - script = (ScriptContainer)ScriptController.Instance.playerScripts.scripts.get(i); - if (!errored.contains(i)) { - if(script == null || script.errored || !script.hasCode() || ScriptController.Instance.playerScripts.errored.contains(i)) - return; - - script.run(type, event); - - if (script.errored) { - ScriptController.Instance.playerScripts.errored.add(i); - } - - Iterator var8 = script.console.entrySet().iterator(); - - while(var8.hasNext()) { - Entry entry = (Entry)var8.next(); - if (!ScriptController.Instance.playerScripts.console.containsKey(entry.getKey())) { - ScriptController.Instance.playerScripts.console.put(entry.getKey(), " tab " + (i + 1) + ":\n" + (String)entry.getValue()); - } - } - - script.console.clear(); - } - } - - } - } - - public boolean isEnabled() { - return ScriptController.Instance.playerScripts.enabled && ScriptController.HasStart && (this.player == null || !this.player.worldObj.isRemote); - } - public boolean isClient() { - return this.player.isClientWorld(); - } - public boolean getEnabled() { - return ScriptController.Instance.playerScripts.enabled; - } - public void setEnabled(boolean bo) { - ScriptController.Instance.playerScripts.enabled = bo; - this.enabled = bo; - } - public String getLanguage() { - return ScriptController.Instance.playerScripts.scriptLanguage; - } - public void setLanguage(String lang) { - this.scriptLanguage = lang; - } - public List getScripts() { - return this.scripts; - } - public String noticeString() { - if(this.player == null) { - return "Global script"; - } else { - BlockPos pos = new BlockPos(this.player); - return PlayerDataScript.toStringHelper(this.player).add("x", pos.getX()).add("y", pos.getY()).add("z", pos.getZ()).toString(); - } - } - public IPlayer getPlayer() { - if (this.playerAPI == null) { - this.playerAPI = (IPlayer) NpcAPI.Instance().getIEntity(this.player); - } - return this.playerAPI; - } - public Map getConsoleText() { - return this.console; - } - public void clearConsole() { - this.console.clear(); - } - public static final class ToStringHelper { - private final String className; - private final PlayerDataScript.ToStringHelper.ValueHolder holderHead; - private PlayerDataScript.ToStringHelper.ValueHolder holderTail; - private boolean omitNullValues; - private boolean omitEmptyValues; - private ToStringHelper(String className) { - this.holderHead = new PlayerDataScript.ToStringHelper.ValueHolder(); - this.holderTail = this.holderHead; - this.omitNullValues = false; - this.omitEmptyValues = false; - this.className = (String) Preconditions.checkNotNull(className); - } - public PlayerDataScript.ToStringHelper omitNullValues() { - this.omitNullValues = true; - return this; - } - public PlayerDataScript.ToStringHelper add(String name, @CheckForNull Object value) { - return this.addHolder(name, value); - } - public PlayerDataScript.ToStringHelper add(String name, boolean value) { - return this.addUnconditionalHolder(name, String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper add(String name, char value) { - return this.addUnconditionalHolder(name, String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper add(String name, double value) { - return this.addUnconditionalHolder(name, String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper add(String name, float value) { - return this.addUnconditionalHolder(name, String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper add(String name, int value) { - return this.addUnconditionalHolder(name, String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper add(String name, long value) { - return this.addUnconditionalHolder(name, String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper addValue(@CheckForNull Object value) { - return this.addHolder(value); - } - public PlayerDataScript.ToStringHelper addValue(boolean value) { - return this.addUnconditionalHolder(String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper addValue(char value) { - return this.addUnconditionalHolder(String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper addValue(double value) { - return this.addUnconditionalHolder(String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper addValue(float value) { - return this.addUnconditionalHolder(String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper addValue(int value) { - return this.addUnconditionalHolder(String.valueOf(value)); - } - public PlayerDataScript.ToStringHelper addValue(long value) { - return this.addUnconditionalHolder(String.valueOf(value)); - } - private static boolean isEmpty(Object value) { - if (value instanceof CharSequence) { - return ((CharSequence)value).length() == 0; - } else if (value instanceof Collection) { - return ((Collection)value).isEmpty(); - } else if (value instanceof Map) { - return ((Map)value).isEmpty(); - } else if (value instanceof Optional) { - return !((Optional)value).isPresent(); - } else if (value instanceof OptionalInt) { - return !((OptionalInt)value).isPresent(); - } else if (value instanceof OptionalLong) { - return !((OptionalLong)value).isPresent(); - } else if (value instanceof OptionalDouble) { - return !((OptionalDouble)value).isPresent(); - } else if (value instanceof com.google.common.base.Optional) { - return !((com.google.common.base.Optional)value).isPresent(); - } else if (value.getClass().isArray()) { - return Array.getLength(value) == 0; - } else { - return false; - } - } - public String toString() { - boolean omitNullValuesSnapshot = this.omitNullValues; - boolean omitEmptyValuesSnapshot = this.omitEmptyValues; - String nextSeparator = ""; - StringBuilder builder = (new StringBuilder(32)).append(this.className).append('{'); - for(PlayerDataScript.ToStringHelper.ValueHolder valueHolder = this.holderHead.next; valueHolder != null; valueHolder = valueHolder.next) { - Object value = valueHolder.value; - if (!(valueHolder instanceof PlayerDataScript.ToStringHelper.UnconditionalValueHolder)) { - if (value == null) { - if (omitNullValuesSnapshot) { - continue; - } - } else if (omitEmptyValuesSnapshot && isEmpty(value)) { - continue; - } - } - builder.append(nextSeparator); - nextSeparator = ", "; - if (valueHolder.name != null) { - builder.append(valueHolder.name).append('='); - } - if (value != null && value.getClass().isArray()) { - Object[] objectArray = new Object[]{value}; - String arrayString = Arrays.deepToString(objectArray); - builder.append(arrayString, 1, arrayString.length() - 1); - } else { - builder.append(value); - } - } - return builder.append('}').toString(); - } - private PlayerDataScript.ToStringHelper.ValueHolder addHolder() { - PlayerDataScript.ToStringHelper.ValueHolder valueHolder = new PlayerDataScript.ToStringHelper.ValueHolder(); - this.holderTail = this.holderTail.next = valueHolder; - return valueHolder; - } - private PlayerDataScript.ToStringHelper addHolder(@CheckForNull Object value) { - PlayerDataScript.ToStringHelper.ValueHolder valueHolder = this.addHolder(); - valueHolder.value = value; - return this; - } - private PlayerDataScript.ToStringHelper addHolder(String name, @CheckForNull Object value) { - PlayerDataScript.ToStringHelper.ValueHolder valueHolder = this.addHolder(); - valueHolder.value = value; - valueHolder.name = (String)Preconditions.checkNotNull(name); - return this; - } - private PlayerDataScript.ToStringHelper.UnconditionalValueHolder addUnconditionalHolder() { - PlayerDataScript.ToStringHelper.UnconditionalValueHolder valueHolder = new PlayerDataScript.ToStringHelper.UnconditionalValueHolder(); - this.holderTail = this.holderTail.next = valueHolder; - return valueHolder; - } - private PlayerDataScript.ToStringHelper addUnconditionalHolder(Object value) { - PlayerDataScript.ToStringHelper.UnconditionalValueHolder valueHolder = this.addUnconditionalHolder(); - valueHolder.value = value; - return this; - } - private PlayerDataScript.ToStringHelper addUnconditionalHolder(String name, Object value) { - PlayerDataScript.ToStringHelper.UnconditionalValueHolder valueHolder = this.addUnconditionalHolder(); - valueHolder.value = value; - valueHolder.name = (String)Preconditions.checkNotNull(name); - return this; - } - private static final class UnconditionalValueHolder extends PlayerDataScript.ToStringHelper.ValueHolder { - private UnconditionalValueHolder() { - super(); - } - } - private static class ValueHolder { - @CheckForNull - String name; - @CheckForNull - Object value; - @CheckForNull - PlayerDataScript.ToStringHelper.ValueHolder next; - private ValueHolder() { - } - } - } - public static PlayerDataScript.ToStringHelper toStringHelper(Object self) { - return new PlayerDataScript.ToStringHelper(self.getClass().getSimpleName()); - } -} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/entity/EntityCustomNpc.java b/src/main/java/noppes/npcs/entity/EntityCustomNpc.java index 52dbcf775..a4198484c 100644 --- a/src/main/java/noppes/npcs/entity/EntityCustomNpc.java +++ b/src/main/java/noppes/npcs/entity/EntityCustomNpc.java @@ -1,7 +1,6 @@ package noppes.npcs.entity; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityFlying; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -10,12 +9,9 @@ import noppes.npcs.ModelData; import noppes.npcs.ModelPartData; import noppes.npcs.client.EntityUtil; -// FLY CHANGE -// extends EntityNPCInterface -// extends EntityNPCFlying -public class EntityCustomNpc extends EntityNPCFlying { +public class EntityCustomNpc extends EntityNPCInterface{ public ModelData modelData = new ModelData(); - + public EntityCustomNpc(World world) { super(world); } @@ -80,6 +76,5 @@ public class EntityCustomNpc extends EntityNPCFlying { this.setPosition(posX, posY, posZ); } } - } \ No newline at end of file diff --git a/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java b/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java index a09acbac5..2f0c58b51 100644 --- a/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java +++ b/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java @@ -9,15 +9,15 @@ import net.minecraft.world.World; public class EntityMagicProjectile extends EntityProjectile{ private EntityPlayer player; private ItemStack equiped; - - public EntityMagicProjectile(World par1World){ - super(par1World); - } - + + public EntityMagicProjectile(World par1World){ + super(par1World); + } + public EntityMagicProjectile(World par1World, - EntityPlayer player, ItemStack item, boolean isNPC) { + EntityPlayer player, ItemStack item, boolean isNPC) { super(par1World, player, item, isNPC); - + this.player = player; this.equiped = player.inventory.getCurrentItem(); } @@ -28,9 +28,9 @@ public class EntityMagicProjectile extends EntityProjectile{ this.setDead(); super.onUpdate(); } - + @Override - public String getCommandSenderName(){ - return StatCollector.translateToLocal("entity.throwableitem.name"); - } + public String getCommandSenderName(){ + return StatCollector.translateToLocal("entity.throwableitem.name"); + } } diff --git a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java b/src/main/java/noppes/npcs/entity/EntityNPCFlying.java deleted file mode 100644 index d8dd7e23f..000000000 --- a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java +++ /dev/null @@ -1,71 +0,0 @@ -package noppes.npcs.entity; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.EntityAISwimming; -import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -public abstract class EntityNPCFlying extends EntityNPCInterface { - - public EntityNPCFlying(World world) { - super(world); - } - - @Override - public boolean canFly(){ - return ai.movementType == 1; - } - - @Override - public void fall(float distance) { - if(!canFly()) - super.fall(distance); - } - - @Override - protected void updateFallState(double p_180433_1_, boolean p_180433_3_) { - if(!canFly()) - super.updateFallState(p_180433_1_, p_180433_3_); - } - - public void onLivingUpdate() - { - super.onLivingUpdate(); - if(!canFly()){ - return; - } - - int blockY = (int) this.posY; - double heightOffGround = 0; - if(this.ai.hasFlyLimit) { - for (blockY = (int) this.posY; blockY > 0; blockY--) { - heightOffGround = this.posY - blockY; - if (this.worldObj.getBlock((int) this.posX, blockY, (int) this.posZ) != Blocks.air || heightOffGround > this.ai.flyHeightLimit){ - break; - } - } - } - - if (!this.onGround && !this.velocityChanged && this.motionY < 0 && this.hurtTime == 0) - { - if(heightOffGround >= this.ai.flyHeightLimit && this.ai.hasFlyLimit){ - this.motionY *= 0.8D; - this.velocityChanged = true; - } else { - this.motionY *= this.ai.flyGravity; - this.velocityChanged = true; - } - } - } - - @Override - public boolean isOnLadder(){ - return false; - } - - - - -} diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index f9419d802..f3536f887 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -3,14 +3,33 @@ package noppes.npcs.entity; import io.netty.buffer.ByteBuf; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +import com.mojang.authlib.GameProfile; import net.minecraft.block.Block; import net.minecraft.command.ICommandSender; import net.minecraft.command.IEntitySelector; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.*; +import net.minecraft.entity.DataWatcher; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.entity.IRangedAttackMob; +import net.minecraft.entity.NPCEntityHelper; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.EntityAIAttackOnCollide; +import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAILeapAtTarget; +import net.minecraft.entity.ai.EntityAIOpenDoor; +import net.minecraft.entity.ai.EntityAIRestrictSun; +import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; +import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityMob; @@ -20,11 +39,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.pathfinding.PathNavigate; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; @@ -37,6 +55,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.ServerChatEvent; @@ -50,17 +69,36 @@ import noppes.npcs.DataScript; import noppes.npcs.DataStats; import noppes.npcs.IChatMessages; import noppes.npcs.NBTTags; +import noppes.npcs.NoppesStringUtils; import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcDamageSource; import noppes.npcs.Server; import noppes.npcs.VersionCompatibility; -import noppes.npcs.ai.*; +import noppes.npcs.ai.EntityAIAmbushTarget; +import noppes.npcs.ai.EntityAIAnimation; +import noppes.npcs.ai.EntityAIAttackTarget; +import noppes.npcs.ai.EntityAIAvoidTarget; +import noppes.npcs.ai.EntityAIBustDoor; +import noppes.npcs.ai.EntityAIDodgeShoot; +import noppes.npcs.ai.EntityAIFindShade; +import noppes.npcs.ai.EntityAIFollow; +import noppes.npcs.ai.EntityAIJob; +import noppes.npcs.ai.EntityAILook; import noppes.npcs.ai.EntityAIMoveIndoors; +import noppes.npcs.ai.EntityAIMovingPath; +import noppes.npcs.ai.EntityAIOrbitTarget; import noppes.npcs.ai.EntityAIPanic; +import noppes.npcs.ai.EntityAIRangedAttack; +import noppes.npcs.ai.EntityAIReturn; +import noppes.npcs.ai.EntityAIRole; +import noppes.npcs.ai.EntityAISprintToTarget; +import noppes.npcs.ai.EntityAIStalkTarget; +import noppes.npcs.ai.EntityAITransform; import noppes.npcs.ai.EntityAIWander; import noppes.npcs.ai.EntityAIWatchClosest; -import noppes.npcs.ai.pathfinder.FlyingMoveHelper; -import noppes.npcs.ai.pathfinder.PathNavigateFlying; +import noppes.npcs.ai.EntityAIWaterNav; +import noppes.npcs.ai.EntityAIWorldLines; +import noppes.npcs.ai.EntityAIZigZagTarget; import noppes.npcs.ai.selector.NPCAttackSelector; import noppes.npcs.ai.target.EntityAIClearTarget; import noppes.npcs.ai.target.EntityAIClosestTarget; @@ -86,29 +124,25 @@ import noppes.npcs.controllers.LinkedNpcController.LinkedData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestData; import noppes.npcs.controllers.QuestData; +import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.TransformData; -import noppes.npcs.entity.data.DataTimers; import noppes.npcs.roles.JobBard; import noppes.npcs.roles.JobFollower; import noppes.npcs.roles.JobInterface; import noppes.npcs.roles.RoleCompanion; import noppes.npcs.roles.RoleFollower; import noppes.npcs.roles.RoleInterface; -import noppes.npcs.scripted.entity.ScriptNpc; -import noppes.npcs.scripted.event.ScriptEventAttack; -import noppes.npcs.scripted.event.ScriptEventDamaged; -import noppes.npcs.scripted.event.ScriptEventKilled; -import noppes.npcs.scripted.event.ScriptEventTarget; -import noppes.npcs.scripted.interfaces.ICustomNpc; +import noppes.npcs.scripted.ScriptEventAttack; +import noppes.npcs.scripted.ScriptEventDamaged; +import noppes.npcs.scripted.ScriptEventKilled; +import noppes.npcs.scripted.ScriptEventTarget; import noppes.npcs.util.GameProfileAlt; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; public abstract class EntityNPCInterface extends EntityCreature implements IEntityAdditionalSpawnData, ICommandSender, IRangedAttackMob, IBossDisplayData{ - public ICustomNpc wrappedNPC; - public static final GameProfileAlt chateventProfile = new GameProfileAlt(); - public static FakePlayer chateventPlayer; - public static FakePlayer CommandPlayer; + private static final GameProfileAlt chateventProfile = new GameProfileAlt(); + private static FakePlayer chateventPlayer; public DataDisplay display; public DataStats stats; public DataAI ai; @@ -116,7 +150,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public DataInventory inventory; public DataScript script; public TransformData transform; - public DataTimers timers; public String linkedName = ""; public long linkedLast = 0; @@ -133,7 +166,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public long totalTicksAlive = 0; private int taskCount = 1; public int lastInteract = 0; - public Faction faction; //should only be used server side private EntityAIRangedAttack aiRange; @@ -153,20 +185,9 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public boolean updateClient = false; public boolean updateAI = false; -// Fly Change - public FlyingMoveHelper flyMoveHelper = new FlyingMoveHelper(this); - public PathNavigate flyNavigator = new PathNavigateFlying(this, worldObj); - public EntityNPCInterface(World world) { super(world); try{ - if (canFly()) { - this.getNavigator().setCanSwim(true); - this.tasks.addTask(0, new EntityAISwimming(this)); - } else { - this.tasks.addTask(0, new EntityAIWaterNav(this)); - } - dialogs = new HashMap(); if(!CustomNpcs.DefaultInteractLine.isEmpty()) advanced.interactLines.lines.put(0, new Line(CustomNpcs.DefaultInteractLine)); @@ -178,10 +199,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti setFaction(faction.id); setSize(1, 1); this.updateTasks(); - - if (!this.isRemote()) { - this.wrappedNPC = new ScriptNpc(this); - } } catch(Exception e){ e.printStackTrace(); @@ -199,12 +216,12 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti inventory = new DataInventory(this); transform = new TransformData(this); script = new DataScript(this); - timers = new DataTimers(this); + this.getAttributeMap().registerAttribute(SharedMonsterAttributes.attackDamage); this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(stats.maxHealth); this.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(CustomNpcs.NpcNavRange); - this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(this.getSpeed()); + this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(this.getSpeed()); this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(stats.getAttackStrength()); } @@ -235,7 +252,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti super.onUpdate(); if(this.ticksExisted % 10 == 0) script.callScript(EnumScriptType.TICK); - this.timers.update(); } public void setWorld(World world){ @@ -313,7 +329,10 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti LinkedNpcController.Instance.loadNpcData(this); } if(updateClient){ - this.updateClient(); + NBTTagCompound compound = writeSpawnData(); + compound.setInteger("EntityId", getEntityId()); + Server.sendAssociatedData(this, EnumPacketClient.UPDATE_NPC, compound); + updateClient = false; } if(updateAI){ updateTasks(); @@ -362,14 +381,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti ((JobBard)jobInterface).onLivingUpdate(); } } - - public void updateClient() { - NBTTagCompound compound = writeSpawnData(); - compound.setInteger("EntityId", getEntityId()); - Server.sendAssociatedData(this, EnumPacketClient.UPDATE_NPC, compound); - updateClient = false; - } - @Override public boolean interact(EntityPlayer player) { @@ -415,33 +426,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti return true; } - - public PathNavigate getNavigator() { - if(canFly()) - return this.flyNavigator; - else { - return super.getNavigator(); - } - } - - public EntityMoveHelper getMoveHelper() { - if(canFly()) - return this.flyMoveHelper; - else { - return super.getMoveHelper(); - } - } - - protected void updateAITasks() - { - try { - super.updateAITasks(); - } catch (ConcurrentModificationException ignored){ - } - - this.getNavigator().onUpdateNavigation(); - this.getMoveHelper().onUpdateMoveHelper(); - } public void addInteract(EntityLivingBase entity){ if( !ai.stopAndInteract || isAttacking() || !entity.isEntityAlive()) @@ -476,10 +460,10 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti @Override public boolean attackEntityFrom(DamageSource damagesource, float i) { - if (this.worldObj.isRemote || CustomNpcs.FreezeNPCs || (damagesource.damageType != null && damagesource.damageType.equals("inWall"))){ + if (this.worldObj.isRemote || CustomNpcs.FreezeNPCs || damagesource.damageType.equals("inWall")){ return false; } - if(damagesource.damageType != null && damagesource.damageType.equals("outOfWorld") && isKilled()){ + if(damagesource.damageType.equals("outOfWorld") && isKilled()){ reset(); } i = stats.resistances.applyResistance(damagesource, i); @@ -566,7 +550,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti if(event.getTarget() == null) entity = null; else - entity = event.getTarget().getMCEntity(); + entity = event.getTarget().getMinecraftEntity(); } if (entity != null && entity != this && ai.onAttack != 3 && !isAttacking() && !isRemote()){ Line line = advanced.getAttackLine(); @@ -627,7 +611,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti if (worldObj == null || worldObj.isRemote) return; aiLeap = aiAttackTarget = aiResponse = aiSprint = aiRange = null; - + clearTasks(tasks); clearTasks(targetTasks); IEntitySelector attackEntitySelector = new NPCAttackSelector(this); @@ -636,14 +620,8 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti this.targetTasks.addTask(2, new EntityAIClosestTarget(this, EntityLivingBase.class, 4, this.ai.directLOS, false, attackEntitySelector)); this.targetTasks.addTask(3, new EntityAIOwnerHurtByTarget(this)); this.targetTasks.addTask(4, new EntityAIOwnerHurtTarget(this)); - - if (canFly()) { - this.getNavigator().setCanSwim(true); - this.tasks.addTask(0, new EntityAISwimming(this)); - } else { - this.tasks.addTask(0, new EntityAIWaterNav(this)); - } - + + this.tasks.addTask(0, new EntityAIWaterNav(this)); this.taskCount = 1; this.doorInteractType(); this.seekShelter(); @@ -730,9 +708,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti /* * Branch task function for adjusting NPC door interactivity */ - public void doorInteractType(){ - if(canFly()) //currently flying does not support opening doors - return; + public void doorInteractType(){ EntityAIBase aiDoor = null; if (this.ai.doorInteract == 1) { @@ -755,8 +731,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti } else if (this.ai.findShelter == 1) { - if(!canFly()) // doesnt work when flying - this.tasks.addTask(this.taskCount++, new EntityAIRestrictSun(this)); + this.tasks.addTask(this.taskCount++, new EntityAIRestrictSun(this)); this.tasks.addTask(this.taskCount++, new EntityAIFindShade(this)); } } @@ -940,6 +915,13 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti return true; } + @Override + public void addVelocity(double d, double d1, double d2) { + if (isWalking() && !isKilled()) + super.addVelocity(d, d1, d2); + } + + @Override public void readEntityFromNBT(NBTTagCompound compound) { super.readEntityFromNBT(compound); @@ -950,7 +932,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti stats.readToNBT(compound); ai.readToNBT(compound); script.readFromNBT(compound); - timers.readFromNBT(compound); + advanced.readToNBT(compound); if (advanced.role != EnumRoleType.None && roleInterface != null) roleInterface.readFromNBT(compound); @@ -981,7 +963,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti stats.writeToNBT(compound); ai.writeToNBT(compound); script.writeToNBT(compound); - timers.writeToNBT(compound); + advanced.writeToNBT(compound); if (advanced.role != EnumRoleType.None && roleInterface != null) roleInterface.writeToNBT(compound); @@ -1293,9 +1275,8 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti @Override public IIcon getItemIcon(ItemStack par1ItemStack, int par2){ - // Change Here - if (par1ItemStack.getItem() instanceof ItemBow){ - return par1ItemStack.getItem().getIcon(par1ItemStack, par2); + if (par1ItemStack.getItem() == Items.bow){ + return Items.bow.getIcon(par1ItemStack, par2); } EntityPlayer player = CustomNpcs.proxy.getPlayer(); if(player == null) @@ -1426,10 +1407,10 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti return fac; } else{ - Faction fac = FactionController.getInstance().get(faction); + Faction fac = FactionController.getInstance().getFaction(faction); if (fac == null) { faction = FactionController.getInstance().getFirstFactionId(); - fac = FactionController.getInstance().get(faction); + fac = FactionController.getInstance().getFaction(faction); } return fac; } @@ -1440,7 +1421,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public void setFaction(int integer) { if(integer < 0|| isRemote()) return; - Faction faction = FactionController.getInstance().get(integer); + Faction faction = FactionController.getInstance().getFaction(integer); if(faction == null) return; String str = faction.id + ":" + faction.color + ":" + faction.name; @@ -1478,7 +1459,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public NBTTagCompound writeSpawnData() { NBTTagCompound compound = new NBTTagCompound(); display.writeToNBT(compound); - compound.setDouble("MaxHealth", stats.maxHealth); + compound.setInteger("MaxHealth", stats.maxHealth); compound.setTag("Armor", NBTTags.nbtItemStackList(inventory.getArmor())); compound.setTag("Weapons", NBTTags.nbtItemStackList(inventory.getWeapons())); compound.setInteger("Speed", ai.getWalkingSpeed()); @@ -1517,7 +1498,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti } } public void readSpawnData(NBTTagCompound compound) { - stats.maxHealth = compound.getDouble("MaxHealth"); + stats.maxHealth = compound.getInteger("MaxHealth"); ai.setWalkingSpeed(compound.getInteger("Speed")); stats.hideKilledBody = compound.getBoolean("DeadBody"); ai.standingType = EnumStandingType.values()[compound.getInteger("StandingState") % EnumStandingType.values().length]; @@ -1546,18 +1527,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti } display.readToNBT(compound); } - - public Entity func_174793_f() { - if (this.worldObj.isRemote) { - return this; - } else { - EntityUtil.Copy(this, CommandPlayer); - CommandPlayer.setWorld(this.worldObj); - CommandPlayer.setPosition(this.posX, this.posY, this.posZ); - return CommandPlayer; - } - } - + @Override public String getCommandSenderName() { return display.name; @@ -1599,86 +1569,11 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti if(!ai.ignoreCobweb) super.setInWeb(); } - @Override public boolean canBeCollidedWith(){ return !isKilled(); } - - // obviously we dont want this - @Override - public boolean canBePushed() { - return this.display.collidesWith == 0; - } - - // checks for any entity within a certain boundingbox, eg minecarts - @Override - protected void collideWithNearbyEntities() { - if(this.display.collidesWith != 1) { - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand(0.20000000298023224D, 0.0D, 0.20000000298023224D)); - - if (list != null && !list.isEmpty()) { - for (int i = 0; i < list.size(); ++i) { - Entity entity = (Entity) list.get(i); - - if (this.canBePushed() || - (entity instanceof EntityNPCInterface && (this.display.collidesWith == 2 || this.display.collidesWith == 4)) || - (entity instanceof EntityPlayerMP && (this.display.collidesWith == 3 || this.display.collidesWith == 4)) - ) { - super.collideWithEntity(entity); - } - } - } - } - } - - public void applyEntityCollision(Entity entity) - { - if (entity.riddenByEntity != this && entity.ridingEntity != this) - { - double d0 = entity.posX - this.posX; - double d1 = entity.posZ - this.posZ; - double d2 = MathHelper.abs_max(d0, d1); - - if (d2 >= 0.009999999776482582D) - { - d2 = (double)MathHelper.sqrt_double(d2); - d0 /= d2; - d1 /= d2; - double d3 = 1.0D / d2; - - if (d3 > 1.0D) - { - d3 = 1.0D; - } - - d0 *= d3; - d1 *= d3; - d0 *= 0.05000000074505806D; - d1 *= 0.05000000074505806D; - d0 *= (double)(1.0F - this.entityCollisionReduction); - d1 *= (double)(1.0F - this.entityCollisionReduction); - if (this.canBePushed() || - (entity instanceof EntityNPCInterface && (this.display.collidesWith == 2 || this.display.collidesWith == 4)) || - (entity instanceof EntityPlayerMP && (this.display.collidesWith == 3 || this.display.collidesWith == 4)) - ) - this.addVelocity(-d0, 0.0D, -d1); - entity.addVelocity(d0, 0.0D, d1); - } - } - } - - // not any entity can collide. if you want projectiles to still be - // effective, you will have to handle those yourself - @Override - protected void collideWithEntity(Entity p_82167_1_) { - - } - - public boolean canFly(){ - return false; - } - + public EntityAIRangedAttack getRangedTask(){ return this.aiRange; } @@ -1698,13 +1593,9 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti @Override public boolean isInvisibleToPlayer(EntityPlayer player){ - return (scriptInvisibleToPlayer(player) || display.visible == 1) && (player.getHeldItem() == null || player.getHeldItem().getItem() != CustomItems.wand); + return display.visible == 1 && (player.getHeldItem() == null || player.getHeldItem().getItem() != CustomItems.wand); } - public boolean scriptInvisibleToPlayer(EntityPlayer player){ - return display.invisibleToList != null && display.invisibleToList.contains(player.getPersistentID()); - } - @Override public boolean isInvisible(){ return display.visible != 0; @@ -1801,15 +1692,4 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public boolean shouldDismountInWater(Entity rider){ return false; } - - // Model Types: 0: Steve 64x32, 1: Steve 64x64, 2: Alex 64x64 - public int getModelType() - { - return this.display.modelType; - } - - public void setModelType(int val) - { - this.display.modelType = val; - } } diff --git a/src/main/java/noppes/npcs/entity/data/DataTimers.java b/src/main/java/noppes/npcs/entity/data/DataTimers.java deleted file mode 100644 index 58378e07a..000000000 --- a/src/main/java/noppes/npcs/entity/data/DataTimers.java +++ /dev/null @@ -1,137 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.entity.data; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import noppes.npcs.EventHooks; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.interfaces.ITimers; -import noppes.npcs.controllers.PlayerData; -import noppes.npcs.scripted.CustomNPCsException; - -public class DataTimers implements ITimers { - private Object parent; - private Map timers = new HashMap(); - - public DataTimers(Object parent) { - this.parent = parent; - } - - public void start(int id, int ticks, boolean repeat) { - if(this.timers.containsKey(Integer.valueOf(id))) { - throw new CustomNPCsException("There is already a timer with id: " + id, new Object[0]); - } else { - this.timers.put(Integer.valueOf(id), new DataTimers.Timer(id, ticks, repeat)); - } - } - - public void forceStart(int id, int ticks, boolean repeat) { - this.timers.put(Integer.valueOf(id), new DataTimers.Timer(id, ticks, repeat)); - } - - public boolean has(int id) { - return this.timers.containsKey(Integer.valueOf(id)); - } - - public boolean stop(int id) { - boolean remove = this.timers.remove(Integer.valueOf(id)) != null; - return remove; - } - - public void reset(int id) { - DataTimers.Timer timer = (DataTimers.Timer)this.timers.get(Integer.valueOf(id)); - if(timer == null) { - throw new CustomNPCsException("There is no timer with id: " + id, new Object[0]); - } else { - timer.ticks = 0; - } - } - - public void writeToNBT(NBTTagCompound compound) { - NBTTagList list = new NBTTagList(); - Iterator var3 = this.timers.values().iterator(); - - while(var3.hasNext()) { - DataTimers.Timer timer = (DataTimers.Timer)var3.next(); - NBTTagCompound c = new NBTTagCompound(); - c.setInteger("ID", timer.id); - c.setInteger("TimerTicks", timer.id); - c.setBoolean("Repeat", timer.repeat); - c.setInteger("Ticks", timer.ticks); - list.appendTag(c); - } - - compound.setTag("NpcsTimers", list); - } - - public void readFromNBT(NBTTagCompound compound) { - Map timers = new HashMap(); - NBTTagList list = compound.getTagList("NpcsTimers", 10); - - if(list != null) { - for (int i = 0; i < list.tagCount(); ++i) { - NBTTagCompound c = list.getCompoundTagAt(i); - DataTimers.Timer t = new DataTimers.Timer(c.getInteger("ID"), c.getInteger("TimerTicks"), c.getBoolean("Repeat")); - t.ticks = c.getInteger("Ticks"); - timers.put(t.id, t); - } - } - - this.timers = timers; - } - - public void update() { - Iterator var1 = (new ArrayList(this.timers.values())).iterator(); - - while(var1.hasNext()) { - DataTimers.Timer timer = (DataTimers.Timer)var1.next(); - timer.update(); - } - } - - public void clear() { - this.timers = new HashMap(); - } - - public int size() { return this.timers.size(); } - - class Timer { - public int id; - private boolean repeat; - private int timerTicks; - private int ticks = 0; - - public Timer(int id, int ticks, boolean repeat) { - this.id = id; - this.repeat = repeat; - this.timerTicks = ticks; - this.ticks = ticks; - } - - public void update() { - if(this.ticks-- <= 0) { - if(this.repeat) { - this.ticks = this.timerTicks; - } else { - DataTimers.this.stop(this.id); - } - - Object ob = DataTimers.this.parent; - if (ob instanceof EntityNPCInterface) { - EventHooks.onNPCTimer((EntityNPCInterface)ob, this.id); - } - else if(ob instanceof PlayerData) { - EventHooks.onPlayerTimer((PlayerData)ob, this.id); - } - } - } - } -} diff --git a/src/main/java/noppes/npcs/items/ItemNpcScripter.java b/src/main/java/noppes/npcs/items/ItemNpcScripter.java index c4e7b9750..3207b7cf7 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcScripter.java +++ b/src/main/java/noppes/npcs/items/ItemNpcScripter.java @@ -1,20 +1,16 @@ package noppes.npcs.items; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import noppes.npcs.CustomItems; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import noppes.npcs.CustomNpcs; -import noppes.npcs.constants.EnumGuiType; public class ItemNpcScripter extends Item{ - + public ItemNpcScripter(){ maxStackSize = 1; setCreativeTab(CustomItems.tab); @@ -29,15 +25,7 @@ public class ItemNpcScripter extends Item{ public boolean requiresMultipleRenderPasses(){ return true; } - - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer){ - if(!par2World.isRemote) - return par1ItemStack; - CustomNpcs.proxy.openGui(0, 0, 0, EnumGuiType.ScriptEvent, par3EntityPlayer); - return par1ItemStack; - } - + @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister par1IconRegister){ diff --git a/src/main/java/noppes/npcs/items/ItemNpcWeaponInterface.java b/src/main/java/noppes/npcs/items/ItemNpcWeaponInterface.java index 07744e9c3..06317e83f 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcWeaponInterface.java +++ b/src/main/java/noppes/npcs/items/ItemNpcWeaponInterface.java @@ -21,7 +21,6 @@ public class ItemNpcWeaponInterface extends ItemSword implements ItemRenderInter CustomNpcs.proxy.registerItem(this); setCreativeTab(CustomItems.tabWeapon); } - public void renderSpecial(){ GL11.glScalef(0.66f, 0.66f,0.66f); GL11.glTranslatef(0.16f, 0.26f, 0.06f); diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index 0ce52a2f8..a2c4f9548 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -1,23 +1,16 @@ package noppes.npcs.quests; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; -import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.Dialog; import noppes.npcs.controllers.DialogController; -import noppes.npcs.controllers.PlayerData; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IQuestDialog; -import noppes.npcs.scripted.handler.data.IQuestObjective; -public class QuestDialog extends QuestInterface implements IQuestDialog { +public class QuestDialog extends QuestInterface{ public HashMap dialogs = new HashMap(); @@ -32,9 +25,9 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { } @Override - public boolean isCompleted(PlayerData playerData) { + public boolean isCompleted(EntityPlayer player) { for(int dialogId : dialogs.values()) - if(!playerData.dialogData.dialogsRead.contains(dialogId)) + if(!PlayerDataController.instance.getPlayerData(player).dialogData.dialogsRead.contains(dialogId)) return false; return true; } @@ -62,69 +55,4 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { return vec; } - public IQuestObjective[] getObjectives(EntityPlayer player) { - List list = new ArrayList(); - - for(int i = 0; i < 3; ++i) { - if (this.dialogs.containsKey(i)) { - Dialog dialog = (Dialog)DialogController.instance.dialogs.get(this.dialogs.get(i)); - if (dialog != null) { - list.add(new noppes.npcs.quests.QuestDialog.QuestDialogObjective(this, player, dialog)); - } - } - } - - return (IQuestObjective[])list.toArray(new IQuestObjective[list.size()]); - } - - class QuestDialogObjective implements IQuestObjective { - private final QuestDialog parent; - private final EntityPlayer player; - private final Dialog dialog; - - public QuestDialogObjective(QuestDialog this$0, EntityPlayer player, Dialog dialog) { - this.parent = this$0; - this.player = player; - this.dialog = dialog; - } - - public int getProgress() { - return this.isCompleted() ? 1 : 0; - } - - public void setProgress(int progress) { - if (progress >= 0 && progress <= 1) { - PlayerData data = PlayerDataController.instance.getPlayerData(player); - boolean completed = data.dialogData.dialogsRead.contains(this.dialog.id); - if (progress == 0 && completed) { - data.dialogData.dialogsRead.remove(this.dialog.id); - data.questData.checkQuestCompletion(data, EnumQuestType.values()[1]); - data.saveNBTData(data.getNBT()); - } - - if (progress == 1 && !completed) { - data.dialogData.dialogsRead.add(this.dialog.id); - data.questData.checkQuestCompletion(data, EnumQuestType.values()[1]); - data.saveNBTData(data.getNBT()); - } - - } else { - throw new CustomNPCsException("Progress has to be 0 or 1", new Object[0]); - } - } - - public int getMaxProgress() { - return 1; - } - - public boolean isCompleted() { - PlayerData data = PlayerDataController.instance.getPlayerData(player); - return data.dialogData.dialogsRead.contains(this.dialog.id); - } - - public String getText() { - return this.dialog.title + (this.isCompleted() ? " (read)" : " (unread)"); - } - } - } diff --git a/src/main/java/noppes/npcs/quests/QuestInterface.java b/src/main/java/noppes/npcs/quests/QuestInterface.java index 3f7ceb87e..9e48fd02d 100644 --- a/src/main/java/noppes/npcs/quests/QuestInterface.java +++ b/src/main/java/noppes/npcs/quests/QuestInterface.java @@ -4,16 +4,12 @@ import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.controllers.PlayerData; -import noppes.npcs.scripted.handler.data.IQuestInterface; -import noppes.npcs.scripted.handler.data.IQuestObjective; -public abstract class QuestInterface implements IQuestInterface { +public abstract class QuestInterface { public int questId; public abstract void writeEntityToNBT(NBTTagCompound compound); public abstract void readEntityFromNBT(NBTTagCompound compound); - public abstract boolean isCompleted(PlayerData player); + public abstract boolean isCompleted(EntityPlayer player); public abstract void handleComplete(EntityPlayer player); public abstract Vector getQuestLogStatus(EntityPlayer player); - public abstract IQuestObjective[] getObjectives(EntityPlayer var1); } diff --git a/src/main/java/noppes/npcs/quests/QuestItem.java b/src/main/java/noppes/npcs/quests/QuestItem.java index a8817b28d..910b168d2 100644 --- a/src/main/java/noppes/npcs/quests/QuestItem.java +++ b/src/main/java/noppes/npcs/quests/QuestItem.java @@ -1,20 +1,15 @@ package noppes.npcs.quests; -import java.util.*; +import java.util.HashMap; +import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesUtilPlayer; -import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.controllers.PlayerData; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IQuestItem; -import noppes.npcs.scripted.handler.data.IQuestObjective; -import noppes.npcs.util.ValueUtil; -public class QuestItem extends QuestInterface implements IQuestItem { +public class QuestItem extends QuestInterface{ public NpcMiscInventory items = new NpcMiscInventory(3); public boolean leaveItems = false; public boolean ignoreDamage = false; @@ -37,8 +32,8 @@ public class QuestItem extends QuestInterface implements IQuestItem { } @Override - public boolean isCompleted(PlayerData playerData) { - HashMap map = getProcessSet(playerData.player); + public boolean isCompleted(EntityPlayer player) { + HashMap map = getProcessSet(player); for(ItemStack reqItem : items.items.values()){ boolean done = false; for(ItemStack item : map.values()){ @@ -124,80 +119,5 @@ public class QuestItem extends QuestInterface implements IQuestItem { return vec; } - public IQuestObjective[] getObjectives(EntityPlayer player) { - List list = new ArrayList(); - List questItems = NoppesUtilPlayer.countStacks(this.items, this.ignoreDamage, this.ignoreNBT); - Iterator var4 = questItems.iterator(); - while(var4.hasNext()) { - ItemStack stack = (ItemStack)var4.next(); - if (stack.stackSize > 0) { - list.add(new noppes.npcs.quests.QuestItem.QuestItemObjective(this, player, stack)); - } - } - - return (IQuestObjective[])list.toArray(new IQuestObjective[list.size()]); - } - - public void setLeaveItems(boolean leaveItems){ - this.leaveItems = leaveItems; - } - public boolean getLeaveItems(){ - return this.leaveItems; - } - - public void setIgnoreDamage(boolean ignoreDamage){ - this.ignoreDamage = ignoreDamage; - } - public boolean getIgnoreDamage(){ - return this.ignoreDamage; - } - - public void setIgnoreNbt(boolean ignoreNbt){ - this.ignoreNBT = ignoreNbt; - } - public boolean getIgnoreNbt(){ - return this.ignoreNBT; - } - - class QuestItemObjective implements IQuestObjective { - private final QuestItem parent; - private final EntityPlayer player; - private final ItemStack questItem; - - public QuestItemObjective(QuestItem this$0, EntityPlayer player, ItemStack item) { - this.parent = this$0; - this.player = player; - this.questItem = item; - } - - public int getProgress() { - int count = 0; - - for(int i = 0; i < this.player.inventory.getSizeInventory(); ++i) { - ItemStack item = this.player.inventory.getStackInSlot(i); - if (!NoppesUtilServer.IsItemStackNull(item) && NoppesUtilPlayer.compareItems(this.questItem, item, this.parent.ignoreDamage, this.parent.ignoreNBT)) { - count += item.stackSize; - } - } - - return ValueUtil.CorrectInt(count, 0, this.questItem.stackSize); - } - - public void setProgress(int progress) { - throw new CustomNPCsException("Cant set the progress of ItemQuests", new Object[0]); - } - - public int getMaxProgress() { - return this.questItem.stackSize; - } - - public boolean isCompleted() { - return NoppesUtilPlayer.compareItems(this.player, this.questItem, this.parent.ignoreDamage, this.parent.ignoreNBT); - } - - public String getText() { - return this.questItem.getDisplayName() + ": " + this.getProgress() + "/" + this.getMaxProgress(); - } - } } diff --git a/src/main/java/noppes/npcs/quests/QuestKill.java b/src/main/java/noppes/npcs/quests/QuestKill.java index d4568c1eb..fbe6cd87d 100644 --- a/src/main/java/noppes/npcs/quests/QuestKill.java +++ b/src/main/java/noppes/npcs/quests/QuestKill.java @@ -1,50 +1,33 @@ package noppes.npcs.quests; -import java.util.*; +import java.util.HashMap; +import java.util.Vector; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; -import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.PlayerData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestData; import noppes.npcs.controllers.QuestData; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IQuestKill; -import noppes.npcs.scripted.handler.data.IQuestObjective; -public class QuestKill extends QuestInterface implements IQuestKill { +public class QuestKill extends QuestInterface{ public HashMap targets = new HashMap(); - public int targetType = 0; - - @Override - public void writeEntityToNBT(NBTTagCompound compound) { - compound.setTag("QuestKills", NBTTags.nbtStringIntegerMap(targets)); - //compound.setTag("QuestDialogs", NBTTags.nbtStringIntegerMap(targets)); - compound.setInteger("TargetType",targetType); - } @Override public void readEntityFromNBT(NBTTagCompound compound) { - if(!compound.hasKey("QuestKills")) { - targets.clear(); - HashMap oldTargets = NBTTags.getStringIntegerMap(compound.getTagList("QuestDialogs", 10)); - targets.putAll(oldTargets); - } else { - targets = NBTTags.getStringIntegerMap(compound.getTagList("QuestKills", 10)); - } - - //targets = NBTTags.getStringIntegerMap(compound.getTagList("QuestDialogs", 10)); - targetType = compound.getInteger("TargetType"); + targets = NBTTags.getStringIntegerMap(compound.getTagList("QuestDialogs", 10)); } @Override - public boolean isCompleted(PlayerData playerData) { - PlayerQuestData playerdata = playerData.questData; + public void writeEntityToNBT(NBTTagCompound compound) { + compound.setTag("QuestDialogs", NBTTags.nbtStringIntegerMap(targets)); + } + + @Override + public boolean isCompleted(EntityPlayer player) { + PlayerQuestData playerdata = PlayerDataController.instance.getPlayerData(player).questData; QuestData data = playerdata.activeQuests.get(questId); if(data == null) return false; @@ -91,79 +74,4 @@ public class QuestKill extends QuestInterface implements IQuestKill { data.extraData.setTag("Killed", NBTTags.nbtStringIntegerMap(killed)); } - public IQuestObjective[] getObjectives(EntityPlayer player) { - List list = new ArrayList(); - Iterator var3 = this.targets.entrySet().iterator(); - - while(var3.hasNext()) { - Map.Entry entry = (Map.Entry)var3.next(); - list.add(new noppes.npcs.quests.QuestKill.QuestKillObjective(this, player, (String)entry.getKey(), (Integer)entry.getValue())); - } - - return (IQuestObjective[])list.toArray(new IQuestObjective[list.size()]); - } - - public void setTargetType(int type) { - if(type < 0) - type = 0; - if(type > 1) - type = 1; - - this.targetType = type; - } - public int getTargetType() { - return this.targetType; - } - - class QuestKillObjective implements IQuestObjective { - private final QuestKill parent; - private final EntityPlayer player; - private final String entity; - private final int amount; - - public QuestKillObjective(QuestKill parent, EntityPlayer player, String entity, int amount) { - this.parent = parent; - this.player = player; - this.entity = entity; - this.amount = amount; - } - - public int getProgress() { - PlayerData data = PlayerDataController.instance.getPlayerData(player); - PlayerQuestData playerdata = data.questData; - QuestData questdata = (QuestData)playerdata.activeQuests.get(this.parent.questId); - HashMap killed = this.parent.getKilled(questdata); - return !killed.containsKey(this.entity) ? 0 : (Integer)killed.get(this.entity); - } - - public void setProgress(int progress) { - if (progress >= 0 && progress <= this.amount) { - PlayerData data = PlayerDataController.instance.getPlayerData(player); - PlayerQuestData playerdata = data.questData; - QuestData questdata = (QuestData)playerdata.activeQuests.get(this.parent.questId); - HashMap killed = this.parent.getKilled(questdata); - if (!killed.containsKey(this.entity) || (Integer)killed.get(this.entity) != progress) { - killed.put(this.entity, progress); - this.parent.setKilled(questdata, killed); - data.questData.checkQuestCompletion(data, EnumQuestType.values()[2]); - data.questData.checkQuestCompletion(data, EnumQuestType.values()[4]); - data.saveNBTData(data.getNBT()); - } - } else { - throw new CustomNPCsException("Progress has to be between 0 and " + this.amount, new Object[0]); - } - } - - public int getMaxProgress() { - return this.amount; - } - - public boolean isCompleted() { - return this.getProgress() >= this.amount; - } - - public String getText() { - return this.entity + ": " + this.getProgress() + "/" + this.getMaxProgress(); - } - } } diff --git a/src/main/java/noppes/npcs/quests/QuestLocation.java b/src/main/java/noppes/npcs/quests/QuestLocation.java index 15c04fdc5..29348d6b7 100644 --- a/src/main/java/noppes/npcs/quests/QuestLocation.java +++ b/src/main/java/noppes/npcs/quests/QuestLocation.java @@ -1,22 +1,15 @@ package noppes.npcs.quests; -import java.util.ArrayList; -import java.util.List; import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.PlayerData; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestData; import noppes.npcs.controllers.QuestData; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.handler.data.IQuestLocation; -import noppes.npcs.scripted.handler.data.IQuestObjective; -public class QuestLocation extends QuestInterface implements IQuestLocation { +public class QuestLocation extends QuestInterface{ public String location = ""; public String location2 = ""; public String location3 = ""; @@ -37,8 +30,8 @@ public class QuestLocation extends QuestInterface implements IQuestLocation { } @Override - public boolean isCompleted(PlayerData playerData) { - PlayerQuestData playerdata = playerData.questData; + public boolean isCompleted(EntityPlayer player) { + PlayerQuestData playerdata = PlayerDataController.instance.getPlayerData(player).questData; QuestData data = playerdata.activeQuests.get(questId); if(data == null) return false; @@ -102,88 +95,4 @@ public class QuestLocation extends QuestInterface implements IQuestLocation { return false; } - public IQuestObjective[] getObjectives(EntityPlayer player) { - List list = new ArrayList(); - if (!this.location.isEmpty()) { - list.add(new noppes.npcs.quests.QuestLocation.QuestLocationObjective(this, player, this.location, "LocationFound")); - } - - if (!this.location2.isEmpty()) { - list.add(new noppes.npcs.quests.QuestLocation.QuestLocationObjective(this, player, this.location2, "Location2Found")); - } - - if (!this.location3.isEmpty()) { - list.add(new noppes.npcs.quests.QuestLocation.QuestLocationObjective(this, player, this.location3, "Location3Found")); - } - - return (IQuestObjective[])list.toArray(new IQuestObjective[list.size()]); - } - - public void setLocation1(String loc1){ - this.location = loc1; - } - public String getLocation1(){ - return location; - } - - public void setLocation2(String loc2){ - this.location2 = loc2; - } - public String getLocation2(){ - return location2; - } - - public void setLocation3(String loc3){ - this.location3 = loc3; - } - public String getLocation3(){ - return location3; - } - - class QuestLocationObjective implements IQuestObjective { - private final QuestLocation parent; - private final EntityPlayer player; - private final String location; - private final String nbtName; - - public QuestLocationObjective(QuestLocation this$0, EntityPlayer player, String location, String nbtName) { - this.parent = this$0; - this.player = player; - this.location = location; - this.nbtName = nbtName; - } - - public int getProgress() { - return this.isCompleted() ? 1 : 0; - } - - public void setProgress(int progress) { - if (progress >= 0 && progress <= 1) { - PlayerData data = PlayerDataController.instance.getPlayerData(player); - QuestData questData = (QuestData)data.questData.activeQuests.get(this.parent.questId); - boolean completed = questData.extraData.getBoolean (this.nbtName); - if ((!completed || progress != 1) && (completed || progress != 0)) { - questData.extraData.setBoolean(this.nbtName, progress == 1); - data.questData.checkQuestCompletion(data, EnumQuestType.values()[3]); - data.saveNBTData(data.getNBT()); - } - } else { - throw new CustomNPCsException("Progress has to be 0 or 1", new Object[0]); - } - } - - public int getMaxProgress() { - return 1; - } - - public boolean isCompleted() { - PlayerData data = PlayerDataController.instance.getPlayerData(player); - QuestData questData = (QuestData)data.questData.activeQuests.get(this.parent.questId); - return questData.extraData.getBoolean(this.nbtName); - } - - public String getText() { - return this.location + ": " + (this.isCompleted() ? "Found" : "Not Found"); - } - } } diff --git a/src/main/java/noppes/npcs/roles/RoleCompanion.java b/src/main/java/noppes/npcs/roles/RoleCompanion.java index 853745bc1..eb425094f 100644 --- a/src/main/java/noppes/npcs/roles/RoleCompanion.java +++ b/src/main/java/noppes/npcs/roles/RoleCompanion.java @@ -528,7 +528,7 @@ public class RoleCompanion extends RoleInterface { public void setStats(){ ItemStack weapon = npc.inventory.getWeapon(); - npc.stats.setAttackStrength((float) (1 + getSwordDamage(weapon))); + npc.stats.setAttackStrength((int) (1 + getSwordDamage(weapon))); npc.stats.healthRegen = 0; npc.stats.combatRegen = 0; int ranged = getTalentLevel(EnumCompanionTalent.RANGED); diff --git a/src/main/java/noppes/npcs/scripted/CustomNPCsException.java b/src/main/java/noppes/npcs/scripted/CustomNPCsException.java deleted file mode 100644 index 7952cd18d..000000000 --- a/src/main/java/noppes/npcs/scripted/CustomNPCsException.java +++ /dev/null @@ -1,16 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted; - -public class CustomNPCsException extends RuntimeException { - public CustomNPCsException(String message, Object... obs) { - super(String.format(message, obs)); - } - - public CustomNPCsException(Exception ex, String message, Object... obs) { - super(String.format(message, obs), ex); - } -} diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java deleted file mode 100644 index 3d49dc260..000000000 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ /dev/null @@ -1,97 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted; - -import java.io.File; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.EventBus; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.interfaces.*; - -public abstract class NpcAPI { - private static NpcAPI instance = null; - - public NpcAPI() { - } - - public abstract ICustomNpc createNPC(World var1); - - public abstract ICustomNpc spawnNPC(World var1, int var2, int var3, int var4); - - public abstract IEntity getIEntity(Entity var1); - - public abstract IBlock getIBlock(World var1, BlockPos var2); - - public abstract IBlock getIBlock(World world, int x, int y, int z); - - public abstract IContainer getIContainer(IInventory var1); - - public abstract IContainer getIContainer(Container var1); - - public abstract IItemStack getIItemStack(ItemStack var1); - - public abstract IWorld getIWorld(WorldServer var1); - - public abstract IWorld getIWorld(int var1); - - public abstract IWorld[] getIWorlds(); - - public abstract IDamageSource getIDamageSource(DamageSource var1); - - public abstract EventBus events(); - - public abstract File getGlobalDir(); - - public abstract File getWorldDir(); - - public static boolean IsAvailable() { - return Loader.isModLoaded("customnpcs"); - } - - public static NpcAPI Instance() { - if (instance != null) { - return instance; - } else if (!IsAvailable()) { - return null; - } else { - try { - Class c = Class.forName("noppes.npcs.scripted.wrapper.WrapperNpcAPI"); - instance = (NpcAPI) c.getMethod("Instance").invoke((Object) null); - } catch (Exception var1) { - var1.printStackTrace(); - } - - return instance; - } - } - - public abstract void executeCommand(IWorld var1, String var2); - - public abstract String getRandomName(int var1, int var2); - - public abstract INbt getINbt(NBTTagCompound entityData); - - public abstract ScriptPlayer[] getAllServerPlayers(); - - public abstract ScriptItemStack createItem(String id, int damage, int size); - - public abstract ScriptEntityParticle createEntityParticle(String directory); - - public abstract int getServerTime(); -} diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java b/src/main/java/noppes/npcs/scripted/ScriptAnimal.java similarity index 58% rename from src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java rename to src/main/java/noppes/npcs/scripted/ScriptAnimal.java index e1217aedb..232d230bd 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java +++ b/src/main/java/noppes/npcs/scripted/ScriptAnimal.java @@ -1,12 +1,11 @@ -package noppes.npcs.scripted.entity; +package noppes.npcs.scripted; import net.minecraft.entity.passive.EntityAnimal; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.interfaces.IAnimal; -public class ScriptAnimal extends ScriptLiving implements IAnimal { +public class ScriptAnimal extends ScriptLiving{ - public ScriptAnimal(T entity) { + public ScriptAnimal(EntityAnimal entity) { super(entity); } diff --git a/src/main/java/noppes/npcs/scripted/ScriptBlock.java b/src/main/java/noppes/npcs/scripted/ScriptBlock.java deleted file mode 100644 index 9cf52a980..000000000 --- a/src/main/java/noppes/npcs/scripted/ScriptBlock.java +++ /dev/null @@ -1,124 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted; - -import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import noppes.npcs.scripted.interfaces.*; -import noppes.npcs.util.LRUHashMap; - -public class ScriptBlock implements IBlock { - private static final Map blockCache = new LRUHashMap(400); - protected final IWorld world; - protected final Block block; - protected final BlockPos pos; - protected final ScriptBlockPos bPos; - protected TileEntity tile; - - public ScriptBlock(World world, Block block, BlockPos pos) { - this.world = NpcAPI.Instance().getIWorld((WorldServer)world); - this.block = block; - this.pos = pos; - this.bPos = new ScriptBlockPos(pos); - this.setTile(world.getTileEntity(pos.getX(),pos.getY(), pos.getZ())); - } - - protected void setTile(TileEntity tile) { - this.tile = tile; - } - - public IPos getPos() { - return this.bPos; - } - - public int getX() { - return this.pos.getX(); - } - - public int getY() { - return this.pos.getY(); - } - - public int getZ() { - return this.pos.getZ(); - } - - public void remove() { - this.world.getMCWorld().setBlockToAir(getX(), getY(), getZ()); - } - - public boolean isAir() { - return this.block.isAir(this.world.getMCWorld(), getX(), getY(), getZ()); - } - - public ScriptBlock setBlock(String name) { - Block block = (Block)Block.blockRegistry.getObject(new ResourceLocation(name)); - if(block == null) { - return this; - } else { - this.world.getMCWorld().setBlock(getX(),getY(),getZ(),block); - return new ScriptBlock(this.world.getMCWorld(), block, this.pos); - } - } - - public ScriptBlock setBlock(IBlock block) { - this.world.getMCWorld().setBlock(getX(),getY(),getZ(),block.getMCBlock()); - return new ScriptBlock(this.world.getMCWorld(), block.getMCBlock(), this.pos); - } - - public boolean isContainer() { - return this.tile != null && this.tile instanceof IInventory && ((IInventory) this.tile).getSizeInventory() > 0; - } - - public IContainer getContainer() { - if(!this.isContainer()) { - throw new CustomNPCsException("This block is not a container", new Object[0]); - } else { - return NpcAPI.Instance().getIContainer((IInventory)this.tile); - } - } - - public String getName() { - return Block.blockRegistry.getNameForObject(this.block) + ""; - } - - public String getDisplayName() { - return this.tile == null?this.getName():this.tile.blockType.getItemIconName(); - } - - public IWorld getWorld() { - return this.world; - } - - public Block getMCBlock() { - return this.block; - } - - public static void clearCache() { - blockCache.clear(); - } - - public boolean hasTileEntity() { - return this.tile != null; - } - - public TileEntity getMCTileEntity() { - return this.tile; - } - - public INbt getTileEntityNBT() { - NBTTagCompound compound = new NBTTagCompound(); - this.tile.writeToNBT(compound); - return NpcAPI.Instance().getINbt(compound); - } -} diff --git a/src/main/java/noppes/npcs/scripted/ScriptBlockPos.java b/src/main/java/noppes/npcs/scripted/ScriptBlockPos.java deleted file mode 100644 index d8214e1c9..000000000 --- a/src/main/java/noppes/npcs/scripted/ScriptBlockPos.java +++ /dev/null @@ -1,118 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted; - -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import noppes.npcs.scripted.interfaces.IPos; - -public class ScriptBlockPos implements IPos { - private BlockPos blockPos; - - public ScriptBlockPos(BlockPos pos) { - this.blockPos = pos; - } - - public int getX() { - return this.blockPos.getX(); - } - - public int getY() { - return this.blockPos.getY(); - } - - public int getZ() { - return this.blockPos.getZ(); - } - - public IPos up() { - return new ScriptBlockPos(this.blockPos.up()); - } - - public IPos up(int n) { - return new ScriptBlockPos(this.blockPos.up(n)); - } - - public IPos down() { - return new ScriptBlockPos(this.blockPos.down()); - } - - public IPos down(int n) { - return new ScriptBlockPos(this.blockPos.down(n)); - } - - public IPos north() { - return new ScriptBlockPos(this.blockPos.north()); - } - - public IPos north(int n) { - return new ScriptBlockPos(this.blockPos.north(n)); - } - - public IPos east() { - return new ScriptBlockPos(this.blockPos.east()); - } - - public IPos east(int n) { - return new ScriptBlockPos(this.blockPos.east(n)); - } - - public IPos south() { - return new ScriptBlockPos(this.blockPos.south()); - } - - public IPos south(int n) { - return new ScriptBlockPos(this.blockPos.south(n)); - } - - public IPos west() { - return new ScriptBlockPos(this.blockPos.west()); - } - - public IPos west(int n) { - return new ScriptBlockPos(this.blockPos.west(n)); - } - - public IPos add(int x, int y, int z) { - return new ScriptBlockPos(this.blockPos.add(x, y, z)); - } - - public IPos add(IPos pos) { - return new ScriptBlockPos(this.blockPos.add(pos.getMCBlockPos())); - } - - public IPos subtract(int x, int y, int z) { - return new ScriptBlockPos(this.blockPos.add(-x, -y, -z)); - } - - public IPos subtract(IPos pos) { - return new ScriptBlockPos(this.blockPos.add(-pos.getX(), -pos.getY(), -pos.getZ())); - } - - public IPos offset(int direction) { - return new ScriptBlockPos(this.blockPos.offset(EnumFacing.values()[direction])); - } - - public IPos offset(int direction, int n) { - return new ScriptBlockPos(this.blockPos.offset(EnumFacing.values()[direction], n)); - } - - public BlockPos getMCBlockPos() { - return this.blockPos; - } - - public double[] normalize() { - double d = Math.sqrt((double)(this.blockPos.getX() * this.blockPos.getX() + this.blockPos.getY() * this.blockPos.getY() + this.blockPos.getZ() * this.blockPos.getZ())); - return new double[]{(double)this.getX() / d, (double)this.getY() / d, (double)this.getZ() / d}; - } - - public double distanceTo(IPos pos) { - double d0 = (double)(this.getX() - pos.getX()); - double d1 = (double)(this.getY() - pos.getY()); - double d2 = (double)(this.getZ() - pos.getZ()); - return Math.sqrt(d0 * d0 + d1 * d1 + d2 * d2); - } -} diff --git a/src/main/java/noppes/npcs/scripted/ScriptContainer.java b/src/main/java/noppes/npcs/scripted/ScriptContainer.java deleted file mode 100644 index 4e81ce886..000000000 --- a/src/main/java/noppes/npcs/scripted/ScriptContainer.java +++ /dev/null @@ -1,90 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted; - -import net.minecraft.block.Block; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import noppes.npcs.NoppesUtilPlayer; -import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.scripted.interfaces.IContainer; -import noppes.npcs.scripted.interfaces.IItemStack; - -public class ScriptContainer implements IContainer { - private IInventory inventory; - private Container container; - - public ScriptContainer(IInventory inventory) { - this.inventory = inventory; - } - - public ScriptContainer(Container container) { - this.container = container; - } - - public int getSize() { - return this.inventory != null ? this.inventory.getSizeInventory() : this.container.inventorySlots.size(); - } - - public IItemStack getSlot(int slot) { - if (slot >= 0 && slot < this.getSize()) { - return this.inventory != null ? NpcAPI.Instance().getIItemStack(this.inventory.getStackInSlot(slot)) : NpcAPI.Instance().getIItemStack(this.container.getSlot(slot).getStack()); - } else { - throw new CustomNPCsException("Slot is out of range " + slot, new Object[0]); - } - } - - public void setSlot(int slot, IItemStack item) { - if (slot >= 0 && slot < this.getSize()) { - ItemStack itemstack = item == null ? new ItemStack(Block.getBlockById(0)) : item.getMCItemStack(); - if (this.inventory != null) { - this.inventory.setInventorySlotContents(slot, itemstack); - } else { - this.container.putStackInSlot(slot, itemstack); - this.container.detectAndSendChanges(); - } - - } else { - throw new CustomNPCsException("Slot is out of range " + slot, new Object[0]); - } - } - - public int count(IItemStack item, boolean ignoreDamage, boolean ignoreNBT) { - int count = 0; - - for(int i = 0; i < this.getSize(); ++i) { - IItemStack toCompare = this.getSlot(i); - if (NoppesUtilPlayer.compareItems(item.getMCItemStack(), toCompare.getMCItemStack(), ignoreDamage, ignoreNBT)) { - count += toCompare.getStackSize(); - } - } - - return count; - } - - public IInventory getMCInventory() { - return this.inventory; - } - - public Container getMCContainer() { - return this.container; - } - - public IItemStack[] getItems() { - IItemStack[] items = new IItemStack[this.getSize()]; - - for(int i = 0; i < this.getSize(); ++i) { - items[i] = this.getSlot(i); - } - - return items; - } - - public boolean isCustomGUI() { - return this.container instanceof ContainerCustomGui; - } -} diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java b/src/main/java/noppes/npcs/scripted/ScriptEntity.java similarity index 63% rename from src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java rename to src/main/java/noppes/npcs/scripted/ScriptEntity.java index dab54f511..b7391b251 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java +++ b/src/main/java/noppes/npcs/scripted/ScriptEntity.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.entity; +package noppes.npcs.scripted; import java.util.ArrayList; import java.util.HashMap; @@ -18,79 +18,18 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; -import noppes.npcs.NoppesUtilServer; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.*; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.interfaces.IEntity; -import noppes.npcs.scripted.interfaces.INbt; -import noppes.npcs.scripted.interfaces.IPos; -public class ScriptEntity implements IEntity { - protected T entity; +public class ScriptEntity { + protected Entity entity; private Map tempData = new HashMap(); - - public ScriptEntity(T entity){ + + public ScriptEntity(Entity entity){ this.entity = entity; } - /** - * @param directory The particle's directory. Use only forward slashes when writing a directory. Example: "customnpcs:textures/particle/tail.png" - * @param HEXcolor The particle's color as a HEX integer - * @param amount The amount of particles to spawn - * @param maxAge The particle's maximum age in MC ticks - - * @param x The particle's x position - * @param y The particle's y position - * @param z The particle's z position - - * @param motionX The particle's speed in the x axis - * @param motionY The particle's speed in the y axis - * @param motionZ The particle's speed in the z axis - * @param gravity The particle's gravity - - * @param scale1 The particle's starting scale - * @param scale2 The particle's ending scale - * @param scaleRate Multiplier for the particle's scale growth rate - * @param scaleRateStart The time at which the particle begins growing/shrinking - - * @param alpha1 The particle's starting transparency - * @param alpha2 The particle's ending transparency - * @param scaleRate Multiplier for the particle's transparency growth rate - * @param alphaRateStart The time at which the particle begins appearing/fading - */ - public void spawnParticle(String directory, int HEXcolor, int amount, int maxAge, - double x, double y, double z, - double motionX, double motionY, double motionZ, float gravity, - float scale1, float scale2, float scaleRate, int scaleRateStart, - float alpha1, float alpha2, float alphaRate, int alphaRateStart - ) { - int entityID = entity.getEntityId(); - NoppesUtilServer.spawnScriptedParticle(entity, directory, HEXcolor, amount, maxAge, - x, y, z, - motionX, motionY, motionZ, gravity, - scale1, scale2, scaleRate, scaleRateStart, - alpha1, alpha2, alphaRate, alphaRateStart, - entityID - ); - } - public void spawnParticle(ScriptEntityParticle entityParticle) { entityParticle.spawnOnEntity(this); } - - public double getYOffset() { return entity.getYOffset(); } - - /** - * @return The entities width - */ - public double getWidth(){ return entity.width; } - - /** - * @return The entities height - */ - public double getHeight(){ return entity.height; } /** * @return The entities x position @@ -98,95 +37,40 @@ public class ScriptEntity implements IEntity { public double getX(){ return entity.posX; } - + /** * @param x The entities x position */ public void setX(double x){ - entity.setPosition(x, entity.posY, entity.posZ);; + entity.posX = x; } - + /** * @return The entities y position */ public double getY(){ return entity.posY; } - + /** * @param y The entities y position */ public void setY(double y){ - entity.setPosition(entity.posX, y, entity.posZ); + entity.posY = y; } - + /** * @return The entities x position */ public double getZ(){ return entity.posZ; } - + /** * @param z The entities x position */ public void setZ(double z){ - entity.setPosition(entity.posX, entity.posY, z);; - } - - /** - * @return The entities z motion - */ - public double getMotionX(){ - return entity.motionX; - } - - /** - * @param x The entities x motion - */ - public void setMotionX(double x){ - entity.motionX = x; - entity.velocityChanged = true; - } - - /** - * @return The entities x motion - */ - public double getMotionY(){ - return entity.motionY; - } - - /** - * @param y The entities y motion - */ - public void setMotionY(double y){ - entity.motionY = y; - entity.velocityChanged = true; - } - - /** - * @return The entities y motion - */ - public double getMotionZ(){ - return entity.motionZ; - } - - /** - * @param z The entities z motion - */ - public void setMotionZ(double z){ - entity.motionZ = z; - entity.velocityChanged = true; - } - - public void setMotion(double x, double y, double z){ - this.setMotionX(x); - this.setMotionY(y); - this.setMotionZ(z); - } - - public boolean isAirborne(){ - return entity.isAirBorne; + entity.posZ = z; } /** @@ -209,7 +93,7 @@ public class ScriptEntity implements IEntity { public int getBlockZ(){ return MathHelper.floor_double(entity.posZ); } - + /** * @param x The x position * @param y The y position @@ -219,14 +103,7 @@ public class ScriptEntity implements IEntity { entity.setPosition(x, y, z); } - public IPos getPos() { - return new ScriptBlockPos(new BlockPos(entity.posX,entity.posY,entity.posZ)); - } - - public void setPos(IPos pos) { - this.entity.setPosition((double)((float)pos.getX() + 0.5F), (double)pos.getY(), (double)((float)pos.getZ() + 0.5F)); - } - + /** * @param range The search range for entities around this entity * @return Array of entities within range @@ -240,7 +117,7 @@ public class ScriptEntity implements IEntity { } return list.toArray(new ScriptEntity[list.size()]); } - + /** * @param range The search range for entities around this entity * @param type The EntityType you want to find @@ -258,7 +135,7 @@ public class ScriptEntity implements IEntity { cls = EntityMob.class; else if(type == EntityType.NPC) cls = EntityNPCInterface.class; - + List entities = entity.worldObj.getEntitiesWithinAABB(cls, entity.boundingBox.expand(range, range, range)); List list = new ArrayList(); for(Entity living : entities){ @@ -266,16 +143,16 @@ public class ScriptEntity implements IEntity { list.add(ScriptController.Instance.getScriptForEntity(living)); } return list.toArray(new ScriptEntity[list.size()]); - } - + } + /** * @return Whether the entity is alive or not */ public boolean isAlive(){ return entity.isEntityAlive(); } - + /** * @param key Get temp data for this key * @return Returns the stored temp data @@ -283,7 +160,7 @@ public class ScriptEntity implements IEntity { public Object getTempData(String key){ return tempData.get(key); } - + /** * Tempdata gets cleared when the entity gets unloaded or the world restarts * @param key The key for the data stored @@ -292,7 +169,7 @@ public class ScriptEntity implements IEntity { public void setTempData(String key, Object value){ tempData.put(key, value); } - + /** * @param key The key thats going to be tested against the temp data * @return Whether or not temp data containes the key @@ -300,21 +177,21 @@ public class ScriptEntity implements IEntity { public boolean hasTempData(String key){ return tempData.containsKey(key); } - + /** * @param key The key for the temp data to be removed */ public void removeTempData(String key){ tempData.remove(key); } - + /** * Remove all tempdata */ public void clearTempData(){ tempData.clear(); } - + /** * @param key The key of the data to be returned * @return Returns the stored data @@ -328,7 +205,7 @@ public class ScriptEntity implements IEntity { return ((NBTPrimitive)base).func_150286_g(); return ((NBTTagString)base).func_150285_a_(); } - + /** * Stored data persists through world restart. Unlike tempdata only Strings and Numbers can be saved * @param key The key for the data stored @@ -343,7 +220,7 @@ public class ScriptEntity implements IEntity { compound.setString(key, (String)value); saveStoredCompound(compound); } - + /** * @param key The key of the data to be checked * @return Returns whether or not the stored data contains the key @@ -351,7 +228,7 @@ public class ScriptEntity implements IEntity { public boolean hasStoredData(String key){ return getStoredCompound().hasKey(key); } - + /** * @param key The key of the data to be removed */ @@ -360,74 +237,74 @@ public class ScriptEntity implements IEntity { compound.removeTag(key); saveStoredCompound(compound); } - + /** * Remove all stored data */ public void clearStoredData(){ entity.getEntityData().removeTag("CNPCStoredData"); } - + private NBTTagCompound getStoredCompound(){ NBTTagCompound compound = entity.getEntityData().getCompoundTag("CNPCStoredData"); if(compound == null) entity.getEntityData().setTag("CNPCStoredData", compound = new NBTTagCompound()); return compound; } - + private void saveStoredCompound(NBTTagCompound compound){ entity.getEntityData().setTag("CNPCStoredData", compound); } - + /** * @return The age of this entity in ticks */ public long getAge(){ return entity.ticksExisted; } - + /** * Despawns this entity. Removes it permanently */ public void despawn(){ entity.isDead = true; } - + /** * @return Return whether or not this entity is standing in water */ public boolean inWater(){ return entity.isInsideOfMaterial(Material.water); } - + /** * @return Return whether or not this entity is standing in lava */ public boolean inLava(){ return entity.isInsideOfMaterial(Material.lava); } - + /** * @return Return whether or not this entity is standing in fire */ public boolean inFire(){ return entity.isInsideOfMaterial(Material.fire); } - + /** * @return Return whether or not this entity is on fire */ public boolean isBurning(){ return entity.isBurning(); } - + /** * @param ticks Amount of world ticks this entity will burn. 20 ticks equals 1 second */ public void setBurning(int ticks){ entity.setFire(ticks); } - + /** * Removes fire from this entity */ @@ -441,7 +318,7 @@ public class ScriptEntity implements IEntity { public String getTypeName(){ return EntityList.getEntityString(entity); } - + /** * @param item Item to be dropped */ @@ -455,7 +332,7 @@ public class ScriptEntity implements IEntity { public ScriptEntity getRider(){ return ScriptController.Instance.getScriptForEntity(entity.riddenByEntity); } - + /** * @param entity The entity to ride this entity */ @@ -473,7 +350,7 @@ public class ScriptEntity implements IEntity { public ScriptEntity getMount(){ return ScriptController.Instance.getScriptForEntity(entity.ridingEntity); } - + /** * @param entity The entity this entity will mount */ @@ -491,7 +368,7 @@ public class ScriptEntity implements IEntity { public int getType(){ return EntityType.UNKNOWN; } - + /** * @since 1.7.10c * @param type @EntityType to check @@ -500,50 +377,33 @@ public class ScriptEntity implements IEntity { public boolean typeOf(int type){ return type == EntityType.UNKNOWN; } - + /** * @param rotation The rotation to be set (0-360) */ public void setRotation(float rotation){ entity.rotationYaw = rotation; } - + /** - * @return Current rotation of the entity + * @return Current rotation of the npc */ public float getRotation(){ return entity.rotationYaw; } - - public void setPitch(float pitch){entity.rotationPitch = pitch;} - - public float getPitch(){return entity.rotationPitch;} - + /** * @param power How strong the knockback is * @param direction The direction in which he flies back (0-360). Usually based on getRotation() */ - @Override public void knockback(int power, float direction){ float v = direction * (float)Math.PI / 180.0F; - entity.addVelocity(-MathHelper.sin(v) * (float)power, power, MathHelper.cos(v) * (float)power); - entity.velocityChanged = true; + entity.addVelocity(-MathHelper.sin(v) * (float)power, 0.1D + power * 0.04f, MathHelper.cos(v) * (float)power); + entity.motionX *= 0.6D; + entity.motionZ *= 0.6D; + entity.attackEntityFrom(DamageSource.outOfWorld, 0.0001F); } - - public void knockback(int xpower, int ypower, int zpower, float direction){ - float v = direction * (float)Math.PI / 180.0F; - entity.addVelocity(-MathHelper.sin(v) * (float)xpower, ypower, MathHelper.cos(v) * (float)zpower); - entity.velocityChanged = true; - } - - public void setImmune(int ticks) { - entity.hurtResistantTime = ticks; - }; - - public boolean hasCollided() { - return entity.isCollided; - } - + /** * @since 1.7.10c * @return Returns whether or not this entity is sneaking @@ -551,7 +411,7 @@ public class ScriptEntity implements IEntity { public boolean isSneaking(){ return entity.isSneaking(); } - + /** * @since 1.7.10c * @return Returns whether or not this entity is sprinting @@ -559,40 +419,13 @@ public class ScriptEntity implements IEntity { public boolean isSprinting(){ return entity.isSprinting(); } - + /** * @since 1.7.10c * Expert users only * @return Returns minecrafts entity */ - public T getMCEntity(){ + public Entity getMCEntity(){ return entity; } - - public INbt getNbt() { - return NpcAPI.Instance().getINbt(this.entity.getEntityData()); - } - - public INbt getAllNbt() { - NBTTagCompound compound = new NBTTagCompound(); - this.entity.writeToNBT(compound); - return NpcAPI.Instance().getINbt(compound); - } - - public void setNbt(INbt nbt) { - this.entity.readFromNBT(nbt.getMCNBT()); - } - - public void storeAsClone(int tab, String name) { - NBTTagCompound compound = new NBTTagCompound(); - if (!this.entity.writeToNBTOptional(compound)) { - throw new CustomNPCsException("Cannot store dead entities", new Object[0]); - } else { - ServerCloneController.Instance.addClone(compound, name, tab); - } - } - - public ScriptWorld getWorld() { - return (ScriptWorld)NpcAPI.Instance().getIWorld((WorldServer) entity.worldObj); - } -} \ No newline at end of file +} diff --git a/src/main/java/noppes/npcs/scripted/ScriptEntityParticle.java b/src/main/java/noppes/npcs/scripted/ScriptEntityParticle.java deleted file mode 100644 index bc7e15120..000000000 --- a/src/main/java/noppes/npcs/scripted/ScriptEntityParticle.java +++ /dev/null @@ -1,214 +0,0 @@ -package noppes.npcs.scripted; - -import noppes.npcs.NoppesUtilServer; -import noppes.npcs.scripted.entity.ScriptEntity; - -/** - * Created by luisc on 9/8/2021. - */ -public class ScriptEntityParticle { - private String directory; - private int HEXcolor = 0xFFFFFF; - private int amount = 1; - private int maxAge = 20; - private double x = 0,y = 0,z = 0; - private double motionX = 0,motionY = 0,motionZ = 0; - private float gravity = 0; - private float scale1 = 1.0f,scale2 = 1.0f,scaleRate = 0.0f; - private float alpha1 = 1.0f,alpha2 = 1.0f,alphaRate = 0.0f; - private int scaleRateStart = 0, alphaRateStart = 0; - - public ScriptEntityParticle(String directory){ - this.directory = directory; - } - - public void spawnOnEntity(ScriptEntity entity){ - int entityID = entity.getMCEntity().getEntityId(); - NoppesUtilServer.spawnScriptedParticle(entity.getMCEntity(), directory, HEXcolor, amount, maxAge, - x, y, z, - motionX, motionY, motionZ, gravity, - scale1, scale2, scaleRate, scaleRateStart, - alpha1, alpha2, alphaRate, alphaRateStart, - entityID - ); - } - - public String getDirectory() { - return directory; - } - - public int getHEXcolor() { - return HEXcolor; - } - - public int getAmount() { - return amount; - } - - public int getMaxAge() { - return maxAge; - } - - public double getX() { - return x; - } - - public double getY() { - return y; - } - - public double getZ() { - return z; - } - - public double getMotionX() { - return motionX; - } - - public double getMotionY() { - return motionY; - } - - public double getMotionZ() { - return motionZ; - } - - public float getGravity() { - return gravity; - } - - public float getScale1() { - return scale1; - } - - public float getScale2() { - return scale2; - } - - public float getScaleRate() { - return scaleRate; - } - - public float getAlpha1() { - return alpha1; - } - - public float getAlpha2() { - return alpha2; - } - - public float getAlphaRate() { - return alphaRate; - } - - public int getScaleRateStart() { - return scaleRateStart; - } - - public int getAlphaRateStart() { - return alphaRateStart; - } - - public void setDirectory(String directory) { - this.directory = directory; - } - - public void setHEXColor(int HEXcolor) { - this.HEXcolor = HEXcolor; - } - - public void setAmount(int amount) { - this.amount = amount; - } - - public void setMaxAge(int maxAge) { - this.maxAge = maxAge; - } - - public void setPosition(double x, double y, double z){ - this.x = x; - this.y = y; - this.z = z; - } - - public void setX(double x) { - this.x = x; - } - - public void setY(double y) { - this.y = y; - } - - public void setZ(double z) { - this.z = z; - } - - public void setMotion(double motionX, double motionY, double motionZ, float gravity){ - this.motionX = motionX; - this.motionY = motionY; - this.motionZ = motionZ; - this.gravity = gravity; - } - - public void setMotionX(double motionX) { - this.motionX = motionX; - } - - public void setMotionY(double motionY) { - this.motionY = motionY; - } - - public void setMotionZ(double motionZ) { - this.motionZ = motionZ; - } - - public void setGravity(float gravity) { - this.gravity = gravity; - } - - public void setScale(float scale1, float scale2, float scaleRate, int scaleRateStart){ - this.scale1 = scale1; - this.scale2 = scale2; - this.scaleRate = scaleRate; - this.scaleRateStart = scaleRateStart; - } - - public void setScale1(float scale1) { - this.scale1 = scale1; - } - - public void setScale2(float scale2) { - this.scale2 = scale2; - } - - public void setScaleRate(float scaleRate) { - this.scaleRate = scaleRate; - } - - public void setScaleRateStart(int scaleRateStart) { - this.scaleRateStart = scaleRateStart; - } - - public void setAlpha(float alpha1, float alpha2, float alphaRate, int alphaRateStart){ - this.alpha1 = alpha1; - this.alpha2 = alpha2; - this.alphaRate = alphaRate; - this.alphaRateStart = alphaRateStart; - } - - public void setAlpha1(float alpha1) { - this.alpha1 = alpha1; - } - - public void setAlpha2(float alpha2) { - this.alpha2 = alpha2; - } - - public void setAlphaRate(float alphaRate) { - this.alphaRate = alphaRate; - } - - public void setAlphaRateStart(int alphaRateStart) { - this.alphaRateStart = alphaRateStart; - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEvent.java b/src/main/java/noppes/npcs/scripted/ScriptEvent.java similarity index 84% rename from src/main/java/noppes/npcs/scripted/event/ScriptEvent.java rename to src/main/java/noppes/npcs/scripted/ScriptEvent.java index 5a5a8cbfd..fc5ccc9a1 100644 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEvent.java +++ b/src/main/java/noppes/npcs/scripted/ScriptEvent.java @@ -1,4 +1,4 @@ -package noppes.npcs.scripted.event; +package noppes.npcs.scripted; public class ScriptEvent{ diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEventAttack.java b/src/main/java/noppes/npcs/scripted/ScriptEventAttack.java similarity index 90% rename from src/main/java/noppes/npcs/scripted/event/ScriptEventAttack.java rename to src/main/java/noppes/npcs/scripted/ScriptEventAttack.java index 5b37517a4..218b6e681 100644 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEventAttack.java +++ b/src/main/java/noppes/npcs/scripted/ScriptEventAttack.java @@ -1,8 +1,8 @@ -package noppes.npcs.scripted.event; +package noppes.npcs.scripted; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.DamageSource; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.entity.ScriptLivingBase; public class ScriptEventAttack extends ScriptEvent{ diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEventDamaged.java b/src/main/java/noppes/npcs/scripted/ScriptEventDamaged.java similarity index 92% rename from src/main/java/noppes/npcs/scripted/event/ScriptEventDamaged.java rename to src/main/java/noppes/npcs/scripted/ScriptEventDamaged.java index 8a21666e5..27cf4a26f 100644 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEventDamaged.java +++ b/src/main/java/noppes/npcs/scripted/ScriptEventDamaged.java @@ -1,9 +1,8 @@ -package noppes.npcs.scripted.event; +package noppes.npcs.scripted; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.DamageSource; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.entity.ScriptLivingBase; public class ScriptEventDamaged extends ScriptEvent{ diff --git a/src/main/java/noppes/npcs/scripted/ScriptEventDialog.java b/src/main/java/noppes/npcs/scripted/ScriptEventDialog.java new file mode 100644 index 000000000..861faa27e --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/ScriptEventDialog.java @@ -0,0 +1,15 @@ +package noppes.npcs.scripted; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.DamageSource; +import noppes.npcs.controllers.ScriptController; + +public class ScriptEventDialog extends ScriptEvent{ + + /** + * @deprecated + */ + public boolean isClosing(){ + return true; + } +} diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEventKilled.java b/src/main/java/noppes/npcs/scripted/ScriptEventKilled.java similarity index 88% rename from src/main/java/noppes/npcs/scripted/event/ScriptEventKilled.java rename to src/main/java/noppes/npcs/scripted/ScriptEventKilled.java index 606002a34..37c7e202f 100644 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEventKilled.java +++ b/src/main/java/noppes/npcs/scripted/ScriptEventKilled.java @@ -1,9 +1,8 @@ -package noppes.npcs.scripted.event; +package noppes.npcs.scripted; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.DamageSource; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.entity.ScriptLivingBase; public class ScriptEventKilled extends ScriptEvent{ diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEventTarget.java b/src/main/java/noppes/npcs/scripted/ScriptEventTarget.java similarity index 77% rename from src/main/java/noppes/npcs/scripted/event/ScriptEventTarget.java rename to src/main/java/noppes/npcs/scripted/ScriptEventTarget.java index 1bb9832c2..9fa1f28d3 100644 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEventTarget.java +++ b/src/main/java/noppes/npcs/scripted/ScriptEventTarget.java @@ -1,10 +1,10 @@ -package noppes.npcs.scripted.event; +package noppes.npcs.scripted; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.DamageSource; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.entity.ScriptLivingBase; -public class ScriptEventTarget extends ScriptEvent { +public class ScriptEventTarget extends ScriptEvent{ private ScriptLivingBase target; diff --git a/src/main/java/noppes/npcs/scripted/ScriptFaction.java b/src/main/java/noppes/npcs/scripted/ScriptFaction.java index 972ecaf2b..003c08dba 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptFaction.java +++ b/src/main/java/noppes/npcs/scripted/ScriptFaction.java @@ -1,8 +1,6 @@ package noppes.npcs.scripted; import noppes.npcs.controllers.Faction; -import noppes.npcs.scripted.entity.ScriptNpc; -import noppes.npcs.scripted.entity.ScriptPlayer; public class ScriptFaction { private Faction faction; diff --git a/src/main/java/noppes/npcs/scripted/ScriptItemStack.java b/src/main/java/noppes/npcs/scripted/ScriptItemStack.java index 23764c5c1..5be275499 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptItemStack.java +++ b/src/main/java/noppes/npcs/scripted/ScriptItemStack.java @@ -1,14 +1,9 @@ package noppes.npcs.scripted; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.Map; -import com.google.common.collect.Multimap; import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -18,11 +13,9 @@ import net.minecraft.nbt.NBTBase.NBTPrimitive; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.interfaces.INbt; -public class ScriptItemStack implements IItemStack { - public ItemStack item; +public class ScriptItemStack { + protected ItemStack item; public ScriptItemStack(ItemStack item){ this.item = item; @@ -112,8 +105,6 @@ public class ScriptItemStack implements IItemStack { * @return Returns whether or not the key exists */ public boolean hasTag(String key){ - if(item.stackTagCompound == null) - return false; return getTag().hasKey(key); } @@ -122,9 +113,6 @@ public class ScriptItemStack implements IItemStack { * @return Returns the value associated with the key. Returns null of it doesnt exist */ public Object getTag(String key){ - if(item.stackTagCompound == null) - return null; - NBTBase tag = getTag().getTag(key); if(tag == null) return null; @@ -134,12 +122,6 @@ public class ScriptItemStack implements IItemStack { return ((NBTTagString)tag).func_150285_a_(); return tag; } - - public INbt removeTags() { - ScriptNbt nbt = (ScriptNbt)NpcAPI.Instance().getINbt(item.stackTagCompound); - item.stackTagCompound = null; - return nbt; - } public boolean isEnchanted(){ return item.isItemEnchanted(); @@ -161,126 +143,6 @@ public class ScriptItemStack implements IItemStack { } return false; } - - public void addEnchant(int id, int strength) { - Enchantment ench = Enchantment.enchantmentsList[id]; - if (ench == null) { - throw new CustomNPCsException("Unknown enchant id:" + id, new Object[0]); - } else { - this.item.addEnchantment(ench, strength); - } - } - - public void setAttribute(String name, double value) { - NBTTagCompound compound = this.item.getTagCompound(); - if (compound == null) { - this.item.setTagCompound(compound = new NBTTagCompound()); - } - - NBTTagList nbttaglist = compound.getTagList("AttributeModifiers", 10); - NBTTagList newList = new NBTTagList(); - - NBTTagCompound nbttagcompound; - for(int i = 0; i < nbttaglist.tagCount(); ++i) { - nbttagcompound = nbttaglist.getCompoundTagAt(i); - if (!nbttagcompound.getString("AttributeName").equals(name)) { - newList.appendTag(nbttagcompound); - } - } - - if (value != 0.0D) { - AttributeModifier attributeModifier = new AttributeModifier(name, value, 0); - nbttagcompound = new NBTTagCompound(); - nbttagcompound.setString("Name", attributeModifier.getName()); - nbttagcompound.setDouble("Amount", attributeModifier.getAmount()); - nbttagcompound.setInteger("Operation", attributeModifier.getOperation()); - nbttagcompound.setLong("UUIDMost", attributeModifier.getID().getMostSignificantBits()); - nbttagcompound.setLong("UUIDLeast", attributeModifier.getID().getLeastSignificantBits()); - nbttagcompound.setString("AttributeName", name); - newList.appendTag(nbttagcompound); - } - - compound.setTag("AttributeModifiers", newList); - } - - public double getAttribute(String name) { - NBTTagCompound compound = this.item.getTagCompound(); - if (compound == null) { - return 0.0D; - } else { - Multimap map = this.item.getAttributeModifiers(); - Iterator var4 = map.entries().iterator(); - - while(var4.hasNext()) { - Map.Entry entry = (Map.Entry)var4.next(); - if (((String)entry.getKey()).equals(name)) { - AttributeModifier mod = (AttributeModifier)entry.getValue(); - return mod.getAmount(); - } - } - - return 0.0D; - } - } - - public String[] getLore() { - NBTTagCompound compound = this.item.getTagCompound().getCompoundTag("display"); - if (compound != null && compound.func_150299_b("Lore") == 9) { - NBTTagList nbttaglist = compound.getTagList("Lore", 8); - if (nbttaglist.tagCount() < 1) { - return new String[0]; - } else { - List lore = new ArrayList(); - - for(int i = 0; i < nbttaglist.tagCount(); ++i) { - lore.add(nbttaglist.getStringTagAt(i)); - } - - return (String[])((String[])lore.toArray(new String[lore.size()])); - } - } else { - return new String[0]; - } - } - - public void setLore(String[] lore) { - NBTTagCompound compound = this.item.getTagCompound(); - if (compound == null) { - this.item.setTagCompound(compound = new NBTTagCompound()); - } - - NBTTagList nbttaglist = compound.getTagList("display", 10); - NBTTagList newList = new NBTTagList(); - String[] var4 = lore; - int var5 = lore.length; - - for(int var6 = 0; var6 < var5; ++var6) { - String s = var4[var6]; - newList.appendTag(new NBTTagString(s)); - } - - NBTTagCompound nbttagcompound = new NBTTagCompound(); - nbttagcompound.setTag("Lore", newList); - compound.setTag("display", nbttagcompound); - } - - public boolean hasAttribute(String name) { - NBTTagCompound compound = this.item.getTagCompound(); - if (compound == null) { - return false; - } else { - NBTTagList nbttaglist = compound.getTagList("AttributeModifiers", 10); - - for(int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound c = nbttaglist.getCompoundTagAt(i); - if (c.getString("AttributeName").equals(name)) { - return true; - } - } - - return false; - } - } /** * @since 1.7.10d @@ -337,21 +199,6 @@ public class ScriptItemStack implements IItemStack { return true; } - public INbt getNbt() { - NBTTagCompound compound = this.item.getTagCompound(); - if(compound == null) { - this.item.setTagCompound(compound = new NBTTagCompound()); - } - - return NpcAPI.Instance().getINbt(compound); - } - - public INbt getItemNbt() { - NBTTagCompound compound = new NBTTagCompound(); - this.item.writeToNBT(compound); - return NpcAPI.Instance().getINbt(compound); - } - /** * No support is given for this method. Dont use if you dont know what you are doing. * @return Minecraft ItemStack diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java b/src/main/java/noppes/npcs/scripted/ScriptLiving.java similarity index 79% rename from src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java rename to src/main/java/noppes/npcs/scripted/ScriptLiving.java index 9b06e5625..2809ebc24 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java +++ b/src/main/java/noppes/npcs/scripted/ScriptLiving.java @@ -1,13 +1,17 @@ -package noppes.npcs.scripted.entity; +package noppes.npcs.scripted; +import net.minecraft.entity.NPCEntityHelper; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.interfaces.IEntityLiving; +import noppes.npcs.scripted.constants.EntityType; -public class ScriptLiving extends ScriptLivingBase implements IEntityLiving { +public class ScriptLiving extends ScriptLivingBase{ - private T entity; - public ScriptLiving(T entity) { + private EntityLiving entity; + public ScriptLiving(EntityLiving entity) { super(entity); this.entity = entity; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/ScriptLivingBase.java similarity index 77% rename from src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java rename to src/main/java/noppes/npcs/scripted/ScriptLivingBase.java index e6ef07d7d..a80ca19d7 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java +++ b/src/main/java/noppes/npcs/scripted/ScriptLivingBase.java @@ -1,23 +1,30 @@ -package noppes.npcs.scripted.entity; +package noppes.npcs.scripted; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTBase.NBTPrimitive; +import net.minecraft.nbt.NBTTagString; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSource; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.MathHelper; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.scripted.ScriptItemStack; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.interfaces.IEntityLivingBase; -import noppes.npcs.scripted.wrapper.ScriptDamageSource; -public class ScriptLivingBase extends ScriptEntity implements IEntityLivingBase { - protected T entity; +public class ScriptLivingBase extends ScriptEntity{ + protected EntityLivingBase entity; - public ScriptLivingBase(T entity){ + public ScriptLivingBase(EntityLivingBase entity){ super(entity); this.entity = entity; } @@ -35,27 +42,12 @@ public class ScriptLivingBase extends ScriptEntity extends ScriptEntity extends ScriptEntity 255) + strength = 255; if(duration < 0) duration = 0; + else if(duration > 1000000) + duration = 1000000; if(!Potion.potionTypes[effect].isInstant()) duration *= 20; @@ -183,7 +179,7 @@ public class ScriptLivingBase extends ScriptEntity extends ScriptEntity extends ScriptLiving implements IMonster { +public class ScriptMonster extends ScriptLiving{ - public ScriptMonster(T entity) { + public ScriptMonster(EntityMob entity) { super(entity); } diff --git a/src/main/java/noppes/npcs/scripted/ScriptNbt.java b/src/main/java/noppes/npcs/scripted/ScriptNbt.java deleted file mode 100644 index 968ea698d..000000000 --- a/src/main/java/noppes/npcs/scripted/ScriptNbt.java +++ /dev/null @@ -1,215 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted; - -import java.util.Iterator; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagDouble; -import net.minecraft.nbt.NBTTagFloat; -import net.minecraft.nbt.NBTTagInt; -import net.minecraft.nbt.NBTTagIntArray; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; -import noppes.npcs.scripted.interfaces.INbt; -import noppes.npcs.util.NBTJsonUtil; - -public class ScriptNbt implements INbt { - private NBTTagCompound compound; - - public ScriptNbt(NBTTagCompound compound) { - this.compound = compound; - } - - public void remove(String key) { - this.compound.removeTag(key); - } - - public boolean has(String key) { - return this.compound.hasKey(key); - } - - public boolean getBoolean(String key) { - return this.compound.getBoolean(key); - } - - public void setBoolean(String key, boolean value) { - this.compound.setBoolean(key, value); - } - - public short getShort(String key) { - return this.compound.getShort(key); - } - - public void setShort(String key, short value) { - this.compound.setShort(key, value); - } - - public int getInteger(String key) { - return this.compound.getInteger(key); - } - - public void setInteger(String key, int value) { - this.compound.setInteger(key, value); - } - - public byte getByte(String key) { - return this.compound.getByte(key); - } - - public void setByte(String key, byte value) { - this.compound.setByte(key, value); - } - - public long getLong(String key) { - return this.compound.getLong(key); - } - - public void setLong(String key, long value) { - this.compound.setLong(key, value); - } - - public double getDouble(String key) { - return this.compound.getDouble(key); - } - - public void setDouble(String key, double value) { - this.compound.setDouble(key, value); - } - - public float getFloat(String key) { - return this.compound.getFloat(key); - } - - public void setFloat(String key, float value) { - this.compound.setFloat(key, value); - } - - public String getString(String key) { - return this.compound.getString(key); - } - - public void setString(String key, String value) { - this.compound.setString(key, value); - } - - public byte[] getByteArray(String key) { - return this.compound.getByteArray(key); - } - - public void setByteArray(String key, byte[] value) { - this.compound.setByteArray(key, value); - } - - public int[] getIntegerArray(String key) { - return this.compound.getIntArray(key); - } - - public void setIntegerArray(String key, int[] value) { - this.compound.setIntArray(key, value); - } - - public Object[] getList(String key, int type) { - NBTTagList list = this.compound.getTagList(key, type); - Object[] nbts = new Object[list.tagCount()]; - - for(int i = 0; i < list.tagCount(); ++i) { - if(list.func_150303_d() == 10) { - nbts[i] = new ScriptNbt(list.getCompoundTagAt(i)); - } else if(list.func_150303_d() == 8) { - nbts[i] = list.getStringTagAt(i); - } else if(list.func_150303_d() == 6) { - nbts[i] = Double.valueOf(list.func_150309_d(i)); - } else if(list.func_150303_d() == 5) { - nbts[i] = Float.valueOf(list.func_150308_e(i)); - } else if(list.func_150303_d() == 3) { - nbts[i] = Integer.valueOf(list.getStringTagAt(i)); - } else if(list.func_150303_d() == 11) { - nbts[i] = list.func_150306_c(i); - } - } - - return nbts; - } - - public int getListType(String key) { - NBTBase b = this.compound.getTag(key); - if(b == null) { - return 0; - } else if(b.getId() != 9) { - throw new CustomNPCsException("NBT tag " + key + " isn\'t a list", new Object[0]); - } else { - return ((NBTTagList)b).func_150303_d(); - } - } - - public void setList(String key, Object[] value) { - NBTTagList list = new NBTTagList(); - Object[] var4 = value; - int var5 = value.length; - - for(int var6 = 0; var6 < var5; ++var6) { - Object nbt = var4[var6]; - if(nbt instanceof INbt) { - list.appendTag(((INbt) nbt).getMCNBT()); - } else if(nbt instanceof String) { - list.appendTag(new NBTTagString((String) nbt)); - } else if(nbt instanceof Double) { - list.appendTag(new NBTTagDouble(((Double) nbt).doubleValue())); - } else if(nbt instanceof Float) { - list.appendTag(new NBTTagFloat(((Float) nbt).floatValue())); - } else if(nbt instanceof Integer) { - list.appendTag(new NBTTagInt(((Integer) nbt).intValue())); - } else if(nbt instanceof int[]) { - list.appendTag(new NBTTagIntArray((int[]) ((int[]) nbt))); - } - } - - this.compound.setTag(key, list); - } - - public INbt getCompound(String key) { - return new ScriptNbt(this.compound.getCompoundTag(key)); - } - - public void setCompound(String key, INbt value) { - if(value == null) { - throw new CustomNPCsException("Value cant be null", new Object[0]); - } else { - this.compound.setTag(key, value.getMCNBT()); - } - } - - public String[] getKeys() { - return (String[])this.compound.func_150296_c().toArray(new String[this.compound.func_150296_c().size()]); - } - - public int getType(String key) { - return this.compound.func_150299_b(key); - } - - public NBTTagCompound getMCNBT() { - return this.compound; - } - - public String toJsonString() { - return NBTJsonUtil.Convert(this.compound); - } - - public boolean isEqual(INbt nbt) { - return nbt == null?false:this.compound.equals(nbt.getMCNBT()); - } - - public void clear() { - Iterator var1 = this.compound.func_150296_c().iterator(); - - while(var1.hasNext()) { - String name = (String)var1.next(); - this.compound.removeTag(name); - } - - } -} diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/ScriptNpc.java similarity index 52% rename from src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java rename to src/main/java/noppes/npcs/scripted/ScriptNpc.java index a777901ae..1a07d2f77 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/ScriptNpc.java @@ -1,18 +1,19 @@ -package noppes.npcs.scripted.entity; +package noppes.npcs.scripted; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import noppes.npcs.CustomNpcs; +import net.minecraft.util.MathHelper; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.Line; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.ScriptFaction; -import noppes.npcs.scripted.ScriptItemStack; +import noppes.npcs.roles.JobBard; import noppes.npcs.scripted.constants.AnimationType; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.interfaces.ICustomNpc; -import noppes.npcs.scripted.interfaces.ITimers; import noppes.npcs.scripted.roles.ScriptJobBard; import noppes.npcs.scripted.roles.ScriptJobConversation; import noppes.npcs.scripted.roles.ScriptJobFollower; @@ -30,55 +31,32 @@ import noppes.npcs.scripted.roles.ScriptRoleTrader; import noppes.npcs.scripted.roles.ScriptRoleTransporter; import noppes.npcs.util.ValueUtil; -import java.util.ArrayList; -import java.util.UUID; - -public class ScriptNpc extends ScriptLiving implements ICustomNpc { - public EntityNPCInterface npc; - - public ScriptNpc(T npc){ +public class ScriptNpc extends ScriptLiving{ + protected EntityCustomNpc npc; + + public ScriptNpc(EntityCustomNpc npc){ super(npc); this.npc = npc; } /** - * @return Returns the current npcs size + * @return Returns the current npcs size 1-30 */ public int getSize(){ return npc.display.modelSize; } /** - * @param size The size of the npc. Default is 5 + * @param size The size of the npc (1-30) default is 5 */ public void setSize(int size){ - if(size < 1) + if(size > 30) + size = 30; + else if(size < 1) size = 1; - if(size > CustomNpcs.NpcSizeLimit) - size = CustomNpcs.NpcSizeLimit; - npc.display.modelSize = size; npc.script.clientNeedsUpdate = true; } - - /** - * @return Returns the current npcs modelType of the NPC - */ - public int getModelType(){ - return npc.display.modelType; - } - - /** - * @param modelType The modelType of the NPC. 0: Steve, 1: Steve64, 2: Alex - */ - public void setModelType(int modelType){ - if(modelType > 2) - modelType = 2; - else if(modelType < 0) - modelType = 0; - npc.display.modelType = modelType; - npc.script.clientNeedsUpdate = true; - } /** * @return The npcs name @@ -91,17 +69,6 @@ public class ScriptNpc extends ScriptLiving imp npc.ai.orientation = (int)rotation; super.setRotation(rotation); } - public void setRotationType(int rotationType){ - for (EnumStandingType e : EnumStandingType.values()) { - if (e.ordinal() == rotationType) { - npc.ai.standingType = e; - break; - } - } - } - public int getRotationType(){ - return npc.ai.standingType.ordinal(); - } /** * @param name The name of the npc */ @@ -195,7 +162,7 @@ public class ScriptNpc extends ScriptLiving imp /** * @param health New max health */ - public void setMaxHealth(double health){ + public void setMaxHealth(int health){ npc.stats.setMaxHealth(health); npc.script.clientNeedsUpdate = true; } @@ -228,22 +195,6 @@ public class ScriptNpc extends ScriptLiving imp npc.setFaction(id); } - public void setAttackFactions(boolean attackOtherFactions){ - npc.advanced.attackOtherFactions = attackOtherFactions; - } - - public boolean getAttackFactions(){ - return npc.advanced.attackOtherFactions; - } - - public void setDefendFaction(boolean defendFaction){ - npc.advanced.defendFaction = defendFaction; - } - - public boolean getDefendFaction(){ - return npc.advanced.defendFaction; - } - @Override public int getType(){ return EntityType.NPC; @@ -315,14 +266,6 @@ public class ScriptNpc extends ScriptLiving imp return new ScriptRoleTransporter(npc); return new ScriptRoleInterface(npc); } - public void setRole(int role){ - for (EnumRoleType e : EnumRoleType.values()) { - if (e.ordinal() == role) { - npc.advanced.role = e; - break; - } - } - } /** * @return Returns the npcs current job @@ -346,14 +289,6 @@ public class ScriptNpc extends ScriptLiving imp return new ScriptJobSpawner(npc); return new ScriptJobInterface(npc); } - public void setJob(int job){ - for (EnumJobType e : EnumJobType.values()) { - if (e.ordinal() == job) { - npc.advanced.job = e; - break; - } - } - } /** * @return The item held in the right hand @@ -417,71 +352,6 @@ public class ScriptNpc extends ScriptLiving imp npc.inventory.setProjectile(item.item); npc.script.aiNeedsUpdate = true; } - - public boolean canAimWhileShooting() { - return !npc.stats.aimWhileShooting; - } - - public void aimWhileShooting(boolean aimWhileShooting) { - npc.stats.aimWhileShooting = aimWhileShooting; - } - - public void setMinProjectileDelay(int minDelay){ - npc.stats.minDelay = minDelay; - } - public int getMinProjectileDelay(){ - return npc.stats.minDelay; - } - - public void setMaxProjectileDelay(int maxDelay){ - npc.stats.maxDelay = maxDelay; - } - public int getMaxProjectileDelay(){ - return npc.stats.maxDelay; - } - - public void setRangedRage(int rangedRange) { - npc.stats.rangedRange = rangedRange; - } - public int getRangedRage() { - return npc.stats.rangedRange; - } - - public void setFireRate(int rate) { - npc.stats.fireRate = rate; - } - public int getFireRate() { - return npc.stats.fireRate; - } - - public void setBurstCount(int burstCount) { - npc.stats.burstCount = burstCount; - } - public int getBurstCount() { - return npc.stats.burstCount; - } - - public void setShotCount(int shotCount) { - npc.stats.shotCount = shotCount; - } - public int getShotCount() { - return npc.stats.shotCount; - } - - public void setAccuracy(int accuracy) { - npc.stats.accuracy = accuracy; - } - public int getAccuracy() { - return npc.stats.accuracy; - } - - public String getFireSound() { - return npc.stats.fireSound; - } - - public void setFireSound(String fireSound) { - npc.stats.fireSound = fireSound; - } /** * @param slot The armor slot to return. 0:head, 1:body, 2:legs, 3:boots @@ -508,91 +378,6 @@ public class ScriptNpc extends ScriptLiving imp npc.script.clientNeedsUpdate = true; } - - /** - * - * @param slot The slot from the NPC's drop list to return (0-8) - * @return - */ - public ScriptItemStack getLootItem(int slot) { - return new ScriptItemStack(npc.inventory.getStackInSlot(slot+7)); - } - - /** - * - * @param slot The slot from the NPC's drop list to change - * @param item The item the drop list slot will be changed to - */ - public void setLootItem(int slot, ScriptItemStack item) { - npc.inventory.setInventorySlotContents(slot+7, item.item); - } - - /** - * - * @param slot The slot from the NPC's drop list to return (0-8) - * @return The chance of dropping the item in this slot. Returns 100 if the slot is not found. - */ - public double getLootChance(int slot) { - if(!npc.inventory.dropchance.containsKey(slot)) - return 100; - - return npc.inventory.dropchance.get(slot); - } - - /** - * - * @param slot The slot from the NPC's drop list to change - * @param chance The new chance of dropping the item in this slot - */ - public void setLootChance(int slot, double chance) { - if(!npc.inventory.dropchance.containsKey(slot)) - return; - - if(chance < 0) - chance = 0; - if(chance > 100) - chance = 100; - - npc.inventory.dropchance.put(slot,chance); - } - - public int getLootMode(){ - return npc.inventory.lootMode; - } - - public void setLootMode(int lootMode){ - if(lootMode < 0 || lootMode > 1) - return; - npc.inventory.lootMode = lootMode; - } - - public void setMinLootXP(int lootXP) { - if(lootXP > npc.inventory.maxExp) - lootXP = npc.inventory.maxExp; - if(lootXP < 0) - lootXP = 0; - if(lootXP > Short.MAX_VALUE) - lootXP = Short.MAX_VALUE; - - npc.inventory.minExp = lootXP; - } - public void setMaxLootXP(int lootXP) { - if(lootXP < npc.inventory.minExp) - lootXP = npc.inventory.minExp; - if(lootXP < 0) - lootXP = 0; - if(lootXP > Short.MAX_VALUE) - lootXP = Short.MAX_VALUE; - - npc.inventory.maxExp = lootXP; - } - - public int getMinLootXP(){ - return npc.inventory.minExp; - } - public int getMaxLootXP(){ - return npc.inventory.maxExp; - } /** * @param type The AnimationType @@ -610,82 +395,7 @@ public class ScriptNpc extends ScriptLiving imp npc.ai.animationType = EnumAnimation.LYING; else if(type == AnimationType.HUGGING) npc.ai.animationType = EnumAnimation.HUG; - } - - public void setTacticalVariant(int variant){ - if(variant > EnumNavType.values().length-1 || variant < 0) - return; - - npc.ai.tacticalVariant = EnumNavType.values()[variant]; - npc.ai.directLOS = EnumNavType.values()[variant] != EnumNavType.Stalk && npc.ai.directLOS; - } - - public int getTacticalVariant(){ - return npc.ai.tacticalVariant.ordinal(); - } - - public void setTacticalVariant(String variant){ - boolean found = false; - for(String s : EnumNavType.names()){ - if(s.equals(variant)) - found = true; - } - - if(!found) - return; - - npc.ai.tacticalVariant = EnumNavType.valueOf(variant); - } - - public String getTacticalVariantName(){ - return npc.ai.tacticalVariant.name(); - } - - public void setTacticalRadius(int tacticalRadius){ - if(tacticalRadius < 0) - tacticalRadius = 0; - - npc.ai.tacticalRadius = tacticalRadius; - } - - public int getTacticalRadius(){ - return npc.ai.tacticalRadius; - } - - public void setIgnoreCobweb(boolean ignore){ - npc.ai.ignoreCobweb = ignore; - } - - public boolean getIgnoreCobweb(){ - return npc.ai.ignoreCobweb; - } - - public void setOnFoundEnemy(int onAttack){ - if(onAttack < 0 || onAttack > 3) - return; - npc.ai.onAttack = onAttack; - } - - public int onFoundEnemy(){ - return npc.ai.onAttack; - } - - public void setShelterFrom(int shelterFrom){ - if(shelterFrom < 0 || shelterFrom > 2) - return; - npc.ai.findShelter = shelterFrom; - } - - public int getShelterFrom(){ - return npc.ai.findShelter; - } - - public boolean hasLivingAnimation() { - return !npc.display.disableLivingAnimation; - } - - public void setLivingAnimation(boolean livingAnimation) { - npc.display.disableLivingAnimation = !livingAnimation; + } /** @@ -702,24 +412,6 @@ public class ScriptNpc extends ScriptLiving imp public int getVisibleType(){ return npc.display.visible; } - - public void setVisibleTo(ScriptPlayer player, boolean visible) { - UUID uuid = player.player.getPersistentID(); - ArrayList uuidList = npc.display.invisibleToList; - if(uuidList != null) { - if (!uuidList.contains(uuid)) { - if (!visible) - npc.display.invisibleToList.add(uuid); - } else if (visible) { - npc.display.invisibleToList.remove(uuid); - } - } - npc.script.clientNeedsUpdate = true; - } - - public boolean isVisibleTo(ScriptPlayer player) { - return !npc.scriptInvisibleToPlayer(player.player); - } /** * @param type The visibility type of the name, 0:visible, 1:invisible, 2:when-attacking @@ -754,14 +446,14 @@ public class ScriptNpc extends ScriptLiving imp /** * @return The melee strength */ - public float getMeleeStrength(){ + public int getMeleeStrength(){ return npc.stats.getAttackStrength(); } /** * @param strength The melee strength */ - public void setMeleeStrength(float strength){ + public void setMeleeStrength(int strength){ npc.stats.setAttackStrength(strength); } @@ -782,15 +474,15 @@ public class ScriptNpc extends ScriptLiving imp /** * @return The ranged strength */ - public float getRangedStrength(){ + public int getRangedStrength(){ return npc.stats.pDamage; } /** * @param strength The ranged strength */ - public void setRangedStrength(float strength){ - npc.stats.pDamage = (float)(Math.floor(strength)); + public void setRangedStrength(int strength){ + npc.stats.pDamage = strength; } /** @@ -821,96 +513,60 @@ public class ScriptNpc extends ScriptLiving imp npc.stats.burstCount = count; } - public int getRespawnTime() { - return npc.stats.respawnTime; - } - - public void setRespawnTime(int time) { - npc.stats.respawnTime = time; - } - - public int getRespawnCycle() { - return npc.stats.spawnCycle; - } - - public void setRespawnCycle(int cycle) { - if(cycle < 0) - cycle = 0; - if(cycle > 3) - cycle = 3; - - npc.stats.spawnCycle = cycle; - } - - public boolean getHideKilledBody() { - return npc.stats.hideKilledBody; - } - - public void hideKilledBody(boolean hide) { - npc.stats.hideKilledBody = hide; - } - - public boolean naturallyDespawns() { - return npc.stats.canDespawn; - } - - public void setNaturallyDespawns(boolean canDespawn) { - npc.stats.canDespawn = canDespawn; - } - + /** + * @param player The player to give the item to + * @param item The item given to the player + */ public void giveItem(ScriptPlayer player, ScriptItemStack item){ npc.givePlayerItem(player.player, item.item); } - + + + /** + * On servers the enable-command-block option in the server.properties needs to be set to true + * @param command The command to be executed + */ public void executeCommand(String command){ NoppesUtilServer.runCommand(npc, npc.getCommandSenderName(), command, null); } public void setHeadScale(float x, float y, float z){ - if(npc instanceof EntityCustomNpc) { - ((EntityCustomNpc) this.npc).modelData.head.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); - ((EntityCustomNpc) this.npc).modelData.head.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); - ((EntityCustomNpc) this.npc).modelData.head.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); - - npc.script.clientNeedsUpdate = true; - } + npc.modelData.head.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); + npc.modelData.head.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); + npc.modelData.head.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); + + npc.script.clientNeedsUpdate = true; } public void setBodyScale(float x, float y, float z){ - if(npc instanceof EntityCustomNpc) { - ((EntityCustomNpc) this.npc).modelData.body.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); - ((EntityCustomNpc) this.npc).modelData.body.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); - ((EntityCustomNpc) this.npc).modelData.body.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); - - npc.script.clientNeedsUpdate = true; - } + npc.modelData.body.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); + npc.modelData.body.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); + npc.modelData.body.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); + + npc.script.clientNeedsUpdate = true; } public void setArmsScale(float x, float y, float z){ - if(npc instanceof EntityCustomNpc) { - ((EntityCustomNpc) this.npc).modelData.arms.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); - ((EntityCustomNpc) this.npc).modelData.arms.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); - ((EntityCustomNpc) this.npc).modelData.arms.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); - - npc.script.clientNeedsUpdate = true; - } + npc.modelData.arms.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); + npc.modelData.arms.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); + npc.modelData.arms.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); + + npc.script.clientNeedsUpdate = true; } public void setLegsScale(float x, float y, float z){ - if(npc instanceof EntityCustomNpc) { - ((EntityCustomNpc) this.npc).modelData.legs.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); - ((EntityCustomNpc) this.npc).modelData.legs.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); - ((EntityCustomNpc) this.npc).modelData.legs.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); - - npc.script.clientNeedsUpdate = true; - } + npc.modelData.legs.scaleX = ValueUtil.correctFloat(x, 0.5f, 1.5f); + npc.modelData.legs.scaleY = ValueUtil.correctFloat(y, 0.5f, 1.5f); + npc.modelData.legs.scaleZ = ValueUtil.correctFloat(z, 0.5f, 1.5f); + + npc.script.clientNeedsUpdate = true; } /** * @since 1.7.10c * @param resistance Explosion resistance (0-2) default is 1 */ - public void setExplosionResistance(float resistance){ + public void seExplosionResistance(float resistance){ npc.stats.resistances.explosion = ValueUtil.correctFloat(resistance, 0, 2); } @@ -975,147 +631,33 @@ public class ScriptNpc extends ScriptLiving imp /** * @return Returns the combat health regen per second */ - public float getCombatRegen(){ + public int getCombatRegen(){ return npc.stats.combatRegen; } /** * @param regen The combat health regen per second */ - public void setCombatRegen(float regen){ - npc.stats.combatRegen = (float)(Math.floor(regen)); + public void setCombatRegen(int regen){ + npc.stats.combatRegen = regen; } /** * @return Returns the health regen per second when not in combat */ - public float getHealthRegen(){ + public int getHealthRegen(){ return npc.stats.healthRegen; } /** * @param regen The health regen per second when not in combat */ - public void setHealthRegen(float regen){ - npc.stats.healthRegen = (float)(Math.floor(regen)); + public void setHealthRegen(int regen){ + npc.stats.healthRegen = regen; } @Override public long getAge(){ return npc.totalTicksAlive; } - - public ITimers getTimers() { - return ((EntityNPCInterface)this.npc).timers; - } - - public void setFly(int fly){ - if(fly > 0) - fly = 1; - else fly = 0; - - npc.ai.movementType = fly; - } - - public boolean canFly(){ - return npc.ai.movementType == 1; - } - - public void setFlySpeed(double flySpeed){ - if(flySpeed < 0.0D) - flySpeed = 0.0D; - - npc.ai.flySpeed = flySpeed; - } - - public double getFlySpeed(double flySpeed){ - return npc.ai.flySpeed; - } - - public void setFlyGravity(double flyGravity){ - if(flyGravity < 0.0D) - flyGravity = 0.0D; - if(flyGravity > 1.0D) - flyGravity = 1.0D; - - npc.ai.flyGravity = flyGravity; - } - - public double getFlyGravity(double flySpeed){ - return npc.ai.flyGravity; - } - - public void setFlyHeightLimit(int flyHeightLimit){ - if(flyHeightLimit < 0) - flyHeightLimit = 0; - - this.npc.ai.flyHeightLimit = flyHeightLimit; - } - public int getFlyHeightLimit(int flyHeightLimit){ - return this.npc.ai.flyHeightLimit; - } - - public void limitFlyHeight(boolean limit){ - this.npc.ai.hasFlyLimit = limit; - } - public boolean isFlyHeightLimited(boolean limit){ - return this.npc.ai.hasFlyLimit; - } - - public void setSpeed(int speed) { - npc.ai.setWalkingSpeed(speed); - } - - public int getSpeed() { - return npc.ai.getWalkingSpeed(); - } - - public void setSkinType(byte type) { - npc.display.skinType = type; - npc.updateClient = true; - } - - public byte getSkinType() { - return npc.display.skinType; - } - - public void setSkinUrl(String url){ - if(this.npc.display.url.equals(url)) - return; - this.npc.display.url = url; - npc.textureLocation = null; - npc.display.skinType = 2; - npc.updateClient = true; - } - - public String getSkinUrl() { - return this.npc.display.url; - } - - public void setCloakTexture(String cloakTexture) { - npc.display.cloakTexture = cloakTexture; - npc.updateClient = true; - } - - public String getCloakTexture() { - return npc.display.cloakTexture; - } - - public void setOverlayTexture(String overlayTexture) { - npc.display.glowTexture = overlayTexture; - npc.updateClient = true; - } - - public String getOverlayTexture() { - return npc.display.glowTexture; - } - - public void setCollisionType(int type){ - npc.display.collidesWith = type; - } - public int getCollisionType(){ - return npc.display.collidesWith; - } - - public void updateClient() { this.npc.updateClient(); } } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java b/src/main/java/noppes/npcs/scripted/ScriptPixelmon.java similarity index 96% rename from src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java rename to src/main/java/noppes/npcs/scripted/ScriptPixelmon.java index 727ca20e8..f3d1ef628 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPixelmon.java +++ b/src/main/java/noppes/npcs/scripted/ScriptPixelmon.java @@ -1,21 +1,21 @@ -package noppes.npcs.scripted.entity; +package noppes.npcs.scripted; +import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityTameable; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.controllers.PixelmonHelper; -import noppes.npcs.scripted.interfaces.IPixelmon; import noppes.npcs.util.ValueUtil; -public class ScriptPixelmon extends ScriptAnimal implements IPixelmon { - private T pixelmon; +public class ScriptPixelmon extends ScriptAnimal{ + private EntityTameable pixelmon; private NBTTagCompound compound = null; - public ScriptPixelmon(T pixelmon){ + public ScriptPixelmon(EntityTameable pixelmon){ super(pixelmon); this.pixelmon = pixelmon; compound = new NBTTagCompound(); pixelmon.writeEntityToNBT(compound); } - public ScriptPixelmon(T pixelmon, NBTTagCompound compound){ + public ScriptPixelmon(EntityTameable pixelmon, NBTTagCompound compound){ this(pixelmon); this.compound = compound; } diff --git a/src/main/java/noppes/npcs/scripted/ScriptPixelmonPlayerData.java b/src/main/java/noppes/npcs/scripted/ScriptPixelmonPlayerData.java index 1efd16256..e44476362 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptPixelmonPlayerData.java +++ b/src/main/java/noppes/npcs/scripted/ScriptPixelmonPlayerData.java @@ -4,7 +4,6 @@ import net.minecraft.entity.passive.EntityTameable; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.controllers.PixelmonHelper; -import noppes.npcs.scripted.entity.ScriptPixelmon; public class ScriptPixelmonPlayerData { private EntityPlayerMP player; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/ScriptPlayer.java similarity index 63% rename from src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java rename to src/main/java/noppes/npcs/scripted/ScriptPlayer.java index 26ad5dd30..19eb36dc6 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/ScriptPlayer.java @@ -1,44 +1,33 @@ -package noppes.npcs.scripted.entity; +package noppes.npcs.scripted; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; import net.minecraft.stats.StatBase; import net.minecraft.stats.StatList; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.WorldSettings; -import noppes.npcs.*; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesStringUtils; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.Server; import noppes.npcs.constants.EnumPacketClient; -import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.controllers.*; -import noppes.npcs.entity.EntityDialogNpc; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.ScriptItemStack; -import noppes.npcs.scripted.ScriptPixelmonPlayerData; +import noppes.npcs.controllers.PixelmonHelper; +import noppes.npcs.controllers.PlayerData; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerDialogData; +import noppes.npcs.controllers.PlayerQuestData; +import noppes.npcs.controllers.Quest; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.QuestData; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.event.FactionEvent; -import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.interfaces.*; -import noppes.npcs.scripted.overlay.ScriptOverlay; import noppes.npcs.util.ValueUtil; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -public class ScriptPlayer extends ScriptLivingBase implements IPlayer { - public T player; - private PlayerData data; - - public ScriptPlayer(T player){ +public class ScriptPlayer extends ScriptLivingBase{ + protected EntityPlayerMP player; + public ScriptPlayer(EntityPlayerMP player){ super(player); this.player = player; } @@ -61,34 +50,6 @@ public class ScriptPlayer extends ScriptLivingBase public void setPosition(double x, double y, double z){ NoppesUtilPlayer.teleportPlayer(player, x, y, z, player.dimension); } - - public void setPosition(double x, double y, double z, int dimensionId){ - if (NpcAPI.Instance().getIWorld(dimensionId) == null) - return; - - NoppesUtilPlayer.teleportPlayer(player, x, y, z, dimensionId); - } - - public int getHunger(){ - return player.getFoodStats().getFoodLevel(); - } - - public void setHunger(int hunger){ - player.getFoodStats().setFoodLevel(hunger); - } - - public float getSaturation(){ - return player.getFoodStats().getSaturationLevel(); - } - - public void setSaturation(float saturation){ - player.getFoodStats().setFoodSaturationLevel(saturation); - } - - public int getDimension(){ - return player.dimension; - } - public boolean hasFinishedQuest(int id){ PlayerQuestData data = PlayerDataController.instance.getPlayerData(player).questData; @@ -99,14 +60,6 @@ public class ScriptPlayer extends ScriptLivingBase PlayerQuestData data = PlayerDataController.instance.getPlayerData(player).questData; return data.activeQuests.containsKey(id); } - - public void showDialog(int id){ - Dialog dialog = (Dialog) DialogController.instance.get(id); - if(dialog == null) - return; - - NoppesUtilServer.openDialog(player, new EntityDialogNpc(this.player.worldObj), dialog); - } public boolean hasReadDialog(int id){ PlayerDialogData data = PlayerDataController.instance.getPlayerData(player).dialogData; @@ -182,7 +135,7 @@ public class ScriptPlayer extends ScriptLivingBase */ public void addFactionPoints(int faction, int points){ PlayerData data = PlayerDataController.instance.getPlayerData(player); - data.factionData.increasePoints(faction, points, player); + data.factionData.increasePoints(faction, points); } /** @@ -268,7 +221,6 @@ public class ScriptPlayer extends ScriptLivingBase } } } - this.updatePlayerInventory(); return true; } @@ -293,14 +245,8 @@ public class ScriptPlayer extends ScriptLivingBase * @return Returns whether or not it gave the item succesfully */ public boolean giveItem(ScriptItemStack item, int amount){ - if(item != null && item.getMCItemStack() != null) { - item.setStackSize(amount); - boolean bool = this.player.inventory.addItemStackToInventory(item.getMCItemStack()); - this.updatePlayerInventory(); - return bool; - } else { - return false; - } + String itemname = Item.itemRegistry.getNameForObject(item.getMCItemStack().getItem()); + return giveItem(itemname, item.getItemDamage(), amount); } /** @@ -344,14 +290,7 @@ public class ScriptPlayer extends ScriptLivingBase player.inventory.mainInventory[i] = null; } } - - public void setRotation(float rotationYaw){ - NoppesUtilPlayer.teleportPlayer(player, player.posX, player.posY, player.posZ, rotationYaw, player.rotationPitch, player.dimension); - } - - public void setRotation(float rotationYaw, float rotationPitch){ - NoppesUtilPlayer.teleportPlayer(player, player.posX, player.posY, player.posZ, rotationYaw, rotationPitch, player.dimension); - } + /** * @param achievement The achievement id. For a complete list see http://minecraft.gamepedia.com/Achievements @@ -399,103 +338,4 @@ public class ScriptPlayer extends ScriptLivingBase return null; return new ScriptPixelmonPlayerData(player); } - - public ITimers getTimers() { - return PlayerDataController.instance.getPlayerData(player).timers; - } - - public void updatePlayerInventory() { - ((EntityPlayerMP)this.entity).inventoryContainer.detectAndSendChanges(); - PlayerData playerData = PlayerDataController.instance.getPlayerData(player); - PlayerQuestData questData = playerData.questData; - questData.checkQuestCompletion(playerData, EnumQuestType.Item); - } - - public boolean checkGUIOpen() { - NoppesUtilPlayer.isGUIOpen(player); - PlayerData data = PlayerDataController.instance.getPlayerData(player); - return data.getGUIOpen(); - } - - public ScriptDBCPlayer getDBCPlayer() { - Set keySet = player.getEntityData().getCompoundTag("PlayerPersisted").func_150296_c(); - Iterator iterator = keySet.iterator(); - - while (iterator.hasNext()) - { - String s = (String)iterator.next(); - if(s.contains("jrmc")) - return new ScriptDBCPlayer(this.player); - } - return null; - } - - public boolean blocking() { - return player.isBlocking(); - } - - private PlayerData getData() { - if (this.data == null) { - this.data = PlayerDataController.instance.getPlayerData(player); - } - - return this.data; - } - - public IQuest[] getActiveQuests() { - PlayerQuestData data = this.getData().questData; - List quests = new ArrayList(); - Iterator var3 = data.activeQuests.keySet().iterator(); - - while(var3.hasNext()) { - int id = (Integer)var3.next(); - IQuest quest = (IQuest)QuestController.instance.quests.get(id); - if (quest != null) { - quests.add(quest); - } - } - - return (IQuest[])quests.toArray(new IQuest[quests.size()]); - } - - public IContainer getOpenContainer() { - return NpcAPI.Instance().getIContainer(((EntityPlayerMP)this.entity).openContainer); - } - - public void showCustomGui(ICustomGui gui) { - CustomGuiController.openGui(this, (ScriptGui) gui); - } - - public ICustomGui getCustomGui() { - return ((EntityPlayerMP)this.entity).openContainer instanceof ContainerCustomGui ? ((ContainerCustomGui)((EntityPlayerMP)this.entity).openContainer).customGui : null; - } - - public void closeGui() { - ((EntityPlayerMP)this.entity).closeContainer(); - Server.sendData((EntityPlayerMP)this.entity, EnumPacketClient.GUI_CLOSE, -1, new NBTTagCompound()); - } - - public void showCustomOverlay(ICustomOverlay overlay) { - CustomGuiController.openOverlay(this, (ScriptOverlay) overlay); - } - - public void closeOverlay(int id) { - Server.sendData((EntityPlayerMP)this.entity, EnumPacketClient.OVERLAY_CLOSE, id, new NBTTagCompound()); - } - - public IQuest[] getFinishedQuests() { - PlayerQuestData data = this.getData().questData; - List quests = new ArrayList(); - Iterator var3 = data.finishedQuests.keySet().iterator(); - - while(var3.hasNext()) { - int id = (Integer)var3.next(); - IQuest quest = (IQuest)QuestController.instance.quests.get(id); - if (quest != null) { - quests.add(quest); - } - } - - return (IQuest[])quests.toArray(new IQuest[quests.size()]); - } } diff --git a/src/main/java/noppes/npcs/scripted/ScriptWorld.java b/src/main/java/noppes/npcs/scripted/ScriptWorld.java index cbcc43f48..b22b335db 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptWorld.java +++ b/src/main/java/noppes/npcs/scripted/ScriptWorld.java @@ -18,29 +18,21 @@ import net.minecraft.nbt.NBTTagString; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileBigSign; +import noppes.npcs.blocks.tiles.TileSign; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.ServerCloneController; -import noppes.npcs.scripted.entity.ScriptEntity; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.interfaces.IBlock; -import noppes.npcs.scripted.interfaces.IWorld; -public class ScriptWorld implements IWorld { +public class ScriptWorld{ private static Map tempData = new HashMap(); - public WorldServer world; + protected WorldServer world; public ScriptWorld(WorldServer world){ this.world = world; } - - public static ScriptWorld createNew(WorldServer world) { - return new ScriptWorld(world); - } - + /** * @return The worlds time */ @@ -61,11 +53,11 @@ public class ScriptWorld implements IWorld { * @param z World position z * @return The block at the given position. Returns null if there isn't a block */ - public IBlock getBlock(int x, int y, int z){ + public ScriptItemStack getBlock(int x, int y, int z){ Block block = world.getBlock(x, y, z); if(block == null || block.isAir(world, x, y, z)) return null; - return new ScriptBlock(world, block, new BlockPos(x,y,z)); + return new ScriptItemStack(new ItemStack(block, 1, world.getBlockMetadata(x, y, z))); } /** @@ -195,14 +187,6 @@ public class ScriptWorld implements IWorld { return null; return new ScriptItemStack(new ItemStack(item, size, damage)); } - - /** - * @param directory The particle's texture directory. Use only forward slashes when writing a directory. Example: "customnpcs:textures/particle/tail.png" - * @return Returns ScriptEntityParticle object - */ - public ScriptEntityParticle createEntityParticle(String directory){ - return new ScriptEntityParticle(directory); - } /** * @param key Get temp data for this key @@ -349,21 +333,13 @@ public class ScriptWorld implements IWorld { public ScriptScoreboard getScoreboard(){ return new ScriptScoreboard(); } - - public BlockPos getMCBlockPos(int x, int y, int z){ - return new BlockPos(x,y,z); - } - + /** * @since 1.7.10c * Expert use only * @return Returns minecraft world object */ - public WorldServer getMCWorld(){ - return this.world; - } - - public int getDimensionID(){ - return world.provider.dimensionId; + public World getMCWorld(){ + return world; } } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java deleted file mode 100644 index be7dffda8..000000000 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java +++ /dev/null @@ -1,537 +0,0 @@ -package noppes.npcs.scripted.entity; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.ScriptItemStack; - -import java.util.ArrayList; -import java.util.Locale; - -public class ScriptDBCPlayer extends ScriptPlayer{ - public T player; - - public ScriptDBCPlayer(T player){ - super(player); - this.player = player; - } - - public void setStat(String stat, int value) { - stat = stat.toLowerCase().trim(); - switch (stat) { - case "str": - case "strength": - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcStrI", value); - break; - case "dex": - case "dexterity": - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcDexI", value); - break; - case "con": - case "constitution": - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcCnsI", value); - break; - case "wil": - case "willpower": - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcWilI", value); - break; - case "mnd": - case "mind": - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcIntI", value); - break; - case "spi": - case "spirit": - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcCncI", value); - break; - } - } - - public int getStat(String stat) { - stat = stat.toLowerCase().trim(); - switch (stat) { - case "str": - case "strength": - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcStrI"); - case "dex": - case "dexterity": - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcDexI"); - case "con": - case "constitution": - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcCnsI"); - case "wil": - case "willpower": - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcWilI"); - case "mnd": - case "mind": - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcIntI"); - case "spi": - case "spirit": - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcCncI"); - } - - throw new CustomNPCsException("Invalid stat name: " + stat + "\nValid stat names are:" + - "\nstr, dex, con, wil, mnd, spi\nstrength, dexterity, constitution, willpower, mind, spirit",new Object[0]); - } - - private double applyOperator(String method, double n1, double n2) { - if (method.equals("+")) { - n1 += n2; - } else if (method.equals("-")) { - n1 -= n2; - } else if (method.equals("*")) { - n1 *= n2; - } else if (method.equals("/")) { - n1 /= n2; - } else if (method.equals("%")) { - n1 %= n2; - } - - return n1; - } - - public void addBonusAttribute(String stat, String bonusID, String operation, double attributeValue){ - addBonusAttribute(stat,bonusID,operation,attributeValue,true); - } - public void addBonusAttribute(String stat, String bonusID, String operation, double attributeValue, boolean endOfTheList){ - bonusAttribute("add",stat,bonusID,operation,attributeValue,endOfTheList); - } - public void addToBonusAttribute(String stat, String bonusID, String operation, double attributeValue){ - bonusAttribute("addto",stat,bonusID,operation,attributeValue,true); - } - public void setBonusAttribute(String stat, String bonusID, String operation, double attributeValue){ - bonusAttribute("set",stat,bonusID,operation,attributeValue,true); - } - public void getBonusAttribute(String stat, String bonusID){ - bonusAttribute("get",stat,bonusID,"*",1.0,true); - } - public void removeBonusAttribute(String stat, String bonusID){ - bonusAttribute("remove",stat,bonusID,"*",1.0,true); - } - public void clearBonusAttribute(String stat){ - bonusAttribute("clear",stat,"","*",1.0,true); - } - - public String bonusAttribute(String action, String stat, String bonusID) { - String[] actions = new String[]{"get", "remove", "clear"}; - boolean valid = false; - for(String s : actions){ - if(s.equals(action.toLowerCase())){ - valid = true; - } - } - if (!valid) { - throw new CustomNPCsException("Action can be: get/remove/clear", new Object[0]); - } - - return bonusAttribute(action,stat,bonusID,"*",1.0,false); - } - - public String bonusAttribute(String action, String stat, String bonusID, String operation, double attributeValue, boolean endOfTheList) { - String[] actions = new String[]{"add", "addto", "set", "get", "remove", "clear"}; - String[] operations = new String[]{"+", "-", "*", "/", "%"}; - - boolean valid = false; - for(String s : actions){ - if(s.equals(action.toLowerCase())){ - valid = true; - } - } - if (!valid) { - throw new CustomNPCsException("Action can be: add/addTo/set/get/remove/clear", new Object[0]); - } - - if(!action.equals("remove") && !action.equals("get") && !action.equals("clear")) { - valid = false; - for (String s : operations) { - if (s.equals(operation)) { - valid = true; - } - } - if (!valid) { - throw new CustomNPCsException("Operation can be: + - * / %", new Object[0]); - } - } - - stat = stat.toLowerCase().trim(); - switch (stat) { - case "strength": - stat = "str"; - break; - case "dexterity": - stat = "dex"; - break; - case "constitution": - stat = "con"; - break; - case "willpower": - stat = "wil"; - break; - case "mind": - stat = "mnd"; - break; - case "spirit": - stat = "spi"; - break; - } - if(!(stat.equals("str") || stat.equals("dex") || stat.equals("con") || stat.equals("wil") || stat.equals("mnd") || stat.equals("spi"))) - throw new CustomNPCsException("Invalid stat name: " + stat + "\nValid stat names are:" + - "\nstr, dex, con, wil, mnd, spi\nstrength, dexterity, constitution, willpower, mind, spirit",new Object[0]); - - String bonusValueString = operation + attributeValue; - String bonus = player.getEntityData().getCompoundTag("PlayerPersisted").getString("jrmcAttrBonus"+stat); - String bonuses[] = bonus.split("\\|"); - String[][] bonusValues = new String[bonuses.length][2]; - if (bonuses.length > 0 && bonuses[0].length() > 0) { - for(int i = 0; i < bonuses.length; ++i) { - String[] bonusValue = bonuses[i].split("\\;"); - bonusValues[i][0] = bonusValue[0]; - bonusValues[i][1] = bonusValue[1]; - } - } - - switch (action) { - case "get": - if(player.getEntityData().getCompoundTag("PlayerPersisted").hasKey("jrmcAttrBonus"+stat)) { - for (String[] s : bonusValues) { - if (s[0].equals(bonusID)) - return s[1]; - } - } - return ""; - case "clear": - if(player.getEntityData().getCompoundTag("PlayerPersisted").hasKey("jrmcAttrBonus"+stat)) - player.getEntityData().getCompoundTag("PlayerPersisted").setString("jrmcAttrBonus"+stat, ""); - break; - case "remove": - String newBonusString = ""; - if(player.getEntityData().getCompoundTag("PlayerPersisted").hasKey("jrmcAttrBonus"+stat)) { - int num = -1; - boolean number; - boolean run = false; - String[] bonusValue; - - try { - num = Integer.parseInt(bonusID); - number = true; - } catch (Exception var33) { - number = false; - } - - for(int i = 0; i < bonuses.length; ++i) { - bonusValue = bonuses[i].split("\\;"); - bonusValues[i][0] = bonusValue[0]; - if (number && i == num || !number && bonusValues[i][0].equals(bonusID)) { - bonuses[i] = ""; - run = true; - break; - } - } - - if (run) { - String startString = ""; - - for (int i = 0; i < bonuses.length; ++i) { - if (bonuses[i] != null && bonuses[i].length() > 0) { - startString = startString + bonuses[i] + (bonuses.length - 1 == i ? "" : "|"); - } - } - - player.getEntityData().getCompoundTag("PlayerPersisted").setString("jrmcAttrBonus"+stat, startString); - } - } - break; - case "add": - boolean nbtFail = false; - - for (int id = 0; id < bonuses.length; ++id) { - String[] bonusValue = bonuses[id].split("\\;"); - bonusValues[id][0] = bonusValue[0]; - if (bonusValues[id][0].equals(bonusID)) { - nbtFail = true; - break; - } - } - - if (!nbtFail) { - if (endOfTheList) { - if (bonus.length() == 0) { - bonus = bonusID + ";" + bonusValueString; - } else { - bonus = bonus + "|" + bonusID + ";" + bonusValueString; - } - } else { - if (bonus.length() == 0) { - bonus = bonusID + ";" + bonusValueString; - } else { - bonus = bonusID + ";" + bonusValueString + "|" + bonus; - } - } - player.getEntityData().getCompoundTag("PlayerPersisted").setString("jrmcAttrBonus"+stat, bonus); - } - break; - case "set": { - String noNBTText; - int startIndex = -1; - boolean number = false; - boolean run = false; - - try { - startIndex = Integer.parseInt(bonusID); - number = true; - } catch (Exception var34) { - number = false; - } - - for (startIndex = 0; startIndex < bonuses.length; ++startIndex) { - String[] bonusValue = bonuses[startIndex].split("\\;"); - bonusValues[startIndex][0] = bonusValue[0]; - if (number && startIndex == startIndex || !number && bonusValues[startIndex][0].equals(bonusID)) { - noNBTText = bonusValues[startIndex][0] + ";" + bonusValueString; - bonuses[startIndex] = ""; - run = true; - bonuses[startIndex] = noNBTText; - bonusValue = bonuses[startIndex].split("\\;"); - bonusValues[startIndex][0] = bonusValue[0]; - bonusValues[startIndex][1] = bonusValue[1]; - break; - } - } - - if (run) { - String startString = ""; - - for (int i = 0; i < bonuses.length; ++i) { - if (bonuses[i] != null && bonuses[i].length() > 0) { - startString = startString + bonuses[i] + (bonuses.length - 1 == i ? "" : "|"); - } - } - - player.getEntityData().getCompoundTag("PlayerPersisted").setString("jrmcAttrBonus"+stat, startString); - } - break; - } - case "addto": { - boolean number; - boolean run = false; - int id = -1; - try { - id = Integer.parseInt(bonusID); - number = true; - } catch (Exception var35) { - number = false; - } - - for (int i = 0; i < bonuses.length; ++i) { - String[] bonusValue = bonuses[i].split("\\;"); - bonusValues[i][0] = bonusValue[0]; - if (number && i == id || !number && bonusValues[i][0].equals(bonusID)) { - if (!bonusValues[i][1].contains("nbt_") && !bonusValues[i][1].contains("NBT_") && !bonusValueString.contains("nbt_") && !bonusValueString.contains("NBT_")) { - double value = Double.parseDouble(bonusValues[i][1].substring(1)); - double resultValue = applyOperator(operation, value, attributeValue); - String result = bonusValues[i][1].substring(0, 1) + resultValue; - String data = bonusValues[i][0] + ";" + result; - bonuses[i] = data; - bonusValue = bonuses[i].split("\\;"); - bonusValues[i][0] = bonusValue[0]; - bonusValues[i][1] = bonusValue[1]; - run = true; - } - break; - } - } - if (run) { - String startString = ""; - - for (int i = 0; i < bonuses.length; ++i) { - if (bonuses[i] != null && bonuses[i].length() > 0) { - startString = startString + bonuses[i] + (bonuses.length - 1 == i ? "" : "|"); - } - } - - player.getEntityData().getCompoundTag("PlayerPersisted").setString("jrmcAttrBonus"+stat, startString); - } - break; - } - } - - return ""; - } - - public void setRelease(byte release){ - player.getEntityData().getCompoundTag("PlayerPersisted").setByte("jrmcRelease",release); - } - public byte getRelease(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcRelease"); - } - - public void setBody(int body){ - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcBdy",body); - } - public int getBody(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcBdy"); - } - - public void setStamina(int stamina){ - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcStamina",stamina); - } - public int getStamina(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcStamina"); - } - - public void setKi(int ki){ - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcEnrgy",ki); - } - public int getKi(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcEnrgy"); - } - - public void setTP(int tp){ - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcTpint",tp); - } - public int getTP(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcTpint"); - } - - public void setGravity(float gravity){ - player.getEntityData().getCompoundTag("PlayerPersisted").setFloat("jrmcGravForce",gravity); - } - public float getGravity(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getFloat("jrmcGravForce"); - } - - public boolean isBlocking(){ - NBTTagCompound compound = new NBTTagCompound(); - this.player.writeToNBT(compound); - return compound.getCompoundTag("JRMCEP").getInteger("blocking") == 1; - } - - public void setHairCode(String hairCode){ - NBTTagCompound compound = new NBTTagCompound(); - this.player.writeToNBT(compound); - compound.getCompoundTag("JRMCEP").setString("haircode",hairCode); - } - public String getHairCode(){ - NBTTagCompound compound = new NBTTagCompound(); - this.player.writeToNBT(compound); - return compound.getCompoundTag("JRMCEP").getString("haircode"); - } - - public void setExtraCode(String extraCode){ - NBTTagCompound compound = new NBTTagCompound(); - this.player.writeToNBT(compound); - compound.getCompoundTag("JRMCEP").setString("extracode",extraCode); - } - public String getExtraCode(){ - NBTTagCompound compound = new NBTTagCompound(); - this.player.writeToNBT(compound); - return compound.getCompoundTag("JRMCEP").getString("extracode"); - } - - public ScriptItemStack[] getInventory(){ - NBTTagCompound compound = new NBTTagCompound(); - this.player.writeToNBT(compound); - - NBTTagList list = compound.getCompoundTag("JRMCEP").getTagList("dbcExtraInvTag",10); - ScriptItemStack[] itemList = new ScriptItemStack[list.tagCount()]; - for (int i = 0; i < list.tagCount(); i++) { - ItemStack itemStack = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(i)); - itemList[i] = new ScriptItemStack(itemStack); - } - - return itemList; - } - - public void setForm(byte form){ - player.getEntityData().getCompoundTag("PlayerPersisted").setByte("jrmcState",form); - } - public byte getForm(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcState"); - } - public void setForm2(byte form2){ - player.getEntityData().getCompoundTag("PlayerPersisted").setByte("jrmcState2",form2); - } - public byte getForm2(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcState2"); - } - - public void setPowerPoints(int points){ - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcArcRsrv",points); - } - public int getPowerPoints(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcArcRsrv"); - } - - public void setAuraColor(int color){ - player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcAuraColor",color); - } - public int getAuraColor(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcAuraColor"); - } - - public void setFormLevel(int level){ - player.getEntityData().getCompoundTag("PlayerPersisted").setString("jrmcSSltX","TR"+level); - } - public int getFormLevel(){ - String formString = player.getEntityData().getCompoundTag("PlayerPersisted").getString("jrmcSSltX"); - if(formString.length() < 1) - return 0; - - StringBuilder digitString = new StringBuilder(); - for(char c : formString.toCharArray()){ - if(Character.isDigit(c)) - digitString.append(c); - } - - if(digitString.length() < 1) - return 0; - - return Integer.parseInt(digitString.toString()); - } - - public void setSkills(String skills){ - player.getEntityData().getCompoundTag("PlayerPersisted").setString("jrmcSSlts",skills); - } - public String getSkills(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getString("jrmcSSlts"); - } - - public void setJRMCSE(String statusEffects){ - player.getEntityData().getCompoundTag("PlayerPersisted").setString("jrmcStatusEff",statusEffects); - } - public String getJRMCSE(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getString("jrmcStatusEff"); - } - - public byte getDBCClass(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcClass"); - } - public int getRace(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcRace"); - } - public int getPowerType(){ - return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcPwrtyp"); - } - public int getKillCount(String type){ - type = type.toLowerCase().trim(); - - int evilKills = player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcKillCountEvil"); - int goodKills = player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcKillCountGood"); - int neutKills = player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcKillCountNeut"); - - switch (type) { - case "evil": - return evilKills; - case "good": - return goodKills; - case "neutral": - return neutKills; - case "all": - return evilKills + goodKills + neutKills; - } - - throw new CustomNPCsException("Invalid kill type: " + type + "\nValid kill types are: evil, good, neutral, all", new Object[0]); - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java b/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java deleted file mode 100644 index 6c20658d0..000000000 --- a/src/main/java/noppes/npcs/scripted/event/CustomGuiEvent.java +++ /dev/null @@ -1,66 +0,0 @@ -package noppes.npcs.scripted.event; - -import cpw.mods.fml.common.eventhandler.Event; -import noppes.npcs.scripted.interfaces.ICustomGui; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.interfaces.IPlayer; - -public class CustomGuiEvent extends Event { - public final IPlayer player; - public final ICustomGui gui; - - public CustomGuiEvent(IPlayer player, ICustomGui gui) { - this.player = player; - this.gui = gui; - } - - public static class ButtonEvent extends CustomGuiEvent { - public final int buttonId; - - public ButtonEvent(IPlayer player, ICustomGui gui, int buttonId) { - super(player, gui); - this.buttonId = buttonId; - } - } - - public static class UnfocusedEvent extends CustomGuiEvent { - public final int textfieldId; - - public UnfocusedEvent(IPlayer player, ICustomGui gui, int textfieldId) { - super(player, gui); - this.textfieldId = textfieldId; - } - } - - public static class CloseEvent extends CustomGuiEvent { - public CloseEvent(IPlayer player, ICustomGui gui) { - super(player, gui); - } - } - - public static class ScrollEvent extends CustomGuiEvent { - public final int scrollId; - public final String[] selection; - public final boolean doubleClick; - public final int scrollIndex; - - public ScrollEvent(IPlayer player, ICustomGui gui, int scrollId, int scrollIndex, String[] selection, boolean doubleClick) { - super(player, gui); - this.scrollId = scrollId; - this.selection = selection; - this.doubleClick = doubleClick; - this.scrollIndex = scrollIndex; - } - } - - public static class SlotEvent extends CustomGuiEvent { - public final int slotId; - public final IItemStack stack; - - public SlotEvent(IPlayer player, ICustomGui gui, int slotId, IItemStack stack) { - super(player, gui); - this.slotId = slotId; - this.stack = stack; - } - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java b/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java deleted file mode 100644 index 9aa5c5aa4..000000000 --- a/src/main/java/noppes/npcs/scripted/event/CustomNPCsEvent.java +++ /dev/null @@ -1,16 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted.event; - -import cpw.mods.fml.common.eventhandler.Event; -import noppes.npcs.scripted.NpcAPI; - -public class CustomNPCsEvent extends Event{ - public final NpcAPI API = NpcAPI.Instance(); - - public CustomNPCsEvent() { - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/DialogEvent.java b/src/main/java/noppes/npcs/scripted/event/DialogEvent.java deleted file mode 100644 index 8e9f9b34f..000000000 --- a/src/main/java/noppes/npcs/scripted/event/DialogEvent.java +++ /dev/null @@ -1,32 +0,0 @@ -package noppes.npcs.scripted.event; - -import noppes.npcs.scripted.handler.data.IDialog; -import noppes.npcs.scripted.interfaces.IPlayer; - -public class DialogEvent extends CustomNPCsEvent { - public final IDialog dialog; - public final IPlayer player; - - public DialogEvent(IPlayer player, IDialog dialog){ - this.dialog = dialog; - this.player = player; - } - - public static class DialogOpen extends DialogEvent { - public DialogOpen(IPlayer player, IDialog dialog) { - super(player, dialog); - } - } - - public static class DialogOption extends DialogEvent { - public DialogOption(IPlayer player, IDialog dialog) { - super(player, dialog); - } - } - - public static class DialogClosed extends DialogEvent { - public DialogClosed(IPlayer player, IDialog dialog){ - super(player, dialog); - } - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/FactionEvent.java b/src/main/java/noppes/npcs/scripted/event/FactionEvent.java deleted file mode 100644 index 34e56d692..000000000 --- a/src/main/java/noppes/npcs/scripted/event/FactionEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -package noppes.npcs.scripted.event; - -import noppes.npcs.scripted.handler.data.IFaction; -import noppes.npcs.scripted.interfaces.IPlayer; - -public class FactionEvent extends CustomNPCsEvent { - public final IFaction faction; - public final IPlayer player; - - public FactionEvent(IPlayer player, IFaction faction){ - this.faction = faction; - this.player = player; - } - - public static class FactionPoints extends FactionEvent { - public boolean decrease; - public int points; - - public FactionPoints(IPlayer player, IFaction faction, boolean decrease, int points) { - super(player, faction); - this.decrease = decrease; - this.points = points; - } - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/ForgeEvent.java b/src/main/java/noppes/npcs/scripted/event/ForgeEvent.java deleted file mode 100644 index 29c03b5a8..000000000 --- a/src/main/java/noppes/npcs/scripted/event/ForgeEvent.java +++ /dev/null @@ -1,46 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.event; - -import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event; -import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.scripted.interfaces.IEntity; - -@Cancelable -public class ForgeEvent extends CustomNPCsEvent { - public final Event event; - - public ForgeEvent(Event event) { - this.event = event; - } - - @Cancelable - public static class WorldEvent extends ForgeEvent { - public final IWorld world; - - public WorldEvent(net.minecraftforge.event.world.WorldEvent event, IWorld world) { - super(event); - this.world = world; - } - } - - @Cancelable - public static class EntityEvent extends ForgeEvent { - public final IEntity entity; - - public EntityEvent(net.minecraftforge.event.entity.EntityEvent event, IEntity entity) { - super(event); - this.entity = entity; - } - } - - public static class InitEvent extends ForgeEvent { - public InitEvent() { - super((Event)null); - } - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java b/src/main/java/noppes/npcs/scripted/event/NpcEvent.java deleted file mode 100644 index 58994c14d..000000000 --- a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java +++ /dev/null @@ -1,145 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.event; - -import cpw.mods.fml.common.eventhandler.Cancelable; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.DamageSource; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.interfaces.*; - -public class NpcEvent extends CustomNPCsEvent { - public final ICustomNpc npc; - - public NpcEvent(ICustomNpc npc) { - this.npc = npc; - } - - public static class TimerEvent extends NpcEvent { - public final int id; - - public TimerEvent(ICustomNpc npc, int id) { - super(npc); - this.id = id; - } - } - - public static class CollideEvent extends NpcEvent { - public final IEntity entity; - - public CollideEvent(ICustomNpc npc, Entity entity) { - super(npc); - this.entity = NpcAPI.Instance().getIEntity(entity); - } - } - - @Cancelable - public static class DamagedEvent extends NpcEvent { - public final IDamageSource damageSource; - public final IEntity source; - public float damage; - public boolean clearTarget = false; - - public DamagedEvent(ICustomNpc npc, Entity source, float damage, DamageSource damagesource) { - super(npc); - this.source = NpcAPI.Instance().getIEntity(source); - this.damage = damage; - this.damageSource = NpcAPI.Instance().getIDamageSource(damagesource); - } - } - - public static class RangedLaunchedEvent extends NpcEvent { - public final IEntityLivingBase target; - public float damage; - //public List projectiles = new ArrayList(); - - public RangedLaunchedEvent(ICustomNpc npc, EntityLivingBase target, float damage) { - super(npc); - this.target = (IEntityLivingBase)NpcAPI.Instance().getIEntity(target); - this.damage = damage; - } - } - - @Cancelable - public static class MeleeAttackEvent extends NpcEvent { - public final IEntityLivingBase target; - public float damage; - - public MeleeAttackEvent(ICustomNpc npc, EntityLivingBase target, float damage) { - super(npc); - this.target = (IEntityLivingBase)NpcAPI.Instance().getIEntity(target); - this.damage = damage; - } - } - - public static class KilledEntityEvent extends NpcEvent { - public final IEntityLivingBase entity; - - public KilledEntityEvent(ICustomNpc npc, EntityLivingBase entity) { - super(npc); - this.entity = (IEntityLivingBase)NpcAPI.Instance().getIEntity(entity); - } - } - - public static class DiedEvent extends NpcEvent { - public final IDamageSource damageSource; - public final String type; - public final IEntity source; - public IItemStack[] droppedItems; - public int expDropped; - - public DiedEvent(ICustomNpc npc, DamageSource damagesource, Entity entity) { - super(npc); - this.damageSource = NpcAPI.Instance().getIDamageSource(damagesource); - this.type = damagesource.damageType; - this.source = NpcAPI.Instance().getIEntity(entity); - } - } - - @Cancelable - public static class InteractEvent extends NpcEvent { - public final IPlayer player; - - public InteractEvent(ICustomNpc npc, EntityPlayer player) { - super(npc); - this.player = (IPlayer)NpcAPI.Instance().getIEntity(player); - } - } - - @Cancelable - public static class TargetLostEvent extends NpcEvent { - public final IEntityLivingBase entity; - - public TargetLostEvent(ICustomNpc npc, EntityLivingBase entity) { - super(npc); - this.entity = (IEntityLivingBase)NpcAPI.Instance().getIEntity(entity); - } - } - - @Cancelable - public static class TargetEvent extends NpcEvent { - public IEntityLivingBase entity; - - public TargetEvent(ICustomNpc npc, EntityLivingBase entity) { - super(npc); - this.entity = (IEntityLivingBase) NpcAPI.Instance().getIEntity(entity); - } - } - - public static class UpdateEvent extends NpcEvent { - public UpdateEvent(ICustomNpc npc) { - super(npc); - } - } - - public static class InitEvent extends NpcEvent { - public InitEvent(ICustomNpc npc) { - super(npc); - } - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java b/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java deleted file mode 100644 index 306bd81f1..000000000 --- a/src/main/java/noppes/npcs/scripted/event/PlayerEvent.java +++ /dev/null @@ -1,446 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.event; - -import cpw.mods.fml.common.eventhandler.Cancelable; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityXPOrb; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import noppes.npcs.scripted.*; -import noppes.npcs.scripted.entity.ScriptLivingBase; -import noppes.npcs.scripted.interfaces.*; - -public class PlayerEvent extends CustomNPCsEvent { - public final IPlayer player; - - public PlayerEvent(IPlayer player) { - this.player = player; - } - - @Cancelable - public static class ChatEvent extends PlayerEvent { - public String message; - - public ChatEvent(IPlayer player, String message) { - super(player); - this.message = message; - } - } - - public static class KeyPressedEvent extends PlayerEvent { - public final int key; - public final boolean isCtrlPressed; - public final boolean isAltPressed; - public final boolean isShiftPressed; - public final boolean isMetaPressed; - public final boolean keyDown; - public final int[] keysDown; - - public KeyPressedEvent(IPlayer player, int key, boolean isCtrlPressed, boolean isAltPressed, boolean isShiftPressed, boolean isMetaPressed, boolean keyDown, int[] heldKeys) { - super(player); - this.key = key; - this.isCtrlPressed = isCtrlPressed; - this.isAltPressed = isAltPressed; - this.isShiftPressed = isShiftPressed; - this.isMetaPressed = isMetaPressed; - this.keyDown = keyDown; - this.keysDown = heldKeys; - } - } - - public static class MouseClickedEvent extends PlayerEvent { - public final int button; - public final int mouseWheel; - public final boolean buttonDown; - - public MouseClickedEvent(IPlayer player, int button, int mouseWheel, boolean buttonDown){ - super(player); - this.button = button; - this.mouseWheel = mouseWheel; - this.buttonDown = buttonDown; - } - } - - public static class PickupXPEvent extends PlayerEvent { - public final int amount; - - public PickupXPEvent(IPlayer player, EntityXPOrb orb) { - super(player); - this.amount = orb.xpValue; - } - } - - public static class LevelUpEvent extends PlayerEvent { - public final int change; - - public LevelUpEvent(IPlayer player, int change) { - super(player); - this.change = change; - } - } - - public static class LogoutEvent extends PlayerEvent { - public LogoutEvent(IPlayer player) { - super(player); - } - } - - public static class LoginEvent extends PlayerEvent { - public LoginEvent(IPlayer player) { - super(player); - } - } - - public static class RespawnEvent extends PlayerEvent { - public RespawnEvent(IPlayer player) { - super(player); - } - } - - public static class ChangedDimension extends PlayerEvent { - public final int fromDim; - public final int toDim; - - public ChangedDimension(IPlayer player, int fromDim, int toDim){ - super(player); - this.fromDim = fromDim; - this.toDim = toDim; - } - } - - public static class TimerEvent extends PlayerEvent { - public final int id; - - public TimerEvent(IPlayer player, int id) { - super(player); - this.id = id; - } - } - - @Cancelable - public static class DamagedEvent extends PlayerEvent { - public final IDamageSource damageSource; - public final IEntity source; - public float damage; - public boolean clearTarget = false; - - public DamagedEvent(IPlayer player, Entity source, float damage, DamageSource damagesource) { - super(player); - this.source = NpcAPI.Instance().getIEntity(source); - this.damage = damage; - this.damageSource = NpcAPI.Instance().getIDamageSource(damagesource); - } - } - - @Cancelable - public static class LightningEvent extends PlayerEvent { - public LightningEvent(IPlayer player) { - super(player); - } - } - - @Cancelable - public static class SoundEvent extends PlayerEvent { - public final String name; - public final float pitch; - public final float volume; - - public SoundEvent(IPlayer player, String name, float pitch, float volume) { - super(player); - this.name = name; - this.pitch = pitch; - this.volume = volume; - } - } - - public static class FallEvent extends PlayerEvent { - public final float distance; - - public FallEvent(IPlayer player, float distance){ - super(player); - this.distance = distance; - } - } - - public static class JumpEvent extends PlayerEvent { - public JumpEvent(IPlayer player){ - super(player); - } - } - - public static class KilledEntityEvent extends PlayerEvent { - public final IEntityLivingBase entity; - - public KilledEntityEvent(IPlayer player, EntityLivingBase entity) { - super(player); - this.entity = new ScriptLivingBase<>(entity);//NpcAPI.Instance().getIEntity(entity); - } - } - - @Cancelable - public static class DiedEvent extends PlayerEvent { - public final IDamageSource damageSource; - public final String type; - public final IEntity source; - - public DiedEvent(IPlayer player, DamageSource damagesource, Entity entity) { - super(player); - this.damageSource = NpcAPI.Instance().getIDamageSource(damagesource); - this.type = damagesource.getDamageType(); - this.source = NpcAPI.Instance().getIEntity(entity); - } - } - - @Cancelable - public static class RangedLaunchedEvent extends PlayerEvent { - public final IItemStack bow; - public int charge; - - public RangedLaunchedEvent(IPlayer player, ItemStack bow, int charge) { - super(player); - this.bow = NpcAPI.Instance().getIItemStack(bow); - this.charge = charge; - } - } - - @Cancelable - public static class DamagedEntityEvent extends PlayerEvent { - public final IDamageSource damageSource; - public final IEntity target; - public float damage; - - public DamagedEntityEvent(IPlayer player, Entity target, float damage, DamageSource damagesource) { - super(player); - this.target = NpcAPI.Instance().getIEntity(target); - this.damage = damage; - this.damageSource = NpcAPI.Instance().getIDamageSource(damagesource); - } - } - - public static class ContainerClosed extends PlayerEvent { - public final IContainer container; - - public ContainerClosed(IPlayer player, IContainer container) { - super(player); - this.container = container; - } - } - - public static class ContainerOpen extends PlayerEvent { - public final IContainer container; - - public ContainerOpen(IPlayer player, IContainer container) { - super(player); - this.container = container; - } - } - - @Cancelable - public static class PickUpEvent extends PlayerEvent { - public final IItemStack item; - - public PickUpEvent(IPlayer player, IItemStack item) { - super(player); - this.item = item; - } - } - - @Cancelable - public static class DropEvent extends PlayerEvent { - public final IItemStack[] items; - - public DropEvent(IPlayer player, IItemStack[] items) { - super(player); - this.items = items; - } - } - - @Cancelable - public static class TossEvent extends PlayerEvent { - public final IItemStack item; - - public TossEvent(IPlayer player, IItemStack item) { - super(player); - this.item = item; - } - } - - @Cancelable - public static class AttackEvent extends PlayerEvent { - public final int type; - public final Object target; - - public AttackEvent(IPlayer player, int type, Object target) { - super(player); - this.type = type; - this.target = target; - } - } - - @Cancelable - public static class InteractEvent extends PlayerEvent { - public final int type; - public final Object target; - - public InteractEvent(IPlayer player, int type, Object target) { - super(player); - this.type = type; - this.target = target; - } - } - - public static class UpdateEvent extends PlayerEvent { - public UpdateEvent(IPlayer player) { - super(player); - } - } - - public static class InitEvent extends PlayerEvent { - public InitEvent(IPlayer player) { - super(player); - } - } - - public static class StartUsingItem extends PlayerEvent { - public final IItemStack item; - public final int duration; - - public StartUsingItem(IPlayer player, ItemStack item, int duration){ - super(player); - - this.item = NpcAPI.Instance().getIItemStack(item); - this.duration = duration; - } - } - public static class UsingItem extends PlayerEvent { - public final IItemStack item; - public final int duration; - - public UsingItem(IPlayer player, ItemStack item, int duration){ - super(player); - - this.item = NpcAPI.Instance().getIItemStack(item); - this.duration = duration; - } - } - public static class StopUsingItem extends PlayerEvent { - public final IItemStack item; - public final int duration; - - public StopUsingItem(IPlayer player, ItemStack item, int duration){ - super(player); - - this.item = NpcAPI.Instance().getIItemStack(item); - this.duration = duration; - } - } - public static class FinishUsingItem extends PlayerEvent { - public final IItemStack item; - public final int duration; - - public FinishUsingItem(IPlayer player, ItemStack item, int duration){ - super(player); - - this.item = NpcAPI.Instance().getIItemStack(item); - this.duration = duration; - } - } - - @Cancelable - public static class BreakEvent extends PlayerEvent { - public final IBlock block; - public int exp; - - public BreakEvent(IPlayer player, IBlock block, int exp) { - super(player); - this.block = block; - this.exp = exp; - } - } - - public static class UseHoe extends PlayerEvent { - public final IItemStack hoe; - public final int x; - public final int y; - public final int z; - - public UseHoe(IPlayer player, ItemStack item, int x, int y, int z) { - super(player); - this.hoe = new ScriptItemStack(item); - this.x = x; - this.y = y; - this.z = z; - } - } - - public static class WakeUp extends PlayerEvent{ - public final boolean setSpawn; - - public WakeUp(IPlayer player, boolean setSpawn) { - super(player); - this.setSpawn = setSpawn; - } - } - - public static class Sleep extends PlayerEvent { - public final int x; - public final int y; - public final int z; - - public Sleep(IPlayer player, int x, int y, int z) { - super(player); - this.x = x; - this.y = y; - this.z = z; - } - } - - public static class Achievement extends PlayerEvent { - public final String description; - - public Achievement(IPlayer player, String description) { - super(player); - this.description = description; - } - } - - public static class FillBucket extends PlayerEvent { - public final IItemStack current; - public final IItemStack result; - - public FillBucket(IPlayer player, ItemStack current, ItemStack result) { - super(player); - this.current = new ScriptItemStack(current); - this.result = new ScriptItemStack(result); - } - } - - public static class Bonemeal extends PlayerEvent { - public final IBlock block; - public final int x; - public final int y; - public final int z; - - public Bonemeal(IPlayer player, int x, int y, int z, World world) { - super(player); - this.block = API.getIBlock(world, x, y, z); - this.x = x; - this.y = y; - this.z = z; - } - } - - public static class RangedChargeEvent extends PlayerEvent { - public RangedChargeEvent(IPlayer player) { - super(player); - } - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/QuestEvent.java b/src/main/java/noppes/npcs/scripted/event/QuestEvent.java deleted file mode 100644 index 24ae2eaaf..000000000 --- a/src/main/java/noppes/npcs/scripted/event/QuestEvent.java +++ /dev/null @@ -1,40 +0,0 @@ -package noppes.npcs.scripted.event; - -import cpw.mods.fml.common.eventhandler.Cancelable; -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.interfaces.IItemStack; -import noppes.npcs.scripted.interfaces.IPlayer; - -public class QuestEvent extends CustomNPCsEvent { - public final IQuest quest; - public final IPlayer player; - - public QuestEvent(IPlayer player, IQuest quest) { - this.quest = quest; - this.player = player; - } - - public static class QuestCompletedEvent extends QuestEvent { - public QuestCompletedEvent(IPlayer player, IQuest quest) { - super(player, quest); - } - } - - @Cancelable - public static class QuestStartEvent extends QuestEvent { - public QuestStartEvent(IPlayer player, IQuest quest) { - super(player, quest); - } - } - - public static class QuestTurnedInEvent extends QuestEvent { - public int expReward; - public IItemStack[] itemRewards = new IItemStack[0]; - - public QuestTurnedInEvent(IPlayer player, IQuest quest) { - super(player, quest); - this.expReward = 0; - } - } - -} diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java b/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java deleted file mode 100644 index af4e300ad..000000000 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEventDialog.java +++ /dev/null @@ -1,11 +0,0 @@ -package noppes.npcs.scripted.event; - -public class ScriptEventDialog extends ScriptEvent{ - - /** - * @deprecated - */ - public boolean isClosing(){ - return true; - } -} diff --git a/src/main/java/noppes/npcs/scripted/event/ScriptEventTimer.java b/src/main/java/noppes/npcs/scripted/event/ScriptEventTimer.java deleted file mode 100644 index 0fdc3584b..000000000 --- a/src/main/java/noppes/npcs/scripted/event/ScriptEventTimer.java +++ /dev/null @@ -1,13 +0,0 @@ -package noppes.npcs.scripted.event; - -public class ScriptEventTimer extends ScriptEvent { - private int id; - - public ScriptEventTimer(int id){ - this.id = id; - } - - public int getId(){ - return id; - } -} diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java deleted file mode 100644 index c840cff66..000000000 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java +++ /dev/null @@ -1,301 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.gui; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.PlayerDataScript; -import noppes.npcs.scripted.interfaces.*; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.controllers.CustomGuiController; -import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.scripted.interfaces.ICustomGui; - -public class ScriptGui implements ICustomGui { - int id; - int width; - int height; - int playerInvX; - int playerInvY; - boolean pauseGame; - boolean showPlayerInv; - String backgroundTexture = ""; - //ScriptContainer scriptHandler; - List components = new ArrayList(); - List slots = new ArrayList(); - - public ScriptGui() { - } - - public ScriptGui(int id, int width, int height, boolean pauseGame) { - this.id = id; - this.width = width; - this.height = height; - this.pauseGame = pauseGame; - //this.scriptHandler = ScriptContainer.Current; - } - - public int getID() { - return this.id; - } - - public int getWidth() { - return this.width; - } - - public int getHeight() { - return this.height; - } - - public List getComponents() { - return this.components; - } - - public List getSlots() { - return this.slots; - } - - public PlayerDataScript getScriptHandler() { - return ScriptController.Instance.playerScripts;//this.scriptHandler; - } - - public void setSize(int width, int height) { - this.width = width; - this.height = height; - } - - public void setDoesPauseGame(boolean pauseGame) { - this.pauseGame = pauseGame; - } - - public boolean getDoesPauseGame() { - return this.pauseGame; - } - - public void setBackgroundTexture(String resourceLocation) { - this.backgroundTexture = resourceLocation; - } - - public String getBackgroundTexture() { - return this.backgroundTexture; - } - - public IButton addButton(int id, String label, int x, int y) { - ScriptGuiButton component = new ScriptGuiButton(id, label, x, y); - this.components.add(component); - return (IButton)this.components.get(this.components.size() - 1); - } - - public IButton addButton(int id, String label, int x, int y, int width, int height) { - ScriptGuiButton component = new ScriptGuiButton(id, label, x, y, width, height); - this.components.add(component); - return (IButton)this.components.get(this.components.size() - 1); - } - - public IButton addTexturedButton(int id, String label, int x, int y, int width, int height, String texture) { - ScriptGuiButton component = new ScriptGuiButton(id, label, x, y, width, height, texture); - this.components.add(component); - return (IButton)this.components.get(this.components.size() - 1); - } - - public IButton addTexturedButton(int id, String label, int x, int y, int width, int height, String texture, int textureX, int textureY) { - ScriptGuiButton component = new ScriptGuiButton(id, label, x, y, width, height, texture, textureX, textureY); - this.components.add(component); - return (IButton)this.components.get(this.components.size() - 1); - } - - public ILabel addLabel(int id, String label, int x, int y, int width, int height) { - ScriptGuiLabel component = new ScriptGuiLabel(id, label, x, y, width, height); - this.components.add(component); - return (ILabel)this.components.get(this.components.size() - 1); - } - - public ILabel addLabel(int id, String label, int x, int y, int width, int height, int color) { - ScriptGuiLabel component = new ScriptGuiLabel(id, label, x, y, width, height, color); - this.components.add(component); - return (ILabel)this.components.get(this.components.size() - 1); - } - - public ITextField addTextField(int id, int x, int y, int width, int height) { - ScriptGuiTextField component = new ScriptGuiTextField(id, x, y, width, height); - this.components.add(component); - return (ITextField)this.components.get(this.components.size() - 1); - } - - public ITexturedRect addTexturedRect(int id, String texture, int x, int y, int width, int height) { - ScriptGuiTexturedRect component = new ScriptGuiTexturedRect(id, texture, x, y, width, height); - this.components.add(component); - return (ITexturedRect)this.components.get(this.components.size() - 1); - } - - public ITexturedRect addTexturedRect(int id, String texture, int x, int y, int width, int height, int textureX, int textureY) { - ScriptGuiTexturedRect component = new ScriptGuiTexturedRect(id, texture, x, y, width, height, textureX, textureY); - this.components.add(component); - return (ITexturedRect)this.components.get(this.components.size() - 1); - } - - public IItemSlot addItemSlot(int x, int y) { - ScriptGuiItemSlot slot = new ScriptGuiItemSlot(x, y); - this.slots.add(slot); - return (IItemSlot)this.slots.get(this.slots.size() - 1); - } - - public IItemSlot addItemSlot(int x, int y, IItemStack stack) { - ScriptGuiItemSlot slot = new ScriptGuiItemSlot(x, y, stack); - this.slots.add(slot); - return (IItemSlot)this.slots.get(this.slots.size() - 1); - } - - public IScroll addScroll(int id, int x, int y, int width, int height, String[] list) { - ScriptGuiScroll component = new ScriptGuiScroll(id, x, y, width, height, list); - this.components.add(component); - return (IScroll)this.components.get(this.components.size() - 1); - } - - public ILine addLine(int id, int x1, int y1, int x2, int y2, int color, int thickness) { - ScriptGuiLine line = new ScriptGuiLine(id, x1, y1, x2, y2, color, thickness); - this.components.add(line); - return (ILine) this.components.get(this.components.size() - 1); - } - - public ILine addLine(int id, int x1, int y1, int x2, int y2) { - ScriptGuiLine line = new ScriptGuiLine(id, x1, y1, x2, y2); - this.components.add(line); - return (ILine) this.components.get(this.components.size() - 1); - } - - public void showPlayerInventory(int x, int y) { - this.showPlayerInv = true; - this.playerInvX = x; - this.playerInvY = y; - } - - public ICustomGuiComponent getComponent(int componentID) { - Iterator var2 = this.components.iterator(); - - ICustomGuiComponent component; - do { - if (!var2.hasNext()) { - return null; - } - - component = (ICustomGuiComponent)var2.next(); - } while(component.getID() != componentID); - - return component; - } - - public void removeComponent(int componentID) { - for(int i = 0; i < this.components.size(); ++i) { - if (((ICustomGuiComponent)this.components.get(i)).getID() == componentID) { - this.components.remove(i); - return; - } - } - - } - - public void updateComponent(ICustomGuiComponent component) { - for(int i = 0; i < this.components.size(); ++i) { - ICustomGuiComponent c = (ICustomGuiComponent)this.components.get(i); - if (c.getID() == component.getID()) { - this.components.set(i, component); - return; - } - } - - } - - public void update(IPlayer player) { - CustomGuiController.updateGui((ScriptPlayer)player, this); - } - - public boolean getShowPlayerInv() { - return this.showPlayerInv; - } - - public int getPlayerInvX() { - return this.playerInvX; - } - - public int getPlayerInvY() { - return this.playerInvY; - } - - public ICustomGui fromNBT(NBTTagCompound tag) { - this.id = tag.getInteger("id"); - this.width = tag.getIntArray("size")[0]; - this.height = tag.getIntArray("size")[1]; - this.pauseGame = tag.getBoolean("pause"); - this.backgroundTexture = tag.getString("bgTexture"); - List components = new ArrayList(); - - NBTTagList list = tag.getTagList("components", 10); - for(int i = 0; i < list.tagCount(); i++){ - NBTBase b = list.getCompoundTagAt(i); - ScriptGuiComponent component = ScriptGuiComponent.createFromNBT((NBTTagCompound)b); - components.add(component); - } - - this.components = components; - List slots = new ArrayList(); - list = tag.getTagList("slots", 10); - - for(int i = 0; i < list.tagCount(); i++){ - NBTBase b = list.getCompoundTagAt(i); - ScriptGuiItemSlot component = (ScriptGuiItemSlot)ScriptGuiComponent.createFromNBT((NBTTagCompound)b); - slots.add(component); - } - - this.slots = slots; - this.showPlayerInv = tag.getBoolean("showPlayerInv"); - if (this.showPlayerInv) { - this.playerInvX = tag.getIntArray("pInvPos")[0]; - this.playerInvY = tag.getIntArray("pInvPos")[1]; - } - - return this; - } - - public NBTTagCompound toNBT() { - NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("id", this.id); - tag.setIntArray("size", new int[]{this.width, this.height}); - tag.setBoolean("pause", this.pauseGame); - tag.setString("bgTexture", this.backgroundTexture); - NBTTagList list = new NBTTagList(); - Iterator var3 = this.components.iterator(); - - ICustomGuiComponent c; - while(var3.hasNext()) { - c = (ICustomGuiComponent)var3.next(); - list.appendTag(((ScriptGuiComponent)c).toNBT(new NBTTagCompound())); - } - - tag.setTag("components", list); - list = new NBTTagList(); - var3 = this.slots.iterator(); - - while(var3.hasNext()) { - c = (ICustomGuiComponent)var3.next(); - list.appendTag(((ScriptGuiComponent)c).toNBT(new NBTTagCompound())); - } - - tag.setTag("slots", list); - tag.setBoolean("showPlayerInv", this.showPlayerInv); - if (this.showPlayerInv) { - tag.setIntArray("pInvPos", new int[]{this.playerInvX, this.playerInvY}); - } - - return tag; - } -} diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiButton.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiButton.java deleted file mode 100644 index 1ac8418ab..000000000 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiButton.java +++ /dev/null @@ -1,149 +0,0 @@ -package noppes.npcs.scripted.gui; - -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.interfaces.IButton; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; - -public class ScriptGuiButton extends ScriptGuiComponent implements IButton { - int width; - int height; - String label; - String texture; - int textureX; - int textureY; - - public ScriptGuiButton() { - this.height = -1; - this.textureY = -1; - } - - public ScriptGuiButton(int id, String label, int x, int y) { - this.height = -1; - this.textureY = -1; - this.setID(id); - this.setLabel(label); - this.setPos(x, y); - } - - public ScriptGuiButton(int id, String label, int x, int y, int width, int height) { - this(id, label, x, y); - this.setSize(width, height); - } - - public ScriptGuiButton(int id, String label, int x, int y, int width, int height, String texture) { - this(id, label, x, y, width, height); - this.setTexture(texture); - } - - public ScriptGuiButton(int id, String label, int x, int y, int width, int height, String texture, int textureX, int textureY) { - this(id, label, x, y, width, height, texture); - this.setTextureOffset(textureX, textureY); - } - - public int getWidth() { - return this.width; - } - - public int getHeight() { - return this.height; - } - - public IButton setSize(int width, int height) { - this.width = width; - this.height = height; - return this; - } - - public String getLabel() { - return this.label; - } - - public IButton setLabel(String label) { - this.label = label; - return this; - } - - public String getTexture() { - return this.texture; - } - - public boolean hasTexture() { - return this.texture != null; - } - - public IButton setTexture(String texture) { - this.texture = texture; - return this; - } - - public int getTextureX() { - return this.textureX; - } - - public int getTextureY() { - return this.textureY; - } - - public IButton setTextureOffset(int textureX, int textureY) { - this.textureX = textureX; - this.textureY = textureY; - return this; - } - - public int getID() { - return this.id; - } - - public ICustomGuiComponent setID(int id) { - this.id = id; - return this; - } - - public int getPosX() { - return this.posX; - } - - public int getPosY() { - return this.posY; - } - - public int getType() { - return 0; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - if (this.width > 0 && this.height > 0) { - nbt.setIntArray("size", new int[]{this.width, this.height}); - } - - nbt.setString("label", this.label); - if (this.hasTexture()) { - nbt.setString("texture", this.texture); - } - - if (this.textureX >= 0 && this.textureY >= 0) { - nbt.setIntArray("texPos", new int[]{this.textureX, this.textureY}); - } - - return nbt; - } - - public ScriptGuiComponent fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - if (nbt.hasKey("size")) { - this.setSize(nbt.getIntArray("size")[0], nbt.getIntArray("size")[1]); - } - - this.setLabel(nbt.getString("label")); - if (nbt.hasKey("texture")) { - this.setTexture(nbt.getString("texture")); - } - - if (nbt.hasKey("texPos")) { - this.setTextureOffset(nbt.getIntArray("texPos")[0], nbt.getIntArray("texPos")[1]); - } - - return this; - } -} diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiComponent.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiComponent.java deleted file mode 100644 index 7d7f8d405..000000000 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiComponent.java +++ /dev/null @@ -1,157 +0,0 @@ -package noppes.npcs.scripted.gui; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; - -public abstract class ScriptGuiComponent implements ICustomGuiComponent { - int id; - int posX; - int posY; - String[] hoverText; - - int color = 0xFFFFFF; - float alpha = 1.0F; - float rotation = 0; - - public ScriptGuiComponent() { - } - - public int getID() { - return this.id; - } - - public ICustomGuiComponent setID(int id) { - this.id = id; - return this; - } - - public int getPosX() { - return this.posX; - } - - public int getPosY() { - return this.posY; - } - - public ICustomGuiComponent setPos(int x, int y) { - this.posX = x; - this.posY = y; - return this; - } - - public boolean hasHoverText() { - return this.hoverText != null && this.hoverText.length > 0; - } - - public String[] getHoverText() { - return this.hoverText; - } - - public ICustomGuiComponent setHoverText(String text) { - this.hoverText = new String[]{text}; - return this; - } - - public ICustomGuiComponent setHoverText(String[] text) { - this.hoverText = text; - return this; - } - - public int getColor() { - return this.color; - } - - public ICustomGuiComponent setColor(int color) { - this.color = color; - return this; - } - - public float getAlpha() { - return this.alpha; - } - - public void setAlpha(float alpha) { - this.alpha = alpha; - } - - public float getRotation() { - return rotation; - } - - public void setRotation(float rotation) { - this.rotation = rotation; - } - - public abstract int getType(); - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - nbt.setInteger("id", this.id); - nbt.setIntArray("pos", new int[]{this.posX, this.posY}); - nbt.setInteger("color", this.color); - nbt.setFloat("alpha",this.alpha); - nbt.setFloat("rotation",this.rotation); - if (this.hoverText != null) { - NBTTagList list = new NBTTagList(); - String[] var3 = this.hoverText; - int var4 = var3.length; - - for(int var5 = 0; var5 < var4; ++var5) { - String s = var3[var5]; - if (s != null && !s.isEmpty()) { - list.appendTag(new NBTTagString(s)); - } - } - - if (list.tagCount() > 0) { - nbt.setTag("hover", list); - } - } - - nbt.setInteger("type", this.getType()); - return nbt; - } - - public ScriptGuiComponent fromNBT(NBTTagCompound nbt) { - this.setID(nbt.getInteger("id")); - this.setPos(nbt.getIntArray("pos")[0], nbt.getIntArray("pos")[1]); - this.setColor(nbt.getInteger("color")); - this.setAlpha(nbt.getFloat("alpha")); - this.setRotation(nbt.getFloat("rotation")); - if (nbt.hasKey("hover")) { - NBTTagList list = nbt.getTagList("hover", 8); - String[] hoverText = new String[list.tagCount()]; - - for(int i = 0; i < list.tagCount(); ++i) { - hoverText[i] = list.getStringTagAt(i); - } - - this.setHoverText(hoverText); - } - - return this; - } - - public static ScriptGuiComponent createFromNBT(NBTTagCompound nbt) { - switch(nbt.getInteger("type")) { - case 0: - return (new ScriptGuiButton()).fromNBT(nbt); - case 1: - return (new ScriptGuiLabel()).fromNBT(nbt); - case 2: - return (new ScriptGuiTexturedRect()).fromNBT(nbt); - case 3: - return (new ScriptGuiTextField()).fromNBT(nbt); - case 4: - return (new ScriptGuiScroll()).fromNBT(nbt); - case 5: - return (new ScriptGuiItemSlot()).fromNBT(nbt); - case 6: - return (new ScriptGuiLine()).fromNBT(nbt); - default: - return null; - } - } -} diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java deleted file mode 100644 index 68c81abdf..000000000 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java +++ /dev/null @@ -1,63 +0,0 @@ -package noppes.npcs.scripted.gui; - -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.interfaces.IItemSlot; -import noppes.npcs.scripted.interfaces.IItemStack; - -public class ScriptGuiItemSlot extends ScriptGuiComponent implements IItemSlot { - IItemStack stack; - - public ScriptGuiItemSlot() { - } - - public ScriptGuiItemSlot(int x, int y) { - this.setPos(x, y); - } - - public ScriptGuiItemSlot(int x, int y, IItemStack stack) { - this(x, y); - this.setStack(stack); - } - - public boolean hasStack() { - return this.stack != null && this.stack.getStackSize() > 0; - } - - public IItemStack getStack() { - return this.stack; - } - - public IItemSlot setStack(IItemStack itemStack) { - this.stack = itemStack; - return this; - } - - public Slot getMCSlot() { - return null; - } - - public int getType() { - return 5; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - if (this.hasStack()) { - nbt.setTag("stack", this.stack.getItemNbt().getMCNBT()); - } - - return nbt; - } - - public ScriptGuiComponent fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - if (nbt.hasKey("stack")) { - this.setStack(NpcAPI.Instance().getIItemStack(ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("stack")))); - } - - return this; - } -} diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLabel.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLabel.java deleted file mode 100644 index bba1444d2..000000000 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLabel.java +++ /dev/null @@ -1,92 +0,0 @@ -package noppes.npcs.scripted.gui; - -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.interfaces.ILabel; - -public class ScriptGuiLabel extends ScriptGuiComponent implements ILabel { - String label; - int width; - int height; - float scale; - boolean shadow; - - public ScriptGuiLabel() { - this.scale = 1.0F; - } - - public ScriptGuiLabel(int id, String label, int x, int y, int width, int height) { - this.scale = 1.0F; - this.setID(id); - this.setText(label); - this.setPos(x, y); - this.setSize(width, height); - this.enableShadow(false); - } - - public ScriptGuiLabel(int id, String label, int x, int y, int width, int height, int color) { - this(id, label, x, y, width, height); - this.setColor(color); - } - - public String getText() { - return this.label; - } - - public ILabel setText(String label) { - this.label = label; - return this; - } - - public int getWidth() { - return this.width; - } - - public int getHeight() { - return this.height; - } - - public ILabel setSize(int width, int height) { - this.width = width; - this.height = height; - return this; - } - - public float getScale() { - return this.scale; - } - - public ILabel setScale(float scale) { - this.scale = scale; - return this; - } - - public boolean hasShadow(){ - return this.shadow; - } - - public void enableShadow(boolean shadow){ - this.shadow = shadow; - } - - public int getType() { - return 1; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - nbt.setString("label", this.label); - nbt.setIntArray("size", new int[]{this.width, this.height}); - nbt.setFloat("scale", this.scale); - nbt.setBoolean("shadow",this.shadow); - return nbt; - } - - public ScriptGuiComponent fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - this.setText(nbt.getString("label")); - this.setSize(nbt.getIntArray("size")[0], nbt.getIntArray("size")[1]); - this.setScale(nbt.getFloat("scale")); - this.enableShadow(nbt.getBoolean("shadow")); - return this; - } -} diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLine.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLine.java deleted file mode 100644 index c59a425c0..000000000 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiLine.java +++ /dev/null @@ -1,98 +0,0 @@ -package noppes.npcs.scripted.gui; - -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.interfaces.ILine; - -public class ScriptGuiLine extends ScriptGuiComponent implements ILine { - int x1; - int y1; - int x2; - int y2; - int thickness = 2; - - public ScriptGuiLine(){ - } - - public ScriptGuiLine(int id, int x1, int y1, int x2, int y2){ - this.setPos(x1, y1); - this.setID(id); - this.hoverText = new String[]{""}; - - this.x1 = x1; - this.y1 = y1; - this.x2 = x2; - this.y2 = y2; - } - - public ScriptGuiLine(int id, int x1, int y1, int x2, int y2, int color, int thickness){ - this.setPos(x1, y1); - this.setID(id); - this.hoverText = new String[]{""}; - - this.x1 = x1; - this.y1 = y1; - this.x2 = x2; - this.y2 = y2; - this.color = color; - this.thickness = thickness; - } - - @Override - public int getType() { - return 6; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - nbt.setInteger("X1",x1); - nbt.setInteger("Y1",y1); - nbt.setInteger("X2",x2); - nbt.setInteger("Y2",y2); - nbt.setInteger("Thickness",thickness); - - return nbt; - } - - public ScriptGuiComponent fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - x1 = nbt.getInteger("X1"); - y1 = nbt.getInteger("Y1"); - x2 = nbt.getInteger("X2"); - y2 = nbt.getInteger("Y2"); - thickness = nbt.getInteger("Thickness"); - - return this; - } - - public int getX1(){ - return this.x1; - } - public int getY1(){ - return this.y1; - } - public int getX2(){ - return this.x2; - } - public int getY2(){ - return this.y2; - } - public int getThickness(){ - return this.thickness; - } - - public void setX1(int x1){ - this.x1 = x1; - } - public void setY1(int y1){ - this.y1 = y1; - } - public void setX2(int x2){ - this.x2 = x2; - } - public void setY2(int y2){ - this.y2 = y2; - } - public void setThickness(int thickness){ - this.thickness = thickness; - } -} diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiScroll.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiScroll.java deleted file mode 100644 index d06b0bcae..000000000 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiScroll.java +++ /dev/null @@ -1,109 +0,0 @@ -package noppes.npcs.scripted.gui; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; -import noppes.npcs.scripted.interfaces.IScroll; - -public class ScriptGuiScroll extends ScriptGuiComponent implements IScroll { - int width; - int height; - int defaultSelection = -1; - String[] list; - boolean multiSelect = false; - - public ScriptGuiScroll() { - } - - public ScriptGuiScroll(int id, int x, int y, int width, int height, String[] list) { - this.setID(id); - this.setPos(x, y); - this.setSize(width, height); - this.setList(list); - } - - public int getWidth() { - return this.width; - } - - public int getHeight() { - return this.height; - } - - public IScroll setSize(int width, int height) { - this.width = width; - this.height = height; - return this; - } - - public String[] getList() { - return this.list; - } - - public IScroll setList(String[] list) { - this.list = list; - return this; - } - - public int getDefaultSelection() { - return this.defaultSelection; - } - - public IScroll setDefaultSelection(int defaultSelection) { - this.defaultSelection = defaultSelection; - return this; - } - - public boolean isMultiSelect() { - return this.multiSelect; - } - - public IScroll setMultiSelect(boolean multiSelect) { - this.multiSelect = multiSelect; - return this; - } - - public int getType() { - return 4; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - nbt.setIntArray("size", new int[]{this.width, this.height}); - if (this.defaultSelection >= 0) { - nbt.setInteger("default", this.defaultSelection); - } - - NBTTagList list = new NBTTagList(); - String[] var3 = this.list; - int var4 = var3.length; - - for(int var5 = 0; var5 < var4; ++var5) { - String s = var3[var5]; - list.appendTag(new NBTTagString(s)); - } - - nbt.setTag("list", list); - nbt.setBoolean("multiSelect", this.multiSelect); - return nbt; - } - - public ScriptGuiComponent fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - this.setSize(nbt.getIntArray("size")[0], nbt.getIntArray("size")[1]); - if (nbt.hasKey("default")) { - this.setDefaultSelection(nbt.getInteger("default")); - } - - NBTTagList tagList = nbt.getTagList("list", 8); - String[] list = new String[tagList.tagCount()]; - - for(int i = 0; i < tagList.tagCount(); ++i) { - list[i] = tagList.getStringTagAt(i); - } - - this.setList(list); - this.setMultiSelect(nbt.getBoolean("multiSelect")); - return this; - } -} diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTextField.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTextField.java deleted file mode 100644 index a492047cc..000000000 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTextField.java +++ /dev/null @@ -1,66 +0,0 @@ -package noppes.npcs.scripted.gui; - -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.interfaces.ITextField; - -public class ScriptGuiTextField extends ScriptGuiComponent implements ITextField { - int width; - int height; - String defaultText; - - public ScriptGuiTextField() { - } - - public ScriptGuiTextField(int id, int x, int y, int width, int height) { - this.setID(id); - this.setPos(x, y); - this.setSize(width, height); - } - - public int getWidth() { - return this.width; - } - - public int getHeight() { - return this.height; - } - - public ITextField setSize(int width, int height) { - this.width = width; - this.height = height; - return this; - } - - public String getText() { - return this.defaultText; - } - - public ITextField setText(String defaultText) { - this.defaultText = defaultText; - return this; - } - - public int getType() { - return 3; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - nbt.setIntArray("size", new int[]{this.width, this.height}); - if (this.defaultText != null && !this.defaultText.isEmpty()) { - nbt.setString("default", this.defaultText); - } - - return nbt; - } - - public ScriptGuiComponent fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - this.setSize(nbt.getIntArray("size")[0], nbt.getIntArray("size")[1]); - if (nbt.hasKey("default")) { - this.setText(nbt.getString("default")); - } - - return this; - } -} diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTexturedRect.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTexturedRect.java deleted file mode 100644 index a2b66012a..000000000 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiTexturedRect.java +++ /dev/null @@ -1,107 +0,0 @@ -package noppes.npcs.scripted.gui; - -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.scripted.interfaces.ITexturedRect; - -public class ScriptGuiTexturedRect extends ScriptGuiComponent implements ITexturedRect { - int width; - int height; - int textureX; - int textureY; - float scale; - String texture; - - public ScriptGuiTexturedRect() { - this.textureY = -1; - this.scale = 1.0F; - } - - public ScriptGuiTexturedRect(int id, String texture, int x, int y, int width, int height) { - this.textureY = -1; - this.scale = 1.0F; - this.setID(id); - this.setTexture(texture); - this.setPos(x, y); - this.setSize(width, height); - } - - public ScriptGuiTexturedRect(int id, String texture, int x, int y, int width, int height, int textureX, int textureY) { - this(id, texture, x, y, width, height); - this.setTextureOffset(textureX, textureY); - } - - public String getTexture() { - return this.texture; - } - - public ITexturedRect setTexture(String texture) { - this.texture = texture; - return this; - } - - public int getWidth() { - return this.width; - } - - public int getHeight() { - return this.height; - } - - public ITexturedRect setSize(int width, int height) { - this.width = width; - this.height = height; - return this; - } - - public float getScale() { - return this.scale; - } - - public ITexturedRect setScale(float scale) { - this.scale = scale; - return this; - } - - public int getTextureX() { - return this.textureX; - } - - public int getTextureY() { - return this.textureY; - } - - public ITexturedRect setTextureOffset(int offsetX, int offsetY) { - this.textureX = offsetX; - this.textureY = offsetY; - return this; - } - - public int getType() { - return 2; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - nbt.setIntArray("size", new int[]{this.width, this.height}); - nbt.setFloat("scale", this.scale); - nbt.setString("texture", this.texture); - if (this.textureX >= 0 && this.textureY >= 0) { - nbt.setIntArray("texPos", new int[]{this.textureX, this.textureY}); - } - - return nbt; - } - - public ScriptGuiComponent fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - this.setSize(nbt.getIntArray("size")[0], nbt.getIntArray("size")[1]); - this.setScale(nbt.getFloat("scale")); - this.setTexture(nbt.getString("texture")); - if (nbt.hasKey("texPos")) { - this.setTextureOffset(nbt.getIntArray("texPos")[0], nbt.getIntArray("texPos")[1]); - } - - return this; - } -} diff --git a/src/main/java/noppes/npcs/scripted/handler/ICloneHandler.java b/src/main/java/noppes/npcs/scripted/handler/ICloneHandler.java deleted file mode 100644 index 177d1af2a..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/ICloneHandler.java +++ /dev/null @@ -1,19 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler; - -import noppes.npcs.scripted.interfaces.IWorld; -import noppes.npcs.scripted.interfaces.IEntity; - -public interface ICloneHandler { - IEntity spawn(double var1, double var3, double var5, int var7, String var8, IWorld var9); - - IEntity get(int var1, String var2, IWorld var3); - - void set(int var1, String var2, IEntity var3); - - void remove(int var1, String var2); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/IDialogHandler.java b/src/main/java/noppes/npcs/scripted/handler/IDialogHandler.java deleted file mode 100644 index e7df6bd60..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/IDialogHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler; - -import noppes.npcs.scripted.handler.data.IDialog; -import noppes.npcs.scripted.handler.data.IDialogCategory; - -import java.util.List; - -public interface IDialogHandler { - List categories(); - - IDialog get(int var1); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/IFactionHandler.java b/src/main/java/noppes/npcs/scripted/handler/IFactionHandler.java deleted file mode 100644 index fededa2c0..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/IFactionHandler.java +++ /dev/null @@ -1,20 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler; - -import noppes.npcs.scripted.handler.data.IFaction; - -import java.util.List; - -public interface IFactionHandler { - List list(); - - IFaction delete(int var1); - - IFaction create(String var1, int var2); - - IFaction get(int var1); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/IQuestHandler.java b/src/main/java/noppes/npcs/scripted/handler/IQuestHandler.java deleted file mode 100644 index f10c53174..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/IQuestHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler; - -import noppes.npcs.scripted.handler.data.IQuest; -import noppes.npcs.scripted.handler.data.IQuestCategory; - -import java.util.List; - -public interface IQuestHandler { - List categories(); - - IQuest get(int var1); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/IRecipeHandler.java b/src/main/java/noppes/npcs/scripted/handler/IRecipeHandler.java deleted file mode 100644 index 6c13bed57..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/IRecipeHandler.java +++ /dev/null @@ -1,22 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler; - -import java.util.List; -import net.minecraft.item.ItemStack; -import noppes.npcs.scripted.handler.data.IRecipe; - -public interface IRecipeHandler { - List getGlobalList(); - - List getCarpentryList(); - - void addRecipe(String var1, boolean var2, ItemStack var3, Object... var4); - - void addRecipe(String var1, boolean var2, ItemStack var3, int var4, int var5, ItemStack... var6); - - IRecipe delete(int var1); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IAvailability.java b/src/main/java/noppes/npcs/scripted/handler/data/IAvailability.java deleted file mode 100644 index 3bcb99b07..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IAvailability.java +++ /dev/null @@ -1,36 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler.data; - -import noppes.npcs.scripted.interfaces.IPlayer; - -public interface IAvailability { - boolean isAvailable(IPlayer var1); - - int getDaytime(); - - void setDaytime(int var1); - - int getMinPlayerLevel(); - - void setMinPlayerLevel(int var1); - - int getDialog(int var1); - - void setDialog(int var1, int var2, int var3); - - void removeDialog(int var1); - - int getQuest(int var1); - - void setQuest(int var1, int var2, int var3); - - void removeQuest(int var1); - - void setFaction(int var1, int var2, int var3, int var4); - - void removeFaction(int var1); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IDialog.java b/src/main/java/noppes/npcs/scripted/handler/data/IDialog.java deleted file mode 100644 index e45e978aa..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IDialog.java +++ /dev/null @@ -1,53 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler.data; - -import java.util.List; - -public interface IDialog { - int getId(); - - String getName(); - - void setName(String var1); - - String getText(); - - void setText(String var1); - - IQuest getQuest(); - - void setQuest(IQuest var1); - - String getCommand(); - - void setCommand(String var1); - - List getOptions(); - - IDialogOption getOption(int var1); - - IAvailability getAvailability(); - - IDialogCategory getCategory(); - - void setDarkenScreen(boolean darkenScreen); - boolean getDarkenScreen(); - - void setDisableEsc(boolean disableEsc); - boolean getDisableEsc(); - - void setShowWheel(boolean showWheel); - boolean getShowWheel(); - - void setHideNPC(boolean hideNPC); - boolean getHideNPC(); - - void setSound(String sound); - String getSound(); - - void save(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IDialogCategory.java b/src/main/java/noppes/npcs/scripted/handler/data/IDialogCategory.java deleted file mode 100644 index e70ab4848..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IDialogCategory.java +++ /dev/null @@ -1,16 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler.data; - -import java.util.List; - -public interface IDialogCategory { - List dialogs(); - - String getName(); - - IDialog create(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IDialogOption.java b/src/main/java/noppes/npcs/scripted/handler/data/IDialogOption.java deleted file mode 100644 index 83356b44a..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IDialogOption.java +++ /dev/null @@ -1,14 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler.data; - -public interface IDialogOption { - int getSlot(); - - String getName(); - - int getType(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IFaction.java b/src/main/java/noppes/npcs/scripted/handler/data/IFaction.java deleted file mode 100644 index e46db9f5a..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IFaction.java +++ /dev/null @@ -1,45 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler.data; - -import noppes.npcs.scripted.interfaces.ICustomNpc; -import noppes.npcs.scripted.interfaces.IPlayer; - -public interface IFaction { - int getId(); - - String getName(); - - int getDefaultPoints(); - - void setDefaultPoints(int var1); - - int getColor(); - - int playerStatus(IPlayer var1); - - boolean hostileToNpc(ICustomNpc var1); - - boolean hostileToFaction(int var1); - - int[] getHostileList(); - - void addHostile(int var1); - - void removeHostile(int var1); - - boolean hasHostile(int var1); - - boolean getIsHidden(); - - void setIsHidden(boolean var1); - - boolean getAttackedByMobs(); - - void setAttackedByMobs(boolean var1); - - void save(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuest.java b/src/main/java/noppes/npcs/scripted/handler/data/IQuest.java deleted file mode 100644 index bfd640ec1..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuest.java +++ /dev/null @@ -1,49 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler.data; - -import noppes.npcs.scripted.interfaces.IContainer; -import noppes.npcs.scripted.interfaces.IPlayer; - -public interface IQuest { - int getId(); - - String getName(); - - void setName(String var1); - - int getType(); - - void setType(int var1); - - String getLogText(); - - void setLogText(String var1); - - String getCompleteText(); - - void setCompleteText(String var1); - - IQuest getNextQuest(); - - void setNextQuest(IQuest var1); - - IQuestObjective[] getObjectives(IPlayer var1); - - IQuestCategory getCategory(); - - IContainer getRewards(); - - String getNpcName(); - - void setNpcName(String var1); - - void save(); - - boolean getIsRepeatable(); - - IQuestInterface getQuestInterface(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestCategory.java b/src/main/java/noppes/npcs/scripted/handler/data/IQuestCategory.java deleted file mode 100644 index 356afb758..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestCategory.java +++ /dev/null @@ -1,16 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler.data; - -import java.util.List; - -public interface IQuestCategory { - List quests(); - - String getName(); - - IQuest create(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestDialog.java b/src/main/java/noppes/npcs/scripted/handler/data/IQuestDialog.java deleted file mode 100644 index 1e285efc0..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestDialog.java +++ /dev/null @@ -1,4 +0,0 @@ -package noppes.npcs.scripted.handler.data; - -public interface IQuestDialog extends IQuestInterface { -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestInterface.java b/src/main/java/noppes/npcs/scripted/handler/data/IQuestInterface.java deleted file mode 100644 index 5edc4f1e0..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestInterface.java +++ /dev/null @@ -1,4 +0,0 @@ -package noppes.npcs.scripted.handler.data; - -public interface IQuestInterface { -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestItem.java b/src/main/java/noppes/npcs/scripted/handler/data/IQuestItem.java deleted file mode 100644 index 7adca2254..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestItem.java +++ /dev/null @@ -1,12 +0,0 @@ -package noppes.npcs.scripted.handler.data; - -public interface IQuestItem extends IQuestInterface { - void setLeaveItems(boolean leaveItems); - boolean getLeaveItems(); - - void setIgnoreDamage(boolean ignoreDamage); - boolean getIgnoreDamage(); - - void setIgnoreNbt(boolean ignoreNbt); - boolean getIgnoreNbt(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestKill.java b/src/main/java/noppes/npcs/scripted/handler/data/IQuestKill.java deleted file mode 100644 index 7193f1aa8..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestKill.java +++ /dev/null @@ -1,6 +0,0 @@ -package noppes.npcs.scripted.handler.data; - -public interface IQuestKill extends IQuestInterface { - void setTargetType(int type); - int getTargetType(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestLocation.java b/src/main/java/noppes/npcs/scripted/handler/data/IQuestLocation.java deleted file mode 100644 index 7496b81ba..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestLocation.java +++ /dev/null @@ -1,12 +0,0 @@ -package noppes.npcs.scripted.handler.data; - -public interface IQuestLocation extends IQuestInterface { - void setLocation1(String loc1); - String getLocation1(); - - void setLocation2(String loc2); - String getLocation2(); - - void setLocation3(String loc3); - String getLocation3(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IQuestObjective.java b/src/main/java/noppes/npcs/scripted/handler/data/IQuestObjective.java deleted file mode 100644 index 5db05a027..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IQuestObjective.java +++ /dev/null @@ -1,18 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler.data; - -public interface IQuestObjective { - int getProgress(); - - void setProgress(int var1); - - int getMaxProgress(); - - boolean isCompleted(); - - String getText(); -} diff --git a/src/main/java/noppes/npcs/scripted/handler/data/IRecipe.java b/src/main/java/noppes/npcs/scripted/handler/data/IRecipe.java deleted file mode 100644 index dd799c149..000000000 --- a/src/main/java/noppes/npcs/scripted/handler/data/IRecipe.java +++ /dev/null @@ -1,36 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.handler.data; - -import net.minecraft.item.ItemStack; - -public interface IRecipe { - String getName(); - - boolean isGlobal(); - - void setIsGlobal(boolean var1); - - boolean getIgnoreNBT(); - - void setIgnoreNBT(boolean var1); - - boolean getIgnoreDamage(); - - void setIgnoreDamage(boolean var1); - - int getWidth(); - - int getHeight(); - - ItemStack getResult(); - - ItemStack[] getRecipe(); - - void delete(); - - int getId(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IAnimal.java b/src/main/java/noppes/npcs/scripted/interfaces/IAnimal.java deleted file mode 100644 index 4bf435547..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IAnimal.java +++ /dev/null @@ -1,11 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.entity.passive.EntityAnimal; - -public interface IAnimal extends IEntityLiving { -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IBlock.java b/src/main/java/noppes/npcs/scripted/interfaces/IBlock.java deleted file mode 100644 index bb84849df..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IBlock.java +++ /dev/null @@ -1,41 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; - -public interface IBlock { - int getX(); - - int getY(); - - int getZ(); - - IPos getPos(); - - String getName(); - - void remove(); - - boolean isAir(); - - IBlock setBlock(String var1); - - IBlock setBlock(IBlock var1); - - boolean isContainer(); - - IContainer getContainer(); - - IWorld getWorld(); - - TileEntity getMCTileEntity(); - - Block getMCBlock(); - - String getDisplayName(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IButton.java b/src/main/java/noppes/npcs/scripted/interfaces/IButton.java deleted file mode 100644 index 06252a0a8..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IButton.java +++ /dev/null @@ -1,30 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -public interface IButton extends ICustomGuiComponent { - int getWidth(); - - int getHeight(); - - IButton setSize(int var1, int var2); - - String getLabel(); - - IButton setLabel(String var1); - - String getTexture(); - - boolean hasTexture(); - - IButton setTexture(String var1); - - int getTextureX(); - - int getTextureY(); - - IButton setTextureOffset(int var1, int var2); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java b/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java deleted file mode 100644 index 6f0b338a6..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IContainer.java +++ /dev/null @@ -1,27 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; - -public interface IContainer { - int getSize(); - - IItemStack getSlot(int var1); - - void setSlot(int slot, IItemStack item); - - IInventory getMCInventory(); - - Container getMCContainer(); - - int count(IItemStack var1, boolean var2, boolean var3); - - IItemStack[] getItems(); - - boolean isCustomGUI(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomGui.java b/src/main/java/noppes/npcs/scripted/interfaces/ICustomGui.java deleted file mode 100644 index 2f803b32e..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomGui.java +++ /dev/null @@ -1,64 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import java.util.List; - -public interface ICustomGui { - int getID(); - - int getWidth(); - - int getHeight(); - - List getComponents(); - - List getSlots(); - - void setSize(int var1, int var2); - - void setDoesPauseGame(boolean var1); - - void setBackgroundTexture(String var1); - - IButton addButton(int var1, String var2, int var3, int var4); - - IButton addButton(int var1, String var2, int var3, int var4, int var5, int var6); - - IButton addTexturedButton(int var1, String var2, int var3, int var4, int var5, int var6, String var7); - - IButton addTexturedButton(int var1, String var2, int var3, int var4, int var5, int var6, String var7, int var8, int var9); - - ILabel addLabel(int var1, String var2, int var3, int var4, int var5, int var6); - - ILabel addLabel(int var1, String var2, int var3, int var4, int var5, int var6, int var7); - - ITextField addTextField(int var1, int var2, int var3, int var4, int var5); - - ITexturedRect addTexturedRect(int var1, String var2, int var3, int var4, int var5, int var6); - - ITexturedRect addTexturedRect(int var1, String var2, int var3, int var4, int var5, int var6, int var7, int var8); - - IScroll addScroll(int var1, int var2, int var3, int var4, int var5, String[] var6); - - ILine addLine(int id, int x1, int y1, int x2, int y2, int color, int thickness); - - ILine addLine(int id, int x1, int y1, int x2, int y2); - - IItemSlot addItemSlot(int var1, int var2); - - IItemSlot addItemSlot(int var1, int var2, IItemStack var3); - - void showPlayerInventory(int var1, int var2); - - ICustomGuiComponent getComponent(int var1); - - void removeComponent(int var1); - - void updateComponent(ICustomGuiComponent var1); - - void update(IPlayer var1); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomGuiComponent.java b/src/main/java/noppes/npcs/scripted/interfaces/ICustomGuiComponent.java deleted file mode 100644 index b7f6474c9..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomGuiComponent.java +++ /dev/null @@ -1,26 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -public interface ICustomGuiComponent { - int getID(); - - ICustomGuiComponent setID(int var1); - - int getPosX(); - - int getPosY(); - - ICustomGuiComponent setPos(int var1, int var2); - - boolean hasHoverText(); - - String[] getHoverText(); - - ICustomGuiComponent setHoverText(String var1); - - ICustomGuiComponent setHoverText(String[] var1); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java b/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java deleted file mode 100644 index 47f0fa7ab..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java +++ /dev/null @@ -1,737 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.entity.EntityCreature; -import noppes.npcs.constants.EnumNavType; -import noppes.npcs.scripted.ScriptFaction; -import noppes.npcs.scripted.ScriptItemStack; -import noppes.npcs.scripted.entity.ScriptLivingBase; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.roles.*; - -public interface ICustomNpc extends IEntityLiving { - /** - * @return Returns the current npcs size 1-30 - */ - public int getSize(); - - /** - * @param size The size of the npc (1-30) default is 5 - */ - public void setSize(int size); - - /** - * @return Returns the current npcs modelType of the NPC - */ - public int getModelType(); - - /** - * @param modelType The modelType of the NPC. 0: Steve, 1: Steve64, 2: Alex - */ - public void setModelType(int modelType); - - /** - * @return The npcs name - */ - public String getName(); - - public void setRotation(float rotation); - /** - * @param name The name of the npc - */ - public void setName(String name); - - /** - * @since 1.7.10 - * @return The npcs title - */ - public String getTitle(); - - /** - * @since 1.7.10 - * @param title The title of the npc - */ - public void setTitle(String title); - - /** - * @return The npcs texture - */ - public String getTexture(); - - /** - * @param texture The texture of the npc - */ - public void setTexture(String texture); - - /** - * @return Home position x - */ - public int getHomeX(); - - /** - * @param x The home x position - */ - public void setHomeX(int x); - - /** - * @return Home position x - */ - public int getHomeY(); - - /** - * @param y The home y position - */ - public void setHomeY(int y); - - /** - * @return Home position x - */ - public int getHomeZ(); - - /** - * @param z The home x position - */ - public void setHomeZ(int z); - - /** - * @param x The home x position - * @param y The home y position - * @param z The home z position - */ - public void setHome(int x, int y, int z); - /** - * @param health New max health - */ - public void setMaxHealth(double health); - - /** - * @param bo Whether or not the npc will try to return to his home position - */ - public void setReturnToHome(boolean bo); - - /** - * @return Whether or not the npc returns home - */ - public boolean getReturnToHome(); - - /** - * @return The faction of the npc - */ - public ScriptFaction getFaction(); - - /** - * @param id The id of the new faction - */ - public void setFaction(int id); - - /** - * - * @param attackOtherFactions True if you want the NPC to attack other factions, false otherwise. - */ - public void setAttackFactions(boolean attackOtherFactions); - - /** - * - * @return Returns true if the NPC attacks other factions, false otherwise. - */ - public boolean getAttackFactions(); - - /** - * - * @param defendFaction True if the NPC should defend faction members, false otherwise. - */ - public void setDefendFaction(boolean defendFaction); - - /** - * - * @return Returns true if the NPC should defend faction members, false otherwise. - */ - public boolean getDefendFaction(); - - public int getType(); - - public boolean typeOf(int type); - - /** - * @param target The targeted npc - * @param item The item you want to shoot - * @param accuracy Accuracy of the shot (0-100) - */ - public void shootItem(ScriptLivingBase target, ScriptItemStack item, int accuracy); - - /** - * @param message The message the npc will say - */ - public void say(String message); - - /** - * @param message The message the npc will say - */ - public void say(ScriptPlayer player, String message); - - /** - * Kill the npc, doesnt't despawn it - */ - public void kill(); - - /** - * Basically completely resets the npc. This will also call the Init script - */ - public void reset(); - - /** - * @return Returns the npcs current role - */ - public ScriptRoleInterface getRole(); - - /** - * @return Returns the npcs current job - */ - public ScriptJobInterface getJob(); - - /** - * @return The item held in the right hand - */ - public ScriptItemStack getRightItem(); - - /** - * @param item Item to be held in the right hand - */ - public void setRightItem(ScriptItemStack item); - - /** - * @return The item held in the left hand - */ - public ScriptItemStack getLefttItem(); - - /** - * @param item Item to be held in the left hand - */ - public void setLeftItem(ScriptItemStack item); - - /** - * @return Returns the projectile the npc uses - */ - public ScriptItemStack getProjectileItem(); - - /** - * @param item Item to be used as projectile - */ - public void setProjectileItem(ScriptItemStack item); - - /** - * - * @return Returns true if the NPC can aim while shooting. - */ - public boolean canAimWhileShooting(); - - /** - * - * @param aimWhileShooting Set to true if you want the NPC to aim while shooting, false otherwise. - */ - public void aimWhileShooting(boolean aimWhileShooting); - - public void setMinProjectileDelay(int minDelay); - public int getMinProjectileDelay(); - - public void setMaxProjectileDelay(int maxDelay); - public int getMaxProjectileDelay(); - - public void setRangedRage(int rangedRange); - public int getRangedRage(); - - public void setFireRate(int rate); - public int getFireRate(); - - public void setBurstCount(int burstCount); - public int getBurstCount(); - - public void setShotCount(int shotCount); - public int getShotCount(); - - public void setAccuracy(int accuracy); - public int getAccuracy(); - - /** - * - * @return The directory of the sound that plays when a projectile is shot - */ - public String getFireSound(); - - /** - * - * @param fireSound The new directory of the sound that plays when a projectile is shot - */ - public void setFireSound(String fireSound); - - /** - * @param slot The armor slot to return. 0:head, 1:body, 2:legs, 3:boots - * @return Returns the worn armor in slot - */ - public ScriptItemStack getArmor(int slot); - - /** - * @param slot The armor slot to set. 0:head, 1:body, 2:legs, 3:boots - * @param item Item to be set as armor - */ - public void setArmor(int slot, ScriptItemStack item); - - /** - * - * @param slot The slot from the NPC's drop list to return (0-8) - * @return The item in the NPC's drop list slot - */ - public ScriptItemStack getLootItem(int slot); - - /** - * - * @param slot The slot from the NPC's drop list to change - * @param item The item the drop list slot will be changed to - */ - public void setLootItem(int slot, ScriptItemStack item); - - /** - * - * @param slot The slot from the NPC's drop list to return (0-8) - * @return The chance of dropping the item in this slot. Returns 100 if the slot is not found. - */ - public double getLootChance(int slot); - - /** - * - * @param slot The slot from the NPC's drop list to change - * @param chance The new chance of dropping the item in this slot - */ - public void setLootChance(int slot, double chance); - - /** - * - * @return The NPC's loot mode. 0 = Normal, 1 = Auto Pickup - */ - public int getLootMode(); - - /** - * - * @param lootMode The NPC's loot mode. 0 = Normal, 1 = Auto Pickup - */ - public void setLootMode(int lootMode); - - /** - * - * @param lootXP The new minimum XP gained from killing the NPC. If greater than the max XP, it will be set to it. - */ - public void setMinLootXP(int lootXP); - - /** - * - * @param lootXP The new maximum XP gained from killing the NPC. If less than the min XP, it will be set to it. - */ - public void setMaxLootXP(int lootXP); - - /** - * - * @return The minimum XP gained from killing the NPC. - */ - public int getMinLootXP(); - - /** - * - * @return The maximum XP gained from killing the NPC. - */ - public int getMaxLootXP(); - - /** - * @param type The AnimationType - */ - public void setAnimation(int type); - - /** - * - * @param variant Changes the tactical variant of the NPC. - * 0 - Rush - * 1 - Dodge - * 2 - Surround - * 3 - Hit N Run - * 4 - Ambush - * 5 - Stalk - * 6 - None - * - */ - public void setTacticalVariant(int variant); - - /** - * - * @return Returns the tactical variant of the NPC. - * 0 - Rush - * 1 - Dodge - * 2 - Surround - * 3 - Hit N Run - * 4 - Ambush - * 5 - Stalk - * 6 - None - * - */ - public int getTacticalVariant(); - - /** - * - * @param variant Sets the NPC's tactical variant by name. - */ - public void setTacticalVariant(String variant); - - /** - * - * @return Returns the name of the NPc's tactical variant. - */ - public String getTacticalVariantName(); - - /** - * - * @param tacticalRadius Sets the radius in which the tactical variant is affected, if any. Effective for all tactical variants except Rush and None. - */ - public void setTacticalRadius(int tacticalRadius); - - /** - * - * @return Gets the radius in which the tactical variant is affected, if any. Effective for all tactical variants except Rush and None. - */ - public int getTacticalRadius(); - - /** - * - * @param ignore True if the NPC goes through cobwebs - */ - public void setIgnoreCobweb(boolean ignore); - - /** - * - * @return True if the NPC goes through cobwebs - */ - public boolean getIgnoreCobweb(); - - /** - * - * @return Changes what the NPC does when it finds an enemy based on the integer given. - * 0 - Retaliate - * 1 - Panic - * 2 - Retreat - * 3 - Nothing - */ - public void setOnFoundEnemy(int onAttack); - - /** - * - * @return Returns an integer representing what the NPC does when it finds an enemy. - * 0 - Retaliate - * 1 - Panic - * 2 - Retreat - * 3 - Nothing - */ - public int onFoundEnemy(); - - /** - * - * @param shelterFrom An integer representing what conditions the NPC seeks shelter under. - * 0 - Darkenss - * 1 - Sunlight - * 2 - Disabled - */ - public void setShelterFrom(int shelterFrom); - - /** - * - * @return Returns an integer representing what conditions the NPC seeks shelter under. - * 0 - Darkenss - * 1 - Sunlight - * 2 - Disabled - */ - public int getShelterFrom(); - - /** - * - * @return Whether the NPC has a living animation - */ - public boolean hasLivingAnimation(); - - /** - * - * @param livingAnimation True if you want the NPC to have a living animation, false otherwise - */ - public void setLivingAnimation(boolean livingAnimation); - - /** - * @param type The visibility type of the npc, 0:visible, 1:invisible, 2:semi-visible - */ - public void setVisibleType(int type); - - /** - * @return The visibility type of the npc, 0:visible, 1:invisible, 2:semi-visible - */ - public int getVisibleType(); - - /** - * - * @param player The player this NPC becomes visible/invisible to - * @param visible True if you want the NPC to be invisible to the player, false otherwise - */ - public void setVisibleTo(ScriptPlayer player, boolean visible); - - /** - * - * @param player The player this NPC is visible/invisible to - * @return False if the NPC has been toggled to be invisible to this player, true otherwise. - * If setVisibleTo(player,visible) was not called to make this NPC invisible to the player at any point - * in the NPC's life, this function will return true regardless of the value of isVisible(). - */ - public boolean isVisibleTo(ScriptPlayer player); - - /** - * @param type The visibility type of the name, 0:visible, 1:invisible, 2:when-attacking - */ - public void setShowName(int type); - - /** - * @return Returns the visibility type of the name, 0:visible, 1:invisible, 2:when-attacking - */ - public int getShowName(); - - /** - * @return Returns the visiblity of the boss bar, 0:invisible, 1:visible, 2:when-attacking - */ - public int getShowBossBar(); - - /** - * @param type The visibility type of the boss bar, 0:invisible, 1:visible, 2:when-attacking - */ - public void setShowBossBar(int type); - - /** - * @return The melee strength - */ - public float getMeleeStrength(); - - /** - * @param strength The melee strength - */ - public void setMeleeStrength(float strength); - - /** - * @return The melee speed - */ - public int getMeleeSpeed(); - - /** - * @param speed The melee speed - */ - public void setMeleeSpeed(int speed); - - /** - * @return The ranged strength - */ - public float getRangedStrength(); - - /** - * @param strength The ranged strength - */ - public void setRangedStrength(float strength); - - /** - * @return The ranged speed - */ - public int getRangedSpeed(); - - /** - * @param speed The ranged speed - */ - public void setRangedSpeed(int speed); - - /** - * @return The ranged burst count - */ - public int getRangedBurst(); - - /** - * @param count The ranged burst count - */ - public void setRangedBurst(int count); - - /** - * - * @return The amount of ticks before this entity respawns - */ - public int getRespawnTime(); - - /** - * - * @param time The new amount of ticks before this entity respawns - */ - public void setRespawnTime(int time); - - /** - * - * @return Respawn: 0 - Yes (Always), 1 - Day, 2 - Night, 3 - No (Dies permanently) - */ - public int getRespawnCycle(); - - /** - * - * @param cycle Sets when the NPC respawns. Respawn: 0 - Yes (Always), 1 - Day, 2 - Night, 3 - No (Dies permanently) - */ - public void setRespawnCycle(int cycle); - - /** - * - * @return Whether the NPC is hidden when it dies - */ - public boolean getHideKilledBody(); - - /** - * - * @param hide True if the NPC is hidden when it dies. False otherwise. - */ - public void hideKilledBody(boolean hide); - - /** - * - * @return Returns true if the NPC naturally despawns. - */ - public boolean naturallyDespawns(); - - /** - * - * @param canDespawn True if the NPC should naturally despawn. False otherwise. - */ - public void setNaturallyDespawns(boolean canDespawn); - - /** - * @param player The player to give the item to - * @param item The item given to the player - */ - public void giveItem(ScriptPlayer player, ScriptItemStack item); - - - /** - * On servers the enable-command-block option in the server.properties needs to be set to true - * @param command The command to be executed - */ - public void executeCommand(String command); - - public void setHeadScale(float x, float y, float z); - - public void setBodyScale(float x, float y, float z); - - public void setArmsScale(float x, float y, float z); - - public void setLegsScale(float x, float y, float z); - - /** - * @since 1.7.10c - * @param resistance Explosion resistance (0-2) default is 1 - */ - public void setExplosionResistance(float resistance); - - /** - * @since 1.7.10c - * @return Returns Explosion Resistance - */ - public float getExplosionResistance(); - - /** - * @param resistance Melee resistance (0-2) default is 1 - */ - public void setMeleeResistance(float resistance); - - /** - * @return Returns Melee Resistance - */ - public float getMeleeResistance(); - - /** - * @param resistance Arrow resistance (0-2) default is 1 - */ - public void setArrowResistance(float resistance); - - /** - * @return Returns Arrow Resistance - */ - public float getArrowResistance(); - - /** - * @param resistance Knockback resistance (0-2) default is 1 - */ - public void setKnockbackResistance(float resistance); - - /** - * @return Returns Knockback Resistance - */ - public float getKnockbackResistance(); - - /** - * @param type Retaliation type. 0:normal, 1:panic, 2:retreat, 3:nothing - */ - public void setRetaliateType(int type); - - /** - * @return Returns the combat health regen per second - */ - public float getCombatRegen(); - - /** - * @param regen The combat health regen per second - */ - public void setCombatRegen(float regen); - - /** - * @return Returns the health regen per second when not in combat - */ - public float getHealthRegen(); - - /** - * @param regen The health regen per second when not in combat - */ - public void setHealthRegen(float regen); - - public long getAge(); - - public void setFly(int fly); - - public boolean canFly(); - - public void setFlySpeed(double flySpeed); - - public double getFlySpeed(double flySpeed); - - public void setFlyGravity(double flyGravity); - - public double getFlyGravity(double flyGravity); - - public void setSpeed(int speed); - - public int getSpeed(); - - public void setSkinType(byte type); - - public byte getSkinType(); - - public void setSkinUrl(String url); - - public String getSkinUrl(); - - public void setCloakTexture(String cloakTexture); - - public String getCloakTexture(); - - public void setOverlayTexture(String overlayTexture); - - public String getOverlayTexture(); - - public void setCollisionType(int type); - - public int getCollisionType(); - - public void updateClient(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlay.java b/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlay.java deleted file mode 100644 index d95a12598..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlay.java +++ /dev/null @@ -1,4 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -public interface ICustomOverlay { -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlayComponent.java b/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlayComponent.java deleted file mode 100644 index 7abb2155d..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomOverlayComponent.java +++ /dev/null @@ -1,29 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -public interface ICustomOverlayComponent { - int getID(); - - ICustomOverlayComponent setID(int id); - - int getPosX(); - - int getPosY(); - - ICustomOverlayComponent setPos(int x, int y); - - int getAlignment(); - - void setAlignment(int alignment); - - int getColor(); - - ICustomOverlayComponent setColor(int color); - - float getAlpha(); - - void setAlpha(float alpha); - - float getRotation(); - - void setRotation(float rotation); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IDamageSource.java b/src/main/java/noppes/npcs/scripted/interfaces/IDamageSource.java deleted file mode 100644 index 8d7dd5caa..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IDamageSource.java +++ /dev/null @@ -1,20 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.util.DamageSource; - -public interface IDamageSource { - String getType(); - - boolean isProjectile(); - - IEntity getTrueSource(); - - IEntity getImmediateSource(); - - DamageSource getMCDamageSource(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IEntity.java b/src/main/java/noppes/npcs/scripted/interfaces/IEntity.java deleted file mode 100644 index 27cdbc218..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IEntity.java +++ /dev/null @@ -1,311 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.entity.Entity; -import noppes.npcs.scripted.entity.ScriptEntity; -import noppes.npcs.scripted.ScriptItemStack; - -public interface IEntity { - /** - * @param directory The particle's directory. Use only forward slashes when writing a directory. Example: "customnpcs:textures/particle/tail.png" - * @param HEXcolor The particle's color as a HEX integer - * @param amount The amount of particles to spawn - * @param maxAge The particle's maximum age in MC ticks - - * @param x The particle's x position - * @param y The particle's y position - * @param z The particle's z position - - * @param motionX The particle's speed in the x axis - * @param motionY The particle's speed in the y axis - * @param motionZ The particle's speed in the z axis - * @param gravity The particle's gravity - - * @param scale1 The particle's starting scale - * @param scale2 The particle's ending scale - * @param scaleRate Multiplier for the particle's scale growth rate - * @param scaleRateStart The time at which the particle begins growing/shrinking - - * @param alpha1 The particle's starting transparency - * @param alpha2 The particle's ending transparency - * @param scaleRate Multiplier for the particle's transparency growth rate - * @param alphaRateStart The time at which the particle begins appearing/fading - */ - public void spawnParticle(String directory, int HEXcolor, int amount, int maxAge, - double x, double y, double z, - double motionX, double motionY, double motionZ, float gravity, - float scale1, float scale2, float scaleRate, int scaleRateStart, - float alpha1, float alpha2, float alphaRate, int alphaRateStart - ); - - public double getYOffset(); - - /** - * @return The entities width - */ - public double getWidth(); - - /** - * @return The entities height - */ - public double getHeight(); - - /** - * @return The entities x position - */ - public double getX(); - - /** - * @param x The entities x position - */ - public void setX(double x); - - /** - * @return The entities y position - */ - public double getY(); - - /** - * @param y The entities y position - */ - public void setY(double y); - - /** - * @return The entities x position - */ - public double getZ(); - - /** - * @param z The entities x position - */ - public void setZ(double z); - - /** - * @return The block x position - */ - public int getBlockX(); - - /** - * @return The block y position - */ - public int getBlockY(); - - /** - * @return The block z position - */ - public int getBlockZ(); - - /** - * @param x The x position - * @param y The y position - * @param z The z position - */ - public void setPosition(double x, double y, double z); - - - /** - * @param range The search range for entities around this entity - * @return Array of entities within range - */ - public ScriptEntity[] getSurroundingEntities(int range); - - /** - * @param range The search range for entities around this entity - * @param type The EntityType you want to find - * @return Array of entities within range - */ - public ScriptEntity[] getSurroundingEntities(int range, int type); - - /** - * @return Whether the entity is alive or not - */ - public boolean isAlive(); - - /** - * @param key Get temp data for this key - * @return Returns the stored temp data - */ - public Object getTempData(String key); - - /** - * Tempdata gets cleared when the entity gets unloaded or the world restarts - * @param key The key for the data stored - * @param value The data stored - */ - public void setTempData(String key, Object value); - - /** - * @param key The key thats going to be tested against the temp data - * @return Whether or not temp data containes the key - */ - public boolean hasTempData(String key); - - /** - * @param key The key for the temp data to be removed - */ - public void removeTempData(String key); - - /** - * Remove all tempdata - */ - public void clearTempData(); - - /** - * @param key The key of the data to be returned - * @return Returns the stored data - */ - public Object getStoredData(String key); - - /** - * Stored data persists through world restart. Unlike tempdata only Strings and Numbers can be saved - * @param key The key for the data stored - * @param value The data stored. This data can be either a Number or a String. Other data is not stored - */ - public void setStoredData(String key, Object value); - - /** - * @param key The key of the data to be checked - * @return Returns whether or not the stored data contains the key - */ - public boolean hasStoredData(String key); - - /** - * @param key The key of the data to be removed - */ - public void removeStoredData(String key); - - /** - * Remove all stored data - */ - public void clearStoredData(); - - /** - * @return The age of this entity in ticks - */ - public long getAge(); - - /** - * Despawns this entity. Removes it permanently - */ - public void despawn(); - - /** - * @return Return whether or not this entity is standing in water - */ - public boolean inWater(); - - /** - * @return Return whether or not this entity is standing in lava - */ - public boolean inLava(); - - /** - * @return Return whether or not this entity is standing in fire - */ - public boolean inFire(); - - /** - * @return Return whether or not this entity is on fire - */ - public boolean isBurning(); - - /** - * @param ticks Amount of world ticks this entity will burn. 20 ticks equals 1 second - */ - public void setBurning(int ticks); - - /** - * Removes fire from this entity - */ - public void extinguish(); - - /** - * @return Name as which it's registered in minecraft - */ - public String getTypeName(); - - /** - * @param item Item to be dropped - */ - public void dropItem(ScriptItemStack item); - - /** - * @return Return the rider - */ - public ScriptEntity getRider(); - - /** - * @param entity The entity to ride this entity - */ - public void setRider(ScriptEntity entity); - - /** - * @return Return the entity, this entity is riding - */ - public ScriptEntity getMount(); - - /** - * @param entity The entity this entity will mount - */ - public void setMount(ScriptEntity entity); - - /** - * @see noppes.npcs.scripted.constants.EntityType - * @return Returns the EntityType of this entity - */ - public int getType(); - - /** - * @since 1.7.10c - * @param type @EntityType to check - * @return Returns whether the entity is type of the given @EntityType - */ - public boolean typeOf(int type); - - /** - * @param rotation The rotation to be set (0-360) - */ - public void setRotation(float rotation); - - /** - * @return Current rotation of the npc - */ - public float getRotation(); - - /** - * @param power How strong the knockback is - * @param direction The direction in which he flies back (0-360). Usually based on getRotation() - */ - public void knockback(int power, float direction); - - public void knockback(int xpower, int ypower, int zpower, float direction); - - public void setImmune(int ticks); - - public boolean hasCollided(); - - /** - * @since 1.7.10c - * @return Returns whether or not this entity is sneaking - */ - public boolean isSneaking(); - - /** - * @since 1.7.10c - * @return Returns whether or not this entity is sprinting - */ - public boolean isSprinting(); - - /** - * @since 1.7.10c - * Expert users only - * @return Returns minecrafts entity - */ - public T getMCEntity(); - - void storeAsClone(int tab, String name); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IEntityLiving.java b/src/main/java/noppes/npcs/scripted/interfaces/IEntityLiving.java deleted file mode 100644 index 4fda07e84..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IEntityLiving.java +++ /dev/null @@ -1,18 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.entity.EntityLiving; - -public interface IEntityLiving extends IEntityLivingBase { - boolean isNavigating(); - - void clearNavigation(); - - void navigateTo(double var1, double var3, double var5, double var7); - - T getMCEntity(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IEntityLivingBase.java b/src/main/java/noppes/npcs/scripted/interfaces/IEntityLivingBase.java deleted file mode 100644 index 846a7ed8b..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IEntityLivingBase.java +++ /dev/null @@ -1,108 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -import net.minecraft.entity.EntityLivingBase; -import noppes.npcs.scripted.entity.ScriptEntity; -import noppes.npcs.scripted.ScriptItemStack; -import noppes.npcs.scripted.entity.ScriptLivingBase; - -public interface IEntityLivingBase extends IEntity { - /** - * @return The entity's current health - */ - public float getHealth(); - - /** - * @param health The new health of this entity - */ - public void setHealth(float health); - - /** - * @return Entity's max health - */ - public double getMaxHealth(); - /** - * @return Whether or not this entity is attacking something - */ - public boolean isAttacking(); - - /** - * @param living Entity which this entity will attack - */ - public void setAttackTarget(ScriptLivingBase living); - - /** - * @return The entity which this entity is attacking - */ - public ScriptLivingBase getAttackTarget(); - - public int getType(); - - public boolean typeOf(int type); - - /** - * @param entity Entity to check - * @return Whether or not this entity can see the given entity - */ - public boolean canSeeEntity(ScriptEntity entity); - - /** - * Expert use only - * @return Returns the minecraft entity object - */ - public T getMCEntity(); - - /** - * Makes the entity swing its hand - */ - public void swingHand(); - - /** - * Works the same as the /effect command - * @param effect - * @param duration The duration in seconds - * @param strength The amplifier of the potion effect - * @param hideParticles Whether or not you want to hide potion particles - */ - public void addPotionEffect(int effect, int duration, int strength, boolean hideParticles); - - /** - * Clears all potion effects - */ - public void clearPotionEffects(); - - /** - * @since 1.7.10c - * @param effect Potion effect to check - * @return Returns -1 if its not active. Otherwise returns the strenght of the potion - */ - public int getPotionEffect(int effect); - - /** - * Note not all Living Entities support this - * @since 1.7.10c - * @return The item the entity is holding - */ - public ScriptItemStack getHeldItem(); - - /** - * Note not all Living Entities support this - * @since 1.7.10c - * @param item The item to be set - */ - public void setHeldItem(ScriptItemStack item); - - /** - * Note not all Living Entities support this - * @param slot Slot of what armor piece to get, 0:boots, 1:pants, 2:body, 3:head - * @return The item in the given slot - */ - public ScriptItemStack getArmor(int slot); - - /** - * Note not all Living Entities support this - * @since 1.7.10c - * @param slot Slot of what armor piece to set, 0:boots, 1:pants, 2:body, 3:head - * @param item Item to be set - */ - public void setArmor(int slot, ScriptItemStack item); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IItemSlot.java b/src/main/java/noppes/npcs/scripted/interfaces/IItemSlot.java deleted file mode 100644 index 8fbca6779..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IItemSlot.java +++ /dev/null @@ -1,18 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.inventory.Slot; - -public interface IItemSlot extends ICustomGuiComponent { - boolean hasStack(); - - IItemStack getStack(); - - IItemSlot setStack(IItemStack var1); - - Slot getMCSlot(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java b/src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java deleted file mode 100644 index d1b92b6a2..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IItemStack.java +++ /dev/null @@ -1,115 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -import net.minecraft.item.ItemStack; - -public interface IItemStack { - public String getName(); - - /** - * @return Returns the stacksize - */ - public int getStackSize(); - - /** - * @return Return whether or not the item has a custom name - */ - public boolean hasCustomName(); - - /** - * @param name The custom name this item will get - */ - public void setCustomName(String name); - - /** - * @return Return the ingame displayed name. This is either the item name or the custom name if it has one. - */ - public String getDisplayName(); - - /** - * @return Get the items ingame name. Use this incase the item ingame has custom name and you want the original name. - */ - public String getItemName(); - - /** - * @param size The size of the itemstack. A number between 1 and 64 - */ - public void setStackSize(int size); - - /** - * @return Returns the item damage of this item. For tools this is the durability for other items the color and more. - */ - public int getItemDamage(); - - /** - * @param value The value to be set as item damage. For tools this is the durability for other items the color and more. - */ - public void setItemDamage(int value); - - /** - * @param key The key of this NBTTag - * @param value The value to be stored. Can be a Number or String - */ - public void setTag(String key, Object value); - - /** - * @param key The key of the NBTTag - * @return Returns whether or not the key exists - */ - public boolean hasTag(String key); - - /** - * @param key The key of the NBTTag - * @return Returns the value associated with the key. Returns null of it doesnt exist - */ - public Object getTag(String key); - - public INbt removeTags(); - - public boolean isEnchanted(); - - /** - * @since 1.7.10d - * @param id The enchantment id - * @return - */ - public boolean hasEnchant(int id); - - /** - * @since 1.7.10d - * @return Returns whether this item is a book - */ - public boolean isWrittenBook(); - - /** - * @since 1.7.10d - * @return Returns the books title - */ - public String getBookTitle(); - - /** - * @since 1.7.10d - * @return Returns the books author - */ - public String getBookAuthor(); - - /** - * @since 1.7.10d - * @return If the item is a book, returns a string array with book pages - */ - public String[] getBookText(); - - /** - * @return Returns whether or not this item is a block - */ - public boolean isBlock(); - - public INbt getNbt(); - - public INbt getItemNbt(); - - /** - * No support is given for this method. Dont use if you dont know what you are doing. - * @return Minecraft ItemStack - */ - public ItemStack getMCItemStack(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ILabel.java b/src/main/java/noppes/npcs/scripted/interfaces/ILabel.java deleted file mode 100644 index 30a09704f..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ILabel.java +++ /dev/null @@ -1,22 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -public interface ILabel extends ICustomGuiComponent { - String getText(); - - ILabel setText(String var1); - - int getWidth(); - - int getHeight(); - - ILabel setSize(int var1, int var2); - - float getScale(); - - ILabel setScale(float var1); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ILine.java b/src/main/java/noppes/npcs/scripted/interfaces/ILine.java deleted file mode 100644 index 2ea987d5c..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ILine.java +++ /dev/null @@ -1,15 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -public interface ILine extends ICustomGuiComponent { - int getX1(); - int getY1(); - int getX2(); - int getY2(); - int getThickness(); - - void setX1(int x1); - void setY1(int y1); - void setX2(int x2); - void setY2(int y2); - void setThickness(int thickness); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IMonster.java b/src/main/java/noppes/npcs/scripted/interfaces/IMonster.java deleted file mode 100644 index 99baf9350..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IMonster.java +++ /dev/null @@ -1,11 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.entity.monster.EntityMob; - -public interface IMonster extends IEntityLiving { -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/INbt.java b/src/main/java/noppes/npcs/scripted/interfaces/INbt.java deleted file mode 100644 index 0ff2b9f77..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/INbt.java +++ /dev/null @@ -1,76 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.nbt.NBTTagCompound; - -public interface INbt { - void remove(String var1); - - boolean has(String var1); - - boolean getBoolean(String var1); - - void setBoolean(String var1, boolean var2); - - short getShort(String var1); - - void setShort(String var1, short var2); - - int getInteger(String var1); - - void setInteger(String var1, int var2); - - byte getByte(String var1); - - void setByte(String var1, byte var2); - - long getLong(String var1); - - void setLong(String var1, long var2); - - double getDouble(String var1); - - void setDouble(String var1, double var2); - - float getFloat(String var1); - - void setFloat(String var1, float var2); - - String getString(String var1); - - void setString(String var1, String var2); - - byte[] getByteArray(String var1); - - void setByteArray(String var1, byte[] var2); - - int[] getIntegerArray(String var1); - - void setIntegerArray(String var1, int[] var2); - - Object[] getList(String var1, int var2); - - int getListType(String var1); - - void setList(String var1, Object[] var2); - - INbt getCompound(String var1); - - void setCompound(String var1, INbt var2); - - String[] getKeys(); - - int getType(String var1); - - NBTTagCompound getMCNBT(); - - String toJsonString(); - - boolean isEqual(INbt var1); - - void clear(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLabel.java b/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLabel.java deleted file mode 100644 index e69d13ec8..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLabel.java +++ /dev/null @@ -1,17 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -public interface IOverlayLabel extends ICustomOverlayComponent { - String getText(); - - IOverlayLabel setText(String var1); - - int getWidth(); - - int getHeight(); - - IOverlayLabel setSize(int var1, int var2); - - float getScale(); - - IOverlayLabel setScale(float var1); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLine.java b/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLine.java deleted file mode 100644 index 517eb7e51..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayLine.java +++ /dev/null @@ -1,17 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -import noppes.npcs.scripted.overlay.ScriptOverlayLine; - -public interface IOverlayLine extends ICustomOverlayComponent { - int getX1(); - int getY1(); - int getX2(); - int getY2(); - int getThickness(); - - void setX1(int x1); - void setY1(int y1); - void setX2(int x2); - void setY2(int y2); - void setThickness(int thickness); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayTexturedRect.java b/src/main/java/noppes/npcs/scripted/interfaces/IOverlayTexturedRect.java deleted file mode 100644 index bd5b6a2d6..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IOverlayTexturedRect.java +++ /dev/null @@ -1,23 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -public interface IOverlayTexturedRect extends ICustomOverlayComponent { - String getTexture(); - - IOverlayTexturedRect setTexture(String var1); - - int getWidth(); - - int getHeight(); - - IOverlayTexturedRect setSize(int var1, int var2); - - float getScale(); - - IOverlayTexturedRect setScale(float var1); - - int getTextureX(); - - int getTextureY(); - - IOverlayTexturedRect setTextureOffset(int var1, int var2); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IPixelmon.java b/src/main/java/noppes/npcs/scripted/interfaces/IPixelmon.java deleted file mode 100644 index b744ac4cc..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IPixelmon.java +++ /dev/null @@ -1,11 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.entity.passive.EntityTameable; - -public interface IPixelmon extends IAnimal { -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java b/src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java deleted file mode 100644 index cafe9629e..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IPlayer.java +++ /dev/null @@ -1,179 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -import net.minecraft.entity.player.EntityPlayerMP; -import noppes.npcs.scripted.ScriptItemStack; -import noppes.npcs.scripted.ScriptPixelmonPlayerData; - -public interface IPlayer extends IEntityLivingBase { - /** - * @return Returns the displayed name of the player - */ - public String getDisplayName(); - - /** - * @return Returns the players name - */ - public String getName(); - - public void setPosition(double x, double y, double z); - - public void setPosition(double x, double y, double z, int dimensionId); - - public boolean hasFinishedQuest(int id); - - public boolean hasActiveQuest(int id); - - public void showDialog(int id); - - public boolean hasReadDialog(int id); - - /** - * Add the quest from active quest list - * @param id The Quest ID - */ - public void startQuest(int id); - - /** - * Add the quest from finished quest list - * @param id The Quest ID - */ - public void finishQuest(int id); - /** - * Removes the quest from active quest list - * @param id The Quest ID - */ - public void stopQuest(int id); - - /** - * Removes the quest from active and finished quest list - * @param id The Quest ID - */ - public void removeQuest(int id); - - public int getType(); - - public boolean typeOf(int type); - /** - * @param faction The faction id - * @param points The points to increase. Use negative values to decrease - */ - public void addFactionPoints(int faction, int points); - - /** - * @param faction The faction id - * @return points - */ - public int getFactionPoints(int faction); - - /** - * @param message The message you want to send - */ - public void sendMessage(String message); - - /** - * @return Return gamemode. 0: Survival, 1: Creative, 2: Adventure - */ - public int getMode(); - - /** - * @param type The gamemode type. 0:SURVIVAL, 1:CREATIVE, 2:ADVENTURE - */ - public void setMode(int type); - - /** - * @param item The item to be checked - * @return How many of this item the player has - */ - public int inventoryItemCount(ScriptItemStack item); - - /** - * @since 1.7.10d - * @return Returns a IItemStack array size 36 - */ - public ScriptItemStack[] getInventory(); - - /** - * @param item The Item type to be removed - * @param amount How many will be removed - * @return Returns true if the items were removed succesfully. Returns false incase a bigger amount than what the player has was given - */ - public boolean removeItem(ScriptItemStack item, int amount); - - /** - * @since 1.7.10c - * @param id The items name - * @param damage The damage value - * @param amount How many will be removed - * @return Returns true if the items were removed succesfully. Returns false incase a bigger amount than what the player has was given or item doesnt exist - */ - public boolean removeItem(String id, int damage, int amount); - - /** - * @since 1.7.10c - * @param item Item to be added - * @param amount The amount of the item to be added - * @return Returns whether or not it gave the item succesfully - */ - public boolean giveItem(ScriptItemStack item, int amount); - - /** - * @since 1.7.10c - * @param id The items name - * @param damage The damage value - * @param amount The amount of the item to be added - * @return Returns whether or not it gave the item succesfully - */ - public boolean giveItem(String id, int damage, int amount); - - /** - * Same as the /spawnpoint command - * @param x The x position - * @param y The y position - * @param z The z position - */ - public void setSpawnpoint(int x, int y, int z); - - public void resetSpawnpoint(); - - /** - * @param item The item to be removed from the players inventory - */ - public void removeAllItems(ScriptItemStack item); - - - /** - * @param achievement The achievement id. For a complete list see http://minecraft.gamepedia.com/Achievements - * @return Returns whether or not the player has this achievement - */ - public boolean hasAchievement(String achievement); - - /** - * @param permission Bukkit/Cauldron permission - * @return Returns whether or not the player has the permission - */ - public boolean hasBukkitPermission(String permission); - - /** - * @since 1.7.10c - * @return Returns the exp level - */ - public int getExpLevel(); - - /** - * @since 1.7.10c - * @param level The new exp level you want to set - */ - public void setExpLevel(int level); - - /** - * Requires pixelmon to be installed - * @since 1.7.10d - */ - public ScriptPixelmonPlayerData getPixelmonData(); - - public ITimers getTimers(); - - public void updatePlayerInventory(); - - public boolean checkGUIOpen(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IPos.java b/src/main/java/noppes/npcs/scripted/interfaces/IPos.java deleted file mode 100644 index 3743f60aa..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IPos.java +++ /dev/null @@ -1,58 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -import net.minecraft.util.math.BlockPos; - -public interface IPos { - int getX(); - - int getY(); - - int getZ(); - - IPos up(); - - IPos up(int var1); - - IPos down(); - - IPos down(int var1); - - IPos north(); - - IPos north(int var1); - - IPos east(); - - IPos east(int var1); - - IPos south(); - - IPos south(int var1); - - IPos west(); - - IPos west(int var1); - - IPos add(int var1, int var2, int var3); - - IPos add(IPos var1); - - IPos subtract(int var1, int var2, int var3); - - IPos subtract(IPos var1); - - double[] normalize(); - - BlockPos getMCBlockPos(); - - IPos offset(int var1); - - IPos offset(int var1, int var2); - - double distanceTo(IPos var1); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IScroll.java b/src/main/java/noppes/npcs/scripted/interfaces/IScroll.java deleted file mode 100644 index 3f1a76fd2..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IScroll.java +++ /dev/null @@ -1,26 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -public interface IScroll extends ICustomGuiComponent { - int getWidth(); - - int getHeight(); - - IScroll setSize(int var1, int var2); - - String[] getList(); - - IScroll setList(String[] var1); - - int getDefaultSelection(); - - IScroll setDefaultSelection(int var1); - - boolean isMultiSelect(); - - IScroll setMultiSelect(boolean var1); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ITextField.java b/src/main/java/noppes/npcs/scripted/interfaces/ITextField.java deleted file mode 100644 index 88c3cca63..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ITextField.java +++ /dev/null @@ -1,18 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -public interface ITextField extends ICustomGuiComponent { - int getWidth(); - - int getHeight(); - - ITextField setSize(int var1, int var2); - - String getText(); - - ITextField setText(String var1); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ITexturedRect.java b/src/main/java/noppes/npcs/scripted/interfaces/ITexturedRect.java deleted file mode 100644 index 2d4c88cba..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ITexturedRect.java +++ /dev/null @@ -1,28 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -public interface ITexturedRect extends ICustomGuiComponent { - String getTexture(); - - ITexturedRect setTexture(String var1); - - int getWidth(); - - int getHeight(); - - ITexturedRect setSize(int var1, int var2); - - float getScale(); - - ITexturedRect setScale(float var1); - - int getTextureX(); - - int getTextureY(); - - ITexturedRect setTextureOffset(int var1, int var2); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ITimers.java b/src/main/java/noppes/npcs/scripted/interfaces/ITimers.java deleted file mode 100644 index f69b93032..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/ITimers.java +++ /dev/null @@ -1,22 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - -package noppes.npcs.scripted.interfaces; - -public interface ITimers { - void start(int var1, int var2, boolean var3); - - void forceStart(int var1, int var2, boolean var3); - - boolean has(int var1); - - boolean stop(int var1); - - void reset(int var1); - - void clear(); - - int size(); -} diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java b/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java deleted file mode 100644 index 9c7b14534..000000000 --- a/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java +++ /dev/null @@ -1,215 +0,0 @@ -package noppes.npcs.scripted.interfaces; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import noppes.npcs.scripted.*; -import noppes.npcs.scripted.entity.ScriptEntity; -import noppes.npcs.scripted.entity.ScriptPlayer; - -public interface IWorld { - /** - * @return The worlds time - */ - public long getTime(); - - /** - * @return The total world time - */ - public long getTotalTime(); - - /** - * @param x World position x - * @param y World position y - * @param z World position z - * @return The block at the given position. Returns null if there isn't a block - */ - public IBlock getBlock(int x, int y, int z); - - /** - * @param x World position x - * @param y World position y - * @param z World position z - * @return Text from signs - * @since 1.7.10d - */ - public String getSignText(int x, int y, int z); - - /** - * @param x World position x - * @param y World position y - * @param z World position z - * @param item The block to be set - */ - public void setBlock(int x, int y, int z, ScriptItemStack item); - - /** - * @param x World position x - * @param y World position y - * @param z World position z - */ - public void removeBlock(int x, int y, int z); - - /** - * @param name The name of the player to be returned - * @return The Player with name. Null is returned when the player isnt found - */ - public ScriptPlayer getPlayer(String name); - - /** - * @param time The world time to be set - */ - public void setTime(long time); - - /** - * @return Whether or not its daytime - */ - public boolean isDay(); - - /** - * @return Whether or not its currently raining - */ - public boolean isRaining(); - - /** - * @param bo Set if it's raining - */ - public void setRaining(boolean bo); - - /** - * @param x The x position - * @param y The y position - * @param z The z position - */ - public void thunderStrike(double x, double y, double z); - - /** - * Sends a packet from the server to the client everytime its called. Probably should not use this too much. - * @param particle Particle name. Particle name list: http://minecraft.gamepedia.com/Particles - * @param x The x position - * @param y The y position - * @param z The z position - * @param dx Usually used for the x motion - * @param dy Usually used for the y motion - * @param dz Usually used for the z motion - * @param speed Speed of the particles, usually between 0 and 1 - * @param count Particle count - */ - public void spawnParticle(String particle, double x, double y, double z, double dx, double dy, double dz, double speed, int count); - - /** - * @param id The items name - * @param damage The damage value - * @param size The number of items in the item - * @return Returns the item - */ - public ScriptItemStack createItem(String id, int damage, int size); - - /** - * @param directory The particle's texture directory. Use only forward slashes when writing a directory. Example: "customnpcs:textures/particle/tail.png" - * @return Returns ScriptEntityParticle object - */ - public ScriptEntityParticle createEntityParticle(String directory); - - /** - * @param key Get temp data for this key - * @return Returns the stored temp data - */ - public Object getTempData(String key); - - /** - * Tempdata gets cleared when the server restarts. All worlds share the same temp data. - * @param key The key for the data stored - * @param value The data stored - */ - public void setTempData(String key, Object value); - - /** - * @param key The key thats going to be tested against the temp data - * @return Whether or not temp data containes the key - */ - public boolean hasTempData(String key); - - /** - * @param key The key for the temp data to be removed - */ - public void removeTempData(String key); - - /** - * Removes all tempdata - */ - public void clearTempData(); - - /** - * @param key The key of the data to be returned - * @return Returns the stored data - */ - public Object getStoredData(String key); - - /** - * Stored data persists through world restart. Unlike tempdata only Strings and Numbers can be saved - * @param key The key for the data stored - * @param value The data stored. This data can be either a Number or a String. Other data is not stored - */ - public void setStoredData(String key, Object value); - - /** - * @param key The key of the data to be checked - * @return Returns whether or not the stored data contains the key - */ - public boolean hasStoredData(String key); - - /** - * @param key The key of the data to be removed - */ - public void removeStoredData(String key); - - /** - * Remove all stored data - */ - public void clearStoredData(); - - /** - * @param x Position x - * @param y Position y - * @param z Position z - * @param range Range of the explosion - * @param fire Whether or not the explosion does fire damage - * @param grief Whether or not the explosion does damage to blocks - */ - public void explode(double x, double y, double z, float range, boolean fire, boolean grief); - - public ScriptPlayer[] getAllServerPlayers(); - - /** - * @since 1.7.10c - * @param x Position x - * @param z Position z - * @return Returns the name of the biome - */ - public String getBiomeName(int x, int z); - - /** - * Lets you spawn a server side cloned entity - * @param x The x position the clone will be spawned at - * @param y The y position the clone will be spawned at - * @param z The z position the clone will be spawned at - * @param tab The tab in which the clone is - * @param name Name of the cloned entity - * @return Returns the entity which was spawned - */ - public ScriptEntity spawnClone(int x, int y, int z, int tab, String name); - - public ScriptScoreboard getScoreboard(); - - BlockPos getMCBlockPos(int x, int y, int z); - - /** - * @since 1.7.10c - * Expert use only - * @return Returns minecraft world object - */ - public WorldServer getMCWorld(); - - public int getDimensionID(); -} diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java deleted file mode 100644 index a3394a7eb..000000000 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java +++ /dev/null @@ -1,161 +0,0 @@ -package noppes.npcs.scripted.overlay; - -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import noppes.npcs.controllers.CustomGuiController; -import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.PlayerDataScript; -import noppes.npcs.scripted.entity.ScriptPlayer; -import noppes.npcs.scripted.gui.ScriptGuiComponent; -import noppes.npcs.scripted.gui.ScriptGuiItemSlot; -import noppes.npcs.scripted.gui.ScriptGuiLabel; -import noppes.npcs.scripted.gui.ScriptGuiLine; -import noppes.npcs.scripted.interfaces.*; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class ScriptOverlay implements ICustomOverlay { - int id; - int defaultAlignment = 0; - List components = new ArrayList(); - - public ScriptOverlay(){ - } - - public ScriptOverlay(int id){ - this.id = id; - } - - public int getID() { - return this.id; - } - - public List getComponents() { - return this.components; - } - - public PlayerDataScript getScriptHandler() { - return ScriptController.Instance.playerScripts;//this.scriptHandler; - } - - public int getDefaultAlignment(){ - return this.defaultAlignment; - } - - public void setDefaultAlignment(int defaultAlignment) { - this.defaultAlignment = defaultAlignment; - } - - public IOverlayTexturedRect addTexturedRect(int id, String texture, int x, int y, int width, int height) { - ScriptOverlayTexturedRect component = new ScriptOverlayTexturedRect(id, texture, x, y, width, height); - this.components.add(component); - return (IOverlayTexturedRect)this.components.get(this.components.size() - 1); - } - - public IOverlayTexturedRect addTexturedRect(int id, String texture, int x, int y, int width, int height, int textureX, int textureY) { - ScriptOverlayTexturedRect component = new ScriptOverlayTexturedRect(id, texture, x, y, width, height, textureX, textureY); - this.components.add(component); - return (IOverlayTexturedRect)this.components.get(this.components.size() - 1); - } - - public IOverlayLabel addLabel(int id, String label, int x, int y, int width, int height) { - ScriptOverlayLabel component = new ScriptOverlayLabel(id, label, x, y, width, height); - this.components.add(component); - return (IOverlayLabel)this.components.get(this.components.size() - 1); - } - - public IOverlayLabel addLabel(int id, String label, int x, int y, int width, int height, int color) { - ScriptOverlayLabel component = new ScriptOverlayLabel(id, label, x, y, width, height, color); - this.components.add(component); - return (IOverlayLabel)this.components.get(this.components.size() - 1); - } - - public IOverlayLine addLine(int id, int x1, int y1, int x2, int y2, int color, int thickness) { - ScriptOverlayLine line = new ScriptOverlayLine(id, x1, y1, x2, y2, color, thickness); - this.components.add(line); - return (IOverlayLine) this.components.get(this.components.size() - 1); - } - - public IOverlayLine addLine(int id, int x1, int y1, int x2, int y2) { - ScriptOverlayLine line = new ScriptOverlayLine(id, x1, y1, x2, y2); - this.components.add(line); - return (IOverlayLine) this.components.get(this.components.size() - 1); - } - - public ICustomOverlayComponent getComponent(int componentID) { - Iterator var2 = this.components.iterator(); - - ICustomOverlayComponent component; - do { - if (!var2.hasNext()) { - return null; - } - - component = (ICustomOverlayComponent)var2.next(); - } while(component.getID() != componentID); - - return component; - } - - public void removeComponent(int componentID) { - for(int i = 0; i < this.components.size(); ++i) { - if (((ICustomOverlayComponent)this.components.get(i)).getID() == componentID) { - this.components.remove(i); - return; - } - } - - } - - public void updateComponent(ICustomOverlayComponent component) { - for(int i = 0; i < this.components.size(); ++i) { - ICustomOverlayComponent c = (ICustomOverlayComponent)this.components.get(i); - if (c.getID() == component.getID()) { - this.components.set(i, component); - return; - } - } - - } - - public void update(IPlayer player) { - CustomGuiController.updateOverlay((ScriptPlayer)player, this); - } - - public ICustomOverlay fromNBT(NBTTagCompound tag) { - this.id = tag.getInteger("id"); - List components = new ArrayList(); - - NBTTagList list = tag.getTagList("components", 10); - for(int i = 0; i < list.tagCount(); i++){ - NBTBase b = list.getCompoundTagAt(i); - ScriptOverlayComponent component = ScriptOverlayComponent.createFromNBT((NBTTagCompound)b); - components.add(component); - } - - this.components = components; - - return this; - } - - public NBTTagCompound toNBT() { - NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("id", this.id); - - NBTTagList list = new NBTTagList(); - Iterator var3 = this.components.iterator(); - - ICustomOverlayComponent c; - while(var3.hasNext()) { - c = (ICustomOverlayComponent)var3.next(); - list.appendTag(((ScriptOverlayComponent)c).toNBT(new NBTTagCompound())); - } - - tag.setTag("components", list); - - return tag; - } -} diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayComponent.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayComponent.java deleted file mode 100644 index 88aa3f396..000000000 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayComponent.java +++ /dev/null @@ -1,123 +0,0 @@ -package noppes.npcs.scripted.overlay; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; -import noppes.npcs.scripted.gui.*; -import noppes.npcs.scripted.interfaces.ICustomGuiComponent; -import noppes.npcs.scripted.interfaces.ICustomOverlayComponent; -import noppes.npcs.scripted.interfaces.IOverlayTexturedRect; - -public abstract class ScriptOverlayComponent implements ICustomOverlayComponent { - int id; - int posX; - int posY; - int alignment = 0; - int color = 0xFFFFFF; - float alpha = 1.0F; - float rotation = 0; - /* ========ALIGNMENTS======== - 0 1 2 - - 3 4 5 - - 6 7 8 - */ - - public ScriptOverlayComponent(){ - } - - public int getID() { - return this.id; - } - - public ICustomOverlayComponent setID(int id) { - this.id = id; - return this; - } - - public int getPosX() { - return this.posX; - } - - public int getPosY() { - return this.posY; - } - - public ICustomOverlayComponent setPos(int x, int y) { - this.posX = x; - this.posY = y; - return this; - } - - public int getAlignment() { - return this.alignment; - } - - public void setAlignment(int alignment) { - this.alignment = alignment; - } - - public int getColor() { - return this.color; - } - - public ICustomOverlayComponent setColor(int color) { - this.color = color; - return this; - } - - public float getAlpha() { - return this.alpha; - } - - public void setAlpha(float alpha) { - this.alpha = alpha; - } - - public float getRotation() { - return rotation; - } - - public void setRotation(float rotation) { - this.rotation = rotation; - } - - public abstract int getType(); - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - nbt.setInteger("id", this.id); - nbt.setIntArray("pos", new int[]{this.posX, this.posY}); - nbt.setInteger("alignment",this.alignment); - nbt.setInteger("color", this.color); - nbt.setFloat("alpha",this.alpha); - nbt.setFloat("rotation",this.rotation); - - nbt.setInteger("type", this.getType()); - return nbt; - } - - public ScriptOverlayComponent fromNBT(NBTTagCompound nbt) { - this.setID(nbt.getInteger("id")); - this.setPos(nbt.getIntArray("pos")[0], nbt.getIntArray("pos")[1]); - this.setAlignment(nbt.getInteger("alignment")); - this.setColor(nbt.getInteger("color")); - this.setAlpha(nbt.getFloat("alpha")); - this.setRotation(nbt.getInteger("rotation")); - - return this; - } - - public static ScriptOverlayComponent createFromNBT(NBTTagCompound nbt) { - switch(nbt.getInteger("type")) { - case 0: - return (new ScriptOverlayTexturedRect()).fromNBT(nbt); - case 1: - return (new ScriptOverlayLabel()).fromNBT(nbt); - case 2: - return (new ScriptOverlayLine()).fromNBT(nbt); - default: - return null; - } - } -} diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLabel.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLabel.java deleted file mode 100644 index 3e2e041ad..000000000 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLabel.java +++ /dev/null @@ -1,97 +0,0 @@ -package noppes.npcs.scripted.overlay; - -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.gui.ScriptGuiComponent; -import noppes.npcs.scripted.interfaces.ILabel; -import noppes.npcs.scripted.interfaces.IOverlayLabel; - -public class ScriptOverlayLabel extends ScriptOverlayComponent implements IOverlayLabel { - String label; - int width; - int height; - float scale; - boolean shadow; - - public ScriptOverlayLabel() { - this.color = 16777215; - this.scale = 1.0F; - } - - public ScriptOverlayLabel(int id, String label, int x, int y, int width, int height) { - this.color = 16777215; - this.scale = 1.0F; - this.setID(id); - this.setText(label); - this.setPos(x, y); - this.setSize(width, height); - this.setShadow(false); - } - - public ScriptOverlayLabel(int id, String label, int x, int y, int width, int height, int color) { - this(id, label, x, y, width, height); - this.setColor(color); - } - - public String getText() { - return this.label; - } - - public IOverlayLabel setText(String label) { - this.label = label; - return this; - } - - public int getWidth() { - return this.width; - } - - public int getHeight() { - return this.height; - } - - public IOverlayLabel setSize(int width, int height) { - this.width = width; - this.height = height; - return this; - } - - public float getScale() { - return this.scale; - } - - public IOverlayLabel setScale(float scale) { - this.scale = scale; - return this; - } - - public boolean getShadow(){ - return this.shadow; - } - - public void setShadow(boolean shadow){ - this.shadow = shadow; - } - - @Override - public int getType() { - return 1; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - nbt.setString("label", this.label); - nbt.setIntArray("size", new int[]{this.width, this.height}); - nbt.setFloat("scale", this.scale); - nbt.setBoolean("shadow",this.shadow); - return nbt; - } - - public ScriptOverlayLabel fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - this.setText(nbt.getString("label")); - this.setSize(nbt.getIntArray("size")[0], nbt.getIntArray("size")[1]); - this.setScale(nbt.getFloat("scale")); - this.setShadow(nbt.getBoolean("shadow")); - return this; - } -} diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLine.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLine.java deleted file mode 100644 index 07590298c..000000000 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayLine.java +++ /dev/null @@ -1,97 +0,0 @@ -package noppes.npcs.scripted.overlay; - -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.gui.ScriptGuiComponent; -import noppes.npcs.scripted.interfaces.IOverlayLine; - -public class ScriptOverlayLine extends ScriptOverlayComponent implements IOverlayLine { - int x1; - int y1; - int x2; - int y2; - int thickness = 2; - - public ScriptOverlayLine(){ - } - - public ScriptOverlayLine(int id, int x1, int y1, int x2, int y2){ - this.setPos(x1, y1); - this.setID(id); - - this.x1 = x1; - this.y1 = y1; - this.x2 = x2; - this.y2 = y2; - } - - public ScriptOverlayLine(int id, int x1, int y1, int x2, int y2, int color, int thickness){ - this.setPos(x1, y1); - this.setID(id); - - this.x1 = x1; - this.y1 = y1; - this.x2 = x2; - this.y2 = y2; - this.color = color; - this.thickness = thickness; - } - - @Override - public int getType() { - return 2; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - nbt.setInteger("X1",x1); - nbt.setInteger("Y1",y1); - nbt.setInteger("X2",x2); - nbt.setInteger("Y2",y2); - nbt.setInteger("Thickness",thickness); - - return nbt; - } - - public ScriptOverlayLine fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - x1 = nbt.getInteger("X1"); - y1 = nbt.getInteger("Y1"); - x2 = nbt.getInteger("X2"); - y2 = nbt.getInteger("Y2"); - thickness = nbt.getInteger("Thickness"); - - return this; - } - - public int getX1(){ - return this.x1; - } - public int getY1(){ - return this.y1; - } - public int getX2(){ - return this.x2; - } - public int getY2(){ - return this.y2; - } - public int getThickness(){ - return this.thickness; - } - - public void setX1(int x1){ - this.x1 = x1; - } - public void setY1(int y1){ - this.y1 = y1; - } - public void setX2(int x2){ - this.x2 = x2; - } - public void setY2(int y2){ - this.y2 = y2; - } - public void setThickness(int thickness){ - this.thickness = thickness; - } -} diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayTexturedRect.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayTexturedRect.java deleted file mode 100644 index 85d0fa155..000000000 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlayTexturedRect.java +++ /dev/null @@ -1,110 +0,0 @@ -package noppes.npcs.scripted.overlay; - -import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.scripted.gui.ScriptGuiComponent; -import noppes.npcs.scripted.interfaces.IOverlayLabel; -import noppes.npcs.scripted.interfaces.IOverlayTexturedRect; -import noppes.npcs.scripted.interfaces.ITexturedRect; - -public class ScriptOverlayTexturedRect extends ScriptOverlayComponent implements IOverlayTexturedRect { - int width; - int height; - int textureX; - int textureY; - float scale; - String texture; - - public ScriptOverlayTexturedRect() { - this.textureY = -1; - this.scale = 1.0F; - } - - public ScriptOverlayTexturedRect(int id, String texture, int x, int y, int width, int height) { - this.textureY = -1; - this.scale = 1.0F; - this.setID(id); - this.setTexture(texture); - this.setPos(x, y); - this.setSize(width, height); - } - - public ScriptOverlayTexturedRect(int id, String texture, int x, int y, int width, int height, int textureX, int textureY) { - this(id, texture, x, y, width, height); - this.setTextureOffset(textureX, textureY); - } - - public String getTexture() { - return this.texture; - } - - public IOverlayTexturedRect setTexture(String texture) { - this.texture = texture; - return this; - } - - public int getWidth() { - return this.width; - } - - public int getHeight() { - return this.height; - } - - public IOverlayTexturedRect setSize(int width, int height) { - this.width = width; - this.height = height; - return this; - } - - public float getScale() { - return this.scale; - } - - public IOverlayTexturedRect setScale(float scale) { - this.scale = scale; - return this; - } - - public int getTextureX() { - return this.textureX; - } - - public int getTextureY() { - return this.textureY; - } - - public IOverlayTexturedRect setTextureOffset(int offsetX, int offsetY) { - this.textureX = offsetX; - this.textureY = offsetY; - return this; - } - - @Override - public int getType() { - return 0; - } - - public NBTTagCompound toNBT(NBTTagCompound nbt) { - super.toNBT(nbt); - nbt.setIntArray("size", new int[]{this.width, this.height}); - nbt.setFloat("scale", this.scale); - nbt.setString("texture", this.texture); - if (this.textureX >= 0 && this.textureY >= 0) { - nbt.setIntArray("texPos", new int[]{this.textureX, this.textureY}); - } - - return nbt; - } - - public ScriptOverlayComponent fromNBT(NBTTagCompound nbt) { - super.fromNBT(nbt); - this.setSize(nbt.getIntArray("size")[0], nbt.getIntArray("size")[1]); - this.setScale(nbt.getFloat("scale")); - this.setTexture(nbt.getString("texture")); - if (nbt.hasKey("texPos")) { - this.setTextureOffset(nbt.getIntArray("texPos")[0], nbt.getIntArray("texPos")[1]); - } - - return this; - } -} diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobConversation.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobConversation.java index 5f92c6d92..45d403e34 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobConversation.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobConversation.java @@ -2,6 +2,10 @@ package noppes.npcs.scripted.roles; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobConversation; +import noppes.npcs.roles.JobGuard; +import noppes.npcs.roles.JobItemGiver; +import noppes.npcs.scripted.ScriptItemStack; +import noppes.npcs.scripted.ScriptPlayer; import noppes.npcs.scripted.constants.JobType; public class ScriptJobConversation extends ScriptJobInterface{ diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobFollower.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobFollower.java index 610ef99e3..f12e9cb88 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobFollower.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobFollower.java @@ -2,7 +2,8 @@ package noppes.npcs.scripted.roles; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobFollower; -import noppes.npcs.scripted.entity.ScriptNpc; +import noppes.npcs.roles.JobGuard; +import noppes.npcs.scripted.ScriptNpc; import noppes.npcs.scripted.constants.JobType; public class ScriptJobFollower extends ScriptJobInterface{ @@ -23,7 +24,7 @@ public class ScriptJobFollower extends ScriptJobInterface{ public ScriptNpc getFollowingNpc(){ if(!isFollowing()) return null; - return (ScriptNpc)job.following.script.dummyNpc; + return job.following.script.dummyNpc; } public boolean isFollowing(){ diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobHealer.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobHealer.java index 52bcaefc9..8c6c934ce 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobHealer.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobHealer.java @@ -1,8 +1,9 @@ package noppes.npcs.scripted.roles; import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.roles.JobGuard; import noppes.npcs.roles.JobHealer; -import noppes.npcs.scripted.entity.ScriptLivingBase; +import noppes.npcs.scripted.ScriptLivingBase; import noppes.npcs.scripted.constants.JobType; public class ScriptJobHealer extends ScriptJobInterface{ @@ -13,7 +14,7 @@ public class ScriptJobHealer extends ScriptJobInterface{ } public void heal(ScriptLivingBase entity, float amount){ - job.heal(entity.getMCEntity(), amount); + job.heal(entity.getMinecraftEntity(), amount); } @Override diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobItemGiver.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobItemGiver.java index 046f89dac..e2d81c5c2 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobItemGiver.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobItemGiver.java @@ -1,7 +1,10 @@ package noppes.npcs.scripted.roles; import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.roles.JobGuard; import noppes.npcs.roles.JobItemGiver; +import noppes.npcs.scripted.ScriptItemStack; +import noppes.npcs.scripted.ScriptPlayer; import noppes.npcs.scripted.constants.JobType; public class ScriptJobItemGiver extends ScriptJobInterface{ diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobPuppet.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobPuppet.java index 20b12965f..7177de312 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobPuppet.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobPuppet.java @@ -1,7 +1,11 @@ package noppes.npcs.scripted.roles; +import noppes.npcs.controllers.ScriptController; import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.roles.JobGuard; +import noppes.npcs.roles.JobHealer; import noppes.npcs.roles.JobPuppet; +import noppes.npcs.scripted.ScriptLivingBase; import noppes.npcs.scripted.constants.JobType; public class ScriptJobPuppet extends ScriptJobInterface{ diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptJobSpawner.java b/src/main/java/noppes/npcs/scripted/roles/ScriptJobSpawner.java index cf9529be8..178afc911 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptJobSpawner.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptJobSpawner.java @@ -1,12 +1,18 @@ package noppes.npcs.scripted.roles; import java.util.ArrayList; +import java.util.Iterator; import net.minecraft.entity.EntityLivingBase; +import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.roles.JobGuard; +import noppes.npcs.roles.JobItemGiver; import noppes.npcs.roles.JobSpawner; -import noppes.npcs.scripted.entity.ScriptLivingBase; +import noppes.npcs.scripted.ScriptItemStack; +import noppes.npcs.scripted.ScriptLivingBase; +import noppes.npcs.scripted.ScriptPlayer; import noppes.npcs.scripted.constants.JobType; public class ScriptJobSpawner extends ScriptJobInterface{ diff --git a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java index d10bd8dad..3b65007c6 100644 --- a/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java +++ b/src/main/java/noppes/npcs/scripted/roles/ScriptRoleFollower.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; -import noppes.npcs.scripted.entity.ScriptPlayer; +import noppes.npcs.scripted.ScriptPlayer; import noppes.npcs.scripted.constants.RoleType; public class ScriptRoleFollower extends ScriptRoleInterface{ @@ -19,11 +19,11 @@ public class ScriptRoleFollower extends ScriptRoleInterface{ * @param player Player who is set as the owner. If null given everything resets */ public void setOwner(ScriptPlayer player){ - if(player == null || player.getMCEntity() == null){ + if(player == null || player.getMinecraftEntity() == null){ role.setOwner(null); return; } - EntityPlayer mcplayer = (EntityPlayer) player.getMCEntity(); + EntityPlayer mcplayer = (EntityPlayer) player.getMinecraftEntity(); role.setOwner(mcplayer); } diff --git a/src/main/java/noppes/npcs/scripted/wrapper/ScriptDamageSource.java b/src/main/java/noppes/npcs/scripted/wrapper/ScriptDamageSource.java deleted file mode 100644 index 32aecda6c..000000000 --- a/src/main/java/noppes/npcs/scripted/wrapper/ScriptDamageSource.java +++ /dev/null @@ -1,43 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.wrapper; - -import net.minecraft.util.DamageSource; -import noppes.npcs.scripted.interfaces.IDamageSource; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.interfaces.IEntity; - -public class ScriptDamageSource implements IDamageSource { - private DamageSource source; - - public ScriptDamageSource(DamageSource source) { - this.source = source; - } - - public String getType() { - return this.source.getDamageType(); - } - - public boolean isUnblockable() { - return this.source.isUnblockable(); - } - - public boolean isProjectile() { - return this.source.isProjectile(); - } - - public DamageSource getMCDamageSource() { - return this.source; - } - - public IEntity getTrueSource() { - return NpcAPI.Instance().getIEntity(this.source.getEntity()); - } - - public IEntity getImmediateSource() { - return NpcAPI.Instance().getIEntity(this.source.getSourceOfDamage()); - } -} diff --git a/src/main/java/noppes/npcs/scripted/wrapper/WrapperEntityData.java b/src/main/java/noppes/npcs/scripted/wrapper/WrapperEntityData.java deleted file mode 100644 index 641e211e2..000000000 --- a/src/main/java/noppes/npcs/scripted/wrapper/WrapperEntityData.java +++ /dev/null @@ -1,59 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.wrapper; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.passive.EntityTameable; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.ResourceLocation; -import noppes.npcs.controllers.PixelmonHelper; -import noppes.npcs.scripted.entity.*; -import noppes.npcs.scripted.interfaces.IEntity; - -public class WrapperEntityData{ - public IEntity base; - private static final ResourceLocation key = new ResourceLocation("customnpcs", "entitydata"); - - public WrapperEntityData(IEntity base) { - this.base = base; - } - - public static IEntity get(Entity entity) { - if (entity == null) { - return null; - } else { - WrapperEntityData data = new WrapperEntityData(new ScriptEntity(entity)); - if (data == null) { - return getData(entity).base; - } else { - return data.base; - } - } - } - - private static WrapperEntityData getData(Entity entity) { - if (entity != null && entity.worldObj != null && !entity.worldObj.isRemote) { - if (entity instanceof EntityPlayerMP) { - return new WrapperEntityData(new ScriptPlayer((EntityPlayerMP)entity)); - } else if (PixelmonHelper.isPixelmon(entity)) { - return new WrapperEntityData(new ScriptPixelmon((EntityTameable)entity)); - } else if (entity instanceof EntityAnimal) { - return new WrapperEntityData(new ScriptAnimal((EntityAnimal)entity)); - } else if (entity instanceof EntityMob) { - return new WrapperEntityData(new ScriptMonster((EntityMob)entity)); - } else if (entity instanceof EntityLiving) { - return new WrapperEntityData(new ScriptLiving((EntityLiving)entity)); - } else if (entity instanceof EntityLivingBase) { - return new WrapperEntityData(new ScriptLivingBase((EntityLivingBase)entity)); - } - } - return null; - } -} diff --git a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java b/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java deleted file mode 100644 index 631f486c6..000000000 --- a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java +++ /dev/null @@ -1,283 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.scripted.wrapper; - -import java.io.File; -import java.util.List; -import java.util.Map; - -import cpw.mods.fml.common.eventhandler.EventBus; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.passive.EntityTameable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSource; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import noppes.npcs.CustomNpcs; -import noppes.npcs.NoppesUtilServer; -import noppes.npcs.controllers.*; -import noppes.npcs.scripted.*; -import noppes.npcs.containers.ContainerNpcInterface; -import noppes.npcs.entity.EntityCustomNpc; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.scripted.ScriptContainer; -import noppes.npcs.scripted.entity.*; -import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.handler.*; -import noppes.npcs.scripted.interfaces.*; -import noppes.npcs.scripted.overlay.ScriptOverlay; -import noppes.npcs.util.JsonException; -import noppes.npcs.util.LRUHashMap; -import noppes.npcs.util.NBTJsonUtil; - -public class WrapperNpcAPI extends NpcAPI { - private static final Map worldCache = new LRUHashMap(10); - public static final EventBus EVENT_BUS = new EventBus(); - private static NpcAPI instance = null; - - public WrapperNpcAPI() { - } - - public static void clearCache() { - worldCache.clear(); - } - - public IFactionHandler getFactions() { - this.checkWorld(); - return FactionController.getInstance(); - } - - public IRecipeHandler getRecipes() { - this.checkWorld(); - return RecipeController.instance; - } - - public IQuestHandler getQuests() { - this.checkWorld(); - return QuestController.instance; - } - - public IDialogHandler getDialogs() { - return DialogController.instance; - } - - public ICloneHandler getClones() { - return ServerCloneController.Instance; - } - - public IEntity getIEntity(Entity entity) { - if(entity == null) - return null; - if(entity instanceof EntityNPCInterface) - return ((EntityNPCInterface)entity).wrappedNPC; - else{ - ScriptEntityData data = (ScriptEntityData) entity.getExtendedProperties("ScriptedObject"); - if(data != null) - return data.base; - if(entity instanceof EntityPlayerMP) - data = new ScriptEntityData(new ScriptPlayer((EntityPlayerMP) entity)); - else if(PixelmonHelper.isPixelmon(entity)) - return new ScriptPixelmon((EntityTameable) entity); - else if(entity instanceof EntityAnimal) - data = new ScriptEntityData(new ScriptAnimal((EntityAnimal) entity)); - else if(entity instanceof EntityMob) - data = new ScriptEntityData(new ScriptMonster((EntityMob) entity)); - else if(entity instanceof EntityLiving) - data = new ScriptEntityData(new ScriptLiving((EntityLiving) entity)); - else if(entity instanceof EntityLivingBase) - data = new ScriptEntityData(new ScriptLivingBase((EntityLivingBase)entity)); - else - data = new ScriptEntityData(new ScriptEntity(entity)); - entity.registerExtendedProperties("ScriptedObject", data); - return data.base; - } - } - - public IBlock getIBlock(World world, BlockPos pos) { - return new ScriptBlock(world, world.getBlock(pos.getX(),pos.getY(),pos.getZ()), pos); - } - - public IBlock getIBlock(World world, int x, int y, int z) { - return new ScriptBlock(world, world.getBlock(x, y, z), new BlockPos(x,y,z)); - } - - public INbt getINbt(NBTTagCompound compound) { - return compound == null?new ScriptNbt(new NBTTagCompound()):new ScriptNbt(compound); - } - - public INbt stringToNbt(String str) { - if (str != null && !str.isEmpty()) { - try { - return this.getINbt(NBTJsonUtil.Convert(str)); - } catch (JsonException var3) { - throw new CustomNPCsException(var3, "Failed converting " + str, new Object[0]); - } - } else { - throw new CustomNPCsException("Cant cast empty string to nbt", new Object[0]); - } - } - - public ICustomNpc createNPC(World world) { - if (world.isRemote) { - return null; - } else { - EntityCustomNpc npc = new EntityCustomNpc(world); - return npc.wrappedNPC; - } - } - - public ICustomNpc spawnNPC(World world, int x, int y, int z) { - if (world.isRemote) { - return null; - } else { - EntityCustomNpc npc = new EntityCustomNpc(world); - npc.setPositionAndRotation((double)x + 0.5D, (double)y, (double)z + 0.5D, 0.0F, 0.0F); - npc.setHealth(npc.getMaxHealth()); - world.spawnEntityInWorld(npc); - return npc.wrappedNPC; - } - } - - public static NpcAPI Instance() { - if (instance == null) { - instance = new WrapperNpcAPI(); - } - - return instance; - } - - public EventBus events() { - return EVENT_BUS; - } - - public IItemStack getIItemStack(ItemStack itemstack) { - return (IItemStack)(itemstack != null && itemstack.stackSize > 0 ? new ScriptItemStack(itemstack) : new ScriptItemStack(new ItemStack(Item.getItemById(0)))); - - } - - public IWorld getIWorld(WorldServer world) { - ScriptWorld w = (ScriptWorld)worldCache.get(world.provider.dimensionId); - if (w != null) { - w.world = world; - return w; - } else { - worldCache.put(world.provider.dimensionId, w = ScriptWorld.createNew(world)); - return w; - } - } - - public IWorld getIWorld(int dimensionId) { - WorldServer[] var2 = CustomNpcs.getServer().worldServers; - int var3 = var2.length; - - for(int var4 = 0; var4 < var3; ++var4) { - WorldServer world = var2[var4]; - if (world.provider.dimensionId == dimensionId) { - return this.getIWorld(world); - } - } - - throw new CustomNPCsException("Unknown dimension id: " + dimensionId, new Object[0]); - } - - public IContainer getIContainer(IInventory inventory) { - return new ScriptContainer(inventory); - } - - public IContainer getIContainer(Container container) { - return (IContainer)(container instanceof ContainerNpcInterface ? ContainerNpcInterface.getOrCreateIContainer((ContainerNpcInterface)container) : new ScriptContainer(container)); - } - - private void checkWorld() { - if (CustomNpcs.getServer() == null || CustomNpcs.getServer().isServerStopped()) { - throw new CustomNPCsException("No world is loaded right now", new Object[0]); - } - } - - public IWorld[] getIWorlds() { - this.checkWorld(); - IWorld[] worlds = new IWorld[CustomNpcs.getServer().worldServers.length]; - - for(int i = 0; i < CustomNpcs.getServer().worldServers.length; ++i) { - worlds[i] = this.getIWorld(CustomNpcs.getServer().worldServers[i]); - } - - return worlds; - } - - public File getGlobalDir() { - return CustomNpcs.Dir; - } - - public File getWorldDir() { - return CustomNpcs.getWorldSaveDirectory(); - } - - public IDamageSource getIDamageSource(DamageSource damagesource) { - return new ScriptDamageSource(damagesource); - } - - public IDamageSource getIDamageSource(IEntity entity) { - if(entity.getType() == 1)//if player - return new ScriptDamageSource(new EntityDamageSource("player",entity.getMCEntity())); - else - return new ScriptDamageSource(new EntityDamageSource(entity.getTypeName(),entity.getMCEntity())); - } - - public void executeCommand(IWorld world, String command) { - //if(!world.getMCWorld().isRemote) - NoppesUtilServer.runCommand(world.getMCWorld(), "API", command); - } - public String getRandomName(int dictionary, int gender) { - return CustomNpcs.MARKOV_GENERATOR[dictionary].fetch(gender); - } - - public ScriptPlayer[] getAllServerPlayers(){ - List list = MinecraftServer.getServer().getConfigurationManager().playerEntityList; - ScriptPlayer[] arr = new ScriptPlayer[list.size()]; - for(int i = 0; i < list.size(); i++){ - arr[i] = (ScriptPlayer) ScriptController.Instance.getScriptForEntity(list.get(i)); - } - - return arr; - } - - public ScriptItemStack createItem(String id, int damage, int size){ - Item item = (Item)Item.itemRegistry.getObject(id); - if(item == null) - return null; - return new ScriptItemStack(new ItemStack(item, size, damage)); - } - - public ScriptEntityParticle createEntityParticle(String directory){ - return new ScriptEntityParticle(directory); - } - - public int getServerTime() { - return MinecraftServer.getServer().getTickCounter(); - } - - public ICustomGui createCustomGui(int id, int width, int height, boolean pauseGame) { - return new ScriptGui(id, width, height, pauseGame); - } - - public ICustomOverlay createCustomOverlay(int id) { - return new ScriptOverlay(id); - } -} diff --git a/src/main/java/noppes/npcs/util/CustomNPCsScheduler.java b/src/main/java/noppes/npcs/util/CustomNPCsScheduler.java new file mode 100644 index 000000000..6fe24be82 --- /dev/null +++ b/src/main/java/noppes/npcs/util/CustomNPCsScheduler.java @@ -0,0 +1,17 @@ +package noppes.npcs.util; + +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +public class CustomNPCsScheduler { + private final static ScheduledExecutorService executor = Executors.newScheduledThreadPool(1); + + public static void runTack(Runnable task, int delay){ + executor.schedule(task, delay, TimeUnit.MILLISECONDS); + } + + public static void runTack(Runnable task){ + executor.schedule(task, 0, TimeUnit.MILLISECONDS); + } +} diff --git a/src/main/java/noppes/npcs/util/LRUHashMap.java b/src/main/java/noppes/npcs/util/LRUHashMap.java deleted file mode 100644 index 0fe23a99f..000000000 --- a/src/main/java/noppes/npcs/util/LRUHashMap.java +++ /dev/null @@ -1,22 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package noppes.npcs.util; - -import java.util.LinkedHashMap; -import java.util.Map.Entry; - -public class LRUHashMap extends LinkedHashMap { - private final int maxSize; - - public LRUHashMap(int size) { - super(size, 0.75F, true); - this.maxSize = size; - } - - protected boolean removeEldestEntry(Entry eldest) { - return this.size() > this.maxSize; - } -} diff --git a/src/main/java/noppes/npcs/util/Vec3NPC.java b/src/main/java/noppes/npcs/util/Vec3NPC.java deleted file mode 100644 index 6c5705e75..000000000 --- a/src/main/java/noppes/npcs/util/Vec3NPC.java +++ /dev/null @@ -1,11 +0,0 @@ -package noppes.npcs.util; - -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; - -public class Vec3NPC extends Vec3 -{ - public Vec3NPC(double p_i1108_1_, double p_i1108_3_, double p_i1108_5_) { - super(p_i1108_1_, p_i1108_3_, p_i1108_5_); - } -} diff --git a/src/main/resources/assets/customnpcs/lang/de_DE.lang b/src/main/resources/assets/customnpcs/lang/de_DE.lang index 90b5fa899..5efa87a55 100644 --- a/src/main/resources/assets/customnpcs/lang/de_DE.lang +++ b/src/main/resources/assets/customnpcs/lang/de_DE.lang @@ -166,7 +166,6 @@ display.livingAnimation=Lebende Animation display.visible=Sichtbar display.bossbar=Boss-Lebensanzeige display.url=Url -display.urlSix=Url64 inv.minExp=Min. Xp inv.maxExp=Max. Xp diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index c3d90ccf7..bed7f8ecc 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -100,6 +100,7 @@ gui.selectSound=Select Sound gui.selectnpc=Select NPC gui.select=Select gui.range=Range +gui.name=Name gui.partly=Partially gui.copy=Copy gui.clear=Clear @@ -113,9 +114,9 @@ gui.detailed=Detailed gui.server=Server gui.showmore=Show More gui.update=Update +gui.disabled=Disabled gui.editor=Editor gui.playernearby=Player nearby -gui.forum=Forum remote.title=Nearby NPCs remote.reset=Reset @@ -125,9 +126,6 @@ remote.freeze=Freeze NPCs spawner.entities=Entities spawner.clones=Clones -spawner.clones2=Clones 2 -spawner.clones3=Clones 3 -spawner.clones4=Clones 4 spawner.mobspawner=MobSpawner spawner.mount=Mount by spawner.mountplayer=Player mounts @@ -144,7 +142,7 @@ mailbox.name=Mailbox mailbox.sender=Sender mailbox.read=Read mailbox.timesend=%s ago -mailbox.day=day +mailbox.day=day mailbox.days=days mailbox.hour=hour mailbox.hours=hours @@ -172,9 +170,7 @@ display.selectTexture=Select Texture display.livingAnimation=Has a living animation display.visible=Visible display.bossbar=BossBar -display.squareTexture=Square Texture display.url=Url -display.urlSix=Url64 inv.minExp=Min Exp inv.maxExp=Max Exp @@ -237,6 +233,8 @@ job.puppet=Puppet stats.health=Health stats.aggro=AggroRange +stats.meleeproperties=MeleeProperties +stats.rangedproperties=RangeProperties stats.projectileproperties=ProjectileType stats.meleestrength=MeleeStrength stats.meleerange=MeleeRange @@ -265,8 +263,6 @@ stats.rangedproperties=RangedOptions stats.burninsun=BurnsInSun stats.amplify=Amplified stats.melee=Melee -stats.disabledamage=DisableDamage -stats.disabletrue=Damage is currently disabled in Stats stats.regenhealth=Health Regen stats.combatregen=Combat Regen stats.naturallydespawns=Naturally Despawn @@ -308,11 +304,6 @@ ai.tacticalvariant=TacticalVariant ai.cobwebAffected=CobwebAffected ai.movement=Movement -movement.ground=Ground -movement.flying=Flying -fly.speed=Flying Speed -fly.gravity=Flying Gravity - aitactics.rush=Rush aitactics.stagger=Dodge aitactics.orbit=Surround @@ -380,7 +371,7 @@ follower.lastday=Last day follower.day=Day follower.days=Days follower.hireText=Thank you for hiring me for -follower.farewellText=My days with you are over. Farewell +follower.farewellText=My days with you are over. Farewell follower.infiniteDays=Infinite Days follower.guiDisabled=GuiDisabled follower.allowSoulstone=AllowSoulstone @@ -446,9 +437,6 @@ quest.exp=Exp quest.takeitems=Take Items quest.objectives=Objectives -script.apidoc=API Docs -script.apisrc=API Source - script.scripts=Scripts script.hooks=Hooks script.loadscript=Load Scripts @@ -462,58 +450,12 @@ script.damaged=Damaged script.killed=Killed script.attack=Attack script.target=Target -script.timer=Timer script.availableScripts=Available Scripts script.loadedScripts=Loaded Scripts script.collide=Collide script.kills=Kills script.dialog_closed=Dialog Closed -eventscript.playerevent=Player Events - -playerscript.disabled=Disabled -playerscript.attack=Attack -playerscript.breakBlock=Break -playerscript.chat=Chat -playerscript.containerclosed=Closed Container -playerscript.containerOpen=Open Container -playerscript.damagedEntity=Damaged Entity -playerscript.damaged=Hurt -playerscript.killed=Killed -playerscript.factionupdate=Faction Updated -playerscript.init=Init -playerscript.interact=Interact -playerscript.keyPressed=Key Pressed -playerscript.kills=Kills -playerscript.levelUp=Level Up -playerscript.login=Login -playerscript.logout=Logout -playerscript.pickUp=Pickup -playerscript.rangedCharge=Arrow Charge -playerscript.rangedLaunched=Arrow Launched -playerscript.toss=Toss Item -playerscript.drop=Drop Items -playerscript.tick=Update -playerscript.pickupXP=Pickup XP -playerscript.timer=Timer -playerscript.mouseClicked=Mouse Click -playerscript.startItem=Item Start -playerscript.usingItem=Using Item -playerscript.stopItem=Item Stop -playerscript.finishItem=Item Finish -playerscript.playSound=Play Sound -playerscript.lightning=Lightning Struck -playerscript.fall=Fall -playerscript.jump=Jump -playerscript.respawn=Respawn -playerscript.changedDim=Dimension Change -playerscript.useHoe=Use Hoe -playerscript.sleep=Sleep -playerscript.wakeUp=Wake Up -playerscript.fillBucket=Fill Bucket -playerscript.bonemeal=Bonemeal -playerscript.achievement=Achievement - item.npcWand.name=Npc Wand item.npcMobCloner.name=Mob Cloner item.npcMovingPath.name=Npc Pather @@ -938,6 +880,7 @@ movement.rotation=Rotation movement.body=Body movement.manual=Manual movement.stalking=Stalking +movement.stalking=Stalking movement.head=Head movement.pauses=Pauses movement.stopinteract=Stop on interact @@ -977,23 +920,4 @@ companion.stage=Stage companion.owner=Owner companion.strength=Strength companion.talent=Talent -companion.level=Level - -markov.generic.name=Generic Generator -markov.ancientGreek.name=Ancient Greek -markov.aztec.name=Aztec -markov.classicCNPCs.name=Classic CNPCs -markov.japanese.name=Japanese -markov.oldNorse.name=Old Norse -markov.roman.name=Roman (Latin) -markov.sami.name=Lappish (Sami) -markov.slavic.name=Old Polish -markov.welsh.name=Breton (Welsh) -markov.spanish.name=Spanish (Latino) - -markov.gender.name=Gender -markov.gender.either=Either -markov.gender.female=Female -markov.gender.male=Male - -markov.generate=Generate \ No newline at end of file +companion.level=Level \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/ancient_greek_female.txt b/src/main/resources/assets/customnpcs/markovnames/ancient_greek_female.txt deleted file mode 100644 index 7ee8a4d8e..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/ancient_greek_female.txt +++ /dev/null @@ -1,406 +0,0 @@ -Achaeis -Achaia -Achradina -Actae -Acte -Ada -Adeia -Aedon -Aegiolea -Aegle -Aerope -Aethre -Agamede -Aganippe -Agape -Agapia -Agarista -Agathe -Agathonice -Agave -Aglaia -Aglaurus -Aikaterine -Aithra -Aketa -Alcandre -Alcestis -Alcippe -Alcmene -Alcyone -Alemene -Alkmena -Althaea -Althaia -Althea -Amarhyllis -Amathea -Amatheia -Amphithoe -Amphitrite -Ampinomene -Amplias -Anais -Anastasia -Andromeda -Antehe -Anteia -Antheia -Anthousa -Anthusa -Anticleia -Antigone -Antiochis -Antiope -Anysia -Appollonia -Apseudes -Arete -Arethusa -Argeia -Ariadne -Arisbe -Aristonike -Aristophane -Arsinoe -Artemidora -Artemisia -Aspasia -Astera -Astyoche -Astyocheia -Atalanta -Ate -Athis -Auge -Augo -Autonoe -Auxesia -Axiothea -Barbara -Basiane -Baucis -Berenike -Bito -Briseis -Caenis -Caleope -Callianeira -Callianessa -Calliphana -Calypso -Canace -Castianiera -Charis -Chione -Chiore -Chloe -Chloris -Chryse -Chryseis -Chrysothemis -Cilissa -Cilla -Circe -Clio -Clymene -Clymere -Colubra -Corythia -Cratais -Creusa -Crisa -Ctimene -Cybele -Cydippe -Cymodoce -Cymothoe -Cyrene -Cythereia -Cytheris -Damaris -Damia -Danae -Deianeira -Deineira -Deiphobe -Deipyle -Delias -Demetria -Demophile -Dexamene -Dianeme -Diomede -Dione -Dirce -Doris -Dorothea -Doto -Drosis -Dynamene -Egeria -Egina -Eidothee -Eileithyia -Elcmene -Electra -Elpir -Endeis -Enyo -Eos -Epicaste -Eriboea -Erigone -Eriopis -Eriphyle -Eris -Eucarpia -Eudokia -Eunice -Euodias -Euphro -Euphrosyne -Europa -Eurycleia -Eurydike -Eurynome -Evadne -Galatea -Glauce -Glyke -Gorgo -Gygaea -Haidee -Halie -Harmodias -Harmonia -Hecuba -Hekabe -Hekaline -Hekate -Helice -Helike -Heliodora -Hellanike -Helle -Hermine -Hermione -Hero -Herophile -Hesione -Hilaera -Hippodameia -Hippodamia -Hippolyta -Hypsipyle -Hyrmina -Iaera -Ianeira -Ianessa -Ianthe -Ino -Iola -Iolanthe -Iole -Iomene -Ione -Iphianassa -Iphigenia -Iphimedeia -Iphis -Iphitheme -Irene -Iris -Isadora -Ismene -Issa -Jocasta -Kallisto -Kallixeina -Kassandra -Katana -Katina -Kephissa -Kharmion -Khloe -Khloris -Kleio -Kleopatra -Klymene -Klytemnestra -Koré -Koritto -Kydilla -Kynna -Kynthia -Kypris -Kyra -Labda -Lais -Lalage -Lampetie -Lampito -Lanike -Laodameia -Laodamia -Laodice -Laothoe -Lasthena -Latona -Leda -Lede -Leto -Leucothea -Leucothoe -Limnoreia -Lois -Lyra -Maeonia -Maera -Maia -Maiandria -Marpessa -Medea -Medesicaste -Megaera -Megara -Megare -Melanie -Melantho -Melissa -Melita -Melite -Menelaia -Merope -Metis -Metriche -Milo -Milto -Molpadia -Monima -Monime -Mykale -Myrine -Nausicaa -Neaera -Nemerte -Nephele -Nesaea -Nicopolis -Nikaia -Nikasepolis -Niko -Niobe -Nysa -Oenone -Oitane -Olympias -Omphale -Oreithuia -Oreithyia -Orithyia -Orthia -Otonia -Pales -Panope -Panora -Parthenia -Parthenope -Pasiphae -Pelopia -Penelope -Penthesilea -Percalus -Perialla -Periboea -Pero -Perse -Persephone -Persis -Pervica -Pervinca -Phaedra -Phaedre -Phaethusa -Phaia -Pherenike -Pherusa -Phigaleia -Philea -Philinna -Philomache -Philomela -Philona -Phoebe -Phryne -Phylace -Phylia -Phyllis -Phylo -Phylomedusa -Podarge -Polycaste -Polydamna -Polydora -Polymede -Polyxena -Procne -Procris -Prone -Proto -Protogonia -Psamathe -Psyche -Pylia -Pyrrha -Pythias -Raisa -Rhea -Rhene -Rhoda -Rhode -Rhodope -Roxane -Sappho -Scylla -Sebasteia -Semele -Sophia -Sotera -Speio -Stheneboea -Stratonice -Tecmessa -Telephassa -Thais -Thalassa -Thaleia -Theano -Thebe -Thelma -Themis -Theodotis -Theophane -Theophania -Theophano -Theresa -Thessala -Thessalonike -Thetis -Thisbe -Thoe -Thoosa -Thyia -Timandra -Timo -Tryphena -Tryphosa -Tyro -Xanthe -Xanthippe -Xantippe -Xene -Xenophile -Zenobia -Zita -Zoe \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/ancient_greek_male.txt b/src/main/resources/assets/customnpcs/markovnames/ancient_greek_male.txt deleted file mode 100644 index f2304a7bc..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/ancient_greek_male.txt +++ /dev/null @@ -1,1567 +0,0 @@ -Abantes -Abas -Abascantus -Abderos -Aberkios -Ablerus -Abreas -Abronychus -Abydos -Acaeus -Acamus -Acessamenus -Acestes -Aclepiades -Acrisias -Acrisius -Acroneos -Actor -Adeimanthos -Adelphius -Admetos -Adrastos -Adrastus -Adrestus -Aeaces -Aegaeon -Aegicoros -Aegisthes -Aegon -Aeimnestos -Aenesidemos -Aeolus -Aeropus -Aeschreas -Aesculapius -Aesepus -Aeson -Aesop -Aetes -Aethon -Aetion -Aetios -Aetolos -Agamedes -Agamemnon -Agapenor -Agapias -Agastrophos -Agathocles -Agathon -Agelaus -Agenor -Agesilaus -Agetos -Agis -Agrias -Aiantes -Aias -Aigeus -Airopos -Aischylos -Akadios -Akamas -Aktis -Aktor -Alastor -Alcaeos -Alcandros -Alcides -Alcimos -Alcinous -Alcmaion -Alcman -Alcon -Alector -Alektryon -Aleuas -Alexandros -Alexarchos -Alexias -Alexis -Alexon -Alkamenos -Alkestis -Alketas -Alkibiades -Alkides -Alkimachos -Alkiphron -Alkmaion -Aloeus -Alphaeus -Alpheos -Alphesiboeus -Alphios -Altes -Alypius -Amarinceus -Ameinias -Ameinokles -Amiantos -Amompharetos -Amopaon -Amphiaraos -Amphidamos -Amphimachos -Amphimnestus -Amphinomous -Amphion -Amphios -Amphitrion -Amyntas -Amyntor -Amyris -Amythaon -Anabesineos -Anacharsis -Anakletos -Anakreon -Anastasios -Anaxagoras -Anaxandridas -Anaxandrides -Anaxandros -Anaxarchos -Anaxilaus -Anaximander -Anaximenes -Anaxis -Anaxos -Anchialus -Anchimolios -Anchises -Ancus -Andokides -Andraemon -Andreas -Androbulos -Androcles -Androdamos -Androgeus -Aneristos -Aniketos -Anisodoros -Antaeus -Antagoras -Antemion -Antenor -Anthemion -Antichares -Antidoros -Antigenes -Antigonos -Antikles -Antilochus -Antinous -Antiochus -Antipatris -Antipatros -Antiphales -Antiphones -Antiphus -Antisthenes -Anytos -Anytus -Apelles -Apellicon -Aphidnos -Apisaon -Apollodoros -Apollophanes -Apollos -Aratus -Arcas -Arcesilaus -Archagoras -Archelaos -Archeptolemus -Archesilaus -Archestratidas -Archilochus -Archytas -Arcidamus -Arcturus -Areilycus -Areisius -Areithous -Argades -Argaeus -Argos -Aridolis -Arion -Ariphron -Aristaeus -Aristagoras -Aristaios -Aristandros -Aristarchos -Aristarchus -Aristides -Aristion -Aristippus -Aristoboulos -Aristobulus -Aristocles -Aristocypros -Aristodemos -Aristogeiton -Aristomachos -Ariston -Aristonous -Aristonymos -Aristophanes -Aristophantes -Aristos -Aristotles -Aristoxenus -Arrabaios -Arridaios -Arsenios -Artemas -Artemidoros -Artemios -Artemisthenes -Arybbas -Asasthenes -Ascalaphus -Ascanius -Aschines -Asius -Asklepios -Asonides -Asopodoros -Asopus -Asphalion -Assaraeus -Astacos -Aster -Asterion -Asteropaeus -Astrabacus -Astyanax -Athamas -Athenades -Athenaeus -Athenion -Athenodorus -Atiphates -Atreus -Atrometos -Attaginas -Attaginos -Attalos -Atymnius -Atys -Audax -Augias -Auletes -Autesion -Autodikos -Autolycus -Autolykos -Automedon -Autonous -Axylus -Azeus -Bacchides -Bacchios -Bacchylides -Bacenor -Bacis -Baerius -Balius -Barates -Bardas -Basileides -Basileios -Basilides -Bathyaes -Belos -Bendis -Bianor -Bias -Bion -Bisaltes -Biton -Blathyllos -Boethus -Borus -Boter -Briareus -Briarus -Brison -Brygos -Bucoli -Bulis -Burrhus -Butacidas -Callimachus -Callimorphus -Carenos -Carneades -Carpophorus -Carpus -Casambus -Castor -Ceas -Cebriones -Celeas -Cephalos -Cepheus -Cephissos -Ceyx -Chabrias -Chaeremon -Chairophon -Chalcodon -Chalcon -Charax -Chares -Charidemos -Charilaus -Charillos -Charmides -Charon -Charopos -Cheiron -Chersis -Chileos -Chilon -Choerilos -Choeros -Chremes -Chremon -Chremonides -Chromis -Chromius -Chrysaor -Chryses -Chrysippos -Chrysogones -Chrysogonus -Chrysolorus -Cilix -Cineas -Cinyras -Cisses -Cisseus -Cleades -Cleandros -Cleathes -Cleisthenes -Cleobulus -Cleodaeos -Cleombrotos -Cleomenes -Cleon -Cleonicus -Cleonymus -Clinias -Clisthenes -Clonius -Clytius -Clytomedes -Cnoethos -Cobon -Codros -Coenus -Coeranus -Coes -Cois -Conon -Coon -Copreus -Cordylion -Coronos -Corydallos -Corydon -Crathis -Cratinus -Cratippus -Cretheus -Crethon -Cretines -Crios -Croesus -Cronos -Cteatus -Ctesippus -Cuphagoras -Cyberniskos -Cycnus -Cylon -Cynaegiros -Cyncus -Cyneas -Cyniscus -Cypselos -Cyrenios -Cytorissos -Dadaces -Daedalos -Daetor -Damasippus -Damasithymos -Damasos -Damastor -Damian -Damianos -Damiskos -Damoetas -Damon -Danaos -Danaus -Daphis -Daphnis -Dardanus -Dares -Davos -Deinias -Deinokrates -Deinomenes -Deiotones -Deiphobus -Deiphonous -Deipylus -Demades -Demaratos -Demarmenos -Demas -Demeas -Demetrios -Democedes -Democoon -Demodocus -Demokrates -Demoleon -Demonax -Demonous -Demophlos -Demosthenes -Deon -Derkylos -Deukalion -Dexicos -Dexios -Diactorides -Diadromes -Diadumenus -Diagoras -Dicaeus -Dieneces -Diocles -Diodoros -Diodorus -Diokles -Diomedes -Dionysios -Dionysophanes -Dionysos -Diophantus -Diores -Dioscuros -Diotrephes -Dismas -Dithyrambos -Dmetor -Dolon -Dolops -Doreios -Doreius -Dorian -Doriskos -Doros -Dorotheus -Doryssos -Dosithios -Drimylos -Dromeus -Dryas -Dryops -Ducetius -Duris -Dymas -Dymnos -Echeeus -Echekrates -Echelaos -Echemmon -Echemus -Echephron -Echepolus -Echestratos -Eetion -Eioneus -Eirenaios -Elasus -Elatos -Elatreus -Eleon -Elephenor -Elpenor -Elpides -Elpidius -Empedocles -Endios -Endymion -Engenes -Eniopus -Ennaeus -Ennomus -Ennychus -Enops -Eos -Epaenetus -Epaphos -Epaphroditus -Epeigeus -Epeius -Ephialtes -Epicurus -Epicydes -Epikrates -Epimenes -Epiphanes -Epistor -Epistrophos -Epitrophos -Epizelos -Erasistratus -Eratosthenes -Eratostheres -Erechtheus -Eretmenus -Ereuthalion -Erginus -Ergiyios -Erichthonius -Erxandros -Eryalus -Erysichton -Eryx -Eryximachos -Eteocles -Eteokles -Eteonous -Euaemon -Eualcidas -Euanthes -Euarestos -Eubalus -Eubulus -Eucarpus -Euchenor -Eucleides -Eudorus -Eudoxsus -Eudoxus -Euenius -Euenor -Euenus -Eugammon -Eugenios -Eugenius -Euhemenis -Euippus -Eukles -Eumaeus -Eumastas -Eumelus -Eumenes -Eumneus -Eumolpus -Euneas -Euonomos -Eupalinus -Euphenes -Euphorbos -Euphorion -Euphronios -Eupolos -Euripides -Euryanax -Eurybates -Eurybiades -Eurycliedes -Eurydamus -Eurydemon -Eurydemos -Euryhus -Eurykrates -Eurykratides -Euryleon -Eurylochos -Eurymachos -Euryphon -Eurypylos -Eurystenes -Eurysthenes -Eurystheus -Eurysthios -Eurythion -Eurytos -Eussorus -Euthydemos -Euthynos -Eutropios -Eutuches -Eutychides -Eutychus -Evaenetos -Evagoras -Evandros -Evanetus -Evelthon -Evenios -Evenus -Evios -Exaduis -Exekias -Faenus -Galenus -Gallus -Ganymedes -Gauanes -Geleon -Gelo -Gelon -Gennadios -Gerasimos -Giorgius -Glaukias -Glaukos -Glycon -Gnipho -Gordias -Gorgias -Gorgion -Gorgos -Gorgythion -Gregorius -Gryllus -Gurgos -Gylippos -Gyras -Gyrtias -Haemon -Hagias -Hagnon -Halisthertes -Halius -Harmatidas -Harmocydes -Harmodios -Harmon -Harpagos -Harpalion -Harpalos -Harpocras -Hecataeus -Hegesandros -Hegesistratos -Hegetoridas -Heirax -Heiron -Hektor -Helenos -Helgesippos -Helicaon -Heliodorus -Helios -Helle -Hephaestos -Herakleides -Herakleitos -Heraklides -Hermeias -Hermeros -Hermippos -Hermogenes -Hermolaos -Hermolycus -Hermon -Hermotimos -Hero -Herodes -Herodianus -Herodion -Heromenes -Hicetaon -Hiero -Hieronymus -Hipparchos -Hipparinos -Hippasus -Hippias -Hippocoon -Hippoklides -Hippokratides -Hippolytos -Hippomachos -Hippomenes -Hippon -Hipponax -Hipponicus -Hipponous -Hippotas -Hippothous -Hippotion -Hoiples -Homeros -Hyakinthos -Hylas -Hyllos -Hyllus -Hypatius -Hypeirochus -Hypenor -Hyperenor -Hyperion -Hypsenor -Hyrcanus -Hyrtacus -Hyrtius -Iakchos -Ialmenes -Iambulus -Iamus -Iasos -Iatragoras -Iatrokles -Ibanolis -Ibykos -Icarion -Icarius -Icarus -Idaeus -Idaios -Idas -Idomeneus -Ilioneus -Illyrius -Ilus -Imbrasus -Imbrius -Imbrus -Inachos -Inachus -Inaros -Iobates -Iolaos -Iollas -Ion -Iphiclus -Iphicrates -Iphikrates -Iphinous -Iphitos -Iphitus -Iros -Irus -Isagoras -Isandros -Ischenous -Isidor -Isidoros -Ision -Ismaros -Ismenios -Isocrates -Isodemos -Isokrates -Itheus -Itylus -Itys -Kadmos -Kaenas -Kaeneus -Kalchas -Kalesius -Kaletor -Kalliaros -Kallias -Kallikles -Kallikrates -Kallimachos -Kallinicus -Kallinos -Kallipides -Kallipos -Kallisthenes -Kallon -Kameirus -Kandaules -Kannadis -Kapaneus -Kapys -Karipos -Karopophores -Kasos -Kassandros -Kaunos -Kebalinos -Kebes -Kekrops -Keos -Kephalon -Kephalos -Kerameikos -Kerkyon -Keteus -Kimon -Kirphis -Kittos -Kleitos -Kleobis -Kleomenes -Koines -Koinos -Konon -Koragos -Korax -Kosmas -Krantor -Krateros -Kreon -Krinippos -Kristos -Kritias -Kritoboulos -Kritodemos -Kriton -Kroisos -Krokinos -Ktesiphon -Kyknos -Kynaegeiros -Kyrillos -Kyrios -Kyros -Labdacus -Labotas -Laertes -Lagos -Laios -Lamachos -Lampo -Lampon -Lampus -Lamus -Laodamas -Laodocus -Laogonus -Laomedon -Laphanes -Lasos -Lasthenes -Laureion -Leagros -Leandros -Learchos -Leicritus -Leitus -Lemnus -Leo -Leocedes -Leodes -Leon -Leonidas -Leonnatos -Leontiades -Leontis -Leoprepes -Leotychides -Lethos -Leucippus -Leukos -Lichas -Licymnios -Linus -Loxias -Lukos -Lycaon -Lycaretos -Lycidas -Lycomedes -Lycophon -Lycophron -Lycoris -Lycurgos -Lycus -Lydus -Lygdamis -Lykomedes -Lykon -Lynceus -Lysagoras -Lysandros -Lysanios -Lysias -Lysikles -Lysimachos -Lysippos -Lysippus -Lysis -Macar -Macarias -Machaon -Maeon -Maiandrios -Makarios -Maleos -Males -Mantes -Mantios -Marcion -Marnes -Maro -Maron -Marsyas -Mastor -Matullus -Mausolos -Mecistes -Mecistios -Medios -Medon -Medus -Megadates -Megakles -Megakreon -Megapenthes -Megareus -Megasthenes -Megathenes -Meges -Megistias -Meidias -Melampos -Melampus -Melanippos -Melanthios -Melanthos -Melas -Meleagros -Melegros -Meles -Meliboeus -Melicertes -Memnon -Menalcas -Menandros -Menares -Menekrates -Menelaos -Menestas -Menesthes -Menesthios -Menexinos -Menoeces -Menoitios -Mentes -Mentor -Meriones -Mermerus -Merops -Mesaulius -Mesthles -Methodios -Metiochus -Meton -Metrobius -Metron -Metrophanes -Meurius -Micythos -Midas -Midylos -Mikkos -Mikon -Milanion -Miltiades -Minos -Misenus -Mnasyllus -Mnesiphilos -Mnester -Mnesus -Moeris -Moliones -Molpagoras -Monoecus -Monomachus -Mopsius -Mopsus -Morsimus -Morys -Moschion -Mulius -Musaeus -Musaios -Mydon -Mygdon -Myrsinus -Myrto -Mys -Narkissos -Nastes -Naubolus -Naukles -Nausithous -Nauteus -Nearchos -Neleos -Nelpus -Neokles -Neoptolemos -Neritos -Nestor -Niarchos -Nicandros -Nicanor -Nicholas -Nicholaus -Nicias -Nicodemos -Nicodemus -Nicodromos -Nicolaus -Nicomachos -Nicon -Nikandros -Nikanor -Nikasios -Nikedemos -Nikeratos -Nikias -Nikomachos -Nikodemes -Nikomedes -Nilus -Nireus -Nisos -Noemon -Nomion -Nothon -Numa -Nyctinus -Nymphicus -Nymphodorus -Ocealus -Ochesius -Ochos -Ocytos -Odaenathus -Odius -Odysseus -Oeagnus -Oecleus -Oedipus -Oenemaus -Oeneus -Oenomaus -Oenopion -Oenops -Oicles -Oileas -Oliatos -Olus -Olympicus -Olympiodorus -Onamakritos -Onesilos -Onesimos -Onesiphorus -Onetas -Onetor -Onias -Onomastos -Ophelestes -Opites -Ops -Orcus -Orestes -Oresus -Orges -Oribasius -Orion -Orius -Oroites -Orpheus -Orsilochus -Orsiphantes -Orthaeus -Orythroneus -Otreus -Otrynteus -Otus -Paeeon -Paios -Palaechthon -Palaemon -Pallans -Pallas -Palmys -Pammon -Panaetios -Panaetius -Panares -Pandaros -Pandion -Panionos -Panites -Pankratios -Pantares -Panthous -Pantites -Paopeus -Paraebates -Paris -Parmenides -Parmenion -Parthenopaeus -Pasion -Pataicos -Patrobas -Patrobus -Patroclus -Patron -Pausanius -Pedaeus -Pedasus -Pedocles -Peirithous -Peiros -Peisandros -Peithon -Pelagon -Pelegon -Peleus -Pelias -Pelicles -Pelonus -Pelopidas -Peneleos -Peneus -Pentheus -Penthylos -Peolpidas -Perdikkas -Perdix -Periandros -Periclymenus -Perieeres -Perikles -Perimedes -Perimos -Periphas -Periphetes -Periscus -Peritas -Periumus -Peteos -Peukestes -Phaedo -Phaenippos -Phaeops -Phaestus -Phaidon -Phaidriades -Phalanthus -Phalces -Phalinos -Phanagoras -Phancis -Phanes -Phanias -Phantias -Pharnaces -Phausius -Phegeus -Pheidias -Pheidippides -Pheidon -Phemius -Phereclus -Pherecydes -Pheres -Pheronactus -Phidias -Phigaleios -Philagros -Philaon -Phileas -Philemon -Philetor -Philiskos -Philistos -Phillipos -Philocion -Philocrates -Philoctetes -Philocypros -Philoetius -Philogus -Philokles -Philokrates -Philolaos -Philologus -Philomen -Philomenes -Philometer -Philon -Philonikos -Philopoemon -Philostratos -Philostratus -Philotas -Philotectes -Philoxenos -Philpoemon -Phineus -Phintias -Phlaris -Phlegon -Phlios -Phoenix -Phoibus -Phoinix -Phoitios -Phokas -Phokion -Phorbas -Phorcys -Phormion -Phormos -Photius -Phrixus -Phrynichos -Phrynikos -Phrynon -Phylacus -Phylas -Pidytes -Pigres -Pinder -Pirithoos -Pisistratos -Pistias -Pittacos -Pittacus -Pittheus -Pixodarus -Plades -Pleistarchos -Pleistos -Plutarch -Podaeleirus -Podaleirus -Podalinus -Podarces -Podargos -Podaroes -Podes -Poeas -Poecas -Poimen -Polemion -Poliadas -Pollio -Polyas -Polybius -Polyctor -Polydectes -Polydeuces -Polydius -Polydoros -Polyeides -Polygonus -Polykleitos -Polykles -Polykritos -Polymedes -Polyneices -Polypemon -Polyperchon -Polyphemous -Polyphetes -Polyphontes -Polypoetes -Polyxeinus -Ponteus -Porphyrios -Porphyrius -Poseidon -Posides -Posidonios -Potamon -Pratinos -Praxilaus -Praxis -Praxiteles -Praxites -Prexinos -Priam -Prinetadas -Priskos -Procrustes -Proctus -Proetus -Prokles -Prokopios -Prokrustes -Proreus -Protagoras -Protesilaus -Prothoenor -Prothous -Protogenes -Protus -Proxenos -Prymneus -Prytanis -Ptolemaios -Ptolomaeus -Pylades -Pylaemenes -Pylaeus -Pylartes -Pylas -Pylenor -Pyris -Pyrrhus -Pythagoras -Pytheas -Pythes -Pythios -Pythogenes -Radamanthos -Rhadamanthos -Rhesus -Rhexenor -Ribes -Rizon -Sabas -Sabyllos -Salmoneus -Sarpedon -Satyros -Scaios -Scamandius -Scamandrius -Schedius -Scylax -Scyllias -Scythas -Sebastos -Seisames -Selagus -Seldomus -Selepos -Seleukos -Sicinnos -Siculus -Silanos -Silenos -Simmias -Simo -Simoisius -Simonides -Sinis -Sinon -Sippas -Siromos -Sisyphus -Skiron -Smindyrides -Smintheus -Socus -Sophanes -Sophokles -Soranus -Sosibios -Sosicles -Sosigines -Sosilus -Sosimenes -Sosipatros -Sosthenes -Sostias -Sostratos -Spertias -Speudon -Speusippos -Spinther -Spirodion -Stachys -Stentor -Stesagoras -Stesanor -Stesilaus -Sthenelaus -Sthenelus -Stichius -Stolos -Strabo -Strachys -Stratios -Straton -Strophantes -Strophius -Strymon -Syagros -Syennesis -Syloson -Synesius -Talaemenes -Talaos -Talaus -Talos -Talthybios -Tarchon -Taureas -Tebaeus -Tecton -Teiresias -Telamon -Telekles -Telemacho -Telemachos -Telemachus -Telephos -Telephus -Telesinus -Telesphorus -Telines -Tellias -Tellis -Telys -Temenos -Tenes -Tenes -Tenthredon -Tereus -Terillos -Teucer -Teukros -Teutamos -Teuthranes -Teuthras -Thales -Thalpius -Thalysios -Tharybis -Thaulos -Thaumastus -Theagenes -Theages -Theas -Theasides -Themistius -Theoclymnius -Theocydes -Theodekles -Theodoros -Theodotus -Theognis -Theomestor -Theomestros -Theophanes -Theophrastos -Theophrastus -Theophylaktos -Theopompos -Theopompus -Theopropides -Theoros -Theos -Theramenes -Therapon -Theras -Thero -Theron -Thersandros -Therseandros -Thersilochus -Thersites -Thessalos -Thestor -Thettalos -Thoas -Thon -Thoon -Thorax -Thrasidaios -Thrasilaus -Thrasius -Thrasybulos -Thrasyllus -Thrasymedes -Threspotus -Thukydides -Thyestes -Thymoetes -Thymotes -Thyrsis -Thyrsos -Timagenidas -Timagoras -Timais -Timanthes -Timasion -Timasitheus -Timesithius -Timnes -Timoleon -Timon -Timonax -Timotheus -Timoxenos -Tiro -Tirynthius -Tisamenos -Tisandros -Tisias -Tithonius -Titormos -Tityrus -Tlepolemus -Tmolus -Trechus -Triopas -Triptolemus -Triton -Troezenus -Trophimus -Trophnus -Tros -Trypho -Turrianus -Tychaeus -Tydeides -Tydeus -Tymnes -Tyndareus -Tyndarios -Ucalegon -Vettias -Xanthippos -Xanthippus -Xanthos -Xenagoras -Xenokrates -Xenophanes -Xenophon -Xiphilinus -Xuthos -Xuthus -Zagreus -Zamolxis -Zenicetes -Zenodoros -Zephyrinus -Zethus -Zeuxidamos -Zeuxis -Zosimus \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/aztec_given.txt b/src/main/resources/assets/customnpcs/markovnames/aztec_given.txt deleted file mode 100644 index 9bbfc6f39..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/aztec_given.txt +++ /dev/null @@ -1,133 +0,0 @@ -Acalan -Acatl -Acue -Ahuatzi -Ahuic -Amoxtli -Anacaona -Apozanolotl -Atlacamani -Atlacoya -Atlatonin -Atzi -Ayauhteotl -Chalchi -Chalmeca -Chantico -Chicomecoatl -Chiconahui -Chimalley -Chimalli -Chimalma -Chipahua -Cihuaton -Cipactonal -Citlalee -Citlalic -Citlalicue -Coatl -Coaxoch -Coyotl -Coyolxauhqui -Cozamalotl -Cuahutéemoc -Cuallea -Cuallee -Cucyo -Cuetzpallea -Cuetzpallee -Cuicatl -Etapalli -Eztli -Guatemoc -Huitzilin -Huixtocihuatl -Huitl -Ichtacka -Ilamatecuhtli -Ilhicamina -Itzcali -Itzcoatl -Itzli -Itzpapalotl -Itztli -Ixcuiname -Ixtli -Macuilxochitl -Matlalihuitl -Metztli -Mictlantecuhtli -Mixcoatl -Miyaoaxochitl -Mizquixaual -Montezuma -Nahuatl -Necahual -Nenetl -Netzahual -Nochehuatl -Nochtli -Ocotlan -Ohtli -Patlea -Patlee -Patli -Quetzalcoatl -Quetzalli -Tayanna -Teicuih -Teiuc -Tenoch -Tezcacoatl -Tlachinolli -Tlanextic -Tlanextli -Tlazohtzin -Tlilpotonqui -Tochtlea -Tochtlee -Tochtli -Toltecatl -Tonalnan -Tonantzin -Tonatiuh -Tonauac -Tototl -Tozi -Tupack -Tupoc -Ueman -Xicohtencatl -Xihuitl -Xilonen -Xiloxoch -Xipil -Xipilli -Xitllali -Xiuhcoatl -Xiuhtonal -Xiutecuhtli -Xochicotzin -Xochil -Xochilt -Xochipilli -Xochiquetzal -Xochitl -Xochiyotl -Xoco -Xocotzin -Xocoyotl -Xolotl -Yaotel -Yaotl -Yaotyl -Yaretzi -Yolihuani -Yolotli -Yoloxochitl -Yolyamanitzin -Zeltzin -Zipactonal -Zolin -Zuma -Zyanya \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/customnpcs_classic.txt b/src/main/resources/assets/customnpcs/markovnames/customnpcs_classic.txt deleted file mode 100644 index f5792dbad..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/customnpcs_classic.txt +++ /dev/null @@ -1,155 +0,0 @@ -Ach-aldhat -Achdranys -Adkal -Aldny -Amethyst -Andern -Ankin -Aphmau -Apolitho -Arei -Ariel -Arisotura -Armos -Atesson -Athi -Ava -Ayumu -Bangheart -Basrrelen -Benjamin -Blackwell -Blaze -Brion -Burhat -Carina -Carnow -Carter -Chald -Chim -Chris -Christine -Claire -Cray -Crowfeather -Cuero -Dacks -Daniel -Darage -Demytrix -Div -Divina -Drake -Drakken -Droco -Dyntan -Eirina -Eldamore -Elmn -Embrera -Entranger -Epodyno -Estz -Ethan -Ezall -Faolan -Farcri -Fian -Gakih -Gareld -Gharis -Ghatroth -Grave -Gyaku -Hailinx -Hir -Honf -Ightech -Ightyd -Ineald -Issraya -Itageray -Kakaragon -Kamoku -Kaoz -Karla -Kathrine -Kederath -Ken -Kennet -Kineth -Kora -Kyoukan -Lambton -Larianne -Larson -Lenyx -Leonardo -Lily -Loxiku -Lucas -Lucien -Lynxx -Mable -Magia -Magnus -Malus -Marble -Meadow -Melancholy -Mia -Mika -Naif -Nalworche -Nasu -Neve -Oldam -Oldrake -Pegato -Qua'an -Ranler -Raven -Rilfom -Riplette -Ristai -Rods -Rose -Ross -Rothcersul -Ruin -Saenorath -Sakamoto -Sakiama -Seinkan -Seth -Shadow -Sieq -Silk -Slater -Smaik -Snow -Sparrow -Tanal -Taradien -Tasr -Thanato -Tia'kim -Tiakono -Tinlt -Torerod -Turturdar -Tyltran -Tymen -Urnp -Valentine -Vorbani -Waran-ess -Wate -William -Winter -Wyrl -Xalgan -Ylander -Yosil -Zenix -Zidane \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/japanese_given_female.txt b/src/main/resources/assets/customnpcs/markovnames/japanese_given_female.txt deleted file mode 100644 index 1b4e1c003..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/japanese_given_female.txt +++ /dev/null @@ -1,386 +0,0 @@ -Ai -Aika -Aiko -Aimi -Aina -Airi -Akane -Akari -Akemi -Akeno -Aki -Akie -Akiko -Akina -Akiyo -Amane -Ami -Anzu -Aoi -Arisa -Asako -Asami -Asuka -Asumi -Asuna -Atsuko -Atsumi -Aya -Ayaka -Ayako -Ayame -Ayami -Ayana -Ayane -Ayano -Ayu -Ayuka -Ayuko -Ayumi -Azumi -Azusa -Chie -Chieko -Chiemi -Chiharu -Chiho -Chika -Chikako -Chinami -Chinatsu -Chisato -Chitose -Chiyako -Chiyo -Chiyoko -Chizuko -Chizuru -Eiko -Eimi -Emi -Emiko -Emiri -Eri -Erika -Eriko -Erina -Etsuko -Fujie -Fujiko -Fūka -Fukumi -Fumi -Fumie -Fumika -Fumiko -Fumino -Fumiyo -Fusako -Fuyuko -Fuyumi -Hana -Hanae -Hanako -Harue -Haruhi -Haruka -Haruko -Haruna -Haruyo -Hatsue -Hideko -Hidemi -Hikari -Himeko -Hina -Hinako -Hiroe -Hiroka -Hiroko -Hiroyo -Hisa -Hisae -Hisako -Hisaya -Hisayo -Hitomi -Honami -Honoka -Ichiko -Ikue -Ikuko -Ikumi -Ikuyo -Itsuko -Itsumi -Jitsuko -Junko -Kaede -Kaguya -Kaho -Kahoru -Kana -Kanae -Kanako -Kanna -Kanoko -Kaori -Kaoruko -Karin -Kasumi -Katsuko -Kawai -Kayoko -Kazue -Kazuha -Kazuko -Kazusa -Kazuyo -Keiki -Keiko -Kiko -Kikue -Kikuko -Kimiko -Kira -Kiyoko -Koharu -Konomi -Kotoe -Kotomi -Kotono -Kotori -Kozue -Kumi -Kumiko -Kuniko -Kurenai -Kuriko -Kyoko -Maaya -Machi -Machiko -Madoka -Maho -Mai -Maiko -Maki -Makiko -Mami -Mamiko -Mana -Manaka -Manami -Mao -Mari -Maria -Marie -Mariko -Masae -Masako -Masayo -Matsuko -Mayako -Mayu -Mayuko -Mayumi -Mayura -Megu -Megumi -Mei -Meiko -Meisa -Michiko -Mie -Mieko -Miho -Mihoko -Miiko -Mika -Mikako -Miki -Mikiko -Miku -Mikuru -Mimori -Mina -Minae -Minako -Minami -Mineko -Mioko -Miori -Misa -Misaki -Misako -Misato -Misumi -Mitsuki -Mitsuko -Mitsuyo -Miu -Miwa -Miwako -Miyabi -Miyako -Miyoko -Miyoshi -Miyu -Miyuki -Miyumi -Miyū -Mizue -Mizuki -Mizuko -Moeko -Momo -Momoe -Momoka -Momoko -Motoko -Mutsuko -Mutsumi -Nagako -Nami -Nana -Nanae -Nanako -Nanami -Nanase -Nao -Naoko -Narumi -Natsue -Natsuko -Natsume -Natsumi -Noa -Nobuko -Nodoka -Nonoka -Noriko -Noriyo -Nozomi -Omi -Otoha -Otome -Ran -Rei -Reika -Reiko -Reina -Rena -Rie -Rieko -Riho -Rika -Rikako -Riko -Rina -Rio -Risa -Risako -Ritsuko -Rui -Rumi -Rumiko -Runa -Ruri -Ruriko -Ryōka -Ryoko -Sachie -Sachiko -Sadako -Saeko -Saki -Sakie -Sakiko -Saku -Sakura -Sakurako -Sanae -Saori -Sari -Satoko -Satomi -Sawa -Sawako -Saya -Sayaka -Sayako -Sayo -Sayoko -Sayumi -Sayuri -Seiko -Setsuko -Shigeko -Shiho -Shiina -Shimako -Shinako -Shino -Shiori -Shizue -Shizuko -Shōko -Shuko -Sugako -Sumie -Sumika -Sumiko -Sumire -Suzue -Suzuka -Suzuko -Taeko -Takako -Takeko -Tamami -Tamao -Tamiko -Tatsuko -Teiko -Teruko -Terumi -Tokiko -Tokuko -Tomiko -Tomoka -Tomoko -Tomoyo -Toshiko -Toyoko -Tsukiko -Tsuneko -Tsuru -Umeko -Waka -Wakako -Yae -Yaeko -Yasue -Yasuko -Yayoi -Yoko -Yoriko -Yoshiko -Yoshino -Yui -Yuka -Yukari -Yukie -Yukiko -Yukina -Yūko -Yumeko -Yumi -Yumie -Yumika -Yumiko -Yuri -Yurie -Yurika -Yuriko -Yurina \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/japanese_given_male.txt b/src/main/resources/assets/customnpcs/markovnames/japanese_given_male.txt deleted file mode 100644 index 2ba71a1f9..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/japanese_given_male.txt +++ /dev/null @@ -1,1189 +0,0 @@ -Akifumi -Akihiko -Akihiro -Akihisa -Akihito -Akimasa -Akimitsu -Akinari -Akinobu -Akinori -Akio -Akisada -Akitake -Akito -Akitoshi -Akitsugu -Akiya -Akiyoshi -Akiyuki -Arata -Arihiro -Arinaga -Arinobu -Aritomo -Asahiko -Asao -Atomu -Atsuhiko -Atsuhiro -Atsuji -Atsunobu -Atsuo -Atsushi -Atsuto -Atsuya -Azuma -Banri -Bunji -Bunta -Chikao -Chikara -Chikashi -Chikayoshi -Chōbyō -Chōei -Choki -Chūichi -Chūjirō -Dai -Daichi -Daigo -Daiji -Daijirō -Daiki -Dairoku -Daisaku -Daishi -Daishin -Daisuke -Daizō -Eiichi -Eiichiro -Eiji -Eijirō -Eikichi -Einosuke -Eishun -Eisuke -Eita -Eitarō -Eizō -Emon -Etsuji -Fujio -Fumiaki -Fumihiko -Fumihiro -Fuminori -Fumio -Fumitaka -Fumito -Fumiya -Fusanosuke -Fusazane -Futoshi -Fuyuki -Gaku -Gakuto -Gen -Gen'ichi -Gen'ichirō -Genjiro -Genki -Genta -Gentarō -Genzo -Giichi -Gin -Goichi -Goro -Hachirō -Hakaru -Haruaki -Haruchika -Haruhiko -Haruhiro -Haruhisa -Haruki -Harukichi -Harunobu -Harunori -Haruo -Harutaka -Haruto -Haruyoshi -Hatsuo -Hayanari -Hayata -Hayato -Heihachirō -Heiichirō -Heisuke -Hideaki -Hideharu -Hidehiko -Hidehito -Hideji -Hidekazu -Hideki -Hidemaro -Hidemasa -Hidemi -Hidemitsu -Hidenobu -Hidenori -Hideo -Hideshi -Hidetada -Hidetaka -Hideto -Hidetoshi -Hidetsugu -Hideya -Hideyo -Hideyoshi -Hideyuki -Hiro -Hiroaki -Hirofumi -Hirohide -Hirohisa -Hiroji -Hirokatsu -Hirokazu -Hiroki -Hirokuni -Hiromasa -Hiromichi -Hiromitsu -Hiromori -Hiromoto -Hironari -Hironobu -Hironori -Hiroo -Hirooki -Hiroomi -Hiroshi -Hiroshige -Hirotaka -Hirotami -Hiroto -Hirotoki -Hirotomo -Hirotoshi -Hirotsugu -Hiroya -Hiroyasu -Hiroyoshi -Hiroyuki -Hisahito -Hisamitsu -Hisamoto -Hisanobu -Hisanori -Hisao -Hisashi -Hisataka -Hisateru -Hisato -Hisatsugu -Hisaya -Hisayasu -Hisayoshi -Hisayuki -Hitoshi -Hokuto -Hozumi -Ichiei -Ichirō -Ichizō -Iehiro -Iehisa -Iemasa -Iemon -Iesada -Ikki -Ikko -Ikuo -Ikurō -Ippei -Isami -Isamu -Isao -Issei -Itaru -Itsuo -Itsurō -Iwao -Jiichirō -Jin -Jin'ichi -Jinpachi -Jinzaburō -Jiro -Jōichirō -Joji -Jōkichi -Jōtarō -Jūbei -Jūkichi -Junichi -Jun'ichirō -Junji -Junki -Junpei -Jun'ya -Junzō -Jūshirō -Jūtarō -Jūzō -Kagemori -Kagenori -Kagetaka -Kaichi -Kaii -Kaiji -Kaito -Kakichi -Kaku -Kakuji -Kanehira -Kanehiro -Kanehisa -Kanematsu -Kanemoto -Kanesuke -Kanetake -Kaneto -Kanetsugu -Kaneyoshi -Kan'ichi -Kankuro -Kansuke -Kanta -Katsuaki -Katsuhiko -Katsuhiro -Katsuhisa -Katsuhito -Katsuji -Katsuki -Katsukiyo -Katsumasa -Katsumoto -Katsunaga -Katsunari -Katsunori -Katsunosuke -Katsuo -Katsushi -Katsusuke -Katsutarō -Katsuteru -Katsutomo -Katsutoshi -Katsuya -Katsuyoshi -Katsuyuki -Katsuzō -Kazuaki -Kazufumi -Kazuharu -Kazuhiko -Kazuhiro -Kazuhisa -Kazuhito -Kazuki -Kazuma -Kazumasa -Kazumichi -Kazunari -Kazunori -Kazuo -Kazuoki -Kazurō -Kazushi -Kazushige -Kazutaka -Kazuto -Kazutoki -Kazutoshi -Kazuya -Kazuyoshi -Kazuyuki -Keigo -Keiichi -Keiichirō -Keiji -Keijirō -Keijū -Keiki -Keinosuke -Keishi -Keisuke -Keita -Keizaburō -Keizō -Ken -Ken'ichi -Kengo -Ken'ichirō -Kenji -Kenjirō -Kenki -Kenkichi -Kensaku -Kensei -Kenshi -Kenshin -Kensuke -Kenta -Kentaro -Kento -Ken'yū -Kenzo -Kesao -Kihachi -Kihachirō -Kihei -Kiichirō -Kikuo -Kimio -Kimitoshi -Kimiya -Kin'ichi -Kin'ichirō -Kinji -Kinjirō -Kintaro -Kin'ya -Kisaburō -Kisaku -Kishō -Kiyoaki -Kiyofumi -Kiyohide -Kiyohiko -Kiyohiro -Kiyoji -Kiyokazu -Kiyomoto -Kiyonari -Kiyonori -Kiyoo -Kiyoshi -Kiyosue -Kiyotaka -Kiyotake -Kiyoyuki -Kogorō -Kōhei -Kōichi -Koichiro -Kojiro -Kōki -Kōkichi -Kōnosuke -Korechika -Korekiyo -Kōrō -Kōsaku -Kōsei -Kōshirō -Koson -Kōsuke -Kotaro -Kōji -Kouta -Kōzō -Koya -Koyo -Kumatarō -Kuniaki -Kunihiko -Kunihiro -Kunihisa -Kunimasa -Kunimitsu -Kunio -Kunitake -Kuniyoshi -Kuniyuki -Kuranosuke -Kusuo -Kyōgo -Kyōhei -Kyōichi -Kyōji -Kyōsuke -Kyukichi -Mahiro -Makio -Makito -Mamoru -Manabu -Manjirō -Mantarō -Mareo -Masaaki -Masabumi -Masachika -Masafumi -Masaharu -Masahide -Masahiko -Masahiro -Masahisa -Masahito -Masaichi -Masaie -Masaji -Masakage -Masakatsu -Masakazu -Masakuni -Masamichi -Masamitsu -Masamori -Masamune -Masamura -Masanao -Masanari -Masanobu -Masanori -Masanosuke -Masao -Masaomi -Masaru -Masashi -Masashige -Masataka -Masatake -Masatane -Masateru -Masato -Masatomo -Masatoshi -Masatsugu -Masaya -Masayoshi -Masayuki -Masazumi -Masuo -Masuzō -Matabei -Matsuchi -Matsuki -Matsuo -Matsushige -Michiaki -Michiharu -Michihiko -Michihiro -Michihisa -Michinori -Michio -Michirō -Michitaka -Michitarō -Michiya -Michiyoshi -Mikio -Mikito -Mikuni -Mineichi -Mineo -Minoru -Mitsuaki -Mitsugi -Mitsugu -Mitsuharu -Mitsuhide -Mitsuhiko -Mitsuhira -Mitsuhiro -Mitsuhisa -Mitsumasa -Mitsumori -Mitsunobu -Mitsunori -Mitsuo -Mitsuomi -Mitsushige -Mitsusuke -Mitsutaka -Mitsutarō -Mitsuteru -Mitsutoshi -Mitsuyasu -Mitsuyo -Mitsuyoshi -Mitsuyuki -Mochiaki -Mokichi -Morihiko -Morihiro -Morikazu -Morimasa -Morio -Morishige -Moritaka -Mosuke -Motoaki -Motofumi -Motoharu -Motohiko -Motohiro -Motoichi -Motojirō -Motoki -Motomu -Motonobu -Motoo -Motoshi -Motoshige -Motosuke -Mototada -Mototsugu -Motoyasu -Motoyuki -Motozane -Mukuro -Munehiro -Munemori -Munenobu -Munenori -Muneo -Muneshige -Munetaka -Munetoki -Munetoshi -Muneyoshi -Murashige -Musashi -Mutsuo -Nagaharu -Nagahide -Nagamasa -Nagamichi -Naganao -Naganori -Nagatoki -Nagatomo -Namio -Nankichi -Naofumi -Naohiko -Naohiro -Naohisa -Naohito -Naoji -Naokatsu -Naoki -Naomasa -Naomichi -Naomori -Naonobu -Naoshi -Naotaka -Naotake -Naoto -Naoya -Naoyuki -Naozumi -Nariaki -Nariakira -Naritaka -Nariyasu -Nariyuki -Naruhisa -Naruhito -Naruyuki -Natsuhiko -Noboru -Nobuaki -Nobuatsu -Nobuharu -Nobuhiko -Nobuhiro -Nobuhisa -Nobuhito -Nobukatsu -Nobukazu -Nobumasa -Nobumitsu -Nobumoto -Nobunao -Nobunari -Nobuo -Nobusada -Nobusuke -Nobutaka -Nobuteru -Nobutoki -Nobutomo -Nobutoshi -Nobutsuna -Nobuyasu -Nobuyoshi -Nobuyuki -Nobuzane -Noriaki -Norifumi -Norifusa -Norihide -Norihiko -Norihiro -Norihito -Norikazu -Norimasa -Norimoto -Norio -Noriyasu -Noriyoshi -Noriyuki -Nozomu -Okimoto -Osamu -Otohiko -Raizo -Reiichi -Reiji -Reizō -Rentarō -Reo -Riichi -Rikichi -Rikiya -Rinshō -Ritsuo -Rokurō -Ryōhei -Ryōichi -Ryōji -Ryōma -Ryōsei -Ryōsuke -Ryōta -Ryōtarō -Ryōzō -Ryu -Ryūhei -Ryūichi -Ryūji -Ryūki -Ryūnosuke -Ryūsaku -Ryūsei -Ryūsuke -Ryūta -Ryūtarō -Ryūma -Ryūya -Ryūzō -Saburō -Sachio -Sadaaki -Sadaharu -Sadahiko -Sadakazu -Sadanaga -Sadao -Sadatoshi -Sadayoshi -Sadazane -Saiichi -Sakichi -Sanji -Sankichi -Satonari -Satoru -Satoshi -Satsuo -Seigen -Seigo -Seihō -Seiichi -Seiichirō -Seiji -Seijin -Seijirō -Seiki -Seikichi -Seishi -Seishirō -Seitarō -Seiya -Seizō -Sendai -Senkichi -Setsurō -Shichirō -Shigeaki -Shigefumi -Shigeharu -Shigehiro -Shigehisa -Shigekazu -Shigeki -Shigemasa -Shigematsu -Shigemi -Shigemitsu -Shigemoto -Shigenaga -Shigenobu -Shigenori -Shigeo -Shigeru -Shigetada -Shigetaka -Shigeto -Shigetoshi -Shigeyasu -Shigeyoshi -Shigeyuki -Shikō -Shin -Shingo -Shin'ichi -Shin'ichirō -Shinji -Shinjirō -Shinjō -Shinkichi -Shinpachi -Shinpei -Shinsaku -Shinsuke -Shinta -Shintarō -Shinya -Shinzō -Shiryu -Shizuo -Shō -Shōgo -Shōhei -Shōichi -Shōji -Shōjirō -Shōma -Shōsuke -Shōta -Shōtarō -Shōya -Shōzō -Shu -Shūgo -Shūichi -Shūji -Shuko -Shun -Shungo -Shun'ichi -Shun'ichirō -Shunji -Shunkichi -Shunpei -Shunsaku -Shunsui -Shunsuke -Shunta -Shuntarō -Shun'ya -Shunzō -Shūsaku -Shūsuke -Shūta -Shūhei -Shūzō -Sō -Sōgen -Sōichi -Sōichirō -Sōji -Sōnosuke -Sōsuke -Sōtarō -Suehiro -Suenaga -Suguru -Sukehiro -Sukemasa -Sukenobu -Suketoshi -Suketsugu -Sukeyuki -Sumihiro -Sumimoto -Sumio -Sumiyoshi -Sunao -Susumu -Sutemi -Tadaaki -Tadachika -Tadafumi -Tadaharu -Tadahiko -Tadahiro -Tadahito -Tadakatsu -Tadamasa -Tadami -Tadamori -Tadanaga -Tadanao -Tadanari -Tadanobu -Tadanori -Tadao -Tadaoki -Tadashi -Tadataka -Tadateru -Tadatomo -Tadatoshi -Tadatsugu -Tadatsune -Tadayo -Tadayoshi -Tadayuki -Taichi -Taichirō -Taiga -Taiichi -Taiji -Taiki -Taishi -Taisuke -Taizō -Taka -Takaaki -Takafumi -Takaharu -Takahide -Takahiko -Takahiro -Takahisa -Takahito -Takakazu -Takaki -Takamasa -Takamitsu -Takamori -Takanobu -Takanori -Takao -Takashi -Takatō -Takatomi -Takatoshi -Takatsugu -Takauji -Takaya -Takayasu -Takayoshi -Takayuki -Takeaki -Takefumi -Takeharu -Takehiko -Takehiro -Takehisa -Takehito -Takeichi -Takejirō -Takenaga -Takenori -Takeo -Takero -Takeru -Takeshi -Taketo -Taketora -Taketoshi -Takeya -Takeyoshi -Takeyuki -Takezō -Taku -Takuji -Takuma -Takumi -Takuo -Takurō -Takuto -Takuya -Takuzō -Tamio -Tamotsu -Tarō -Tasuku -Tateo -Tatsuaki -Tatsuhiko -Tatsuhiro -Tatsuhito -Tatsuji -Tatsuma -Tatsumi -Tatsunori -Tatsunosuke -Tatsuo -Tatsurō -Tatsushi -Tatsuya -Tatsuyoshi -Tatsuyuki -Tatsuzō -Teiichi -Teiji -Teijirō -Teiko -Teizō -Teppei -Teruaki -Teruhiko -Teruhisa -Teruichi -Teruki -Terumasa -Terunobu -Teruo -Teruyoshi -Teruyuki -Tetsu -Tetsuharu -Tetsuhiro -Tetsuji -Tetsumasa -Tetsunosuke -Tetsuo -Tetsurō -Tetsushi -Tetsutarō -Tetsuya -Tetsuzō -Tetta -Togo -Tōichi -Tokihiko -Tokio -Tokuji -Tokujirō -Tokuo -Tokurō -Tokutarō -Tomio -Tomoaki -Tomochika -Tomoharu -Tomohide -Tomohiko -Tomohiro -Tomohisa -Tomohito -Tomoji -Tomokazu -Tomoki -Tomomichi -Tomonobu -Tomonori -Tomotaka -Tomoya -Tomoyasu -Tomoyoshi -Tomoyuki -Torahiko -Toru -Toshi -Toshiaki -Toshifumi -Toshiharu -Toshihide -Toshihiko -Toshihiro -Toshihisa -Toshihito -Toshiji -Toshikatsu -Toshikazu -Toshiki -Toshimasa -Toshimichi -Toshimitsu -Toshinaga -Toshinao -Toshinari -Toshinobu -Toshinori -Toshio -Toshirō -Toshitada -Toshitaka -Toshitsugu -Toshiya -Toshiyasu -Toshiyoshi -Toshiyuki -Toshizō -Toyoaki -Toyohiko -Toyokazu -Toyomatsu -Toyoshige -Toyozō -Tsugio -Tsugumasa -Tsugumichi -Tsugutoshi -Tsuneharu -Tsunehiko -Tsunehisa -Tsunejirō -Tsunekazu -Tsunemi -Tsunenori -Tsuneo -Tsuneyoshi -Tsuneyuki -Tsurugi -Tsutomu -Tsuyoshi -Umanosuke -Umeji -Wataru -Yahiko -Yahiro -Yanosuke -Yashiro -Yasuaki -Yasufumi -Yasuharu -Yasuhide -Yasuhiko -Yasuhiro -Yasuhisa -Yasuji -Yasujirō -Yasukazu -Yasuki -Yasumasa -Yasumi -Yasumichi -Yasunari -Yasunobu -Yasunori -Yasuo -Yasurō -Yasushi -Yasutaka -Yasutake -Yasutarō -Yasutomo -Yasutoshi -Yasuyoshi -Yasuyuki -Yatarō -Yō -Yōhei -Yōichi -Yōichirō -Yōji -Yōjirō -Yorimitsu -Yorinobu -Yorishige -Yoritaka -Yoritsugu -Yoritsune -Yoriyuki -Yoshi -Yoshiaki -Yoshifumi -Yoshiharu -Yoshihide -Yoshihiko -Yoshihiro -Yoshihisa -Yoshihito -Yoshiie -Yoshikane -Yoshikatsu -Yoshikazu -Yoshiki -Yoshikiyo -Yoshikuni -Yoshimasa -Yoshimatsu -Yoshimichi -Yoshimitsu -Yoshimori -Yoshimoto -Yoshinaga -Yoshinao -Yoshinari -Yoshinobu -Yoshinori -Yoshio -Yoshirō -Yoshisada -Yoshishige -Yoshisuke -Yoshitaka -Yoshitake -Yoshitarō -Yoshiteru -Yoshito -Yoshitomo -Yoshitsugu -Yoshiya -Yoshiyasu -Yoshiyuki -Yoshizumi -Yōsuke -Yōta -Yōzō -Yūdai -Yugi -Yugo -Yūhei -Yuichi -Yūichirō -Yūji -Yūjirō -Yūkichi -Yukiharu -Yukihiko -Yukihiro -Yukimasa -Yukimura -Yukinobu -Yukinori -Yukio -Yukishige -Yukitaka -Yukito -Yukitoshi -Yukiya -Yukiyoshi -Yuma -Yūsaku -Yūsei -Yūshi -Yūsuke -Yūta -Yutaka -Yūtarō -Yūto -Yūya -Yūzō -Yuzuru -Zenjiro -Zenkichi -Zentarō -Zenzō \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/japanese_surnames.txt b/src/main/resources/assets/customnpcs/markovnames/japanese_surnames.txt deleted file mode 100644 index 7bd973486..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/japanese_surnames.txt +++ /dev/null @@ -1,2341 +0,0 @@ -Abe -Abeno -Abiko -Abo -Aburaya -Adachi -Adachihara -Agata -Agatsuma -Agawa -Ahane -Aiba -Aichi -Aida -Aihara -Aijima -Aikawa -Aikoh -Aikura -Aikyo -Aimoto -Aisawa -Aiso -Aiuchi -Aizawa -Akaba -Akabane -Akada -Akae -Akagawa -Akagi -Akahori -Akahoshi -Akaike -Akaishi -Akamatsu -Akamine -Akane -Akaneya -Akanishi -Akao -Akasaka -Akasaki -Akashi -Akasofu -Akatsuka -Akaza -Akazawa -Akesaka -Akiba -Akihara -Akiho -Akikawa -Akimoto -Akimura -Akinaga -Akino -Akisada -Akita -Akitomi -Akiya -Akiyama -Akiyoshi -Akizuki -Akutagawa -Akutsu -Amachi -Amami -Amamiya -Amane -Amano -Amari -Amaya -Amemiya -Amenomori -Amuro -Anabuki -Anai -Anami -Anan -Ando -Anno -Anzai -Aoba -Aochi -Aoi -Aoike -Aoki -Aomatsu -Aomori -Aomoto -Aono -Aonuma -Aoshima -Aoyagi -Aoyama -Aozora -Arabori -Aragaki -Arai -Arakaki -Arakawa -Araki -Aramaki -Arata -Aratama -Aratani -Ariga -Arikawa -Arima -Arimachi -Arimori -Arimoto -Arimura -Arinaga -Arisaka -Arisawa -Arishima -Arita -Arito -Ariyoshi -Asada -Asagami -Asagiri -Asahara -Asahi -Asahina -Asai -Asaka -Asakawa -Asaki -Asakuma -Asakura -Asami -Asano -Asanuma -Asao -Asaoka -Asashima -Asato -Asayama -Ashida -Ashihara -Ashinano -Ashiro -Ashitomi -Aso -Asoshina -Asuka -Asumi -Atsumi -Atsuzawa -Awaji -Awara -Awashima -Awaya -Ayahana -Ayamine -Ayano -Ayatsuji -Ayukawa -Ayusawa -Azaki -Azuki -Azuma -Azumaya -Azumi -Baba -Baisho -Bando -Banno -Beppu -Bessho -Chatan -Chiaki -Chiba -Chida -Chihaya -Chijimatsu -Chikanari -Chikudate -Chinen -Chisaka -Chiyotanda -Chiziwa -Chujo -Chuza -Daigo -Daiju -Daimon -Daita -Date -Deguchi -Demura -Dewa -Dobashi -Dogura -Doi -Doigawa -Dokite -Domon -Domoto -Ebashi -Ebihara -Ebina -Ebinuma -Ebisu -Eda -Edamura -Edano -Egami -Egashira -Egawa -Eguchi -Egusa -Ehara -Eisen -Ejiri -Ekuni -Emon -Emoto -Enami -Enatsu -Endo -Enokida -Enomoto -Esashi -Esashika -Esumi -Fuchigami -Fuchizaki -Fueki -Fuji -Fujibayashi -Fujie -Fujihara -Fujiharu -Fujii -Fujiie -Fujikawa -Fujiki -Fujikura -Fujima -Fujimaki -Fujimaru -Fujimori -Fujimoto -Fujimura -Fujinaga -Fujinaka -Fujinami -Fujino -Fujio -Fujioka -Fujisaki -Fujisawa -Fujishima -Fujita -Fujitani -Fujiwara -Fujiyama -Fukada -Fukai -Fukao -Fukasawa -Fukaura -Fukaya -Fukazawa -Fuke -Fukikoshi -Fukuchi -Fukuda -Fukudome -Fukufuji -Fukuhara -Fukui -Fukumi -Fukumitsu -Fukumori -Fukumoto -Fukumura -Fukunaga -Fukuo -Fukuoka -Fukura -Fukushi -Fukushima -Fukutomi -Fukuyama -Fukuzawa -Fumizuki -Funae -Funai -Funaki -Funakoshi -Funamizu -Funatani -Funatsu -Funayama -Furihata -Furuhashi -Furuhata -Furui -Furukawa -Furuki -Furusawa -Furushima -Furuta -Furutani -Furuya -Fushimi -Futagawa -Futahashi -Futakami -Futami -Futara -Fuwa -Fuyuki -Fuyukichi -Gamo -Ganaha -Genji -Gomi -Goto -Goda -Gushiken -Hachisu -Hachisuka -Hada -Haga -Hagihara -Hagimoto -Hagimura -Hagino -Hagio -Hagisaki -Hagiuda -Hagiwara -Haitani -Hajikano -Hajime -Hakamada -Hakoyama -Haku -Hama -Hamada -Hamaguchi -Hamamoto -Hamamura -Hamanaka -Hamano -Hamasaki -Hamayotsu -Hamuro -Hanabusa -Hanada -Hanae -Hanagata -Hanai -Hanamori -Hanamura -Hanaoka -Hanashiro -Hanato -Hanazawa -Hanazono -Handa -Hara -Harada -Haraguchi -Harakawa -Harasaki -Harasawa -Harimoto -Harukawa -Haruki -Haruna -Haruno -Haruta -Hasebe -Hasegawa -Hasekura -Hasemi -Hashi -Hashida -Hashiguchi -Hashimoto -Hashimura -Hashiratani -Hashiuchi -Hashizume -Hasumi -Hata -Hatada -Hatakeda -Hatakeyama -Hatanaka -Hatano -Hatayama -Hato -Hatori -Hatoyama -Hatsu -Hatsumi -Hattori -Hayaishi -Hayakawa -Hayama -Hayami -Hayano -Hayasaka -Hayashi -Hayashibe -Hayashida -Hayata -Hazui -Hazuki -Henmi -Hibi -Hibino -Hida -Hidaka -Higa -Higaki -Higaonna -Higasayama -Higashida -Higashide -Higashiguchi -Higashihara -Higashikokubaru -Higashimura -Higashinakano -Higashino -Higashio -Higashiyama -Higuchi -Hiiragi -Hijikata -Hikari -Hikawa -Hikichi -Hikosaka -Himeno -Himura -Hinata -Hinoi -Hinouchi -Hioka -Hira -Hirabayashi -Hirafuji -Hiraga -Hirahara -Hirai -Hiraide -Hiraishi -Hiraiwa -Hiraizumi -Hirajima -Hiraka -Hirakawa -Hiraki -Hirako -Hirama -Hiramatsu -Hiramoto -Hiranaka -Hirano -Hirao -Hiraoka -Hirasawa -Hirase -Hirashima -Hirata -Hirate -Hiratsuka -Hirayama -Hirayanagi -Hirobe -Hiroe -Hirohashi -Hiroi -Hiromichi -Hironaga -Hironaka -Hirono -Hirooka -Hirosaka -Hirose -Hirosue -Hirota -Hirotsu -Hiroyama -Hiryu -Hisa -Hisagae -Hisakawa -Hisamoto -Hisamura -Hisataka -Hisaya -Hisayuki -Hishida -Hishikawa -Hishimi -Hitoto -Hiura -Hiyama -Hiyamizu -Hoashi -Hodoshima -Hokari -Hokinoue -Homma -Homura -Honami -Honda -Hondo -Honjo -Hori -Horie -Horigome -Horiguchi -Horihata -Horii -Horiike -Horikawa -Horikoshi -Horimoto -Horio -Horiuchi -Hosaka -Hoshi -Hoshide -Hoshikawa -Hoshimi -Hoshina -Hoshino -Hosoda -Hosoe -Hosogai -Hosoi -Hosokawa -Hosoki -Hosono -Hosoya -Hosoyamada -Hotta -Hozaki -Hozumi -Hyodo -Ibayashi -Ibuki -Ichida -Ichigatani -Ichihara -Ichihashi -Ichii -Ichijo -Ichikawa -Ichiki -Ichimada -Ichimura -Ichinohe -Ichinose -Ichioka -Ichiyama -Ichiyanagi -Icho -Ida -Ide -Ideguchi -Idemitsu -Idoki -Ieiri -Igarashi -Igari -Igawa -Iguchi -Igusa -Ihara -Iida -Iijima -Iimura -Iimuro -Iinuma -Iio -Iizuka -Ijichi -Ikari -Ikarino -Ikariya -Ikeda -Ikegami -Ikeguchi -Ikehara -Ikemoto -Ikeuchi -Ikuta -Imada -Imahori -Imai -Imaizumi -Imajuku -Imakake -Imakita -Imakura -Imamichi -Imamura -Imanishi -Imaoka -Imaruoka -Imaya -Imoto -Imura -Ina -Inaba -Inada -Inagaki -Inagawa -Inami -Inamine -Inaoka -Inokuma -Inomata -Inoue -Inubushi -Inui -Inukai -Inuzuka -Ioka -Irie -Irifune -Iriguchi -Irii -Isaka -Isayama -Iseda -Ishibashi -Ishibumi -Ishida -Ishidate -Ishigaki -Ishige -Ishiguro -Ishihara -Ishii -Ishijima -Ishikawa -Ishikuma -Ishima -Ishimaru -Ishimine -Ishimori -Ishimoto -Ishimura -Ishinabe -Ishino -Ishitate -Ishiwata -Ishiyama -Ishizaka -Ishizaki -Ishizu -Ishizuka -Ishizumi -Isoda -Isogai -Isomura -Isono -Isoyama -Isozaki -Isshiki -Itagaki -Itahashi -Itamura -Itani -Ito -Ito -Itodani -Itokawa -Itoyama -Itsuki -Itsumi -Itsuno -Iuchi -Iwabuchi -Iwadare -Iwadate -Iwahara -Iwahashi -Iwai -Iwakabe -Iwaki -Iwama -Iwamasa -Iwami -Iwamoto -Iwamura -Iwanaga -Iwao -Iwasa -Iwasaki -Iwase -Iwashiro -Iwashita -Iwata -Iwatani -Iwazaki -Izawa -Izumi -Izumida -Izumikawa -Izumitani -Jinno -Jissoji -Kabane -Kabashima -Kabayama -Kadokawa -Kadokura -Kadonaga -Kadono -Kadonosono -Kadowaki -Kaeriyama -Kagami -Kagawa -Kageyama -Kagurazaka -Kai -Kaieda -Kaifu -Kaimoto -Kaji -Kajihara -Kajii -Kajikawa -Kajino -Kajio -Kajishima -Kajitani -Kajiura -Kajiwara -Kajiya -Kajiyama -Kakehashi -Kakimoto -Kakizakai -Kaku -Kakunaka -Kakutani -Kamachi -Kamada -Kamamoto -Kamata -Kambayashi -Kameda -Kamei -Kamekawa -Kamibayashi -Kamijo -Kamiki -Kamikita -Kamimachi -Kamimoto -Kamimura -Kaminaga -Kaminuma -Kamio -Kamisaka -Kamitanida -Kamitsubo -Kamiya -Kamiyama -Kamohara -Kamura -Kanada -Kanai -Kanakubo -Kaname -Kanamori -Kanasawa -Kanaya -Kanayama -Kanazawa -Kanda -Kanehara -Kanehira -Kanehisa -Kanekawa -Kaneko -Kanemaru -Kanematsu -Kanemitsu -Kanemoto -Kaneshige -Kaneshiro -Kaneto -Kanetsuki -Kangawa -Kanmuri -Kanokogi -Karahashi -Karakawa -Karashima -Karube -Kasagi -Kasahara -Kasai -Kasamatsu -Kasaya -Kase -Kashibuchi -Kashima -Kashiwabara -Kashiwagi -Kashiwase -Kashiyama -Kasuga -Kasuya -Katabuchi -Katagami -Katagiri -Kataoka -Katayama -Kato -Katori -Katsuji -Katsuki -Katsumata -Katsumoto -Katsura -Katsuragi -Katsuro -Katsuya -Kawabe -Kawachi -Kawada -Kawagishi -Kawagoe -Kawaguchi -Kawahara -Kawai -Kawaji -Kawakami -Kawakatsu -Kawakubo -Kawamae -Kawamata -Kawamori -Kawamoto -Kawamura -Kawana -Kawanabe -Kawanaka -Kawano -Kawaoka -Kawaragi -Kawasaki -Kawase -Kawashima -Kawasumi -Kawauchi -Kawazoe -Kawazu -Kawazura -Kayama -Kazama -Kazami -Kibayashi -Kichise -Kida -Kida -Kido -Kidokoro -Kidowaki -Kihara -Kijima -Kijimuta -Kikawada -Kikuchi -Kikumoto -Kikuno -Kimihara -Kimijima -Kimizuka -Kimoto -Kimura -Kingetsu -Kino -Kinomoto -Kinoshita -Kinouchi -Kinowaki -Kinugasa -Kirishima -Kiriyama -Kiryu -Kishi -Kishida -Kishikawa -Kishimoto -Kishino -Kishinouyei -Kisugi -Kita -Kitabatake -Kitabayashi -Kitabeppu -Kitada -Kitagawa -Kitahama -Kitahara -Kitai -Kitajima -Kitamori -Kitamoto -Kitamura -Kitano -Kitao -Kitashima -Kitazawa -Kitera -Kito -Kitta -Kiuchi -Kiyama -Kiyofuji -Kiyokawa -Kiyokiba -Kiyomoto -Kiyonari -Kiyota -Kiyotake -Kiyozawa -Kizawa -Kizu -Koba -Kobashi -Kobashigawa -Kobata -Kobayakawa -Kobayashi -Kobiyama -Kobori -Koda -Kodaira -Kodaka -Kodama -Koezuka -Koga -Kogawa -Koguchi -Kogure -Kohara -Koharuno -Koike -Koishi -Koiwai -Koizumi -Kojima -Kokubo -Kokubun -Komaeda -Komatsu -Komatsubara -Komiya -Komiyama -Komori -Komura -Komuro -Konagawa -Konaka -Kondo -Konishi -Konno -Kono -Konoe -Konoike -Konomi -Konuma -Kosaka -Koshiba -Koshikawa -Kosugi -Kotegawa -Kotobuki -Kotoge -Kotorida -Koumaru -Koyama -Koyamada -Koyamatsu -Koyanagi -Kozakura -Kuba -Kubo -Kuboki -Kubota -Kuboyama -Kudo -Kugimiya -Kumabayashi -Kumada -Kumagai -Kumai -Kumaki -Kumakiri -Kumashiro -Kumazaki -Kumazawa -Kunii -Kunikida -Kunimoto -Kunimura -Kunitake -Kunitomo -Kuniyoshi -Kuno -Kurakawa -Kuramochi -Kuramoto -Kuranari -Kurata -Kure -Kuribayashi -Kurihara -Kurimoto -Kurino -Kurisu -Kurita -Kuriyama -Kuroda -Kuroeda -Kuroiwa -Kurokawa -Kuroki -Kuronuma -Kurosawa -Kuroshima -Kurotori -Kuroyanagi -Kurumada -Kusachi -Kusaka -Kusakabe -Kusakari -Kusakawa -Kusamura -Kusanagi -Kusao -Kusayanagi -Kushibiki -Kushida -Kusuda -Kusumoto -Kusunoki -Kusunose -Kutaragi -Kutsukake -Kutsuki -Kuwabara -Kuwada -Kuwahara -Kuwamoto -Kuwano -Kuwashima -Kuwata -Kuwayama -Kuwazawa -Kuwazuru -Kyoguchi -Kyoya -Mabuchi -Mabuki -Machi -Machida -Machii -Madoka -Maeba -Maeda -Maehara -Maehata -Maekawa -Maeshiro -Maeyama -Maeyamada -Maezuka -Makabe -Makara -Maki (name) -Makihara -Makihira -Makino -Makio -Makishima -Makiyama -Manabe -Managi -Manaka -Manatsu -Mano -Marumo -Maruo -Marutaka -Maruya -Maruyama -Masada -Masaki -Masamune -Masaoka -Mase -Mashiba -Mashima -Masuchi -Masuda -Masui -Masukawa -Masuko -Masuo -Masuyama -Matoba -Matsuba -Matsubara -Matsubayashi -Matsuda -Matsugae -Matsui -Matsukata -Matsukawa -Matsuki -Matsumae -Matsumiya -Matsumoto -Matsumura -Matsunae -Matsunaga -Matsunami -Matsuno -Matsuo -Matsuoka -Matsushige -Matsushima -Matsushita -Matsutani -Matsutomo -Matsutoya -Matsuura -Matsuya -Matsuyama -Matsuzaka -Matsuzaki -Matsuzawa -Mawatari -Mayuzumi -Michigami -Michihara -Michiki -Midori -Midorikawa -Mifune -Mihara -Mihashi -Miike -Mikami -Mikawa -Miki -Mikimoto -Mikumo -Mikuni -Mikuriya -Mimori -Mimoto -Mimura -Minagawa -Minami -Minamida -Minamino -Minase -Minato -Minazuki -Minegishi -Mineshima -Minowa -Misaki -Mishima -Mishin -Misumi -Mita -Mitamura -Mitani -Mitarai -Mitsubayashi -Mitsuda -Mitsugi -Mitsuhara -Mitsuhashi -Mitsuhira -Mitsui -Mitsukuri -Mitsumori -Mitsumune -Mitsuoka) -Mitsurugi -Mitsuura -Mitsuyoshi -Miuchi -Miura -Miwa -Miya -Miyagahara -Miyagawa -Miyagi -Miyagishima -Miyahara -Miyahira -Miyaji -Miyajima -Miyakawa -Miyake -Miyama -Miyamae -Miyamoto -Miyamura -Miyano -Miyanoue -Miyao -Miyasaka -Miyasato -Miyashiro -Miyashita -Miyata -Miyatake -Miyauchi -Miyawaki -Miyazaki -Miyazato -Miyazawa -Miyoshi -Mizoguchi -Mizubayashi -Mizugami -Mizuhara -Mizuhashi -Mizui -Mizukawa -Mizuki -Mizukoshi -Mizumoto -Mizumura -Mizunaga -Mizuno -Mizusaki -Mizusawa -Mizushima -Mizuta -Mizutani -Mochida -Mochizuki -Mogaki -Momoi -Mori -Morihara -Morikawa -Morikubo -Morimi -Morimoto -Morimura -Morinaga -Morinaka -Morino -Morioka -Morisaka -Morisaki -Morishige -Morishima -Morishita -Morita -Moritani -Moritsugu -Moriuchi -Moriwaki -Moriya -Moriyama -Moriyasu -Morizawa -Morohoshi -Morosawa -Morozumi -Motegi -Motohashi -Motoi -Motoki -Motomura -Motoshima -Motoya -Motoyama -Mukaiya -Mukoda -Mukojima -Munakata -Munekata -Munemori -Muneta -Munetomo -Mura -Murahama -Murai -Murakami -Murakawa -Muraki -Muramatsu -Muramoto -Muranaka -Murano -Muraoka -Murase -Murashige -Murata -Murayama -Murofushi -Muroi -Murota -Muroya -Murozono -Muta -Muto -Mutsumi -Myojin -Nabatame -Nagabuchi -Nagahama -Nagahata -Nagai -Nagakawa -Nagaku -Nagakura -Nagamatsu -Nagamine -Naganawa -Nagano -Naganuma -Nagaoka -Nagara -Nagasaki -Nagasako -Nagasato -Nagasawa -Nagase -Nagashima -Nagasone -Nagasu -Nagata -Nagatani -Nagato -Nagatomo -Nagatsuka -Nagatsuma -Nagayama -Nagisa -Naito -Naka -Nakabayashi -Nakachi -Nakada -Nakae -Nakagaichi -Nakagaki -Nakagami -Nakagawa -Nakahara -Nakai -Nakaido -Nakaima -Nakajima -Nakajo -Nakama -Nakamaki -Nakamaru -Nakamatsu -Nakamichi -Nakamoto -Nakamura -Nakanishi -Nakano -Nakaoka -Nakasako -Nakasato -Nakasone -Nakata -Nakatake -Nakatani -Nakatsu -Nakatsuka -Nakauchi -Nakaya -Nakayama -Nakazato -Nakazawa -Nambu -Namekata -Namigata -Namikawa -Namino -Namioka -Namura -Nanao -Nanase -Nanbu -Naoe -Nara -Narabayashi -Narahashi -Narazaki -Narimatsu -Narita -Narumi -Naruse -Nashida -Nashimoto -Nashiro -Nasu -Natori -Natsui -Natsuka -Natsukawa -Natsuki -Natsume -Natsumi -Negishi -Nemoto -Nihei -Niimi -Niiya -Niiyama -Niizuma -Nikaido -Nimura -Ninagawa -Ninomiya -Nishi -Nishida -Nishiguchi -Nishihara -Nishihira -Nishii -Nishijima -Nishikawa -Nishikori -Nishime -Nishimori -Nishimoto -Nishimura -Nishina -Nishino -Nishio -Nishiogi -Nishioka -Nishitani -Nishiyama -Nishizaki -Nishizawa -Niwa -Noborisaka -Noborizato -Nobumoto -Nobutoki -Nogaito -Nogami -Noguchi -Nohira -Noiri -Nojima -Nojiri -Nokubo -Nomoto -Nomura -Nonaka -Nonomura -Nonoshita -Norimoto -Noro -Nosaka -Noshitani -Notsuda -Nozaki -Nozawa -Nozuki -Nunomaki -Nutahara -Oba -Obari -Obata -Obayashi -Obokata -Obonai -Ochi -Ochiai -Oda -Odagiri -Oe -Ofuji -Ogaeri -Ogasawara -Ogata -Ogawa -Ogi -Ogihara -Ogino -Ogita -Ogiwara -Ogoe -Oguchi -Ogura -Ogushi -Ohara -Ohashi -Ohata -Ohori -Ohta -Oikawa -Oimatsu -Oizaki -Ojima -Oka -Oka -Okabayashi -Okabe -Okada -Okajima -Okakura -Okamoto -Okamura -Okano -Okawara -Okayama -Okazaki -Oketani -Oki -Okiayu -Okiishi -Okimoto -Okino -Okita -Oku -Okubo -Okuda -Okuhara -Okui -Okuma -Okumoto -Okumura -Okutani -Okuyama -Okuzawa -Omigawa -Ominami -Omotehara -Omura -Omuro -Onaga -Onaka -Onchi -Onishi -Onizuka -Ono -Onoda -Onodera -Onozawa -Onuki -Onuma -Oishi -Ooka -Okawa -Omori -Osaki -Osako -Osugi -Ozora -Orihara -Osafune -Osaka -Osanai -Osaragi -Osawa -Oshikawa -Oshima -Oshio -Oshiro -Oshita -Oshitani -Osumi -Otaka -Otani -Otomo -Otonashi -Otori -Otosaka -Otsu -Otsubo -Otsue -Otsuka -Ouchi -Oya -Oyadomari -Oyama -Oyamada -Ozaki -Ozawa -Rai -Rakuyama -Renbutsu -Rokuda -Sada -Sadanaga -Sadatomi -Sado -Saeki -Sagara -Sagawa -Sahashi -Saikachi -Saikawa -Saionji -Saito -Sakagami -Sakaguchi -Sakahara -Sakai -Sakakibara -Sakakura -Sakamoto -Sakamura -Sakano -Sakanoue -Sakata -Sakate -Sakazume -Sakemoto -Sakimoto -Sakino -Sakisaka -Sakita -Sakoda -Sakuda -Sakuma -Sakura -Sakuraba -Sakurabi -Sakurada -Sakurai -Sakurano -Sakurauchi -Sakurazawa -Samejima -Sameshima -Sanada -Sanematsu -Sanenobu -Saneto -Saneyoshi -Sanmaido -Sanmiya -Sano -Sano -Saotome -Saruhashi -Sarusawa -Saruwatari -Sasabe -Sasada -Sasagaki -Sasagawa -Sasahara -Sasai -Sasajima -Sasakawa -Sasaki -Sasakura -Sasamoto -Sasano -Sasanuma -Sasazaki -Sase -Sashihara -Sato -Satomi -Satomura -Satouchi -Satsukawa -Satsuki -Sawa -Sawada -Sawai -Sawairi -Sawaki -Sawamatsu -Sawamura -Sawano -Segawa -Seki -Sekido -Sekiguchi -Sekimoto -Sekine -Sekizuka -Seko -Sengoku -Senuma -Senzaki -Serizawa -Seto -Setoguchi -Shiba -Shibahara -Shibakoya -Shibamoto -Shibamura -Shibasaki -Shibata -Shibazaki -Shibukawa -Shibutani -Shibuya -Shichi -Shiga -Shigaki -Shigematsu -Shigemitsu -Shigemoto -Shigeno -Shigenobu -Shigeta -Shigezono -Shihomi -Shiina -Shiizaki -Shikata -Shikida -Shima -Shimabukuro -Shimada -Shimahara -Shimakawa -Shimaki -Shimakura -Shimamiya -Shimamoto -Shimamura -Shimanuki -Shimaoka -Shimatani -Shimazaki -Shimizu -Shimoda -Shimoi -Shimoji -Shimokawa -Shimomura -Shimono -Shimotori -Shimotsuki -Shimoyama -Shimoyanagi -Shimozawa -Shimura -Shina -Shinbo -Shindo -Shinjo -Shinkawa -Shinoda -Shinohara -Shinoyama -Shinozaki -Shinozuka -Shintake -Shintaku -Shintani -Shinya -Shinzaki -Shioda -Shiokawa -Shiomi -Shiono -Shionoya -Shiota -Shiotani -Shioura -Shioya -Shioyama -Shiozawa -Shirahata -Shirai -Shiraishi -Shirakawa -Shiraki -Shirakura -Shiranui -Shirasaki -Shirata -Shiratori -Shirayanagi -Shiroma -Shiroo -Shirota -Shiroyama -Shishido -Shishikura -Shishiuchi -Sho -Shoda -Shoji -Shojo -Shoshi -Shukuzawa -Soejima -Soga -Sogabe -Soma -Sone -Soneta -Sonoda -Sonohara -Sonoyama -Sonozaki -Sorayama -Sorimachi -Sotomura -Soyeda -Suegara -Suehiro -Suekichi -Suematsu -Suenaga -Suetsugu -Sugai -Sugamoto -Sugano -Suganuma -Sugawara -Sugaya -Sugeno -Sugi -Sugibayashi -Sugie -Sugihara -Sugii -Sugimoto -Sugimura -Sugino -Sugioka -Sugisaki -Sugishita -Sugita -Sugitani -Sugiura -Sugiyama -Suguri -Sumeragi -Sumida -Sumii -Sumimoto -Sumioka -Sumiyoshi -Sunahara -Sunakawa -Sunohara -Sunouchi -Suwa -Suyama -Suzaki -Suzuki -Suzuoki -Tabara -Tabata -Tabei -Tabuchi -Tachi -Tachibana -Tachimoto -Tachino -Tachizaki -Tada -Tadamori -Tadokoro -Tagami -Tagashira -Tagawa -Taguchi -Taichi -Taira -Tajima -Tajiri -Taka -Takabayashi -Takachi -Takada -Takaezu -Takagaki -Takagawa -Takagi -Takahara -Takahashi -Takahata -Takahide -Takaishi -Takaki -Takakura -Takakuwa -Takamatsu -Takami -Takamine -Takamiya -Takamori -Takamoto -Takamura -Takanaka -Takanashi -Takano -Takao -Takaoka -Takasaki -Takase -Takashima -Takashina -Takasugi -Takata -Takatani -Takato -Takaya -Takayama -Takayanagi -Takayasu -Takazaki -Takeba -Takeda -Takegahara -Takehara -Takehisa -Takehora -Takei -Takeichi -Takekawa -Takemi -Takemoto -Takemura -Takenaga -Takenaka -Takeno -Takeoka -Takesaki -Takeshima -Takeshita -Taketsuru -Takeuchi -Takewaka -Takewaki -Takeya -Takeyama -Takigawa -Takiguchi -Takii -Takimoto -Takita -Takiyama -Takizawa -Takuma -Takumi -Tamabayashi -Tamagawa -Tamaki -Tamakoshi -Tamashiro -Tamayama -Tamiya -Tamura -Tanaami -Tanahashi -Tanaka -Tanamura -Taneda -Tanemoto -Tanemura -Tani -Tanigaki -Tanigawa -Taniguchi -Taniike -Tanikawa -Tanimoto -Tanimura -Tanioka -Taniyama -Tanonaka -Tanoue -Tanuma -Taohata -Tasaka -Tashima -Tashiro -Tatekawa -Tateno -Tateyama -Tatsuhara -Tatsuki -Tatsumi -Tatsuta -Tatsuyoshi -Tawada -Tayama -Tazawa -Teguramori -Tenjin -Terada -Terajima -Teramoto -Teramura -Teranishi -Teraoka -Terasaki -Terashima -Terata -Terauchi -Terawaki -Terayama -Teruya -Teshigahara -Teshima -Tetsuto -Tezuka -Tobe -Toda -Todoroki -Togami -Togan -Togashi -Togawa -Tojo -Tokashiki -Toki -Tokioka -Tokita -Tokiwa -Toko -Tokuda -Tokugawa -Tokui -Tokumoto -Tokunaga -Tokura -Tokushige -Tokuyama -Tomihari -Tomii -Tomiie -Tominaga -Tominari -Tomioka -Tomisawa -Tomita -Tomiyama -Tomizawa -Tomochika -Tomonaga -Tomori -Tonari -Tonegawa -Tonoike -Tonokura -Tonomura -Tonouchi -Torikai -Toriyama -Tosaka -Tosaka -Toyama -Toyoda -Toyokawa -Toyonaga -Toyoshima -Toyota -Tozawa -Tsubobayashi -Tsuboi -Tsubota -Tsubouchi -Tsuburaya -Tsuchida -Tsuchie -Tsuchihashi -Tsuchimoto -Tsuchiya -Tsuchiyama -Tsuda -Tsuetaki -Tsuji -Tsujihara -Tsujii -Tsujimoto -Tsujimura -Tsujio -Tsukada -Tsukagawa -Tsukagoshi -Tsukamoto -Tsukuda -Tsumori -Tsumura -Tsunakake -Tsunawaki -Tsunematsu -Tsuru -Tsurumaki -Tsurumi -Tsuruno -Tsushima -Tsutsui -Tsutsumi -Tsuzuki -Tsuzurahara -Ubukata -Uchibayashi -Uchida -Uchikawa -Uchikoshi -Uchima -Uchimura -Uchino -Uchiyama -Uda -Uechi -Ueda -Uegaki -Uehara -Uehashi -Ueki -Uekusa -Uematsu -Uemoto -Uemura -Ueno -Uesaka -Uesato -Ueshiba -Uesugi -Ueta -Ueto -Ueyama -Ueyonabaru -Ugaki -Ugumori -Ujihara -Ukita -Umebayashi -Umeda -Umehara -Umeji -Umeki -Umemoto -Umemura -Umesaka -Umezaki -Umezawa -Unetani -Uozumi -Uragami -Uramoto -Uranishi -Urano -Urata -Urayama -Urushibara -Usami -Usatsuka -Ushijima -Ushioda -Usui -Utada -Utagawa -Utsumi -Uwasawa -Wada -Wakabayashi -Wakai -Wakaizumi -Wakaki -Wakamatsu -Wakamoto -Wakamura -Wakao -Wakasugi -Wakatsuki -Wakayama -Wakayoshi -Waki -Wakimoto -Wakino -Wakisaka -Wakita -Wakiya -Wakui -Watabe -Watai -Watanabe -Watanuki -Watari -Watase -Watsuji -Yabuchi -Yabuta -Yada -Yadama -Yaegashi -Yagami -Yagi -Yaginuma -Yaguchi -Yagura -Yahiro -Yajima -Yakushimaru -Yama -Yamabe -Yamada -Yamagata -Yamagishi -Yamaguchi -Yamahana -Yamaji -Yamakawa -Yamamoto -Yamamura -Yamamuro -Yamanaka -Yamanami -Yamane -Yamanishi -Yamano -Yamaoka -Yamasaki -Yamase -Yamashina -Yamashiro -Yamashita -Yamataka -Yamato -Yamauchi -Yamazaki -Yanaga -Yanagawa -Yanagi -Yanagida -Yanagidate -Yanagihara -Yanagimachi -Yanagimoto -Yanagisawa -Yanagita -Yanase -Yanoguchi -Yara -Yashida -Yashiki -Yashima -Yashiro -Yasuda -Yasue -Yasukawa -Yasukochi -Yasumi -Yasumoto -Yasumura -Yasunaga -Yasuraoka -Yasutake -Yauchi -Yazawa -Yoda -Yodogawa -Yokoi -Yokomizo -Yokono -Yokosawa -Yokota -Yokouchi -Yokoyama -Yonamine -Yoneda -Yonehara -Yonemoto -Yonemura -Yoneno -Yoneshige -Yoneyama -Yonezawa -Yoritaka -Yoshida -Yoshie -Yoshigahara -Yoshihara -Yoshii -Yoshiie -Yoshikawa -Yoshikuni -Yoshimatsu -Yoshimi -Yoshimori -Yoshimoto -Yoshimura -Yoshimuta -Yoshinaga -Yoshino -Yoshio -Yoshitaka -Yoshitake -Yoshiya -Yoshiyama -Yoshiyuki -Yoshizaki -Yoshizawa -Yoshizumi -Yuda -Yuguchi -Yuhara -Yui -Yukawa -Yuki -Yukimura -Yukimuro -Yukisada -Yumi -Yumoto -Yuruki -Yutani -Yuzawa -Yuzuki -Zaizen -Zayasu \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/old_norse_bothgenders.txt b/src/main/resources/assets/customnpcs/markovnames/old_norse_bothgenders.txt deleted file mode 100644 index d47eccba3..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/old_norse_bothgenders.txt +++ /dev/null @@ -1,1065 +0,0 @@ -Aðaliz -Aðallaug -Aðalmærki -Ádís -Ádísa -Aðísla -Áfríðr -Ágáða -Agata -Ágáta -Agatha -Agattha -Agða -Agdis -Agilamundō -Agvtthv -Ágærðr -Aldís -Aldríf -Aldviðr -Alfdís -Álfdís -Álfeiðr -Alffinna -Alfgerðr -Álfgerðr -Alfheiðr -Alfhilda -Alfhildr -Álfhildr -Alfífa -Alflaug -Alfný -Alfrún -Alhildr -Alhiltr -Allaug -Allogia -Almveig -Alví -Alvíg -Alvǫr -Álǫf -Alþrúðr -Ama -Áma -Amba -Amgerðr -Ámgerðr -Amma -Ámóða -Angeyja -Angrboða -Anna -AnsufriþioR -Arinbjǫrg -Arinborg -Aringærðr -Arinví -Arna -Arnbiorg -Arnbiǫrg -Arnbjǫrg -Arnborg -Arndís -Arndísa -Arneiðr -Arnfasta -Arnfríðr -Arngerðr -Arngunnr -Arngærðr -Arnheiðr -Arnhildr -Arnkatla -Arnlaug -Arnleif -Arnljót -Arnóra -Arnríðr -Arnvé -Arnví -Arnþóra -Arnþrúðr -Ása -Ásbera -Asbiorg -Ásbiǫrg -Ásbjǫrg -Ásdís -Ásfríðr -Ásgauta -Ásgerða -Ásgerðr -Ásgunnr -Ásgærðr -Áshilda -Áshildr -Áskatla -Áslaug -Ásleif -Ásmóð -Ásboð -Ásný -Asriðr -Ásríðr -Ásta -Astríðr -Ástríðr -Ásunn -Ásví -Ásvǫr -ÁsælfR -Atla -Auða -Auðbjǫrg -Auðfríðr -Auðgerðr -Auðguðr -Auðgærðr -Auðhelga -Auðhildr -Auðhumla -Auðný -Auðr -Auðumbla -Auðumla -AuðælfR -Auþa -Aþmiul -Íma -Bára -Baugeið -Baugeiðr -Baugheiðr -Baunila -Begga -Bekkhildr -Bera -Bergdís -Berghildr -Bergliót -Bergljót -Bergþóra -Bersa -Bestla -Beyla -Biargey -Bil -Biollok -Birla -Birna -Birsa -Bitra -Biǫrg -Bjargey -Bjarnhildr -Bjarnilla -Bjartey -Bjollok -Bjǫrg -Bjǫrt -Blankiflúr -Blóðughadda -Bófríðr -Borga -Borghilda -Borghildr -Borgildr -Borgný -Borgunna -Bót -Bótey -Bótfríðr -Bótheiðr -Bóthilda -Bóthildr -Bóthæiðr -Bótvé -Bótví -Brák -Bráma -Brana -Brettifa -Brigida -Bryngerðr -Brynhilda -Brynhildr -Buna -Bylgja -Bǫðný -Böðvildr -Dagheiðr -Dagmær -Dagný -Dagrún -Dalla -Dana -Dís -Dísa -DísælfR -Dómhilda -Dómhildr -Dóta -DóttiR -Drífa -Droplaug -Drumba -Drǫfn -Dúfa -Dýrfinna -Dýrhildr -Edda -Eðna -Egilleif -Eir -Eirný -Eistla -Eldfríðr -Eldríðr -Ellisif -Elsebe -Elseby -Embla -Esja -Eydís -Eyfura -Eygerðr -Eyia -Eyildr -Eyja -Eylaug -Eyvǫr -Fasta -Fastgærðr -Fasthæiðr -Fastlaug -Fastný -Fastríðr -Faství -Fenja -FingR -Finna -Fiǫlmóð -Fiǫrleif -Fjǫlvǫr -Fjǫrleif -Foldheiðr -Folka -Folkví -Freydís -Freygerðr -Freyja -Fríða -Friðgerðr -Fríðr -FriðælfR -Frigg -Frøydís -Frøygærðr -Frøyguðr -Frøygunnr -Frøylaug -Fulla -Fǫnn -Gás f -Gauthildr -Gefion -Gefjon -Gefjun -Gefn -Geira -Geirahǫd -Geirahǫð -Geiravǫr -Geirbiǫrg -Geirbjǫrg -Geirdís -Geirdriful -Geirhildr -Geirlaug f -Geirný -Geirríðr -Geirrǫmul -Geirrǫndul -Geirrǫnul -Geirskǫgul -Geirskǫgull -Geirvǫr -Geirǫlul -Geirǫmul -Geirǫnul -Geirþrúðr -Gerðr -Gertrud -Giaflaug -Gígja -Gilla -Gillaug -Ginna -Ginnlaug -Gísla -Gíslaug -Gjaflaug -Glóa -Glyrna -Gná -Gói f -Greilǫð -Greip f -Grélǫð -Gríð -Gríðr -Gríma f -Grímhildr -Gró -Gróa -Guðbiǫrg -Guðbjǫrg -Guðfinna -Guðfríðr -Guðlaug -Guðleif -Guðmóð -Guðný -Guðr -Guðríðr -Guðrún -Guðvé -Guðveig -Guðví -Guðvǫr -GuðælfR -Gulla -Gullaug -Gullveig -Gulløy -Gunna -Gunnbiǫrg -Gunnbjǫrg -Gunnborga -Gunnfríðr -Gunngerðr -Gunnheiðr -Gunnhilda -Gunnhildr -Gunnhæiðr -Gunnlaug -Gunnleif -Gunnlǫð -Gunnr -Gunnríðr -Gunnuðr -Gunnvǫr -GunnælfR -Gunnþrúðr -Gyða -Gyðja -Gylla -Gyra -Gyríðr -Gýríðr -GæiRa -GæiRfríðr -GæiRhildr -GæiRlaug -GæiRunnr -GæiRví -GæiRvǫr -Gǫll -Gǫndul -Gǫndull -Hábera -Hadda -Hafþóra -Hagný -Halla -Hallabera -Hallbera -Hallbiǫrg -Hallbjǫrg -Halldís -Halldóra -Hallfríðr -Hallgerðr -Hallgríma -Hallkatla -Hallótta -Hallríðr -Hallveig -Hallvǫr -Haurlaug -Heðindís -Heðinfast -Heðingunnr -Heðinví -Hefring -Heiðr -Heiðrún -Heimlaug -Hel -Helga -Herbjǫrg -Herborg -Herborga -Herdís -Herfjǫtur -Herfríðr -Hergerðr -Hergunnr -Herja -Herríðr -Hervǫr -Herþrúðr -Hetha -Hialmdís -Hiálmgerðr -Hialmlaug -Hiálp -Hiðindís -Hiðinfast -Hiðingunnr -Hiðinví -Hilda -Hildeborg -Hildibjǫrg -Hildigerðr -Hildigunnr -Hildiriðr -Hildiríðr -Hildr -Hildriðr -Hildríðr -Himinglæva -Hjalmgerðr -Hjálmgerðr -Hjalmþrimul -Hjalmþrimull -Hjálp -Hjǫlp -Hjǫrdís -Hjǫrgunnr -Hjǫrthrimul -Hjǫrþrimul -Hlaðgerðr -Hlaðguðr -Hlaðgunnr -Hlédís -Hlégunnr -Hleiðr -Hlíf -Hlífa -Hlífhildr -Hlíføy -Hlífþrasa -Hlín -Hlǫkk -Holma -Holmdís -Holmfríðr -Hólmfríðr -Holmgærðr -Holmlaug -Hólmlaug -Holmví -Hrafnhildr -Hrefna -Hreiðunn -Hreiðunna -Hreiðunnr -Hremsa -Hrímgarðr -Hringia -Hringja -Hrist -Hróða -Hróðgerðr -Hróðgærða -Hróðlaug -Hróðný -Hróðví -HróðælfR -Hrund -Hræfna -Hrǫnn -Huld -Hulð -Hulda -Húngerðr -Húnvǫr -Hvít -Hyrrokkin -Hæilví -Hæimlaug -Hælga -Hælgunnr -Hæra -Hærfríðr -Hærlæif -Hærþrúðr -Hǫð -Hǫdd -Hǫrn -Iðunn -Iðunnr -Ígulfríðr -Ilmr -Ingiberg -Ingibiǫrg -Ingibjǫrg -Ingiborg -Ingifast -Ingifríðr -Ingigerðr -Ingigunnr -Ingigærðr -Ingilaug -Ingileif -Ingilæif -Ingimóð -Ingirida -Ingiríðr -Ingirún -Ingiøy -Ingiþóra -Ingríðr -Ingunn -Ingunnr -Ingveldr -Ingvǫldr -Iófast -Iófríðr -Iógærðr -Iórhildr -Ióríðr -Iórunn -Iórunnr -Irpa -Ísfríðr -Ísgerðr -Ísleif -Ísríðr -Iǫfurfast -Iǫfurfríðr -Iǫfurfǫst -Jarð -Jarðþrúðr -Jarngerðr -Járngerðr -Járnsaxa -Jarþrúðr -Jóðdís -Jóðhildr -Jódís -Jófríðr -Jóra -Jóreiðr -Jórheiðr -Jórhildr -Jóríðr -Jórunn -Jórunna -Jǫrð -Kaðlín -Kalda -Kára -Kárhildr -Káta -Katla -Ketilbjǫrg -Ketillaug -Ketilríðr -Ketilvé -Kiǫlvǫr -Kjǫlvǫr -Kolbrún -Kolfinna -Kolga -Kolgríma -Kolka -Kolla -Kolþerna -Kormlǫð -Kristrún -Kyi -Kyriþ -Kætilfríðr -Kætilgærðr -Kætillaug -Kætillauga -Kætilví -KætilælfR -Kætiløy -Laufey -Leiðvǫr -Leikný -Líf -Lífa -Líføy -Líknví -Línhildr -Listvǫr -Ljóðey -Ljót -Ljóta -Ljótunnr -Ljúfvina -Lofn -Lofnheiðr -Lopthæna -Lopthœna -Lyngheiðr -Mabil -Mábil -Magga -Magna -Magnhilda -Magnhildr -Málfríðr -Mallymkun -Malmfríðr -Malmury -Mardǫll -Margerðr -Marsibil -Marzibil -Melkorka -Menglǫð -Mette -Mildríðr -Mist -Miǫll -Mjaðveig -Mjǫll -Móbil -Móða -Móðguðr -Móðgunnr -Móðir -Mundgerða -Mundgerðr -Mundgærðr -Mungærðr -Myrgiol -Myrgiǫl -Myrgjol -Mýrún -Mær -MáR -Nál -Nanna -Nefja -Niðbiǫrg -Nótt -Oda -Óðalfríðr -Oddbiǫrg -Oddbjǫrg -Oddfríðr -Oddgerðr -Oddkatla -Oddlaug -Oddleif -Oddný -Oddrún -Oddvǫr -Oðin -Ólaug -Ólof -Ólæif -Ólǫf -Ormfríðr -Ormhildr -Ósk -Ótama -Otkatla -Ráðgerðr -Ráðgríð -Radgríðr -Ráðgríðr -Ráðný -Ráðveig -Rafarta -Rafnhildr -Raghnilldr -Ragna -Ragnbiǫrg -Ragnborg -Ragndid -Ragneiðr -Ragnfriðr -Ragnfríðr -Ragnheiðr -Ragnhilda -Ragnhildr -Ragnogh -Ragnveig -Ragnví -Ragnvæig -Ragnvǫr -RagnælfR -Ragnþrúðr -Rán -Randalín -Randgnid -Randgríðr -Randid -Randví -Raneigh -Rangdid -Rangrið -Ranka -Rannavg -Ranndtuoig -Ranneigh -Rannoff -Rannog -Rannogh -Rannok -Rannow -Rannueg -Rannueig -Rannueigh -Rannueyg -Rannugh -Rannuæigh -Rannveig -Rannveyg -Rannvæig -Rannwæigh -Rannæy -Ranog -Ranueidgh -Ranueig -Ranueigh -Ranueyg -Ranuig -Ranuæigh -Ranveg -Ranveigh -Ranveyg -Ranveygh -Ranvæig -Ranvæigh -Ranæigh -Reginleif -Reginleifr -Reiðunn -Ríkví -Rinda -Rindr -Riúpa -Rjúpa -Róðný -Rognogh -Rognok -Rollov -Ronnaugh -Ronndoug -Ronnoc -Ronnoch -Ronnog -Ronnogh -Ronnok -Ronnongh -Ronnoogh -Ronnoug -Ronnow -Ronog -Ronogh -Róta -Runa -Rúna -Rúnfríðr -Rǫgnveig -Rønnou -Rǫskva -Sága -Salbiǫrg -Salbjǫrg -Saldís -Salgerðr -Sandøy -Sangriðr -Sangríðr -Sanngriðr -Sanngríðr -Sásgærðr -Saumlǫð -Sefa -Sibba -Síða -Sif -Sigbiǫrg -Sigbjǫrg -Sigfríðr -Sigga -Siggun -Siggunnr -Siglaug -Signi -Signý -Sigrdríf -Sigrdrífa -Sigrfljóð -Sigrid -Sigríða -Sigríðr -Sigrlinn -Sigrúðr -Sigrún -Sigunnr -Sigvei -Sigveig -Sigvin -Sigvæig -Sigvǫr -Sigyn -Sigþrúðr -Simlǫð -Sjǫfn -Skaði -Skaga -Skalmǫld -Skeggjǫld -Skeggǫld -Skírlaug -Skjalddís -Skjaldgerðr -Skjaldvǫr -Skjalf -Skjǫlf -Skuld -Skǫgul -Skǫgull -Sniólaug -Snjófríðr -Snót -Snotra -Snæfríðr -Snælaug -Snœfríðr -Sofie -Sólbjǫrt -Sólveig -Sóma -Steinbiǫrg -Steinbjǫrg -Steinfríðr -Steingerðr -Steinhildr -Steinný -Steinríðr -Steinunnr -Steinvǫr -Stygg -Stynfríðr -Stæina -Stæinborg -Stæinfríðr -Stæinhildr -Stæinlaug -Sunnifa -Sunniuæ -Sunnlǫð -Svafa -Sváfa -Svala -Svana -Svanbjǫrg -Svanborg -Svanhildr -Svanhvít -Svanlaug -Sveid -Sveið -Svipul -Svipull -Svæina -Svæinhæiðr -Sylgja -Syn -Systa -Sæhildr -Sæuðr -Sæunn -Sæunnr -Sǫlrún -Sǫlva -Sǫlveig -Sǫlvǫr -Søyvǫr -Tanngnidr -Tanngniðr -Tekla -Thekla -Tíðfríðr -Tófa -Tóka -Tóla -Tolla -Tonna -Tóra -Trana -Uðr -Úlfarna -Úlfeiðr -Ulfheiðr -Úlfheiðr -Ulfhildr -Úlfhildr -Ulfrún -Úlfrún -Ulvhildr -Una -Undrlaug -Unna -Unnr -Urðr -Valborg -Valdís -Valgerðr -Valka -Vanadís -Vár -Vébiǫrg -Vébjǫrg -Védís -Véfreyja -Véfríðr -Végerðr -Vélaug -Véný -Verdandi -Verðandi -Víborg -Víf -Vífríðr -Vigdís -Vígdís -Víguðr -Vígundr -Vígærðr -Vilborg -Vilgerðr -Vírún -Visna -Wīwijō -Wiwjō -VíælfR -Vór -Vrindr -Vǫr -Ynghildr -Yngvildr -Yngvǫr -Yri -Ýri -Yrr -Ýrr -Yrsa -Ægileif -Æilíf -Ærinbjǫrg -Ærinborg -Ærindís -Æringunnr -Æringærðr -Ærinví -Ærnbjǫrg -Ærnborg -Ærndís -Ærnfríðr -Ærngærðr -Ærnlaug -Ærnví -Æsa -Ǣsgærðr -Ǣshæiðr -Ǣstríðr -Ætta -Ǫgn -Ǫlhildr -Ǫlrun -Ǫlrún -Ǫlvǫr -Ǫndótt -Øyborg -Øydís -Øyðr -Þióðbjǫrg -Þióðgerðr -Þióðhildr -Þiúð -Þiúðborg -Þiúðhæiðr -Þiúðr -Þiúðví -Þjóðgerðr -Þjóðhildr -Þjóðunn -Þodny -Þone -Þonne -Þonny -Þóra -Þórarna -Þorbera -Þorbiǫrg -Þorbjǫrg -Þordís -Þórdís -Þórelfr -Þórey -Þorfinna -Þórfríða -Þorfríðr -Þórfríðr -Þorgerðr -Þórgerðr -Þorgríma -Þórguðr -Þórgundr -Þorgunna -Þorgunnr -Þórgunnr -Þórgærðr -Þórhalla -Þórheiðr -Þórhildr -Þórhæiðr -Þórildr -Þorkatla -Þorlaug -Þórlaug -Þorleif -Þorljót -Þórlǫf -Þorny -Þorný -Þórný -Þórodda -Þorríðr -Þórríðr -Þóruðr -Þórunn -Þórunnr -Þorvé -Þorveig -Þórví -Þorvǫr -Þórvǫr -Þraslaug -Þrima -Þrúðr -Þrúðrún -Þúfa -Þuríðr -Þúríðr -Þyri -Þyríðr -Þyrna -Þyrwi -Þýrví -Þǫgn \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/roman_cognomina.txt b/src/main/resources/assets/customnpcs/markovnames/roman_cognomina.txt deleted file mode 100644 index b6d12ecbe..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/roman_cognomina.txt +++ /dev/null @@ -1,1021 +0,0 @@ -Abercius -Abito -Acacius -Acaunus -Achaicus -Acilianus -Adauctus -Adepphius -Adjutor -Adranos -Adventus -Aeacus -Aebutus -Aemilianus -Aetius -Afer -Agaptus -Agatopus -Agelastus -Agorix -Agricola -Agrippa -Agustalis -Ahala -Ahenobarbus -Albanus -Albinius -Albinus -Albucius -Alethius -Allectus -Aloysius -Aluredes -Alypius -Amandus -Amantius -Ambrosius -Amor -Amphion -Anatolius -Ancus -Andronicus -Angelus -Antias -Antius -Anullinus -Apelles -Apellinus -Aper -Apollonarius -Aponius -Aquila -Aquilius -Aquillius -Aratus -Arcadius -Arcavius -Archarius -Arius -Armiger -Arminus -Arpagius -Arrianus -Arruntius -Aruns -Arvina -Asellio -Asina -Asprenas -Asprenus -Assanius -Audaios -Audens -Augendus -Augurnus -Augurius -Augustalis -Augustanus -Augustus -Auila -Aurelianus -Aurelius -Ausonius -Auspex -Auxentius -Auxientius -Auxilius -Avienus -Avitus -Balbillus -Balbus -Bambalio -Bamballio -Banquerius -Barbatus -Baro -Bassus -Bato -Belenus -Belisarius -Bellator -Belletor -Bellicus -Bellus -Bestia -Betto -Bibaculus -Bibulus -Bitucus -Blandus -Bodenius -Bolanus -Bonifatius -Bonosus -Bonus -Bradua -Britannicus -Brocchus -Bromidus -Bruccius -Brucetus -Bruscius -Brutus -Bubo -Buccio -Bulla -Burcanius -Burrus -Buteo -Caecilianus -Caecina -Caecus -Caelistis -Caelestius -Caelianus -Caelinus -Caepio -Caerellius -Caesar -Calacicus -Calatinus -Caldus -Calenus -Calerus -Caletus -Caligula -Callisunus -Calogerus -Calpornius -Calpurnianus -Calpurnis -Calvinus -Calvus -Camerius -Camillus -Campanus -Candidianus -Candidus -Candidius -Canio -Canisius -Cantaber -Capito -Capiton -Caprarius -Caracturus -Carantus -Carbo -Carinus -Carius -Carnifex -Carus -Casca -Cassianus -Castinus -Castorius -Castus -Catianus -Catilina -Cato -Catonius -Catullus -Catulus -Catus -Cecilianus -Celatus -Celer -Celsus -Cenaeus -Cencius -Censorinus -Censorius -Centumalus -Cerialis -Cerinthus -Cerularius -Cervianus -Cervidus -Cethegus -Chlorus -Christianus -Cicero -Cico -Cimber -Cinna -Cinnianus -Cita -Cittinus -Civilis -Clarus -Classicianus -Claudianus -Clemens -Clement -Clodian -Clodianus -Cogitatus -Colias -Collatinus -Columbanus -Columella -Comes -Comitianus -Comitinus -Commidius -Commidus -Commius -Commodus -Concessus -Congrio -Constans -Constantius -Corbulo -Cordus -Cornix -Cornutus -Corvinus -Corvus -Cosmas -Cotentinus -Cotta -Crassus -Cremutius -Crescentius -Cresces -Crispian -Crispin -Crispus -Crito -Crotilo -Cucuphas -Culleolus -Cumanus -Cunobarrus -Cupitas -Curio -Cyprianus -Cyprias -Cyricus -Dacien -Dalmatius -Dama -Damasippus -Damasus -Damian -Dannicus -Dardanius -Dardanus -Decentius -Decianus -Decmitius -Decmus -Dexion -Dexippus -Didicus -Dignus -Dio -Diocletianus -Diocourides -Disertus -Docilinus -Docilus -Dolabella -Dominicus -Domitianus -Donatianus -Donatus -Donicus -Dorotheus -Draco -Drusillus -Drusus -Dubitatius -Dulcitius -Durio -Durus -Duvianus -Eborius -Eburnus -Ecdicius -Eclectus -Egbuttius -Egnatius -Elerius -Eliphas -Elpidius -Elvorix -Emeritus -Encratis -Ennecus -Ennius -Ennodius -Eonus -Epidianus -Epimachus -Epolonius -Erasinus -Esdras -Eudomius -Eudoxius -Eugenius -Eugenus -Eulogius -Eumenius -Eunapius -Euphemius -Eustacius -Eutherius -Evodius -Excingus -Exsupereus -Exuperantius -Exupertus -Fabianus -Fabillus -Facilis -Fadus -Fagus -Falco -Falconius -Falx -Famia -Familiaris -Fastidius -Farus -Faustillus -Faustinianus -Faustinius -Faustus -Faventinus -Felicissimus -Felissimus -Felix -Ferentinus -Ferreolius -Festus -Fidelis -Figulus -Fimbria -Fimus -Firminus -Firmus -Flaccus -Flamma -Flavian -Flavianus -Flavillus -Flavinus -Florens -Florentius -Florianus -Florus -Forianus -Fortunatus -Fraucus -Fredisius -Frigidian -Frontalis -Frontinus -Fronto -Fructosis -Frugi -Frugius -Frumentius -Fullofaudes -Fulvianus -Furius -Fuscinus -Fuscus -Gaianus -Gaius -Gala -Galarius -Galenus -Galerus -Gallio -Gallus -Galvisius -Garilianus -Gaurus -Gavros -Gavrus -Gelasius -Gellius -Gemellus -Geminianus -Generidus -Genesius -Genialis -Gennadius -Gerardus -Germanus -Germanicus -Gessius -Geta -Getha -Glabrio -Glaucia -Globulus -Gluvias -Glycia -Gordian -Gordianus -Gordio -Gorgonius -Gracchus -Gracilis -Gratian -Gratidianus -Grattus -Gregorius -Grumio -Gualterus -Gryllus -Habitus -Hadrianus -Hardalio -Haterius -Helvius -Herculius -Herenus -Herma -Hermina -Hesychius -Hiberus -Hilario -Hilaris -Hilarius -Hirpinius -Hirrus -Homullus -Honoratus -Horatius -Hortensis -Hortensius -Hortensus -Hosidius -Humilus -Hybrida -Iacomus -Igennus -Ignatius -Indaletius -Indus -Ingenuus -Ingenvinus -Iocundus -Iovinus -Irenaeus -Isatis -Isauricus -Italicus -Ivmarus -Ianuarius -Iavolenus -Iovinianus -Iovinus -Iovius -Iuba -Iulian -Iulianus -Iuncinus -Iuncus -Iunianus -Iustianus -Iustinianus -Iustinus -Iustus -Iuvenlis -Labienus -Lactantius -Laeca -Laenas -Laetinianus -Laevinus -Larcius -Lartius -Lateranus -Latinius -Laurentius -Leddicus -Lentullus -Lentulus -Leon -Leontius -Lepidus -Lepontus -Leptis -Libanius -Liberalis -Libo -Licinianus -Licinius -Ligur -Ligustinus -Limetanus -Linus -Litorius -Littera -Litumaris -Livianus -Livigenus -Longinus -Lovernianus -Lovernius -Lucan -Lucanus -Lucianus -Lucius -Luccius -Lucceius -Lucilianus -Lucretius -Luctacus -Lucullus -Lunaris -Luonercus -Lupercus -Lupicinus -Lupinus -Lupis -Lurco -Lurio -Lutherius -Lutorius -Maccalus -Macrinus -Macro -Macrobius -Mactator -Maecenus -Maecius -Magnentius -Magnus -Magunnus -Maius -Major -Malchus -Mallus -Maltinus -Mancinus -Manlius -Mansuetus -Marcallas -Marcellinus -Marcellus -Marcialis -Marcipor -Margarita -Marinianus -Marinus -Maritialis -Maritimus -Marius -Maro -Marsallas -Marsicus -Marsus -Marsyas -Martial -Martialis -Martianus -Martinus -Martius -Martyrius -Marullinus -Marullus -Maternus -Matho -Mauricius -Maursus -Maximian -Maximianus -Maximinius -Maximinus -Maximus -Medullinus -Megellus -Melissus -Melitus -Mellitus -Melus -Meminius -Memmius -Memor -Mercator -Mercurialis -Mercurinus -Merula -Messala -Messor -Metellus -Metilius -Metunus -Micianus -Mico -Micon -Milonius -Minervalis -Minianus -Minicianus -Moderatus -Molacus -Momus -Montanus -Montaus -Mordanticus -Mucianus -Muco -Muncius -Murena -Mus -Musa -Musicus -Mutilus -Mutius -Nabor -Naevius -Narcissus -Narses -Nasica -Naso -Natalinus -Natalis -Naucratius -Nazarius -Nectaridus -Nelius -Nemesianus -Nemnogenus -Neneus -Nennius -Nepos -Nero -Nertomarus -Nerva -Nicasius -Nicetius -Nigellus -Niger -Nigidius -Nigrinus -Niraemius -Nobilior -Nolus -Nonius -Noster -Novation -Novellius -Numerianus -Numonis -Oceanus -Octavian -Octavianus -Octobrianus -Olennius -Olympicus -Opilio -Opimius -Opis -Optatus -Ordius -Orientalis -Orientius -Orissus -Orosius -Osterianus -Otho -Ovidus -Pacatianus -Pachomius -Pacuvianus -Paenula -Paetinus -Paetus -Palicamus -Pamphilius -Panaetius -Pansa -Pantensus -Pantera -Panthera -Papinian -Papus -Paratus -Parnesius -Pascentius -Pastor -Paterculus -Paternus -Patiens -Patricius -Paulinus -Paullus -Pavo -Pelagius -Pennus -Peregrinus -Perennis -Perpenna -Perperna -Pertacus -Pertinax -Petasius -Petreius -Petronax -Petrus -Philippus -Photius -Pictor -Pilatus -Pilus -Piso -Pius -Placidus -Planta -Plautis -Plautius -Plautus -Pleminius -Pollienus -Pollio -Polus -Polybius -Pompolussa -Pomponius -Poplicola -Porcus -Porphyrius -Postumianus -Postumus -Potitus -Praetextus -Prilidianus -Primanus -Primulus -Primus -Prisca -Priscian -Priscillian -Priscillianus -Priscus -Probus -Processus -Proceus -Proculus -Procyon -Profuterius -Propertius -Protacius -Protus -Proxsimus -Publianus -Publicola -Publicus -Pudens -Pudentius -Pulcher -Pulcherius -Pullus -Pusinnus -Pustula -Quartinus -Quarto -Quatruus -Quentin -Quietus -Quintilianus -Quintilius -Quintillius -Quintillus -Quiriac -Quiricus -Quirinalis -Ramio -Ramirus -Ravilla -Reburrus -Receptus -Rectus -Regillus -Reginus -Regulus -Remigius -Remus -Renatus -Respectus -Restitutus -Rex -Rhesus -Ripanus -Rogatus -Rogelius -Romanus -Romulianus -Romulus -Roscius -Rufinianus -Rufinus -Rufrius -Rufus -Rullus -Ruricius -Ruso -Rusticus -Rutilianus -Sabellius -Sabinianus -Sabinus -Sacerdos -Saenus -Salinator -Salonianus -Saloninus -Salonius -Salvian -Salvianus -Sanctus -Sandilianus -Sanga -Sarimarcus -Sarrius -Saturninus -Saunio -Scaevola -Scapula -Scaro -Scato -Scaurus -Schlerus -Scipio -Scribonianus -Scrofa -Sebastianus -Secundas -Segestes -Sejanus -Sellic -Seneca -Senecianus -Senecio -Senilis -Senna -Senopianus -Sentius -Septimianus -Septimus -Seronatus -Serranus -Servanus -Servatius -Seuso -Severlinus -Severus -Sevso -Siculus -Sidonius -Sigilis -Silanus -Silius -Silo -Silus -Silvanus -Similis -Simo -Simplex -Simplicianus -Siricus -Sisenna -Sisinnius -Sita -Sollemnis -Sospes -Sorex -Sorio -Sosius -Sotericus -Soulinus -Spartacus -Spendius -Speratus -Spurinna -Statius -Stichus -Strabo -Sudrenus -Suilius -Sulinus -Sulla -Super -Superbus -Superstes -Sura -Surinus -Surius -Surus -Sylla -Sylvian -Sylvius -Symmachus -Symphorian -Sympronian -Synistor -Synnodus -Tacitus -Taenaris -Tancinus -Tanicus -Tarsicius -Tatianus -Taurinus -Telesinus -Terenteianus -Tertullian -Tertulus -Tetricus -Tetullianus -Thrasea -Thurinus -Tiberillus -Tiberinus -Tibullus -Tiburs -Titianus -Titillus -Torquatus -Traianus -Trailus -Tranio -Tranquillus -Trebonianus -Tremerus -Tremorinus -Trenico -Trenus -Triarius -Trifer -Triferus -Trimalchio -Trogus -Trupo -Tuccianus -Tuditanus -Turibius -Turpilianus -Turpilinus -Tuticanus -Tutor -Ulpianus -Urbicus -Ursinus -Ursus -Uticensis -Vala -Valens -Valentinian -Valentinus -Valerianus -Valgus -Varialus -Varro -Varus -Vatia -Vedrix -Venantius -Venator -Ventor -Venustinius -Verecundus -Verinus -Verres -Verrucosus -Verullus -Verus -Vespasianus -Vespillo -Vestinus -Vetranio -Vettonianus -Vetus -Viator -Vibennis -Vibius -Victor -Victoricus -Victorinus -Victorianus -Victricius -Vincentius -Vindex -Vinicianus -Viridio -Virilis -Vitalinus -Vitalis -Vitulus -Vitus -Vocula -Volusianus -Vopiscus -Vulso \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/roman_nomina.txt b/src/main/resources/assets/customnpcs/markovnames/roman_nomina.txt deleted file mode 100644 index 3ad617a07..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/roman_nomina.txt +++ /dev/null @@ -1,542 +0,0 @@ -Aburius -Accius -Accoleius -Acilius -Aebutius -Aedinius -Aelius -Aemilius -Albanius -Albatius -Allectius -Amatius -Annius -Antistius -Antius -Antonius -Appuleius -Aquillius -Armenius -Arrius -Arsinius -Artorius -Asinius -Ateius -Atius -Atilius -Atrius -Attius -Aufidius -Aurelius -Aurius -Ausonius -Avidius -Axius -Baebius -Balventius -Bantius -Barbatius -Barrius -Bellicius -Bellienus -Bellius -Betilienus -Betucius -Blandius -Blossius -Bruttius -Bucculeius -Burbuleius -Burrienus -Caecilius -Caecina -Caecius -Caedicius -Caelius -Caeparius -Caepasius -Caerellius -Caesennius -Caesetius -Caesius -Caesonius -Caesulenus -Caetronius -Calavius -Calidius -Calpurnius -Calventius -Calvisius -Camilius -Camillius -Camelius -Canidius -Caninius -Canius -Cantilius -Cantius -Canuleius -Canutius -Carfulenus -Carisius -Carius -Caristanius -Carpinatius -Carteius -Carvilius -Cassius -Castricius -Castrinius -Catius -Catienus -Catilius -Ceionius -Centenius -Cestius -Cicereius -Cilnius -Cincius -Cispius -Claudius -Clodius -Cloelius -Clovius -Cluilius -Cluentius -Cluvius -Cocceius -Cominius -Consentius -Considius -Coponius -Cordius -Corfidius -Cornelius -Cornificius -Coruncanius -Cosconius -Cossinius -Cossutius -Cotius -Cottius -Crassitius -Crepereius -Critonius -Cupiennius -Curiatius -Curius -Curtilia -Curtius -Cuspius -Decimius -Decius -Dellius -Desticius -Dexsius -Didius -Digitius -Dillius -Domitius -Duccius -Duilius -Durmius -Duronius -Egilius -Egnatius -Egnatuleius -Ennius -Epidius -Eppius -Equitius -Erucius -Fabius -Fabricius -Fadius -Faenius -Falcidius -Falerius -Fannius -Farsuleius -Faucius -Favonius -Festinius -Fidiculanius -Flaminius -Flavius -Flavinius -Flavonius -Floridius -Florius -Floronius -Fonteius -Foslius -Fuficius -Fufidius -Fufius -Fulcinius -Fulvius -Fundanus -Furius -Furnia -Gabinius -Galerius -Gallius -Gargonius -Gavius -Geganius -Gellius -Geminius -Genucius -Gessius -Granius -Gratius -Gratidius -Haterius -Heius -Helvidius -Helvius -Herennius -Herminius -Hirrius -Hirtius -Hirtuleius -Horatius -Hortensius -Hosidius -Hostilius -Iccius -Icilius -Insteius -Julius -Junius -Juventius -Laberius -Labienus -Lacerius -Laecanius -Laelius -Laenius -Laetilius -Laetorius -Lafrenius -Lamponius -Laronius -Lartius -Latinius -Lavinius -Lemonius -Lentidius -Liburnius -Licinius -Ligarius -Livius -Lollius -Longinius -Loreius -Lucceius -Lucienus -Lucilius -Lucius -Lucretius -Lurius -Luscius -Lusius -Lutatius -Macrinius -Maecilius -Maecius -Maelius -Maenius -Maevius -Magius -Mallius -Mamilius -Manilia -Manlius -Manilius -Marcius -Marius -Matius -Matienus -Matinius -Matrinius -Maximius -Memmius -Menenius -Menius -Mescinius -Messienus -Messius -Metilius -Mettius -Milonius -Mimesius -Minatius -Minicius -Minidius -Minucius -Modius -Mucius -Mummius -Munatius -Munius -Murrius -Mussidius -Mustius -Mutius -Naevius -Nasennius -Nasidienus -Nasidius -Nautius -Neratius -Nerius -Nigidius -Ninnius -Nipius -Nonius -Norbanus -Novellius -Novius -Numerius -Numicius -Numisius -Numitorius -Nummius -Numonius -Nymphidius -Obellius -Obultronius -Occius -Oclatinius -Oclatius -Octavenus -Octavius -Ofanius -Ofilius -Ogulnius -Ollius -Opellius -Opetreia -Opimius -Opiternia -Oppidius -Oppius -Opsidius -Opsilius -Opsius -Oranius -Orbicius -Orbilius -Orchius -Orcivius -Orfidius -Orfius -Oscius -Ostorius -Otacilius -Ovidius -Ovinius -Paccius -Pacidius -Pacilius -Paconius -Pactumeius -Pacuvius -Palfurius -Palpellius -Pantuleius -Papinius -Papirius -Papius -Pasidienus -Pasidius -Passienus -Patulcius -Pedanius -Pedius -Peducaeus -Peltrasius -Percennius -Perperna -Persius -Pescennius -Petellius -Petillius -Petreius -Petronius -Petrosidius -Pilius -Pinarius -Pinnius -Pisentius -Placidius -Plaetorius -Plaguleius -Plautius -Pleminius -Plinius -Plotius -Pollius -Pompeius -Pompilius -Pomponius -Pomptinus -Pontidius -Pontificius -Pontilienus -Pontilius -Pontius -Popidius -Poppaeus -Porcius -Portius -Postumius -Postumulenus -Potitius -Praecilius -Praeconius -Precius -Priscius -Propertius -Publicius -Publilius -Pupius -Quartinius -Quartius -Quinctilius -Quinctius -Quirinius -Rabirius -Rabonius -Rabuleius -Racilius -Raecius -Ragonius -Rammius -Ranius -Rasinius -Reginius -Remmius -Rennius -Resius -Romanius -Romilius -Roscius -Rubellius -Rubrenus -Rubrius -Rufinius -Rufius -Rufrius -Rullius -Rupilia -Rusonius -Rusticelius -Rustius -Rutilius -Sabellius -Sabidius -Sabinius -Sabucius -Saenius -Safinius -Salienus -Sallustius -Salonius -Saltius -Salvidienus -Salvidius -Salvius -Sammius -Sanquinius -Sariolenus -Sarius -Satellius -Satrienus -Satrius -Sattius -Saturius -Saufeius -Scaevilius -Scaevinius -Scaevius -Scandilius -Scantinius -Scantius -Scribonius -Secundinius -Secundius -Seius -Sempronius -Sennius -Sentius -Septimius -Sepunius -Sergius -Sertorius -Servilius -Sestius -Sextilius -Sextius -Sidonius -Silius -Sittius -Socellius -Sornatius -Spurius -Statius -Statilius -Stertinius -Suedius -Sulpicius -Tadius -Tanicius -Tertinius -Tettidius -Tettienus -Tettius -Titiedius -Titius -Titinius -Trebatius -Trebellius -Treblanus -Tremellius -Tuccius -Tullius -Turullius -Ulpius -Umbrius -Ummidius -Urgulanius -Valerius -Varius -Vatinius -Vedius -Velius -Veranius -Verecundius -Vergilius -Verginius -Vesnius -Veturius -Vibenius -Vibidius -Vibius -Victricius -Viducius -Vinicius -Vipsanius -Vipstanus -Viridius -Virius -Visellius -Vitellius -Vitruvius -Volcatius -Volumnius -Volusenna -Volusenus -Volusius -Vulius \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/roman_praenomina.txt b/src/main/resources/assets/customnpcs/markovnames/roman_praenomina.txt deleted file mode 100644 index ffae59a1f..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/roman_praenomina.txt +++ /dev/null @@ -1,52 +0,0 @@ -Appius -Aulus -Caelus -Decius -Decimus -Faustus -Flavius -Gaius -Gnaeus -Kaeso -Lucius -Mamercus -Manius -Marcus -Mettius -Numerius -Octavianus -Publius -Quintus -Secundus -Septimus -Servius -Sextus -Spurius -Tertius -Tiberius -Titus -Agrippa -Amulius -Arrunus -Camillus -Canus -Cossus -Drusus -Gallus -Herius -Hostus -Larus -Marcellus -Nero -Nonus -Oppius -Paulus -Postumius -Potitus -Primus -Proculus -Silvanus -Sisenna -Tullus -Vibius -Vopiscus \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/saami_bothgenders.txt b/src/main/resources/assets/customnpcs/markovnames/saami_bothgenders.txt deleted file mode 100644 index c9e48b893..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/saami_bothgenders.txt +++ /dev/null @@ -1,722 +0,0 @@ -Ábel -Ábo -Ábrrán -Ádo -Ádolfe -Ágá -Ággi -Ahkebeaivi -Ahkejuoksa -Ahkemiella -Áibmu -Áigesárri -Áigin -Áillon -Áillun -Ailo -Áilu -Áivvit -Áksel -Álbe -Albearta -Ále -Áles -Álfa -Algebeaivi -Állan -Ámmá -Ámmol -Ámmon -Ámmot -Ándá -Ándaras -Ándde -Ánddijá -Ánde -Ánderijá -Ánnjá -Áno -Ánot -Ansealbma -Anselbme -Ánte -Ánton -Ántte -Ápmot -Áppo -Áppá -Ápparan -Ára -Arijoutsi -Áron -Árrajuoksa -Ártne -Ártor -Árvet -Ásko -Aslak -Áslat -Ásllak -Ásllat -Áttán -Ávgos -Ávvu -Bánccu -Báncu -Bánnos -Bávllos -Bávlos -Bávva -Bávval -Bávvál -Bážá -Dáidu -Beahkká -Beaivi -Beaivvet -Beanta -Beartu -Beđar -Bede -Begá -Behkká -Behtter -Benjáme -Benne -Biđe -Biede -Biehtár -Biejan -Biejaš -Bienná -Biera -Bieraš -Bierdna -Bierra -Bierrán -Bierrelaš -Bierril -Bierža -Bieržá -Biette -Bihto -Bijáš -Bilzi -Birger -Birki -Cáijá -Čoavvá -Čuivi -Curtnaš -Dánel -Dárbmu -Dávgon -Dávved -Dávvet -Deahppán -Dearsu -Defá -Diijá -Doaivu -Doaivvot -Doffá -Dommá -Dorste -Duomis -Duommá -Duoŋgi -Dure -Duttá -Duvká -Duvre -Eaddji -Ealjá -Edo -Egel -Eidnár -Eidno -Einár -Eirá -Eiven -Elejas -Eles -Elias -Eljes -Emel -Eret -Erke -Ertno -Esájas -Feles -Filpa -Fretterat -Fretteret -Gábe -Gáhppá -Gáiju -Gáivvaš -Gáktu -Gállá -Gállagas -Gáppe -Gárral -Gávgu -Gealbu -Gearral -Geažotmiella -Guhtur -Guivi -Gunnár -Gusto -Gustu -Hánas -Hánno -Hánsa -Háral -Hárri -Heaibmu -Heaika -Heammu -Heandarak -Heandarat -Hegon -Heige -Heigen -Heijá -Heiká -Hendá -Henddo -Heneš -Hennet -Hentto -Herko -Holger -Hugo -Iđga -Iiggá -Iisku -Iissát -Ilbmar -Imbá -Indu -Irján -Iskko -Isku -Issák -Issát -Ivvár -Jágát -Jágo -Jáhken -Jáhko -Jáhkot -Jálbmár -Járre -Járri -Jeansa -Joavnna -Joel -Johá -Johán -Johanas -Johánas -Jompá -Joná -Jonás -Joŋgu -Jonne -Jonsá -Joret -Jorge -Jorgen -Josáp -Josát -Jovnna -Jovnnás -Jovssek -Jovssep -Jovsset -Jovssut -Jovvá -Juffe -Juhán -Juho -Juhu -Juhván -Juhvo -Julejus -Jullá -Juŋgi -Juŋkil -Junne -Junte -Juoksa -Jusát -Jussá -Jusse -Jussenaš -Juvvá -Juvven -Kállá -Kálle -Kárral -Klemmá -Lágon -Lájár -Lárá -Láras -Lársa -Larsa -Lásse -Lávo -Lávra -Lávrrahaš -Lávrras -Lávrrohaš -Leaifa -Leammá -Leammu -Ledjo -Lejo -Lemek -Lemet -Lemmá -Lenne -Máde -Máđen -Mádes -Mahtte -Máhtte -Máhtto -Máidnu -Márkkos -Márte -Márten -Matti -Mávdnos -Mávnos -Mávra -Mávrres -Mellet -Mielat -Migál -Migáš -Migil -Migos -Migoš -Migot -Mihka -Mihkil -Mihkkal -Mihkkel -Mihkkil -Mihkku -Mikkal -Mikko -Mikkol -Mikku -Milot -Mohkku -Mokci -Morte -Morten -Mortu -Mures -Náhkol -Náinnas -Nanit -Nibá -Nigá -Nigo -Nihkke -Nihkko -Nihkolávo -Nihkul -Niikka -Niikke -Niikko -Niila -Niilá -Niilas -Niillá -Niillán -Niillas -Nilá -Nila -Nilán -Nilas -Nilke -Nillá -Nilla -Nilpa -Nilsa -Nilse -Ninna -Njulgu -Nuhtte -Nunná -Nuvtte -Oanet -Oaván -Oge -Oijá -Olá -Olen -Olet -Olle -Ommot -Orddot -Oskár -Osku -Otto -Oula -Ovla -Ovlá -Ovlin -Ovlla -Ovllá -Peivas -Piera -Poalla -Ráffo -Ráidner -Rálfa -Ránso -Rásmmos -Rásmos -Rássa -Rástoš -Rásttoš -Rávdnár -Rávle -Reaidnu -Rede -Riggu -Riibma -Riigu -Rijá -Rikkar -Robe -Robearta -Rolfa -Ruben -Ruigi -Saba -Sabba -Sabbe -Sáhkár -Sálá -Sálbmo -Sálmmo -Sálmo -Sámmol -Sáppá -Sárra -Sárrajuoksa -Sávlos -Selen -Sierge -Siiggur -Siivár -Silvu -Simit -Simmá -Simmon -Sivdda -Skarild -Speaidna -Sveidna -Tobejas -Uđđi -Uđjjus -Uhkku -Ulmmá -Urbán -Uvllá -Válde -Valljáš -Vállju -Válter -Veaidnu -Veaiku -Vide -Viggu -Viktor -Vilhealbma -Ville -Volbmar -Vulle -Vuoitu -Vuolát -Vuollá -Ádá -Agát -Áidná -Áidnu -Áila -Aile -Áile -Áillun -Áilon -Áilu -Áirá -Aire -Áire -Álbma -Álehtta -Álehttá -Álet -Álgen -Aliinná -Aliissá -Állet -Álvá -Amándá -Ánet -Ánná -Ánne -Ássa -Ássá -Ásta -Ástá -Ávdnos -Ávrá -Eirá -Edel -Eijá -Eivor -Elbmá -Elen -Eliissá -Ellá -Elle -Ello -Elsá -Elssá -Elve -Emmá -Emmoš -Ervá -Ester -Evá -Bávlá -Bente -Biellá -Biergá -Bigga -Biggá -Bigge -Biijá -Bikká -Biret -Birgget -Birrá -Birtá -Buohttá -Čuvje -Dárjá -Dávdna -Delle -Diinna -Diinná -Duiri -Dulá -Duojá -Duová -Florá -Gáddjá -Gáhte -Gáhteriinná -Gáre -Gáren -Gealá -Geardá -Gearte -Giđeš -Gierá -Girste -Giste -Gollá -Gunná -Gunvor -Gutnel -Hánna -Hánná -Heide -Heidi -Helbme -Heleainná -Helená -Helgá -Njáveš -Helve -Henná -Hilbmá -Hildá -Hilká -Hillá -Ibbá -Iidá -Iiddá -Iinná -Ikká -Iŋgá -Iŋger -Iŋgir -Iŋŋer -Irbmá -Isá -Janihtá -Janiinná -Jaská -Johánná -Juđet -Juhánná -Juljá -Juoksáhkká -Káhtariinná -Káre -Káren -Kariinná -Karoliinná -Kearte -Kirste -Kristiinná -Láidná -Láilá -Lávrá -Leainná -Leandu -Leinná -Lejá -Lená -Lieđđi -Liisá -Liissá -Liljá -Lindá -Linne -Livli -Lohcca -Lohttá -Lottá -Luviissá -Máddjá -Máddji -Mággá -Magredá -Mágredá -Máidna -Máijá -Máijjá -Máilá -Máire -Mákke -Máre -Máren -Máret -Márge -Márgget -Márgrehtá -Márgreittá -Márgu -Mariánná -Mariánne -Marihttá -Márjá -Márjjá -Mártá -Matildá -Mávdná -Mávnnel -Meartá -Meret -Merjá -Miijá -Miinná -Miljá -Mimmi -Minná -Mirjá -Náddjá -Naná -Nánná -Nánni -Násti -Nienná -Niná -Norá -Oajá -Oggi -Oile -Olgá -Piija -Piijá -Ráfi -Ráhkel -Ráijá -Rana -Rávdná -Ravna -Redá -Regiinná -Rihttá -Riidá -Riittá -Risten -Ristiinná -Ristin -Ruhte -Ruvsá -Sáben -Sábin -Sáddja -Sáibmi -Sánná -Sárá -Sáráhkká -Šealggá -Seará -Šeará -Seita -Selbmá -Selggo -Seljo -Siinná -Sikká -Silvá -Sire -Siru -Sive -Sivnne -Soabá -Sofe -Soffá -Sojá -Soljá -Solla -Sonjá -Sunná -Suoinná -Suonjar -Susánna -Susánná -Sussu -Teresá -Tiinná -Tildá -Tuá -Uksáhkká -Ullá -Unni -Vábo -Válbor -Várbu -Várvá -Venlá -Verá -Viivvá -Vilbmá -Virba -Virvá -Vuohkku \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/slavic_given.txt b/src/main/resources/assets/customnpcs/markovnames/slavic_given.txt deleted file mode 100644 index d58d47507..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/slavic_given.txt +++ /dev/null @@ -1,914 +0,0 @@ -Bądzisław -Bąsław -Bdzigost -Będzieciech -Będzimir -Będziemir -Będziemirz -Będomir -Będzimysł -Biecław -Biecław -Biezdar -Biezdziad -Biezpraw -Brzezpraw -Biezprzem -Biezprzym -Bezprym -Biezstryj -Biestryj -Biezstryk -Brzezstryk -Brzestryk -Biezój -Biezwój -Biezrząd -Blizbor -Blizborz -Bodzepor -Bogdał -Bogdaj -Bogodał -Bogdasz -Bogudan -Bogodan -Bogdan -Bodan -Bogodar -Bogudar -Boguchwał -Boguchał -Bogufał -Bogofał -Bogfał -Bogchwał -Bochwał -Bofał -Bogumił -Bogomił -Bogmił -Bogomieł -Bogumieł -Bogmieł -Bogumysław -Bogurad -Bogured -Bogusąd -Bogusław -Bogosław -Bohusław -Bogsław -Bogwiedz -Bogwidza -Bogowid -Bolebor -Boleczaj -Boleczest -Bolelut -Bolemir -Bolemysł -Bolesław -Bosław -Borzój -Borzywój -Borzygniew -Borzgniew -Borzymir -Borzysław -Borzywoj -Borzój -Bożebor -Bożeciech -Bożciech -Bożydar -Bożdar -Bożysław -Bracław -Bratomir -Bratumił -Bratomił -Bratmił -Bretomił -Bretmił -Braturad -Brodzisław -Brocław -Barcław -Barcław -Bronimir -Bromir -Bronisąd -Bronisław -Bronsław -Barnisław -Brunisław -Brosław -Brzezdob -Brzezdoma -Budziboj -Bojan -Budzigniew -Budzimir -Budzisław -Budziwoj -Budźwoj -Budziwój -Bygost -Bytomir -Chociebąd -Chociebor -Chociemir -Chocimier -Chocimir -Chocimirz -Chocimierz -Chociesław -Chocław -Choroman -Chwalibog -Chwalimir -Chalimir -Chwalisław -Chalisław -Ciechomir -Ciechosław -Ciecierad -Ciecirad -Cieciered -Cieciurad -Ciećrad -Ciecimiar -Cierpisław -Ciesław -Cieszybor -Cieszbor -Cieszygor -Cieszymir -Cieszymiar -Cieszymier -Cieszmir -Cieszmiar -Cieszmier -Cieszymierz -Cieszymysł -Cieszyrad -Cieszysław -Cirzpibog -Czcirad -Czcisław -Cisław -Czedrog -Czesław -Czasław -Czębor -Częstobor -Częsbor -Częstogoj -Częstomir -Częstowoj -Czścibor -Czcibor -Cibor -Czesbor -Dadzbog -Dalebor -Dalibor -Dalbor -Daleborz -Dalegor -Dalemir -Dalimir -Dalemiar -Dalimiar -Dalestryj -Dalewin -Dalwin -Dargorad -Długomił -Dobiegniew -Dobielut -Dobiemiest -Dobiemir -Dobiemiar -Dobiemier -Dobimir -Dobiesław -Dobosław -Dobrobąd -Dobrociech -Dobrogost -Dobromił -Dobromir -Dobromysł -Dobromysław -Dobrosiodł -Dobrosław -Dobrowit -Dobrowoj -Dobrutro -Dobrzegniew -Domaborz -Domabor -Domagniew -Domamir -Domiemir -Domarad -Domorad -Domared -Domaradz -Domasław -Domosław -Domastoj -Domastryj -Domasuł -Domawój -Domażyr -Drogodziej -Drogomił -Dromił -Drogomir -Drogmir -Dragomir -Dargomier -Drogomysł -Drogoradz -Drogosław -Drogowit -Drogobysz -Dragobysz -Dziebor -Dzierżykraj -Dzierżysław -Dziersław -Dziesław -Dzisław -Dzirżyterg -Dzirżywój -Dziwigor -Dziwisław -Falibog -Falibor -Falimir -Falimirz -Falmierz -Falimierz -Falisław -Gniewomir -Gniewomiar -Gniewomier -Gniemir -Gniewosz -Godzimir -Godzisław -Godosław -Gocław -Gorzysław -Gorsław -Gosław -Gostmił -Gościmir -Gościrad -Gościsław -Gościwid -Gościwit -Gościwój -Grodzisław -Gromisław -Grzymisław -Grzymosław -Grzymsław -Grzmisław -Grzysław -Himisław -Hodysław -Hubysław -Huniemir -Huniesław -Imisław -Izasław -Izbor -Izbygniew -Izbylut -Izbelut -Jaczemir -Jaczewoj -Janisław -Jarogniew -Jerogniew -Jaromir -Jaromiar -Jeromiar -Jeromier -Jaropełk -Jarosław -Jerosław -Jirosław -Jarostryj -Jimisław -Juniesław -Jutrogost -Jutrowoj -Jutrowój -Kanimir -Kanimier -Kajmir -Kalmir -Kanmił -Kazimierz -Kazimir -Kazimirz -Kazimiar -Kazimier -Kaźmir -Kociebor -Kociemir -Kociemiar -Kociemier -Kocimiar -Kocimier -Kocimir -Koćmir -Krzesąd -Krzesimir -Krzesisław -Krzecław -Krzesław -Krzysław -Krzywosąd -Kwalimir -Kwalisław -Lech -Lechosław -Lederg -Lelistryj -Lesław -Lubgost -Lubodrog -Lubomir -Lubomirz -Lubomysł -Luboradz -Lubowid -Ludomił -Ludmił -Ludomir -Ludomer -Ludmar -Ludosław -Ludziwoj -Lutobor -Litobor -Lutogniew -Lutomir -Lutomiar -Lutmiar -Lutomysł -Lutosław -Lucław -Małobąd -Małogost -Małomir -Małostryj -Małostryk -Małowid -Małowój -Manomir -Markusław -Masław -Mezamir -Męcimir -Męcisław -Męcław -Męsław -Miecisław -Miecław -Miesław -Mieczysław -Miestwin -Mieszko -Milan -Miłobąd -Miłobor -Miłobrat -Miłochat -Miłoczat -Miłodrog -Miłodziad -Miłogost -Miłgost -Miłorad -Miłosław -Miełosław -Miłostryj -Miłosz -Miłowit -Miłwit -Miłowój -Minigniew -Minogniew -Mirogod -Mirogniew -Mironieg -Mirosław -Misław -Modlibog -Modliboż -Mojmi -Mojsław -Morzysław -Mroczysław -Mroczesław -Mroczsław -Mrocław -Mrocław -Mrosław -Mszczój -Mścibor -Mścigniew -Mścisław -Mściwoj -Mszczójwoj -Mściwój -Mysław -Myślibor -Myślidar -Myślimir -Naczęmir -Naczęmiar -Naczęmier -Naczęrad -Naczęsław -Nacław -Nacław -Naczęwoj -Naczęwój -Nadar -Nadbor -Nadmir -Nagod -Namir -Namysław -Nasiębąd -Nasiębud -Nasiębor -Nasięgniew -Nasław -Nawoj -Nawój -Nażyr -Niebor -Niecisław -Niebylec -Niedabył -Niedabysz -Niedalic -Niedał -Niedan -Niedaniec -Niedoma -Niedamir -Niedomysł -Niegodoma -Niegosław -Niegowoj -Niegrod -Nielubiec -Niemir -Niemierz -Niemironieg -Niemoj -Niemst -Niemsta -Niemszczon -Nienach -Niepełk -Nieprosz -Nieprasz -Nieproch -Nieprzebąd -Nieprzebud -Nieprzebysz -Nierad -Niered -Nierod -Niesąd -Niesiebąd -Niesiebud -Niesiebor -Niesiodł -Niestek -Niestoj -Niesuł -Nietęg -Nietubył -Niewsza -Niezamysł -Nieznamir -Nieznawój -Ninogniew -Ninomysł -Nowosiodł -Objęsław -Ocięsław -Odolan -Okrzesław -Osiębor -Osięgniew -Ostrobod -Ostrogniew -Ostrowod -Pakosław -Pełczybog -Pęcisław -Pęcław -Pęcław -Pęsław -Pękosław -Pomir -Pomścibor -Poznan -Poznomir -Prosimir -Przebąd -Przebor -Przedabog -Przedbor -Przedwor -Przedmir -Przezmir -Przedpełk -Przedpołk -Przedsław -Przecław -Przecław -Przesław -Przedwoj -Przedwój -Przemęt -Przemił -Przemir -Przemysł -Przemysław -Przemyślibor -Przezdoma -Przezdziad -Przezpraw -Przezprzem -Przyboj -Przybor -Przybygniew -Przybylut -Przybymir -Przybyrad -Przybysław -Przybywoja -Przybywój -Przysnobor -Przywit -Racibor -Raciborz -Recibor -Racigniew -Racimir -Racimiar -Racisław -Racław -Recław -Resław -Rasław -Radociech -Radogost -Radomił -Radomir -Radomiar -Radmir -Radosław -Redosław -Radsław -Redsław -Radosz -Radost -Radowit -Radowój -Radsuł -Radzim -Rodomił -Rodomieł -Rodsław -Rocław -Rocław -Rosława -Rościgniew -Rościsław -Rzędzimir -Rzędzisław -Rzędziwoj -Sambor -Szenbor -Samogost -Samosąd -Sęczygniew -Sędowin -Sędzimir -Sędomir -Sędzisław -Sędosław -Sędziwoj -Sędowoj -Sędźwoj -Sudywoj -Sędziwój -Siebąd -Siebor -Siabor -Szabor -Szebor -Sieciebor -Sietbor -Sieciech -Sieciesław -Siecław -Siecław -Siesław -Siedlewit -Siemidrog -Siemierz -Siemił -Siemimił -Siemmił -Siemimysł -Siemomysł -Siemomysław -Siemir -Siemar -Siemirad -Siemisław -Siemosław -Siemoradz -Siemowit -Siepraw -Siestrzemił -Siestrzewit -Sięgniew -Siężyr -Sężyr -Sirosław -Sierosław -Skarbimir -Skarbimirz -Skardmir -Skamir -Skarbisław -Skaziczest -Sławobor -Sławociech -Sławciech -Sławomir -Sławomiar -Sławosław -Smysław -Snowid -Sobiebor -Sobiemir -Sobiemysł -Sobierad -Sobiesąd -Sobiesław -Sobieżyr -Spycigniew -Spycimir -Spyćmier -Spyćmir -Spyćmierz -Spycisław -Stanibor -Stanimir -Stanisław -Stasław -Stojgniew -Stoigniew -Stogniew -Stojsław -Stoisław -Stosław -Tosław -Stomir -Strachomir -Strogobor -Strogomir -Stronisław -Strosław -Strzebor -Strzedziwoj -Strzeżymir -Strzeżysław -Strzedzisław -Strzecław -Strzecław -Strzesław -Sulibor -Sulibrat -Sulidziad -Suligost -Sulimir -Sulimiar -Sulmir -Sulirad -Sulisław -Solisław -Sulistryj -Suliwój -Swojsław -Swosław -Ścibor -Świebąd -Świebor -Świeborz -Świeciech -Świecław -Świesław -Świedarg -Świelub -Świegniew -Świemił -Świemir -Świerad -Świrad -Świętobor -Świętomir -Świętopełk -Świętosław -Święcesław -Święcław -Święsław -Tasław -Tatomir -Tatomier -Tatumir -Tęgomir -Toligniew -Tolisław -Tomił -Tomir -Tomisław -Tosław -Trzebiebor -Trzebiegost -Trzebiemir -Trzebiemiar -Trzebiemier -Trzebiemysł -Trzebomysł -Trzebiesław -Trzebisław -Trzebor -Trzebowit -Twardomir -Twardosław -Twardostoj -Tworzymir -Tworzysław -Ubysław -Unieboż -Uniebog -Uniedrog -Uniegost -Uniemir -Unimir -Uniemysł -Unierad -Unirad -Uniesław -Unisław -Uniewit -Uściwoj -wacław -warcisław -warsław -wędziemir -wielebor -wielebyt -wieledrog -wielimir -wielisław -wielesław -wielsław -wiercisław -wiesław -więcemił -więcemir -więcemiar -więcemier -więcmier -więcerad -więcesław -więcław -więcław -więsław -wilkomir -wirciżyr -wirzchosław -wisław -witomir -witomysł -witosław -wicław -witosz -władysław -włodzimierz -włodzimir -włodzisław -włocław -włocław -włościbor -właścibor -włościbyt -włościwoj -wojbor -wojciech -wociech -wojemił -wojmir -wojsław -wojesław -wojisław -wosław -wolebor -wolimir -wolemir -wolmir -wolisław -wolrad -wrocisław -wrocław -wrosław -wrociwoj -wszebąd -wszebor -wszabor -wświebor -wszeborz -wszeciech -wszegniew -wszemił -wszemir -wszemiar -wszemysł -wszerad -wszesiodł -wszesuł -wszetopełk -wysław -wyszebor -wyszabor -wyszemir -wyszesław -wyszetrop -wyszomir -wyszymir -Zadar -Zamir -Zawisza -Zbigniew -Zbygniew -Zbrosław -Zbylut -Zbelut -Zbysław -Zbywoj -Zdamir -Zdawój -Zdzibor -Zdziebor -Zdziczest -Zdziebąd -Zdziebud -Zdziegod -Zdziegrod -Zdziemił -Zdzierad -Zdziesuł -Zdziewit -Zdziewój -Zdziwój -Zdzimir -Zdziemir -Zdzisław -Zdziesław -Zdzistryj -Zdziwoj -Ziemomysł -Ziemowit -Znamir -Zwnisław -Żegota -Żelibor -Żelibrat -Żeligniew -Żelimysł -Żelisław -Żelistryj -Żeliwój -Żyrosław -Żerosław \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/slavic_given_alt.txt b/src/main/resources/assets/customnpcs/markovnames/slavic_given_alt.txt deleted file mode 100644 index bd7b93bbd..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/slavic_given_alt.txt +++ /dev/null @@ -1,914 +0,0 @@ -bądzisław -bąsław -bdzigost -będzieciech -będzimir -będziemir -będziemirz -będomir -będzimysł -biecław -biecław -biezdar -biezdziad -biezpraw -brzezpraw -biezprzem -biezprzym -bezprym -biezstryj -biestryj -biezstryk -brzezstryk -brzestryk -biezój -biezwój -biezrząd -blizbor -blizborz -bodzepor -bogdał -bogdaj -bogodał -bogdasz -bogudan -bogodan -bogdan -bodan -bogodar -bogudar -boguchwał -boguchał -bogufał -bogofał -bogfał -bogchwał -bochwał -bofał -bogumił -bogomił -bogmił -bogomieł -bogumieł -bogmieł -bogumysław -bogurad -bogured -bogusąd -bogusław -bogosław -bohusław -bogsław -bogwiedz -bogwidza -bogowid -bolebor -boleczaj -boleczest -bolelut -bolemir -bolemysł -bolesław -bosław -borzój -borzywój -borzygniew -borzgniew -borzymir -borzysław -borzywoj -borzój -bożebor -bożeciech -bożciech -bożydar -bożdar -bożysław -bracław -bratomir -bratumił -bratomił -bratmił -bretomił -bretmił -braturad -brodzisław -brocław -barcław -barcław -bronimir -bromir -bronisąd -bronisław -bronsław -barnisław -brunisław -brosław -brzezdob -brzezdoma -budziboj -bojan -budzigniew -budzimir -budzisław -budziwoj -budźwoj -budziwój -bygost -bytomir -chociebąd -chociebor -chociemir -chocimier -chocimir -chocimirz -chocimierz -chociesław -chocław -choroman -chwalibog -chwalimir -chalimir -chwalisław -chalisław -ciechomir -ciechosław -ciecierad -ciecirad -cieciered -cieciurad -ciećrad -ciecimiar -cierpisław -ciesław -cieszybor -cieszbor -cieszygor -cieszymir -cieszymiar -cieszymier -cieszmir -cieszmiar -cieszmier -cieszymierz -cieszymysł -cieszyrad -cieszysław -cirzpibog -czcirad -czcisław -cisław -czedrog -czesław -czasław -czębor -częstobor -częsbor -częstogoj -częstomir -częstowoj -czścibor -czcibor -cibor -czesbor -dadzbog -dalebor -dalibor -dalbor -daleborz -dalegor -dalemir -dalimir -dalemiar -dalimiar -dalestryj -dalewin -dalwin -dargorad -długomił -dobiegniew -dobielut -dobiemiest -dobiemir -dobiemiar -dobiemier -dobimir -dobiesław -dobosław -dobrobąd -dobrociech -dobrogost -dobromił -dobromir -dobromysł -dobromysław -dobrosiodł -dobrosław -dobrowit -dobrowoj -dobrutro -dobrzegniew -domaborz -domabor -domagniew -domamir -domiemir -domarad -domorad -domared -domaradz -domasław -domosław -domastoj -domastryj -domasuł -domawój -domażyr -drogodziej -drogomił -dromił -drogomir -drogmir -dragomir -dargomier -drogomysł -drogoradz -drogosław -drogowit -drogobysz -dragobysz -dziebor -dzierżykraj -dzierżysław -dziersław -dziesław -dzisław -dzirżyterg -dzirżywój -dziwigor -dziwisław -falibog -falibor -falimir -falimirz -falmierz -falimierz -falisław -gniewomir -gniewomiar -gniewomier -gniemir -gniewosz -godzimir -godzisław -godosław -gocław -gorzysław -gorsław -gosław -gostmił -gościmir -gościrad -gościsław -gościwid -gościwit -gościwój -grodzisław -gromisław -grzymisław -grzymosław -grzymsław -grzmisław -grzysław -himisław -hodysław -hubysław -huniemir -huniesław -imisław -izasław -izbor -izbygniew -izbylut -izbelut -jaczemir -jaczewoj -janisław -jarogniew -jerogniew -jaromir -jaromiar -jeromiar -jeromier -jaropełk -jarosław -jerosław -jirosław -jarostryj -jimisław -juniesław -jutrogost -jutrowoj -jutrowój -kanimir -kanimier -kajmir -kalmir -kanmił -kazimierz -kazimir -kazimirz -kazimiar -kazimier -kaźmir -kociebor -kociemir -kociemiar -kociemier -kocimiar -kocimier -kocimir -koćmir -krzesąd -krzesimir -krzesisław -krzecław -krzesław -krzysław -krzywosąd -kwalimir -kwalisław -lech -lechosław -lederg -lelistryj -lesław -lubgost -lubodrog -lubomir -lubomirz -lubomysł -luboradz -lubowid -ludomił -ludmił -ludomir -ludomer -ludmar -ludosław -ludziwoj -lutobor -litobor -lutogniew -lutomir -lutomiar -lutmiar -lutomysł -lutosław -lucław -małobąd -małogost -małomir -małostryj -małostryk -małowid -małowój -manomir -markusław -masław -mezamir -męcimir -męcisław -męcław -męsław -miecisław -miecław -miesław -mieczysław -miestwin -mieszko -milan -miłobąd -miłobor -miłobrat -miłochat -miłoczat -miłodrog -miłodziad -miłogost -miłgost -miłorad -miłosław -miełosław -miłostryj -miłosz -miłowit -miłwit -miłowój -minigniew -minogniew -mirogod -mirogniew -mironieg -mirosław -misław -modlibog -modliboż -mojmi -mojsław -morzysław -mroczysław -mroczesław -mroczsław -mrocław -mrocław -mrosław -mszczój -mścibor -mścigniew -mścisław -mściwoj -mszczójwoj -mściwój -mysław -myślibor -myślidar -myślimir -naczęmir -naczęmiar -naczęmier -naczęrad -naczęsław -nacław -nacław -naczęwoj -naczęwój -nadar -nadbor -nadmir -nagod -namir -namysław -nasiębąd -nasiębud -nasiębor -nasięgniew -nasław -nawoj -nawój -nażyr -niebor -niecisław -niebylec -niedabył -niedabysz -niedalic -niedał -niedan -niedaniec -niedoma -niedamir -niedomysł -niegodoma -niegosław -niegowoj -niegrod -nielubiec -niemir -niemierz -niemironieg -niemoj -niemst -niemsta -niemszczon -nienach -niepełk -nieprosz -nieprasz -nieproch -nieprzebąd -nieprzebud -nieprzebysz -nierad -niered -nierod -niesąd -niesiebąd -niesiebud -niesiebor -niesiodł -niestek -niestoj -niesuł -nietęg -nietubył -niewsza -niezamysł -nieznamir -nieznawój -ninogniew -ninomysł -nowosiodł -objęsław -ocięsław -odolan -okrzesław -osiębor -osięgniew -ostrobod -ostrogniew -ostrowod -pakosław -pełczybog -pęcisław -pęcław -pęcław -pęsław -pękosław -pomir -pomścibor -poznan -poznomir -prosimir -przebąd -przebor -przedabog -przedbor -przedwor -przedmir -przezmir -przedpełk -przedpołk -przedsław -przecław -przecław -przesław -przedwoj -przedwój -przemęt -przemił -przemir -przemysł -przemysław -przemyślibor -przezdoma -przezdziad -przezpraw -przezprzem -przyboj -przybor -przybygniew -przybylut -przybymir -przybyrad -przybysław -przybywoja -przybywój -przysnobor -przywit -racibor -raciborz -recibor -racigniew -racimir -racimiar -racisław -racław -recław -resław -rasław -radociech -radogost -radomił -radomir -radomiar -radmir -radosław -redosław -radsław -redsław -radosz -radost -radowit -radowój -radsuł -radzim -rodomił -rodomieł -rodsław -rocław -rocław -rosława -rościgniew -rościsław -rzędzimir -rzędzisław -rzędziwoj -sambor -szenbor -samogost -samosąd -sęczygniew -sędowin -sędzimir -sędomir -sędzisław -sędosław -sędziwoj -sędowoj -sędźwoj -sudywoj -sędziwój -siebąd -siebor -siabor -szabor -szebor -sieciebor -sietbor -sieciech -sieciesław -siecław -siecław -siesław -siedlewit -siemidrog -siemierz -siemił -siemimił -siemmił -siemimysł -siemomysł -siemomysław -siemir -siemar -siemirad -siemisław -siemosław -siemoradz -siemowit -siepraw -siestrzemił -siestrzewit -sięgniew -siężyr -sężyr -sirosław -sierosław -skarbimir -skarbimirz -skardmir -skamir -skarbisław -skaziczest -sławobor -sławociech -sławciech -sławomir -sławomiar -sławosław -smysław -snowid -sobiebor -sobiemir -sobiemysł -sobierad -sobiesąd -sobiesław -sobieżyr -spycigniew -spycimir -spyćmier -spyćmir -spyćmierz -spycisław -stanibor -stanimir -stanisław -stasław -stojgniew -stoigniew -stogniew -stojsław -stoisław -stosław -tosław -stomir -strachomir -strogobor -strogomir -stronisław -strosław -strzebor -strzedziwoj -strzeżymir -strzeżysław -strzedzisław -strzecław -strzecław -strzesław -sulibor -sulibrat -sulidziad -suligost -sulimir -sulimiar -sulmir -sulirad -sulisław -solisław -sulistryj -suliwój -swojsław -swosław -ścibor -świebąd -świebor -świeborz -świeciech -świecław -świesław -świedarg -świelub -świegniew -świemił -świemir -świerad -świrad -świętobor -świętomir -świętopełk -świętosław -święcesław -święcław -święsław -tasław -tatomir -tatomier -tatumir -tęgomir -toligniew -tolisław -tomił -tomir -tomisław -tosław -trzebiebor -trzebiegost -trzebiemir -trzebiemiar -trzebiemier -trzebiemysł -trzebomysł -trzebiesław -trzebisław -trzebor -trzebowit -twardomir -twardosław -twardostoj -tworzymir -tworzysław -ubysław -unieboż -uniebog -uniedrog -uniegost -uniemir -unimir -uniemysł -unierad -unirad -uniesław -unisław -uniewit -uściwoj -wacław -warcisław -warsław -wędziemir -wielebor -wielebyt -wieledrog -wielimir -wielisław -wielesław -wielsław -wiercisław -wiesław -więcemił -więcemir -więcemiar -więcemier -więcmier -więcerad -więcesław -więcław -więcław -więsław -wilkomir -wirciżyr -wirzchosław -wisław -witomir -witomysł -witosław -wicław -witosz -władysław -włodzimierz -włodzimir -włodzisław -włocław -włocław -włościbor -właścibor -włościbyt -włościwoj -wojbor -wojciech -wociech -wojemił -wojmir -wojsław -wojesław -wojisław -wosław -wolebor -wolimir -wolemir -wolmir -wolisław -wolrad -wrocisław -wrocław -wrosław -wrociwoj -wszebąd -wszebor -wszabor -wświebor -wszeborz -wszeciech -wszegniew -wszemił -wszemir -wszemiar -wszemysł -wszerad -wszesiodł -wszesuł -wszetopełk -wysław -wyszebor -wyszabor -wyszemir -wyszesław -wyszetrop -wyszomir -wyszymir -zadar -zamir -zawisza -zbigniew -zbygniew -zbrosław -zbylut -zbelut -zbysław -zbywoj -zdamir -zdawój -zdzibor -zdziebor -zdziczest -zdziebąd -zdziebud -zdziegod -zdziegrod -zdziemił -zdzierad -zdziesuł -zdziewit -zdziewój -zdziwój -zdzimir -zdziemir -zdzisław -zdziesław -zdzistryj -zdziwoj -ziemomysł -ziemowit -znamir -zwnisław -żegota -żelibor -żelibrat -żeligniew -żelimysł -żelisław -żelistryj -żeliwój -żyrosław -żerosław \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/spanish_given_female.txt b/src/main/resources/assets/customnpcs/markovnames/spanish_given_female.txt deleted file mode 100644 index 74c520d36..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/spanish_given_female.txt +++ /dev/null @@ -1,310 +0,0 @@ -abella -adalina -adelaida -adelina -adelita -adelmira -adoncia -adora -adoracion -adoria -adriana -agata -agota -agueda -aina -alba -aldonza -alejandra -aleta -alicia -alisa -alita -almudena -alondra -alta -amada -amaranta -amparo -ana -ángela -angélica -ángelita -anita -antonia -antonietta -anunciación -araceli -aracelis -aracely -arcelia -ariadna -ascención -asunción -azucena -basilia -beatriz -belén -benita -berengária -bernardita -bibiana -bienvenida -blanca -bonita -brunilda -camila -cande -candelaria -candelas -caridad -carmela -carmelita -carmen -carmencita -casilda -catalina -catherina -celestina -célia -cenobia -charo -chelo -chica -chickie -chicky -chiquita -chita -chus -clarisa -concepción -concha -conchita -constanza -consuela -consuelo -corazón -crescencia -cruz -cruzita -custodia -débora -deifilia -delfina -desideria -dolores -dominga -domitila -doncia -dorita -dorotea -drina -dulce -edelmira -eduarda -elena -elicia -elmira -elodia -eloisa -elvira -emelina -emigdia -emiliana -emperatriz -emygdia -encarna -encarnación -encarnita -enriqueta -ercilia -ernesta -esmaralda -esmeralda -esmerelda -esperanza -estefanía -estela -estrella -eufémia -eugènia -eulália -evita -feliciana -felicidad -felipa -felipina -fernánda -fidelia -francisca -gabriela -genoveva -gertrudis -gilberta -gracia -graciana -graciela -guadalupe -herminia -ibbie -idoya -imelda -iñes -inéz -inmaculada -isabel -isabell -isbel -ivette -izabelle -jacinta -jessenia -jesúsa -jimena -josefina -jovita -juana -juanita -leocadia -leonor -leta -leticia -lita -loída -lola -lolita -lorita -lucía -lucinda -lucinde -luisa -luisina -lupe -lupita -lurdes -luz -macarena -macaria -magdalena -maite -manola -manolita -manuela -manuelita -marcela -marcelina -maresol -margaretta -marguerita -maría -marianela -mariangela -maribel -maricela -maricruz -marisol -marita -maritza -marta -martirio -martita -matilde -mayte -melania -mercedes -miguela -milagros -mireia -mónica -natalia -neva -nieve -nieves -nilda -nina -nita -noelia -nohemi -novia -núria -odalis -odalys -olalla -paca -paloma -paquita -pascuala -pastora -pepita -peppi -perla -perlita -perpetua -petrona -pía -piedad -pilar -pili -priscila -prudencia -rafaela -raimunda -ramira -ramona -raquel -rebeca -reina -remedios -renata -reyna -ria -ricarda -rita -roberta -robertina -rocío -rosario -rosita -salud -sancha -sanchia -sara -sarita -sence -sens -socorro -sofía -sol -soledad -suelo -susana -susanita -tatiana -tecla -teófila -tere -teresa -thera -therasia -theresa -tomasa -tonia -trini -trinidad -valencia -valentia -verónica -violeta -visitación -xènia -ximena -xiomara -yazmin -yesenia -yessenia -ynes -ynez -ysabel -zarita -zenaida - diff --git a/src/main/resources/assets/customnpcs/markovnames/spanish_given_male.txt b/src/main/resources/assets/customnpcs/markovnames/spanish_given_male.txt deleted file mode 100644 index e57018070..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/spanish_given_male.txt +++ /dev/null @@ -1,381 +0,0 @@ -aarón -abelardo -abraám -abrahán -adalberto -adán -adolpho -adrián -agapeto -agapito -agustín -alano -alarico -alberto -alejandro -alejo -alfonso -alfredo -alphonso -álvaro -amadis -amado -amador -amancio -amando -amaranto -ambrosio -amidio -amilcar -anacleto -anbessa -andrés -anibal -anselmo -antonello -antonio -apolinar -armando -arnaldo -arsenio -arturo -asdrubal -atilio -augusto -aureliano -aurelio -babieca -bajardo -baldomero -balduino -bartolomé -basilio -bautista -bayardo -beltrán -benedicto -benito -berenguer -bermudo -bernardo -blas -bolívar -bolivar -buenaventura -camilo -candelario -carlito -carlitos -carlos -carmelo -casimiro -cayetano -cayo -cebrián -cecilio -celestino -celino -celio -celso -césar -che -chico -chucho -chus -chuy -ciriaco -claudio -clavileno -clemente -cleto -clímaco -conrado -cristián -cristóbal -cruz -curro -custodio -damián -demetrio -desi -desiderio -diego -dimas -dionisio -domingo -donato -doroteo -eberardo -edgardo -edmundo -eduardo -efraín -eladio -eleuterio -eliseo -eloy -elpidio -emerico -emidio -emigdio -emiliano -emilio -emygdio -enrique -epifanio -ermenegildo -ernesto -espiridión -essua -estavan -estéban -eugènio -eugenio -eulálio -eurico -eusbio -eusebio -eustaquio -eutimio -eutropio -ezequiel -fabián -fabricio -faramundo -faustino -fausto -federico -feliciano -felipe -fermín -fernán -fernándo -fidel -flavio -florencio -fons -fonsie -francisco -frascuelo -frasquito -fulgencio -gabino -gael -gaspar -geraldo -gerardo -germán -gervasi -gervasio -gil -gilberto -godofredo -goito -gonzalo -goyo -graciano -gregorio -gualtiero -guilermo -guillermo -guiomar -gustavo -hector -heliodoro -herberto -heriberto -hermenegildo -herminio -hernán -hernando -hieronimo -hilario -hipolito -horacio -humberto -iago -ignacio -ildefonso -iñigo -inigo -iñjgo -inocencio -isandro -ismael -iuceph -jacinto -jacobo -jaime -javier -jenaro -jerónimo -jesús -joaquin -jorge -josé -josue -juan -juanito -julián -julio -junípero -ladislao -lalo -leandro -leocadio -león -leonardo -leoncio -leopoldo -lino -lope -lorencio -lucio -luis -macario -manolete -manolito -manolo -manuel -marcelino -marcelo -marcial -marcio -marcos -mario -martín -mateo -mauricio -maximiano -maximiliano -maximino -máximo -melchor -merlín -miguel -modesto -moisés -nacho -nacio -narciso -natalio -natanael -nazario -nicodemo -nicolao -nicolás -novio -octavio -odalis -olegario -óscar -osvaldo -ovidio -pablo -paco -pancho -paquito -pascual -pastor -patricio -paulino -pedro -pepe -pepito -pino -pío -plácido -plinio -poncio -porfirio -primo -prospero -prudencio -quique -rafael -raimundo -rainerio -ramiro -ramón -raúl -raymundo -régulo -reinaldo -remigio -renato -reyes -reynaldo -ricardo -rico -roberto -rodolfo -rodrigo -rogelio -rogerio -rolando -roldán -román -roque -rosario -rubén -rufino -ruperto -ruy -sabas -sal -salomón -salvador -sancho -sandalio -sans -santiago -santos -saturnino -saulo -sebastián -sergio -seve -severiano -severino -severo -silvestre -silvio -simón -sofronio -sosimo -tacito -tadeo -teobaldo -teodoro -teodosio -teódulo -teófilo -tercero -tiburcio -timoteo -tito -tomás -tonio -toño -trinidad -tristán -ulises -urbano -valentín -valeriano -valerio -vasco -velasco -venceslás -vicente -víctor -victorino -vidal -vincenç -vinicio -virgilio -vito -wilfredo -ximen -ximenez -zacarías \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/spanish_surnames.txt b/src/main/resources/assets/customnpcs/markovnames/spanish_surnames.txt deleted file mode 100644 index 328a4cf8d..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/spanish_surnames.txt +++ /dev/null @@ -1,550 +0,0 @@ -abadía -abadiano -abalo -abarca -abascal -abasolo -abrigo -abril -acevedo -aceves -acosta -adames -adan -aguado -aguera -aguero -aguilar -aguinaga -aguirre -alas -alba -albacete -albaladejo -albareda -albarracín -albarrán -alburquerque -alcalá -alcantara -aldana -alegre -alegría -alén -alfonseca -almánzar -almirón -alonso -alou -altamira -altamirano -álvarez -alvear -alzamora -amaya -amescua -anglada -angulo -anon -aracil -aragonés -arancibia -aranda -arcaño -arévalo -arguello -ariza -armenteros -arraiza -arrate -arredondo -arroyo -arrúa -arruabarrena -arruebarrena -artiñano -asencio -asensi -asensio -asín -asquerino -astudillo -ávalos -ávila -avilés -aznar -azpilicueta -azucena -badillo -balenciaga -ballesta -baltra -banegas -barboza -barea -barquín -barradas -barragan -batista -bautista -baviera -becerril -bejarano -bello -benitez -bermudez -bernárdez -berrios -bettencourt -bielsa -bilbao -blanco -blandón -blas -bobadilla -bolaño -bolaños -bonastre -borges -borla -borrero -bracamontes -bracho -bravo -brenes -brugué -brugués -bueno -buenvenida -bustamante -cabal -caballero -cabello -calderón -calvente -campillo -cañizares -cannella -caraballo -carazo -carbonell -cárdenas -cardona -carmona -carpintero -carpio -carrasco -carrasquillo -carrera -carreras -cartagena -casablancas -casas -casilla -casillas -castañeda -castelblanco -castellano -castellanos -castillo -castrillón -ceballos -cepeda -cervantes -cevallos -chacón -chávez -cienfuegos -cisneros -cisternas -claros -claver -collantes -colomer -colón -congost -copello -cordero -cordova -coria -coronado -corrales -correa -cortes -cortizo -covarrubias -crespi -cruz -cuadra -cubilla -cuellar -cuello -cuesta -cueto -damirón -dávila -de#arguello -de#la#cruz -de#la#cueva -de#la#fuente -de#la#rosa -de#la#vega -de#los#santos -de#lucas -de#minaur -de#miñaur -de#ribera -de#soto -de#vargas -de#jesus -del#granado -del#negro -del#rosario -del#toro -delfin -delgado -derbez -díaz -diego -dimas -domínguez -duarte -duque -echazú -eizaguirre -enríquez -escalera -escobar -esguerra -espejo -espina -espinal -espinosa -esteve -estrada -expósito -fajardo -falcon -fandiño -fernández -ferreiro -ferrero -ferriz -ferro -figueras -figuerola -florencio -flores -florimón -forero -francisco -fuenmayor -fuentes -gabarain -galarza -galdames -galdón -galdós -gallardo -gallego -gallegos -galvan -galvez -gamboa -garbajosa -garci -garcía -garrido -garza -gay -godínez -godoy -gómez -gonzález -gordon -gracián -guaita -guajardo -guardado -guardia -guerra -guerrero -gutiérrez -guzmán -hechavarría -henao -hermosillo -hermoza -hernández -hernán#gómez -hernanz -herrada -herrera -herreros -hervás -hidalgo -horta -sáenz#de#oiza -huertas -hurtado -ibáñez -iglesias -inciarte -iniesta -iraheta -iturri -jaén -jara -jerónimo -jiménez -juárez -karanka -kindelán -lavalle -lebrón -leon -leyva -libertad -lizano -lizárraga -llompart -llorente -lobo -lópez -lópez#de#lacalle -loya -lucena -lucero -lucio -lugo -luz -machuca -madero -madrazo -maestre -maldonado -malla -mancisidor -marciano -mariano -mariátegui -marqués -marrero -marron -martínez -martos -marzo -mata -mateo -mateos -máynez -mayor -mayoral -maytín -mazo -medel -medina -mejía -menaldo -mendez -mendia -mendoza -menem -menendez -menezes -merino -milian -miranda -molinero -montana -montaño -montenegro -montero -montes -montes#de#oca -morales -moreno -morillo -morón -moya -mucciolo -muniz -muñoz -muralles -nabarro -nápoles -navarro -navas -negrin -negro -nieto -nieves -ñíguez -noguera -norales -novoa -nunez -ocampos -oquendo -ordóñez -orjuela -oropeza -ortega -ortiz -oseguera -ozuna -pabón -pacheco -padilla -palazuelos -palomo -paredes -parejo -parera -parra -pascual -pastrana -pazmiño -peguero -peinado -peña -penagos -peñate -peralta -perdomo -perea -pérez -perroni -perurena -pestano -picallo -picazo -pichardo -pimentel -pineda -piñera -pinto -piquer -polaco -polanco -ponce -porcel -portela -posada -postigo -prado -punto -purita -quesada -quevedo -quezada -quintal -quintana -quintanilla -quintero -rada -rafaeli -ramírez -ramiro -rascon -recarte -renteria -restrepo -ríos -rivera -riveros -rodríguez -rojas -rojo -romaña -romero -rondon -rosa -rosario -ruiz -ruiz#de#alarcón -ruvalcaba -sacasa -saiz -salazar -salcido -saldaña -saldívar -salvador -samaniego -sánchez -sandoval -santa#cruz -santayana -santiago -santisteban -santos -sanz -sarasola -sastre -saucedo -sedeño -seguel -sepúlveda -serrano -silvestre -sinaloa -siqueiros -solana -solano -solarte -sosa -soto -sotomayor -suarez -tatís -tato -tavarez -taveras -tejada -tobón -todero -toledano -toledo -tomás -topete -torre -torres -totanés -treviño -triana -trueba -unzaga -uriarte -urías -uriburu -urquía -valbuena -valderrama -valdivieso -valenciano -valiente -vallejos -valverde -vasquez -vega -velazco -velazquez -verdasco -vicente -victorino -vidal -vilana -villalobos -villanueva -villaseñor -viniegra -yanes -zamacois -zambrano -zapata -zapatero -zarazúa -zayas -zorrilla -zuloaga \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/markovnames/welsh_female.txt b/src/main/resources/assets/customnpcs/markovnames/welsh_female.txt deleted file mode 100644 index 2f6009bd1..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/welsh_female.txt +++ /dev/null @@ -1,310 +0,0 @@ -Addfwyn -Aderyn -Adlais -Adwen -Aelwen -Aerfen -Aeron -Aeronwen -Aeronwy -Afryl -Alaw -Aldyth -Alwen -Alys -Amranwen -Aneira -Anest -Angharad -Ann -Anwen -Annwr -Annwyl -Arddun -Arianell -Arianrhod -Arianwen -Arwen -Aurddolen -Auron -Awela -Awena -Banwen -Beca -Berwen -Bethan -Beti -Betrys -Blodeuedd -Blodwedd -Blodwen -Branwen -Brengwain -Briallen -Brisen -Bronmai -Bronwen -Brythonwen -Buddug -Cadi -Cain -Calan -Canaid -Caron -Caronwen -Carwen -Caryl -Carys -Catrin -Ceindeg -Ceindrych -Ceinfryn -Ceinwen -Ceirios -Ceri -Ceridwen -Cerys -Collwen -Creuddylad -Crisiant -Crystyn -Cyffin -Daron -Deilwen -Del -Delun -Delwen -Delyn -Delyth -Deris -Derwena -Deryn -Deryth -Dilwen -Dilys -Drudwen -Drysi -Dwyfor -Dwynwen -Dwyryd -Dwysan -Dyddanwy -Dyddgu -Dyfi -Ebrill -Edwy -Efa -Eigra -Eilir -Eilonwy -Eilwen -Eira -Eirian -Eirianwen -Eirianedd -Eiriol -Eirlys -Eirwen -Eirys -Elan -Elain -Elen -Elenid -Eleri -Elinor -Elisabeth -Elli -Elliw -Eluned -Enfys -Enid -Eos -Erin -Eryl -Esyllt -Ethni -Eurfron -Euron -Eurddolyn -Eurwen -Ewig -Faleiry -Fanw -Ffion -Fflur -Ffraid -Ffreuer -Fioled -Gaenor -Geinor -Generys -Glenda -Glenys -Glesni -Glynis -Goleubryd -Goleudydd -Grug -Gwawr -Gwawrddydd -Gwawrwen -Gwen -Gwenda -Gwenddydd -Gwendolen -Gwener -Gwenfair -Gwenfor -Gwenfrewi -Gwenfron -Gwenhwyfar -Gwenith -Gwenllian -Gwenlyn -Gwennan -Gwennant -Gwennol -Gwenol -Gwenydd -Gwenynan -Gwerful -Gwernen -Gwernfyl -Gwlithen -Gwyddelan -Gwyddfid -Gwladys -Gwylan -Gwylfai -Gwyneth -Gwynonwen -Haf -Hafgan -Hafren -Hafwen -Heddwen -Hedydd -Heini -Heledd -Heulwen -Heulyn -Hydref -Hywela -Iarlles -Idanwen -Ifanna -Ifanwy -Ilar -Iona -Ionor -Iorwen -Iseult -Ithela -Leri -Lili -Lilwen -Liwsi -Lleucu -Llian -Llinos -Llio -Lluan -Lodes -Lowri -Luned -Lyneth -Lynfa -Lynwen -Mabli -Madlen -Maelona -Maelorwen -Mai -Mair -Mallt -Manon -Marged -Medeni -Medi -Medwen -Mefin -Megan -Meinwen -Meirionwen -Melangell -Meleri -Meudwen -Modron -Modwen -Moelwen -Mold -Mona -Morforwyn -Morfudd -Morwen -Mwyndeg -Mwynen -Myfanwy -Nan -Nans -Nant -Nefyn -Nerys -Nest -Nia -Non -Olwen -Owena -Perl -Rebeca -Rhagnell -Rhedyn -Rhiain -Rhiangar -Rhiannon -Rhianwen -Rhianydd -Rhondda -Rhonwen -Rhosan -Rhoslyn -Rhunedd -Rosentyl -Rowena -Sara -Seirial -Seirian -Seren -Sian -Sidan -Sioned -Siriol -Siwan -Siwsan -Sulian -Sulwen -Surwen -Tafwys -Tangwen -Tangwystl -Tanwen -Taryn -Tegan -Tegeirian -Tegfedd -Tegwedd -Tegwen -Tegyd -Teiddwen -Teifi -Telaid -Teleri -Telyn -Tesni -Tirion -Tonwen -Tudful -Undeg -Wena -Wenhaf -Ynyra diff --git a/src/main/resources/assets/customnpcs/markovnames/welsh_male.txt b/src/main/resources/assets/customnpcs/markovnames/welsh_male.txt deleted file mode 100644 index dfd0984e0..000000000 --- a/src/main/resources/assets/customnpcs/markovnames/welsh_male.txt +++ /dev/null @@ -1,272 +0,0 @@ -Adda -Addaon -Adeon -Aedd -Aeddan -Aelhearn -Aelwyn -Aeron -Afagddu -Afallon -Afan -Alan -Alaw -Alawn -Alban -Aldith -Aldryd -Alec -Aled -Alun -Alwyn -Amaethon -Amlodd -Anarawd -Andreas -Aneirin -Angwyn -Anhun -Arawn -Arial -Arianwyn -Arnallt -Arofan -Aron -Arthen -Arthfael -Arthgen -Arthur -Arwel -Arwyn -Asaff -Aurfryn -Auryn -Awen -Awsten -Baeddan -Baglan -Barri -Barti -Bedaws -Bedwyn -Bedivere -Bedwyn -Bedwyr -Berddig -Bergam -Berwyn -Bevan -Beuno -Beynon -Bleddyn -Bledig -Bledri -Blwchfardd -Boreugwyn -Bran -Branwaladr -Breichiawl -Brice -Brioc -Brochfael -Brychan -Bryn -Brynllyn -Brynmor -Bryngwyn -Brython -Cadell -Cadfael -Cadog -Cadwaladr -Cadwallon -Cadwgan -Caerwyn -Caradog -Carwyn -Caswallon -Cawrdaf -Cecil -Cedrych -Cei -Ceinfryn -Ceiriog -Celyn -Celynen -Cennydd -Ceredig -Ceri -Cewydd -Cian -Cledwyn -Clwyd -Clydai -Clydno -Coel -Collen -Colwyn -Conan -Conwy -Cospatrick -Craigfryn -Cranog -Crwys -Culhwch -Cunedda -Curig -Cyfeiliog -Cyffin -Cymro -Cynan -Cynddelw -Cyndeyrn -Cynddylan -Cynedda -Cynfab -Cynfarch -Cynfael -Cynfrig -Cynog -Cynon -Dafydd -Dai -Dedwydd -Deian -Deiniol -Delwyn -Derfel -Deri -Dewi -Dogmael -Dwyryd -Dyfri -Dylan -Ednyfed -Einion -Eirian -Eirwyn -Elffin -Elidir -Elis -Elwyn -Elystan -Emlyn -Emrys -Emyr -Evan -Fflamddwyn -Ffransis -Fychan -Gareth -Gawain -Geraint -Gerallt -Gethin -Gildas -Gilfaethwy -Glanmor -Glyn -Goronwy -Grigor -Gruffydd -Gwaednerth -Gwalchgwyn -Gwalchmai -Gwatcyn -Gwaun -Gwenlyn -Gwili -Gwilym -Gwion -Gwydderig -Gwyddno -Gwydion -Gwyn -Gwynfor -Gwythyr -Hafgan -Heddwyn -Heilyn -Heini -Hergest -Heulfryn -Heulyn -Huw -Hywel -Iago -Ianto -Idris -Idwal -Iestin -Ieuan -Ifan -Ifor -Illtyd -Ioan -Iolo -Iorweth -Lewys -Llew -Lloyd -Llyr -Llywarch -Llywelyn -Mabon -Macsen -Madog -Mael -Maelgwyn -Maelgwn -Maelmadog -Math -Mathonwy -Medrawd -Meical -Meilyr -Meirion -Meredudd -Merfyn -Meurig -Mihangel -Moelwyn -Morgan -Morien -Myrddin -Nudd -Owain -Pawl -Pedr -Peredur -Powel -Pryderi -Pwyll -Rhein -Rheinallt -Rhisiart -Rhodri -Rhun -Rhydderch -Rhydian -Rhydwyn -Rhys -Robat -Seiriol -Selwyn -Siarl -Siencyn -Simwnt -Sion -Sionyn -Sior -Steffan -Sulien -Sulwyn -Taliesin -Tegwyn -Teilo -Tewdwr -Tomos -Trefor -Trystan -Wyn -Ynyr diff --git a/src/main/resources/assets/customnpcs/textures/cloak/BugTracker.png b/src/main/resources/assets/customnpcs/textures/cloak/BugTracker.png deleted file mode 100644 index ccfaceac9755ef03209d85412dcbac7d6390d11d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1213 zcmV;u1Va0XP)Px#24YJ`L;!FAZ~%RJ)IMPV000SaNLh0L01m?d01m?e$8V@)00007bV*G`2j2PP_ zFgGletvYZQ)eGqcOGUhpIx^VGE^IG4a39)P=^T#vaUtGJZ?>D>G%MJTC0W`f)2{X- z;Yb6o7boX5>4$C86BL&JP0o4G$;MSxt&8({U`qXMKW= z=>7x}8&rQ-S~2NjRxmuOU7x?Y@wtkT_4pwKK=Zt0Km|Q03<>u?y&n=IC3foz>NzL;*TJa(%&&( zdf>}RsC2+~MZ115DR}4O(vV;UaP5%jy5tAogO+h_T!;Yho&^V8u2x7@v ze7mOBq`Dc7J_6{<=CGc02p`?mkKG9fgIg?uPhxK-NH9|J3xdlDj`%&&S_pwQ~8^0n^LCAYeY7;cUCW=k?(92LOx` z*i-LYb%$3AdMh3%H@Jr9F?*XUVHeajf zuOhwu`Y#6h7dtA9>-mK=iY(Lj?Te=RfF-{Jy!YvRLGaGtQG8wx4!eERwcoV2_?=Q@ znTs72_`Dt(8v+GhpvbbRK9H9H1(&NzyHSTYe7IxH9UdO9Uo#oH2W;i&oc~dF^58=h zS*EceKx0FIjH;UI0~Y-#T+oj6GEj#I_1KDX{jCsSvs(GE`){KgooyFH;|cEnK2|yc zT&^mj@dTkBo6-N!-bfxRAxP0pXP+@eWfpZY*u@Q|Y zas-%@1nafiNY`#}X0j5|A(L6zVp*l5Wg9Up9{bOQ{mD6%S|)3F+N8?~+kfTF#`HiwrUs8RX{8Zakjm zr-Oj}6W>HkJBIogBpOd~&_n{P|3?CJ3i`wM#9~(PQSYm{(Nsyk2g)j|tg^}~tE{rh bdK&c)Orx}7(_M-G00000NkvXXu0mjf`AkBX diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Cobalt.png b/src/main/resources/assets/customnpcs/textures/cloak/Cobalt.png deleted file mode 100644 index 639e6b151eb0d5313c79644e5c934e4d85aa322c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4095 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Black cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Black cape.png deleted file mode 100644 index 7435f563049da24b9850461a77758272a32ea206..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQZhE>nhGaOujkw5l*ns0o(2d*w{#$=H%b0fbpd8!X2m`aM z^UH;91)smHlB%>SJnDs8|F;#}&BNA)@|Q6%aWjh5EfUxep`t%ysfhNAg*yTc1XwXQ z{k_X%bjL_4N+CJ4y6D%+*Hc{-=5O16?eT@%yW=@`Y=#v{ZdUp9EN#H5Rkcm8Sa zxAUe}Zx`KKSX%saJ{7pEy!iR*`|cX|iTCc*Tb*P+zimy5+IB;(M1w$}Kme#oy%boD zw%#*>0Q8d7RBi*1kH2QFD%x!TFkSxzlGy}RfOjWK060Kv3sJX?K;cVz4if@^yBqER zz!ix*G7$imeELa@TO>Dv&RDLq^bZd$iZu?7H9*zwh2@kTdjLlRtLtecLIAM3o&vBT zt}3S={XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQwtKobhGaOuopF%2!GMR^)7&{p-|o%Pq>iQ|lhcz=GnO+P zkMRo-ylwRT@r&SZk>72tg(h7W;OEce;>ulc$7my4Kw9X6Mf%K9+!r*?-Vks2eCEGW zhTX5rr`|I>eQU7mCIegQQ%N(2O6#7ym24q%YJ{et6r7+ z%?~hWz3h5nm2yBlPTrY8>D7N5Nv4K?Npmw9avo)U&S|*icB3|jVfKz&Hqr~W36{<0 YzK|-ex2ohR&<6|*p00i_>zopr09~ne3jhEB diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Dark Grey cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Dark Grey cape.png deleted file mode 100644 index 473b71e5d90557f9094db97b27b3c4b538ff2df9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQrg^$JhGaOuo$ScRpvc1%ZXXxF?w#~3uMDGmtTF{IM}Er9 z*?NunYSqa|{hQu`410gA@;}Y=YUa0~6h;KwM>pZz6;p4cmDAts)s>&jIhARGVbNY@ zhU;k|J0lvpwyZvH@xPFF`H7?A0Rd&-5*W|D)!4L=fi*RqU+lr1J|$^xG~s@3y+CgB TP3JX1p}^qj>gTe~DWM4f{b**K diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Dark Red cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Dark Red cape.png deleted file mode 100644 index 6fa909df5c3def9c86f9643c00eefca0f43e5dcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQ_IkQFhGaOuopO=)umX>ZV$OxY-R|yZIi{FR{h>PX@WSF+ zkDuLo&!3BbGPaFkniGDTaph;_?LQ~(6FSRKRK>5pcIz&MM79DS^QHi=pY;rSYBrjg zMh|Y(c;9~ivCc>M%fa*S82Jl)7=9%r^1fh5akyfA;PC$1t&i7QKX~OnRwOE##TnWxWu g!@T94_`L>x(}|+yee%XnfF5D+boFyt=akR{0H1YzhX4Qo diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Gold cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Gold cape.png deleted file mode 100644 index 9925678efed7ecf1f214c4696472233fe0df8db6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQ=6Sj}hGaOuopO-3!GMRE^RF@A?|R90##NVOdzQ-W_#biZ z>4IaWJ!e0jyFKw&)w6$9N;((V7JTn>NMybc_1m1`$hXZ)&NeVK2y`$`aK4#!j6pie zqkyMD=2Vz5+l>oOP00*T0=CUEeYSZibJJ%|hQ5@w63ild;(ye7u!T%Ll;0W2c|b_I yLzT&ar9-}-@rQ61_Ynp`g*qFy2mTs*9~eS>_{{Zl&lmw+%HZkh=d#Wzp$Pz!4`|&0 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Grey cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Grey cape.png deleted file mode 100644 index 96473600985e2eb94a63a27f0a4d1fe1588cecb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQnmk<`Lo%G-PC6)fz<{TD*14x|jU#R;E@2n9VOV~6&ED^o zT;|5CS#m$0P1IS$6!HJm`mGIng2gW4VeZ}6Q2Ot5^;3cM`VNe9BCNf27d)Qoyp`eH fdMgYjP%Z!2T^#1`xu>-QUBlq%>gTe~DWM4f9Sdb# diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Lavender cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Lavender cape.png deleted file mode 100644 index 26140e6b99df3d3a90bda1ee6e1aa9a95cc14334..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmV;i0Z#sjP)H0NB0&6V?qJdx=>s zrs{i;INl;>0NASkbBah}k b6Wa6xg)uuXZ&+JI00000NkvXXu0mjf^+272 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Light Brown cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Light Brown cape.png deleted file mode 100644 index b471a1106fef1ba5587218b6d964a699a0e3c2d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYoiz#7}-2s978gk-%gJeI;6nU!ubA~=$`KP_l{~;SWe)HGBVJ; zbffW|O8=Doe>ZtX|K4@K$x>lm|8vIO|LVQd*BI8ae0ozAE7SRVuBOb&<<`Z9iY=lV zg*GXzTd(EKIvlz4J?{>Q>|9n=#jeNdrwh72FfEuf<4I9`gXVvZIMxYIlDeLqjAOm9 ziSN{BJ%%eX7n6h?G^fu}j>=)ui0{vME?{lLQzYGP<}J6uX6Z&Fbzde%W-FXA4W&V&=#dd=pfJ7S?viG<+!6U{WYN zuahl$Kxd{zDSzn!jZd5Btmd1cD!lmJLOu!Cx@pDt4}R1zSC8Cl1q?O@Pgg&ebxsLQ E0E8@=7XSbN diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Light Yellow cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Light Yellow cape.png deleted file mode 100644 index 850aadc4297c8e398e0d18f0f3b1436e641ea928..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQ7J9lkhGaOuopO-3!GMREGq%Crd83x|$Mhzy8wa-@Y5d*) zG=}e$&9`i$J*jtjRz6mK{&C_O7wLw3)=e$E4%u(-GYH(aSIuQ(VQ6vSX^=S;X3Tcu zf>Tp6!;^q*vkVWki3!OtE3|LAy5@D|wi1T|JH`VO*N7%JG=1mZ&wsLERnU*UNnuPM zx_FNWF)A<}=|9f!hw~_FQUiy8y&UrgbrJC$jQvOW%yqlxcmW;D;OXk;vd$@?2>^TR BX+i)1 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Light green cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Light green cape.png deleted file mode 100644 index c7affa5a8ae25f086e5c30e329c424659d1a60d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQ+C5zyLo%G-PIBaJa1c0Rv1CE}gQ*MHb=j5D{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQ=6Jd|hGaOuopO-3!GMREQ?|`8(P!F9uX2NFRS*6pTTXA5 zdTwZTe0QGvtJgDszwX@NAl-1!nyHo7A^Yup27%k>Cz&xbF*qr(Iq;>fmSoP!P&{bJ zP^1xkRwBWfo3oE`g7eL+YctMIM1%dp9S4}5OZd#0u5dU2-O1qT>gTe~DWM4f=geRH diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Pink cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Pink cape.png deleted file mode 100644 index b05d7d6be5f5596b9348a945a386fe1750c25329..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYoiz#7)3l?978gk--bo=H5mxxRCe?qd0fG-|H^hxUnf7y8ZV|s zjkMj-PVT45)2*zHRac*Vm~lnoew{hn>f&=N5^H93`OXu6E*Ey_sMtZ4ZEP-9X+auO zm(GR@7<^o{CNE}%xWz_B&pls~1lDnEWW3W|dyth`!}Csex0ctN?RF;WD;c{>)?Q-y zy|$ZY!4{UUXA+p#{p2iF)4toxwq}!VCr9S%-)0xu8Mk%wUb^=Ea>KGuFS>bGZky{| z%6xBSuy%fRgM;JFax z%{)U!-zcHzD<2CBv&;+*UqLAb+4;;L7c%nsv@GM`ZRk7S_(S~!r;d4?>fA_RAToHm L`njxgN@xNA7Hpgv diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Red cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Red cape.png deleted file mode 100644 index 40cd6204addce964e28e7e9654e786dfd2abacba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmV2N}FbritjK&M` zX1w|Te`LJq4|p+ZB4Eol9FYxNMncPWfF<3!z1P=v;=DiBMV2O^#;vRp^tZd7Lb;sO zPZ|)O=jngn>1cD=r@nDu|6c-X@Lc1^`1c)#Yt*_Drq4?5!8yet z3235fxjxuzrVI@0R9bOPaYzDm=o!bPlH$hb;49dU)^S>cL*US99PwmFvt;|WkV)~ayj{$Z8R z1>fL3{wBce8qF)(I6{*{=}jPN7=tu1Uf`_&E}TRHxJ1$yM^u0>b6oaC1#pR^FOH}H tU*@>%iwfWpNnadM0lv&}*|&HFd;nV$M`4Brnv(zk002ovPDHLkV1oRo&j0`b diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/White cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/White cape.png deleted file mode 100644 index 579d732bc54c20043cc58dd671361c8ab43b92af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQvOQfKLo%G-PCv=Zpult3;@f@kB}#p)5Bl%&PCC{*%l(MX zR<&18cD8H%d!d)|Q7VDS<$&}9!7Z#0_&OMD7`}^jT-*Qsc>IIkqV_CREWQkP7zG>H v599~1xG=nH;5fjXz}*3)WCa*27%njd*z?Q3Tv@yvXf1=MtDnm{r-UW|tx!>2 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Yellow cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Color Capes/Yellow cape.png deleted file mode 100644 index 8376438410f50f1e05c7d4abb15c3bdaebaf0e3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#4wDoEqnXuPv+Y13$r9IylHmNblJdl&REB`W%)Amk zKi3e2GGjecJ+lkVYomaQW_h|ehGaOuo#H6epuoeta?aoX_Ir&_$UCJ)@P1Fb^fv44 z^0Ut>wyT$wU(GI8&^^zV(9@WZ$b6ytzd6H^Z>yJ_ZD42+=wO`Sd^779gLITf0Z)U> zsW4-<8yB3Kk{O-^Y@20zee+W0rq7%VeJN`tm__!)|ETp~3z>T8eMcnc0YT{wRVD|P t4*7n@AHrSSM;HVZ>TK8^_-p8WV2Yi>XCBrtaSqUx44$rjF6*2UngGLOWy$~m diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/CowCape.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/CowCape.png deleted file mode 100644 index 1b23999961129efd3e62ebe5e7a599d0b4f99d88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjK*1fJE{-7?&Tl6cNk(dszH?4~V)n8V G9>)QKk$Nn{1`ISV`@iy0XB4ude`@%$AjK*5QgE{-7?&Tp?Ac+Or5w)r*MHBR8TCuQN`8Xi)!*G4Pd|=yfB!mce){|HMOF2C zKS~Df-Ea2e$MyGr{&u|j`}J75%h!KNI_3!uA@A4oK4VjH$IYGh4de+127}o_b>Aj6 w-U+>VBo)N>boFyt=akR{WD1tJMwIyGr=;dE_?Kj)7U?_ZNn{1`ISV`@iy0XB4ude`@%$AjK*1fJE{-7?&Tl85<~-~m;Jp1w$b?rxr?*W^ zSlpPZ^lkDR$HFfU=H_ts9(ekoaKCMNRog$VHx05%aq~4|vTLm$Neiy$*S3G0VQ}R2 z;ZyC$Cn{Fo6aM&X!>5Pp%tv;2TvwOBU?sKSyUfR5PabJ+V}2qiu--qq>gs9U1AH%U z%FW;JyvHs#v+Ts0=@JRcJFd4+y|4J_YvR*%nZJ4<-uX?=|FarIlSPiap3Hwk^--_k zF^S|JAhFm@Q-Ap@{=#J&lpg^7z~JfX=d#Wzp$W(oEOCt}@y$<3&0+8_$w)2Ich1RA K%wBfF<2V4EmV;gZ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/SlimeCape.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/SlimeCape.png deleted file mode 100644 index 7ac832cd56400acb247c6d7f297b13776efe1ab9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjK*7JBE{-7?&Tl6j!MWDV z1<%gZELb4Xs`2x}D)#VClXWg$%D?$j^4Qb5n!J_UU&gKA%2C|@oW1e<_QUQQJ?iFZ z&MU93EBaB-^?3H{$6vnQn^$hnpe@+_bkfvMl9O+L7IvP!%4qJcg){HWljn{WJ*IWO zg)!v*E?axc3b8zMKF-$Fj1RWo{@nb)uqMQ`!SAE=_UGzi4FN~kK4mjpz2K8~o}VdP zb#2Uc(Vwx?fXWU?IFv8;PO-~7@6WUE*|CrDcCWwvQ7E{UBfLxTZ56}j=s4x=&zEz} z-&!IK)?4nn>gU`QKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I13k+e<2pYE1|}0v z7srqc=eN_(YPST69DBZhfe3eMs-qW&F!v^<`-0r5iBtL~wJxdg$uya%vn<6`DX6Pg zX|vFzO%799r%qz^PA&X8XZ!QqJ9)EOkJdh)_3P}O^Oon&ytFA_ww+URsZ;P*@mKl> z)7e-f?Jn(5zaqlNo%(Yxlj-jd-$K`MKdo$bD)d|KaCV>FiLign2ZEMc%V%wS8uT@E zJ(no!UnbM44+nM&?hk+bF!^fKCY>qI%DAt*IJlU9lPKqdpKdE7ZqJp z&-x$edv)&W##OqF>i)fQHop|2e+n|}dls={XNuzi)2w9-A54!Q;&r{uv@Vc4hrzmd z{lEOVK$US-4B8W;|8GAxdAXbZ1V#qEHHYn(8Db*ZYilR0{lnp4Uzrum@atqSyHUe( z?fiogzxN(Ey7FQ(`@PAr`HnHndVUbQCNgXj-=A`__ojd1zNb+O-1y}xgcrv#cst7p zKb+zKQ)31cs$k`5m}Oh>Soz*02oq?J1oMGh{(%2t40+WJzw8?n*e1x-1-5sV*FQ{o z;tDqG`R;dDZarz<{~_l1TDWm(v(7&`67GJV1?-9seOKg8cDh%~u_7E*aQ?Ww+#!Zb z*&hycSKIyjAiy>uuGw8aMf+ZG8~@+4HygfBdFWhUY?h$2t7YR0p<|1@CA#$z@o}2D aYMGCfYJK`y>?I9MV+@|IelF{r5}E)CK_trn diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/bee.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/bee.png deleted file mode 100644 index c5ebe0f2621ae3be86acbdc28b456bc88805196f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP{JU8>vnU zR(X5a`N=x#f7dcTetNJvUE%xRzek&F47ANJ^m)k1Y1Ev&`2YWZA+ar+fqEEAg8YIR z9G=}s196hP-Cg)4b}`%pa@b2eeO=j~aPcv+F!UWTo(dG&;OXKRVsScIAcTp@(IDXf zS5NHSJ2AZn8Fn-I2v0e6(Wk)I*_6?jv5nJgkE0YrMQYJrA!|NS$rIic=vog*DwN z==_7=4Jq%1_ur1wZuk_-Qy_XmF1F}**Za6VT;K9~_q}D^lq?#PqgLdxHmda587+ku z5v{?DG6p?Og8U2;cVg{r8O)ae-L6{V8c~vxSdwa$T$Bo=7>o>z40H{F$RxzT(8|EX p%D_O|zyL_T6I|Snq9HdwB{QuOw}$yX(#Ajy44$rjF6*2UngB2rq7VQ8 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/burning.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/burning.png deleted file mode 100644 index cde96d03a195d6076fdd8f2a0fa8c7d9166e38a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1074 zcmZ{hYgE#A7{`C$4KH~qO^-EYrfu0c5v#ndhJ`03;Gp8|Xy#paP98ai>oU)gxt4P^ z1uspeC=*3dLra@z5~etG%DgVY8>U49p^1MzW*!;7+>5>VKHu|wp6B!Cc?!v-%LlAn ztpETALV|H&M#mb3M3@+B`K6*ijAoi1NDKtvak2GoqS^j1IXH|6z@6g&(C-4UV{Fk^ z0LVcDph*D0zXAYfYE^gWR{+4SkqML_<3e>?chAUFVP(DMgF!a)N;D)>t?H`;!mgol z;oz8h)4+SuzMz4sTZPrFT|L7SD&2dPZoOxClFzSeY~u9~h*wtT-mWaXkV@XFU-e4= z?3GIES_JhiEqzrtd)c>Nb`<{8aewM*k#4$nva>{|Xqf0M>*m~j#`$5YG-9eW@^wSv zn}!7a5OusfZkeC9#Lrmbr;n9i9W9R+4UVXxy#@7#OtHv&{6sW3tcE_$Fz_>sD=&#e zO>Gz?iB&KNkR(ow!>PFxIg==7lIjBjMAE<1(C)&@dy#agp-mu`^l8?#TFu-n1Fx+m zFP0MeMD1F&LekYd(8<#+OIDS_wb>?l>rdk~*<-ag6)pMW9NGjsOF#O(UiRI_@Qvxx zXgM=X&WwPhsd7e`oDm8QBtnvSWf@snM%wI;R+bW>{%EK_rqah}_CYZ7%o&5haE|48 z)p%kUEsPWnuqt`len`4<8AnrQHf9=wB{ewa1^~9=eZhRq!aa>m3t9*<$l|rlk;53I zEG~7-$OuAkfs|mWZeluo4sCCd5K^G?OjtxhB)T=q6Y~C<{v&x6ExLsG#3bL4cQ41! z{9}sBJpR_AkAI9^^XSA5;`ayR(Ic!vZ$B5}WX?e+JS*_DIro(QAhOj$IbvgTLEiqN zFP&=ZVCk}V{1__t!ww3O5$_>b6e-zpAnyw*yoCEkmE^3~d)!IbPTW)3U?&Mtt_qqW}Ofr=V> zbFA4K?7{}ij{VuXJ)sbv_1pe4y=Xzvw3I|zs(*5Js?h)jjX|SMV^A0$3I^kU7VZBf n<|G>Jk4DcMwpsrHGP6>?NxS|3Kuayw%LsswAQDb+F(Ln7Kp_5b diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/camo.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/camo.png deleted file mode 100644 index cb4fc56395ff9b37f27ccd36ffd0a2e8e719a4fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 626 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(m@lC&U#@dwv| zR)LyQ^EcrZmfH0~rg=B62^JlgyfEZe-OEh|my-)c7$jT@vvi*nYjkTZGvjK^J6ap% zpl5sIv?e#>%IL%l!?(e4Vxr!kKMNel-R=;)K$ZU$bFcoxmKALs&uZ`Jch@d{@58X< ziQA;=NsH&PbL^_P!Qh>@=0xMZBDoR<0~WPbGs~s7*Zs-9_R=%4*<57B`%aN9#ry{r z6i7F?hDRxJR(%OHJLS{Cln@uqc~)uR#b)E0Gt3NWO0P_W4fj<}NKwjXOW4VE?U-qZ zoJ`uCc^h&gn!C8<`)MX5lF!N|bKK-a)T*T^iy(A>(@#LC!0+rYrez`*^d!9o-bx%nxX YX_dG&m@Vm$1!`dMboFyt=akR{0P^tNFaQ7m diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/candy_cane.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/candy_cane.png deleted file mode 100644 index 1fb65bdd172678d0ebe2137350d0baa4ad24d285..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 513 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(m@lC&U#k&pIwM^sEg(e(YhSfJ1aPZ!4!i_>o}?dEH85MT}X!<;T$bHR|M=WXAO)!nul z-;xxfZvA+*+w$m5l#?YT^u9jg=&i*Pa6UO|`@|q9i4;B-JXp zC>2OC7#SED=o%X78X1Nd8Ce;bSQ#5@8yHv_7;v1_2L?NmhTQy=%(P0}8Y-tu?*VFH N@O1TaS?83{1OQ2Qw0r;n diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/card.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/card.png deleted file mode 100644 index bbfd76859be43d749e8b12d1959f615091c1ad0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1367 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 F2>=J-ET{kg diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/dragon.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/dragon.png deleted file mode 100644 index 7fe610026a032cadf6cca0a01ba2037c84ab59bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 719 zcmZ`#YeHv7i*;bv0@4ov5q&!RN>YR*S3^I4%4 zYKD)>B1lrOhoONW1!0AW2|cJEQj}@_i-a)k^JhQ0aPQ%q!-0Emhb7A(@D26_AfSw7 z4ue{zBfY(t*>kXSf&oss&a4B*yZkmB+-=io%rOIXv4E!;_{~V3W#A+MtP}z2K0s7G zFqN%gj9(U$RnK7TPV5yRoR1Jchp7F-2j){G3o+)X6MVY(Z=G_*-LYQ^jz-rPow4Gl%0(%>*b5)Rj4*eOV( zFnI|!68Q#%2H=bn_gZ1rAY23%3p2gwI|WlZ6cP;7;pGrs4dI##ssuc>37SgL zegv}vsI#Nqjzjw)i^lM2B*o&v1w6Wl&f{pSgf#=H2_RFTmLV|)TU%R8edm~OfJNtI z)CrS}H}Ly5pJ)1BdGLBhU}wuf4FrtQ0yy>BKsB|pPePxE-r zmS~}B&~SBiZL@Z|+7qNG+Z0#1-v^5KTu93`gpHoC+?m#UpLr3^q$$O##tkR_?C sa)nx{R4e5P1feE~QO$hBKY?RaC6#6F{|7!gDsC|WQ2H!#ETgFDFYxltPXGV_ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/dragoncape.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/dragoncape.png deleted file mode 100644 index 1c8c00ba131716a04b62e14a2fb9d5a333c1d4a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oNz1PwLbIIh+L^k;M!Q z+`=Ht$S`Y;1W>Rdz$e7@-@kv6meF(1o;L3hXMu|0|#A@ zGou-(XP>8wV@SoEw-;{eQyqEe;Cbud{D=m*ZOCB;M+3@qopYc^21+ z?(E(BcC|5CFljJ1{t3G`wQ7pL8DkqqNa^J(re1?Uq7Pgg&ebxsLQ0O|9-pa1{> diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/eagle.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/eagle.png deleted file mode 100644 index 9583d1d9cfe4c424320ce60b6251beb58ed76121..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 748 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5yFi#xbidgpprAyFYeY$Kep*R+Vo@qXL1JcJiC$i6iGqoqfu3cKah)Fn15=i# zi(^QJ^V4a8-j@?aj(rc@^+Ksbp@oA>YnOnpq0y3MLUBHYGcGR>jreoXGI?uKlz6vH z)amX60?IFraqQw~vU8AszV`V<(*a_io>`rQB)ai+PGI7QH``4`)7hE^4cpBcYD^RzT z$zgqZS>PIjhEr!AZvV5!@v${Uxg7!8^8?drxkE3mh zc2}vd(e-PIXU}Z{E8QLP;`v1F;=>Q$9of3!a*XPWg^6tau_D?$39F4HKh@8Vmg(+F zm(SpptC-&HoVehSiGcQ4x; zcNLzopr07!;LQ2+n{ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/enchant.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/enchant.png deleted file mode 100644 index ab0336a01401191914a973f7a30586d6e116ae19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oNz1PwLbIIh+L^k;M!Q z+`=Ht$S`Y;1W?d5z$e5NNJp_uv}TUiVe*h*P|IW4*uZvHpUK~yspQ4uw_m>hpO~mM zFH?7RhHlrzLqGrj4rE}+Vql14V5r%%e!=G_EG+E2ydn!1>Y4!!5-$nz3ugF_6>R7( zz7JF~*VDx@q+-t7E1p8l20Si-QD+qt7@2N-x6fipjEH^{^iTTjyja!g-AspU9ZxRa z4V|DL>0`Xz^ncIQt~phFovUHx3vIVCg!0PzKig#Z8m diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/flower.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/flower.png deleted file mode 100644 index d9026065fab07415456ce6b0f7725928e291ebd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 602 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP-13)Plzj!wpV8T|Np;> zJY$m;`$ShMElFlyHHHt9;{Wd~U6t>f>a0{1WB=!H&;N$+$C3{e+VSk|FVz-hFp*@i zkY=!wVK|t$yV%71|Mm5eCW4o;tD0;qmxnC6oL%j&&GCMEX0RS-gaK!fvHAZeC)Y=; zTpTnn&(Qo&-Is6!&Q1rb^BE_+H96i@Jl`6lZ{y6zR{ zXFXCp%6Pzi5!*4-2`ZVho*IhH@KJT}Fq!Z=%_2cgZ<>&W3tNIkf~tepMz$nwk<_h$ zOfn2Bw>iCyVL11_$=o4}nT4TX#gr1J2Ngk5C)PAnxfJZ1;&(ta?*YpTj=j-Lxh-}P z(tHN;%g$fl&C6I)TKd;p-t3%kOre=n0?_fQC9V-ADTyViR>?)FK#IZ0z{o(?z*yJF zB*ehj%Fx`(*h1UDz{HYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(m)iC&U#<@0y}r>?t!n z)!_7U`+IvLHkX=wI-m9TZsY&||5rYp$p}=zSQ6wH%;50sMjD8d5gv}2+6Nh)rOGL_G4Y*t;FA6M z>QdnE2sSNIgAC^j&rdgeW!@FCNLre$VPD9%s8t_QWOz~+?+q3c33gO!H1o(i%^-W| z${__KKB>$bw|A=)&2jdQZ@;jK&ve$Sm|e3 zhZT5Sgp==FS^wq#{%y^(U##1^w@Y>M+qT^0juJkjh zYz+@&C9F7ty!o>j*!K9WImUd+>vIN!L|p6Tsfw~PXLd3MnC`f8m|+70dvPwq85zCq zlF+X_%%|5f7Vz(|Id8Dp;_^YRdBm=hvL0PM&&P1QW8M1A(Z?gSqK-$ryy$g#1<%V?)F zK#IZ0z{o(?z*5)HB*e(j%D~jh#8BJ7z{@FWC>nC}Q!>*kackiCDP9WHz~JfX K=d#Wzp$Py}*v7X2 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/heat.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/heat.png deleted file mode 100644 index 4ab2b0799989e2ce69807669085d27b01e0162a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5yFr-o_>U`QKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I13k+e<2pYE2F3@T zE{-7?&QGUo^kQ}tas6B<#VjQ*!t0{Mc<|8v4O=z_Y%uO%VR2l|(R3}!v&#CQQoZ51 zxhG}s+sP}o9?elJ*koL;CVB2|YV^6C*P`o>|5g8Sewn}%`E6!*KbMs&-e}%?{dM-c zyv2J3-dtpV>ZQf7CuHhxn^)Hzj+KfrytAHrE0+Dlj&=N}riL)2u4O8i${H~3QA^}w zt{EYBRkXb)6u&umuW>#?8Tsy&GqluWPVBH0x*8r0GC%mz_p<9rp~L#X9Ta%>`$kWIDE2qx{qFKpv^O$zowi>8yv|>v;nAmauXo;G z40Ll9V^GwoXjYF*&HG!J4qcxl|MzjILY?lXEvx1fn;J{vq!h-Xzb-T@&cv@ N22WQ%mvv4FO#rS|18@KU diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/ivy.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/ivy.png deleted file mode 100644 index 3d6243268ad7f7807d7995c3dbd5d139df97916b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 507 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/migrate.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/migrate.png deleted file mode 100644 index b7e4d65255ba2def28b3172319a9c4841adbf853..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2070 zcmV+x2004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru(PsMuH{|q(Js!*bL~LV~)}mXm9E5y}#GT zKQ3+ha=W&-w~H=*lV9#V=RD8zd(QWH&U4QBDG_1u{6%6L?WA)x1Yr(8+l>{kz;PVH zK#_{I;f2%KA6F=C66k==Zb8sgSH?+qXK3?7vQfmmR1BMl8~<`rDWw<povlfLPP-m) z+orBoh}jPDvS~yCXc1ygl6az$x>~_7HEGwwPE?RcRbeTOr8LTlV<#%G6BSrWo%9f8v!*eIgdvB%>k^XyXQ9DwUN-Txg{3sxKYy9?&n20m zEE35izV8F@FE_)ibr~LhVJc_dcx6mQa3F5`+Ga`jq$y8MA(QFGb$hsJ=5(_3(0(aL zS?yeY{hi%PDOI{6xVt`!V<$NJY>sLxPDkYO{PwF@fQ>wuSC)P2%L0^a$1p!-q=;Dw-s(+*Qp_-7%uzPJil~S* zXM-GCV7ab9E5%GR#-+$3H-bSCVTCR$%9*yFE&!T$J;8#tp9SF5zI;unnSLWdT=3p~ zr&M##6VUf(hLyL2>RMO?+c5HLUMLclrx65 z`1n2b)LlQF_DnZRH?Ct=?QE=MlJY54fJ;YNXK4wr4U=*VuHxZIM7eE}&|n!tuMa&U zm;#28=c?Qq-d{++XoSMSosac5%fG&v-!(qc-@dhRYe@;vrhu;_;@ZSknuJzp6`&-- zQeY^Jr4390Qz+P9NdMfj#pAAoN50pjQk7EySn$P_EZMM%DCl7MSL*?I_!kFQK7S!i zEx#|>cBlo=N=RyhBv4^!EEGN=rUcjulv4div_k!b^ovE`%m+1Hyr|C z`|7)B?Y%)n92?NRSvp;VC=w(RrrI85WvOBPwU#wZ zzrEWl%Aq;assU)(+YEpg`fPn_8#OoFginmW{o_@Rw*HfEF8f?*2#6<>BpgL|P6$L1 zi`zg*7%D8wLfi-kNZKCpWRft9hV>WHFBa*@W7W?4Y5Vtiv?cugVmmX8>v??Tx_+5E zo_wGrlLye{rUE5|7-(f6;v)iD3(7DEMTjIIo=j41s)GH6^slQ-7VXrer>K!z3t<0ir4@FXBGG@+Zn;1udFq@V82 z6y;F!wq2?!RRh41E%mHuxQpv5^GEG;TmCSX%@t+3F#4{UrG9>S^Max)_3gVG2VIT7 zfB1)k+D$EgkW%?Mu3S2|YzY8?ibnk+l#RxJB_4=P&pg3f@4i9x^h$DJKID5}J<5jp zD>&cNQL+RW*O8^}r4t}yQ<;~F746i|A872~N1xlcd)WBp*4B~{Fz#wnckK9><&_8j}|ptaxkY(BiN zWHmrd#&@>=B~0Yn@`1qr2^dX4DJ28H?G0_08k22*+ys2kF>D)DN)4=veWB=!iW-A_ ze_KSKZu%$J7vcHIn}OiIEOMqwS4DGh&eZkf_Um-=XrV zz}O)Blf6w3d%;8tP@lbPBuqH6lTE;|44CK(heZFs9{&MheGlFS%*#Rm001R)MObuX zVRU6WV{&C-bY%cCFfuSLF)%GMF;p=*Ix#moF*7SLFgh?W*ClDj0000bbVXQnWMOn= zI&E)cX=ZrnIx#aVFfckWFs69XdH?_b07*qoM6N<$f+zRB A(*OVf diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/minecon.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/minecon.png deleted file mode 100644 index 0e7902b8f08f87802b0f126d7d249ab8b9d0fa99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 714 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP@*WnC&U#jmfS~ujndjo?6*CE4O}9a&b#}$E^DP`GrkWnkFtxDQW%x z|9|C^>rOyh8B2ovf*Bm1-ADs*lDyqrR1Y(rClbe_K*DnXIvAzt5^1PzM5KFolMunjc325 zX6>$wP4f1fv?N$3j7_FRz(M}z?Mq7!TszJ3p}cE`!h;T*!lMkG9VSeRdYCI6U0Zls zgqMgIHk@@3VqRj+B=Fq$K=gt=%mRh%8eU9xAuJb;c^J5@XLQ{e>=pXZ`3W22g){2~ zFS3_a&U^DJ>a8+Efv0i73s5D%XF7b<)cw}$hQk6(32X_B7nmh-w@;g=z|!(LZR=%*`L+KI9^75^_SQP-75kZV zWH0ag&zq3nkSOzOYQ5Wj{r}x2va$Tk=jZ(`zV9+Y@quxd0x*d%sFt`!l%yn}$cL!%HQ11m!VD`O*V0|P4qgF8$e(@`|!=BH$)RpQpLHr_xRsDZ)L L)z4*}Q$iB}-G2XL diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/neon.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/neon.png deleted file mode 100644 index b40a35ba9b1c0a211647ffb4b5e05f8ccf41f67c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 628 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5yFi#xbidgpprAyFYeY$Kep*R+Vo@qXL1JcJiC$i6iGqoqfu3cKah)Fn1LG%8 z7srqc=eJXQy_g*ZT8kSd$fwPD;k5XtqM}gYL(MzY!s{Ox?rDrZ$lM|AC=kOQvrAx) z|W4{FG+3k83I{8$!?d7>sf|lQZy>vgz{+nV){uCGptb2F=^{vZWPM*Gf z{MhEJZx+P-&-Iii!rwqUDn(z^TNM|57rALh;NmYt&gpYg$Y`=#a&)oS0dF!a{G z*?ZfDs~PbZq`oD*fBkHyU24FT>ZWTOj`N+GYSnPB zO!u@=uNyn>f`!YOUzF_@@`?-tvag?FNZ7JUtMS>-o_Tx>ZrzInGUlCsu~m(UrE_sDGONV!C;Xqb=1?C;R+91^#<|fzKbm~*&1dYOy~!Cr zeq57e$o>Wlv6ajV0{8LmN}JDkLE}DK>}GISEbu+FrOoPF!g@2#%TljyBm=`o+wG93 y^24r)1xG!0B&oz03ayji4DV^dBHVuEC)=L9z`4gmM74k^gu&C*&t;ucLK6T>UlTR} diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/neon_green.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/neon_green.png deleted file mode 100644 index e2119e9b7a20875f2afdfe2976792b6744de6e13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 946 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP~u^LPlzj!{{R2~%v6u* z$!@bVyk?}h%}Vo}li@ut$A5Z?>-1#TxmiAQvb?7zInPe_o|EA-FWYZwg45g#UvV25 zpx%;bzw)@ik{G|DD4(*}fZ{0M(ine@WCI;v$uJ-H0C$H7KhIDfw*WUse>eMJFXs?% zm;5k~NPn+D4@cbzR)+H&#KjrH{XBv^okD$FqXT`WCApZbbJNjgn3?7g;^i9d>+$~z z!`v+2l+Ag0M=NJ%cos%_S0n^g-e@h03y2Kx3UpzZlkOGj?N*r-;^%5NJ;iNCihF*z zXF-HlL4@bL9N*yiVGcltGL{7S1v5B2yO9RsBze2LF#c!Ky$9s5mw5WRvOnPxWoFiez;EWJY}KG!D_{J5`v3m|wlzK} zyHD}gzH03DKfTxZ`0ftdi2Y`7BZ=tlZ*(-TSh` z&ukc$Jt%7MibD8~{Gy=S(~XBZqK zyjEPemM>)cWO~OU>rLDYK9f~KJyx7uR`8T_kK6=`7($|D zo&~><4dhnmpVN0xwPAxeLss|KnMWQf%O-yje6W&(Ve8SaZ;ZCCePd*6{qKdq~pOn;*Xj9=9f*NBpo#FA92^mS!_ z%)=|HDH`$O&1s;ti>HfYh{y4_S045?D+sV8hzkh#=X6Kh|L>X49=*C_@0{s(*853c zHhJ^hVUcL3YS7t367hx|it%^w>x z85aEY(qxWpXF4SKEPzFH*V#$x7vxMAsJ;tyPI36nw!wlS=K!_%6y&7uvvQBEyn7Ov) zK);WmM*67+&y^?4XP#pgK6ajY#ew-R^$*Os%&>o29ed5EllIT01^){kJ-?zR3K+zy zC9V-ADTyViR>?)FK#IZ0z|d0H&`8(NIK;@%%EZvh$Uxh`z{L>1iiX_$l+3hB W+#0M+p2h$*FnGH9xvX{0eT)Y!@}GK3^;MncGz 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/pirate.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/pirate.png deleted file mode 100644 index 21f02c6f91e4c73815ea60b9664d3c06b253500a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 870 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP$DqEC&U#~ zi)(3VU0fG;YkQi7g@v)P@zX=at5&UYcX#jV>XMU_n=)leV`Jm&*|T>|bG5g(cX4r1 zS644DFP~Aay`s&^+uM6;vBv-Z{~u&=Oa~guSQ6wH%;50sMjD8dG6bH5c}{y_~|}%I@0#UBNg(@%xNz&*mHU2i#zJ z5X^8Q?7BpV_@(AB|IY>IW-hE=&ikgUvx7rN)4rFs9t{eMKQwSu*{`XVJ0~Y|!x6Q@OON#k9QPPW4xXAN9X@4uo8ra(;^I=L^l(7<=Y(a9ogFaFSW3V+y-D+g84Y z9RjWE7-D*AEI5xg9~Bp4e70p-q2>8P-}-q+7r7sp8`|{!yGFuWvB0&k+zP2r zFPU!=R5Wp%|MlaJNgtc`P2}~HYEWffU~ikec#qks?V`=!rWe=b{AX<3VD<1YlM_EM zji{EmMwFx^mZVxG7o`Fz1|tI_16@NyT?69~BV#L5ATrc8Ft9Q(*xz*d4T^@`{FKbJ XO57UG-OmmHYGCkm^>bP0l+XkK5E@&+ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/plank.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/plank.png deleted file mode 100644 index fd332877aa2dbfb297b5de841f9b2e6ab29f67ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(mocC&U#*?YcVsSb-L4<`#QB@%z;Q-eZ$09E`1*Y9hiW4}SxgTe~DWM4fe-33y diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/purple_gold.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/purple_gold.png deleted file mode 100644 index a6a5afd1e3560dbd0d6460082572f0bea34e1f6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP{K06C&U#^Z)$0ELR-$*7@zeW>Z>Sxgzbk$Kqpt>}Bbjo+bQ0+cRU=6sF?d zts4|e&nXI7ZP_c9+{iEZOl3k*lG7@d==OyQGMr21G{@o#5Oevp{e|+&+Ob3f&vj7#+9*xtIJkXyOptD$cn;u)xniXvyl+@1-2n8{f=h zXNpr~tL&TNAbQ4^>EP!81>40kPnG5^KbBR$e%iW*yw^s>Hh+7kGAtD%-+)HY$b~QcL4yY46XMVTX((1ETuYzr3 zb^HUfd!jSiPYc=!)XX?wGrwNA=I5vLe;918ah(=VDn1SjH`Nl?h?11Vl2ohYqEsNo zU}RuuscUGYYiJx|WN2k-U}b2mZD3$!U~t>%O9G09-29Zxv`X9>R>}L^0cv3IboFyt I=akR{06Rh1bN~PV diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/red_design.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/red_design.png deleted file mode 100644 index 39f1f3d781a20d18a3215d259c7330e123e4d461..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 710 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP{J(0C&U#MrwMxn-nX@#SPJcyuv5X%vxZksl(1SNlQ7;!}S0E|Ca9(1%Nu4 zN`m}?85qhYpS1w;7?Zr+T?8L(wcQ2ea29w(7BevL9R^{>`rq!4-QCMP)6;D3%PFpA6X!o< zS5-Zgy4vS``qKAN0cTt^S1I{erYlYRRCvu_!FJuG*6rIp${P2!w`N~)&J=z7JSK~q zaoZ{xh7jF`YgH^uT0>`6Wiwuw?dsrUZSaoa*~+NSEC!FWy!Y*x6i&<$V$iv=rcpqF zW0BUYWdTy9JPGpg2X-*4Db0~kVhUrvCMzMgptx*_$E){_uU}kr>SO%k&l}9raO1oV zTMzSs?uHKSzKPs7K4%?bHYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(m)iC&U#<|Ns9#L4dbP zMDUoR^gJoCr)mm{tSqLS>_GA5Gp}y}s$eP!@(X5QD4TrN0?1=b@^*J&{LiF&56Iyx z@Q5sCVBk9h!i=ICUJXD&_7YEDSN12YEd1&+hozlZfI=HQT^vI!PQSfm$ah$Q$Km2C z^B1B$0`m%mtS)nhIPP@lo4|U$#NfDI$*YFlC9AHSf1xfg$v^$m#WT^b>m*B~9*8j( z<@2nGFaJ<`E}7vkr~b_1P=`Y)>qFU>HeX=KPH;7D)!M4{po4E(gZzPa37>8}OXZOh z+2gu`RkR^RM{!H?lzg`>Di?wdY&0@S2njG~E}X}Z!LzBL)X61HjyX+iVy<6ia9+jL z?~aW5e_4Kf_w}E@C?eff;L0nY+f_?kBT7;dOH!?pi&B9UgOP!efv$n6u7OF2p{bRz zrInF|wt<0_fkBbg$7&P}x%nxXX_dG&FsFMS2WpT2*$|wcR#Ki=l*&+$n3-3imzP?i YV4`QJXPV+30g8JDPgg&ebxsLQ0Gt)7xBvhE diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/red_dragon.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/red_dragon.png deleted file mode 100644 index a5e1f56ffd6b13df94d252136623b8c6e223b4d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(n1oC&U#x6l^x&VR3k&aHx#2!$d%btDuCpLgDXrA;X_ayBUi3Yqu;u zo+*(ztMlAP2|Z_f2cIVmtPz<)FWxW&268dPU2n(@t+=SOn%QL95&z_Tb`j5N;Uxk` z9LgNmiJs-YVYiXDo>z40H_)bqy>+42-P|O{@&fv<(cb3=E2P#G9gM c$jwj5OsmALf%)n4PM`(`Pgg&ebxsLQ01M5AO8@`> diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/red_leader.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/red_leader.png deleted file mode 100644 index 6af4adf2c464e27894d2f53a36ddfb3f9868fd39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(mfZC&U#B&_j=Dl3DH2S3=|DrWtbI))8YjwPNQRNXw5%$9C zLJsy*JOfpq?pEI-aqs-8+o5kiDDm7Z-+tqcns2>&&E}Q*`!;cHdgc`oGHsqtU1s~u znHyex*l_WHlk-D4eg>lu!3|0-*-Q8^wlXlVGBD8wkp?XiYpmdKI;Vst0E#K8cK`qY diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/red_royal.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/red_royal.png deleted file mode 100644 index 138bfe4d54bcc4bc5ae4d6e22c8b809959d86821..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 746 zcmZ`#dq`7p6h8OP&3tAy$VbvO(E_Jj-+6moZMx~)(Ce%utu1w0Sx%jXkvK=764MmT z)Kna#k|aqWWNJ#9A(%sioHfMX|{+x9Jbe;sqAIJDlQY9T!?T*i`@x4uv>$V^GT;!J*39c7S7zOmqXgZ*oBvKxW?BJc*k8(Oevw3P*3K zl_5Y~Zm12=gcF(uG#P?w{ZWk@n?&BRH=PZJX&6}|&>v@1yX3M&B!qIVhnOWcYH@Nt zfaAz+VRgQa?yP97iIGNGFY{dO!jDb|PZO-?Sd1`2E*@K*Hs|R`C$8eY&dS2u$1qu) zy|E?6jgkSM5h^Lv-XpXB`-*+az1!jH(ody`94RAqJl1QuG{5m%iqeVm>y*V^BHQ#5 z^nZTJUlcXFFwUg+l&6f4R%dqRI1;om*EYMNJp5h#BaTs5>6xV%eP$5YwLB3Fz1BJ{ z+61lPc^BnL)%jssW-(|ol}gDwO*RnuWbKbup$k^%J~f%-`amSy0ObtWc9YbaLS*KRkXKy zyf802yR>vQ(2?+JDOr2+w5Pk6F9sz&u{myRp*abniP7;J2CP}4FboTbzTVQ}vTNF} zFCC&${C1{Z#o73fzqA9nTZgN2TvgB6w|Z-$&TG<@nhYu}FM|aLBm+r5GSn|HL>>@8 qg@jSTq%TQQB$-v*hW}%@o|Aq>RrG&@E8#lG8XzW0ChU$>=>7sUpA{hh diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/ripper.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/ripper.png deleted file mode 100644 index e56a8a460c39cd8fd39229f49d4324ad8157a398..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 691 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5yFi#xbidgpprAyFYeY$Kep*R+Vo@qXL1JcJiC$i6iGqoqfu3cKah)Fn1Cybr zi(^QJ^V4ab-Y$+jEzj9Gnilk(Zm23?bv&LZA}Ssr=qex{^5MbF?*IQU?bDAsYwY4L zSM|c#@THeQ$gWH0{k&Ed-?{JepYz|d6$g&k%Y3=~`*82yqI;2XCN4X>-+uj4Q<${B z`Rmgy8x7JG@}Ac$4oYOc@wPX;F=4BD_Jx@;rblMq-KZm{Q?{JPYVzV^=31ih-`@K! zS^oIpdOihr-sg_xHnDvB<}@U{XDGVz!)@sywt`(|`AmYp%gScF^XKO|Vm3uB-PHGO zLFO$MrEg{H=bvl8&6XtX1u^R;Bgd0vH_O*D7|vl+VON+iJMI2frXvMX6Y@i}K1mns zHJU7&;GC(zJ|TNQqdWKHn~b+=EgSBf*vrUKbLYO%!8%q3%d8cqAEUF?Zme(MU3fC^ zvGmj~`TPc!Y}S&#dkmb{xL(*y%5RWqxO=nOV!`|RCk$`S-OFbE@>kxI-9usf-;YJp z!y6?0m=}dH?R>6pI-g&*)J_&29s}V zPk%a*&tSmiwm6XMl@)^o>*0q6tflXnIu>~}T-;$bdryv2kaKeU{ML)DmvTOB;`HS0 zt$n@8X3{MNzgnZ2997)U%o~E``;Rx>V|s7Kz%T1FO-eU>h3UV04NKbE71y%7qKtjjyFvs)#ZykI&r3n%4+o_&71$VajJ-v8E(V(?mQW;6+2nu*e<-t-TCa;wgU`5 zq-|v#wq7mX`mGJjdCzp=fBh96hOKq%1!4dH2O2Y6`6atS@3iuM#x-x{c3(@d2YUZY z34``u+wE6mQGI2cfziq S<}oleF?hQAxvXHYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(mfZC&U#<=VmnY?KGJo0GK0URq;D4xk;#o%1p(zPLH<@J|R&xYM zXlN{z@$ll<5z}bIoW*}@+g?{)DNa%A$Ia}!*S#-gv4~_`>#Pu>oIQ)V#d~T)^#vyH zL#t&HHXXE7X!tNIjnS-m*1>ys=d`_;x>Rz}|7YP0kqU2S-B}@SpqdbOjp>;CjV8hU zdHh{@bC?94@Gjz#cl^;Nvf%jwbBFDWT)|9#Kfm6?V0bI+kP%w|$ZM)4t`Q|Ei6yC4 z$wjF^iowXh$UxV?RM)^f#L&#j(A>(@P}{)3%D}+>z?=Ul8glbfGSez?Yw(*J;tbTl N;OXk;vd$@?2>>shvtj@M diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/spiral.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/spiral.png deleted file mode 100644 index be9292c73370ca933a759444a84c0c0ca73dc2b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP{Jv|C&U#<1A&Bugr1(B zlao_ONJvUbN^x;#2?qzSjQsVa;DV5Stp%z8?)n@MW3#Go%eEsPSRAb*}2=#vH!Dr z#MJYH%_9B#*$mZiMwSZsAid|I{bB`IUh7!0^0OK^ZZ&j^p2@%|(8QU?s>UGN@gPuv zDWs7@j#a5abcz})R|Z#9BA2eiv!r U9yRH|0%~CJboFyt=akR{03hkAhX4Qo diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/tea_leaves.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/tea_leaves.png deleted file mode 100644 index 33d91bb92df5dabe68e33d26f8c6d05ce2dafb79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 938 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#N0|O&>fKP}kNWroF4M+FY zAKp`cWMBP}z4b@;H6B0Ecx-=NU0ubYJyl2cRvz9{d1PN*1kQ$XjtfK2HILS9zW=01XQDCsi);+q}O-%nxBPn^T|VXhxhc{ zx!QjDO!v)8fwmS7hC0^z+I{z~_uRhHd-qz`^$Xp%F8f=WG#)$9d*^EBwewv!F7@2H zTy=EcmeOsTOSX1izYt(!(RuAc$CYz_*5+1v+M7$acHOubWN&4quU&t5ufK&!#lhW` zK!%OQ|Ns9jmPO731_xtFkY6x^!?PP{AWo9EyGz8|tw;KR9QG1VUsv`g%+d@hoSeN3 z6+r2JPZ!4!kK=DA-3+>IAmX4Z?y6Qe;mxg$y4@OuI?)}j%N8;oy0s)HcR|Vj|Mn}F z2hW=rZ*BSh`8_`%>tG;FKFKQ+KR6vf&EW%vG5+R<+nfox+mte?y-;;$H!)c z1^P|bpC61i?_rBQ|N3aOh6jh|%=u}JwG0juK3}*i*VWkWc5=qk$x}9pHy*WV5R`Fq zJ&}6naAc(Kl|H?{cg2`mKF*s`9q~cn*Uh@h1wM0ye)AqsY&Sgq{)ouq#SNiq;ZawQ z*fH#xFDo8+h2@BzmF3l}yeUan>=@?EJ+G&?e#xGH2L#t{xwus;J4>G7L(eIGw-`C(k^$u5?}Tm+h=1_fCQN=fk^KUsX0__b)c~ zD|^d4%UCS9^RE8pt2aMipOiKC`C0!g#TzrYZW=sw{c$G3=wj67Re6dBf?On$4S6hA z-CQxJ#yGA1iqnU`$KU#|mv?_?=2quA*(6XsIm`0Tciy_MzXfD1oAnM|QEv(QzkU8z zfi;nvpVdF)fA?3HHN4bE7Z_WrC9V-ADTyViR>?)FK#IZ0z{o(?z*yJFJjB4j%Gk`x pz)~B?FfeG(zFmW&AvZrIGp!Q0hHqxc2Y?zFJYD@<);T3K0RUT>j4A*C diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/thread.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/thread.png deleted file mode 100644 index 0702f834b7d136c984a83f8a4de46bfc214664a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(nJuC&U#~@oc>21s zKVjrxVv;Il-TN0PG~Lt1F~s8Z+lvQ9n+yb40^S@r%Ee)(utqFFZDFGWvzCd%mG?sH z&n#w`>+JVG_4!*dc1`VxUoFLEPt+GscXHr03DT-@ZD@P)v_)=u?t?GiKCJt;*o;Mi z@g2_+Yv%Pg9cIiIIdam$yosshD|>+e8}r8J2`5yQ^>;oI{OIdA-P^CEWm|Z3NXE-W zCTh&rS{nW)zn%Mge*7u+X&Gute9HZ&fKF5`ag8WRNi0dVN-jzTQVd20Mh3bDhPnn8 wAqGZPKxAa5ZD3$!VDQ#Z?+S{B-29Zxv`X9>=HyJv0BT_HboFyt=akR{0G&CKdjJ3c diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/tiger.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/tiger.png deleted file mode 100644 index 9f4bdd45a002cb0e4a174886dc8aa45ba22cfab3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(mWWC&U#<|6l2!=VSXH z2;S`aeB*-tA!Qt7BG!Q4r+uem(kjLi}ki%Z$>Fdh=gqe}W zN~UAak!+yQ3{Mxw5R21qCpz*q83?$3266#RtYudSo{j^hgK86w+{xmMTmw93xs zei83~@3(RA+;i9ZEmz6kznXW(XaZZuP5Bf4rQ*TdyTlcF#IDZ~@%85reBraUU<$+a zXDT0B3{JXbWVQ!QDyv{ntQVPAy5r`e3G*}qu6>DlxUZ#P#RSb;&POjbYCWpTO6>am zO~>oPr*{q<|NjJ~vCh!7a&+up40NMviEBhjN@7W>RdP`(kYX@0Ff!0JFxE9N3^6dV uGPSTWvd}g#ure^X6u9pLiiX_$l+3hB+!_}1u=xNrFnGH9xvXY diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/waffle.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/waffle.png deleted file mode 100644 index 4a2c295bef355a642143186667113aa32050ea9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP{KICC&U#wK0|i z`2{mLJiCzw;v{*yy9i9(#H$13u$OrHy0SlE6%-LSKOUOa4HUZX>EamTas2IMZ@$9{ zJTAgHe>mIj{NE<)v83#ES@=;WCNZ1j>a^S6oMN?Rh{A44$rjF6*2UngAF(yHYaZfQY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(mfZC&U#2mY(TTGoSBqAPg{XE)7O>#2@j*FAWM~+j!+#-tU7`V15w+-wM8riL@=z18U!>Jt@ZZyu@8MX=QrPX&i8O0&ThFh(aq&E z7XW~pP{31SM6hC!@mL=xS4%Ju^lS+mfb-Rq59^#T&BzicG5_nu*lsxh?=cH`20$SU zz;i7CF^2*0&Odfl5r+-BRspxp{Ew`C(I< zv^YayN|zR`m4B5gDNL8GSBvy2flirdP>FJsi3$N*mJq)wMNr;4v9H6f7AK^L6Xl64 zjZ`R4VAojf$L}~!-FH-6o~XJyp-SR4_o9~u(9-k6$s+C=nds0B`;OL$z3p~`O1N4o zPzpKd@8HHT+W!*Wye3JfOpx$am1vbJ5#Q477@I+hGURG8U(EeN!2@Xuv5*~W&Qxt$ zEzH-5@-;$zvS3ZTuL!#eGAX6WfHl#V^RLKEO5{N(E@TK3B$H6WCyhBdQ}8Qtmj;aj zfcF*h*eb)2y*D>`1ok9q=P4d{i_WB$H@xATsl2AWSXDrqxqza}?JL(OEx8%;t7ma< zd${X((r?^?gH5FJt_9p%*Z0g%SmL>#=brs~5*ZyGaUM&X&sW$28ygS0Jctmn^%42m z_YFm>za$>+$MGJuzl!xDr~f$>+xWgZpXd)h$a@^cOFZc>9Pj_$BDmOZ5J1K)?mr#R zYo+wQ&49LDv-hqz637y9+csF_s9BzXJ!vdjglElqNdl}M1Fv}a7XZ^fC|yw zose!F>q^^X)8x)uydr{jT^~6UF?4!@mXj|bd0pjV`mowXI}$|zYo8FO+deV!tAGbi z;KF#WcL&!!Y>u9){h3{mY&fXTea@N^L85xN@m*obOk6p!kAf_RhK6jej4}sp`eVBr zQsFV#%ygpvGFXW`Z~G_?;IihPIx&pIW&6kTi5i0O1kM;Y*=+D(m9}}D%NeO7`1}P; zlNkYXaM<1_i%OP91=Y=H)P-BawLK{TPGm|a8)>SeHk{ee1dbR<0cj7iXC0srWHWJE9w$H4HMQB3OV diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Created/zebra.png b/src/main/resources/assets/customnpcs/textures/cloak/Created/zebra.png deleted file mode 100644 index daebc8cb9fe309fe3d00f13d67eaaf575b697385..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Daybreak/TierII.png b/src/main/resources/assets/customnpcs/textures/cloak/Daybreak/TierII.png deleted file mode 100644 index 95a5d09431a372af1a06a5da8fda9fa247ea97f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9786 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 t_^>AY5|o{ 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 Bc)I`q diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Daybreak/TierV.png b/src/main/resources/assets/customnpcs/textures/cloak/Daybreak/TierV.png deleted file mode 100644 index ec4642fcdde2d5837b2ee7b32d4f0a031c8f51f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16085 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 nu74@le}i&0&k%-mCJW~&0^%R}jXL`hch^ zBqW}Y*o}Q02iztUMHW{9;Zjj(MGFGrTXxsib&T(hudzcMJB~{WF{K5yY9y+PRIMud zAAX%Vwj-lTec&mpuBFlJ9ZV0T`lBJG*FzOEE>p)8nS8w zt?6&j_r5^h-N1o~Ph82pbI)I;)bhX9CV#WmA_Lyp+#a-!&*Gqq3*Zf<4x9)k0yrU@r_?0M$<%r43 z2d84>gt&yj!LD&0b|0|}fTDPe_1R}=&uwG-+D~|L{zvrB{(!;NpV9qvfbQHt0?0b* zqv|IRP=^p$d|)byhl)X9BJj}~yMV-hXc+)0QKf;`L}PlBgnoz4EQw~}rv`ZJeuAp# z(ok$7=Ug3DoGQ=a*$InEm>|UQU=KiK48S@qQ1G-6pDrOL^6d^8hSo8EX4;$;@JTl3?fACNT_+fr1_F4sBUb%rUE`Eke&BSWCiyP-Oln7GVSwqMMGi>G zoq!KKTyef;(R@JCY5!*k9F{r<@PMm}O&WAm z$4-dRKg7`xvn1KVQ-(!qzy%SRb{mz$Rd60)|K*p*X~0X(8|X^8b4P t?+ecUolU?dU=y$j*aU0>Hi7*>;2+Et%|`Q?L}CB{002ovPDHLkV1nl;H+}#B diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Angel.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Angel.png deleted file mode 100644 index 0bd73c2ec4c0395b3049cbb7927453ed22cdbfa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 891 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5hd`K7RKu$QC@59p8c`CQpH@%~{Kw+l|qGf#@O3lQ$mfXUzvYqN;^X6)4L0wr z<#gy&cCcY&sbcWo);e|nYTXU9w;f0^>a2;6i!*v;w#_o>=JT&}7{Yit4v0ChJXps5 zX2r(8eorF5K7O36=1_MhkY}U7vO7EZ3&b0C*b1^Mv`8~%MA)xiul#cM?Abf+tH1hp zU8u>>?#=Y1j;+S?H<>@W!}f8r>3z^&1@3+RWFTN z7Beai{KwEy|PZ9LpX**PDNICA-5My956jeq^+$ zbx1Sr(b=-1bk~mr%`Th$y9E|_l-mCJwus3lW#tJ|JuQ6Pf8Rwvu;*ADTPt>+eJwDf OFnGH9xvXPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0005FNkl*;MvW?$Je%QBm4MNwFu=ac`1`WNkY^E9(eq5b;! zGrwN1tt`u-?e}}z?RLid(D0mA!8~Jp0kGL@>~J^?t?zqln#KVM0nBM70Wjmo@-TnhGr;mC7$p3R%Spd`kYJmqpJ-}?30N#Dl$^r0q0207%-~q4$cpx4^ zj8+N&>z$ZmluHh0fiVDp_#0uYRtf-7rt$-T`@g^ZP~bQY1H|75W3@5>R0f)AoDyGc zQki!jL{fIH(DwpBVU|*kaY;Z*x(aN2bPDNB8 zb~7$DE-^7j^FlWO00ezWL_t(&L+w}TYZF@>%}3t{!OtqFAS#Nu;EF4PyNIaZu609P zKDeObdul~(eO6nWCf(CCCX+OoY||{0wMm<{siv)MU9j)3Iq%#dkte)AAOmyYGMTwE z7tZ;e-?=xY8k6adK1qV#=R+hCK{OiuHL}?(5{ZQNTbAYDMko}5qA1#2(|NE}^Erf8nTxf4^*N+H701pL_dwUTh zf#Km{jE#+HV`gSXy9$DpN>{2a2n%t6m z8`BdLn4lmzl2zmJ-vr3#^BU4SpsTA(KLUt~1^s@+Nh+7gpg1~; z+1Xi4Q-B{7VFY z8@`lE_{vZm|L_4rRx1*mtB@B~&$BJY3I+Ta8No8sNV3X;yh@u7^!FphY7dg=cM?wDz75~jtq7eug(Sb} z?dj2v05Su$q4GTue8MTw=4QD0Tt0CEqYob< zdhQ%LR;_}4&mKe@8{uN0mY1)7$RsXEWmq*gi8#)jK~eO*2s>KZf9VpEw0MHggaC0m zMt<}N@7Jz{dFfIl&YnexVwl&jN87e-h`f3QNlz^hX=#DV;L6eB-aB{TynY=8-e*WO zMl$NNXDF~e(zO0B0a*3A<;(GQ!2(21p43EY*}NHT917>$T(i7<^&|N7DPm41hG}`V zqXP;SnGlMb1c_Dx*PJpjpqjB9jyq`ZGp#uldcl0RCyzkty1-D%&N__pLj2pn2g! z1a|I(bN6mEuUP}zu3ZRUxB$bO3+#1ttks#Aue*PQ*wn&`wP7<}z_Cf$@`*yhKf*_xTZ{CE9nNVK7 z`q983vvT|Lzjy()sR_!xdr%mJ?t=#rq@|M-A;LK)ZQaYtO3aK1&k7RX>D;sl(#DPO zP=w&&!|3O;z=H>HFigwKS3hd!&PCmlC9sjOpIczy*fB_K3(M-&XkD~OBj-GR9Ifni zD+TGHGlD$!+9`;c0(8EB{+P@zT z_HqM>)iLBOD_6oog7qs_;4Sz1ZW0VK7i{OxqlqohDxNVA-Fx@KM;AEhl1?6|%F7!t rV8DO@0|pEjFkrxd0RslA4JOmScHjQ+Yo$Ze00000NkvXXu0mjft_W6> diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Flame.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Flame.png deleted file mode 100644 index 9370eb3d59f55781fdf305743fb963513dd43e54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1114 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 Ol)=;0&t;ucLK6T0+`d=< diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Moon.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Moon.png deleted file mode 100644 index d1498700fc47f9848d04510dd7b2b6cb87bcfce2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1169 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{0btvy{FLo%GNPJ8bkoGxTVJ+z8kY>UqP{&+Pn6` znffXdEuT3&H@mB5ka%JWs$dlH@k4Dvwsien#JM2?x}TaMQ*iX z*S0->&M0M^jB4cAu0Yp1yC&U(1BL=NceTmPE9=l(BQ zf7xqY>Ccwedt*z0}ng4?;ucVH> z|F_VeePwrKvc%LcNQzu4WZJWJv4rtOj%V-BDjQk1zB#NTw?sa{a`r(drM83umZ_pk zEg5azRedR&GyPC=a;(Igznu5}xmAAJVd2+sZeH4*-s2BGe@#x)YiaKf>vxF+=vZJ!f}WU}OXs71L8l6wpBOUU_;Tm^e)sa*mMk^0N({0G z?j5LmsKIz+%P+QD6MR$!`tAs_s{|K1Psv;?x$NVM`Jyd{>MWU-G3ZR$ectYXT*1>% znVC(-it9hiD15JXow@Nd_Xq!q-lXOZeV3);I;roJ%glAm58k_*|BOXKdZ(K2`p4U& z1RrM=`{s!y@E1&B*mGU;Q0HTL1ryuGlPe2-q^;|!i>~~TbJsBGS|u#+`7lj5W#blm z)&%1>d!nXWGwoshWXP8dOem-4ysRwauiwG`Hnx}J-agL$?cDbs@?EL@y3(gvXO7d! ziH1@N>Cje?C{Qp)U#>xzNavEAgzj4fVfuD<`gy`92jh5F?lBHbpjR;}Nz z)j7aqL1zJKAh z0#0eAg$rC~#})N4%(-Q;W5(`mtESeX=bZaBMb@6(y5-l;TaQ<)vr=NZa*2SItv8w?taZ%v=q-pP&15^8UOS?}sVhd%qv*)wghG(A^;miaS&4 zP!)C;n{IKMzN}fqx>Y#q(oYxeEcGi(K6i>;u@l+xkDZZ;`N2bPDNB8 zb~7$DE-^4L^m3s900OE>L_t(&L+zJcYZ_4yhSy!c;>Y??wPq=a5pM%+u_fqDFN!Gy zj2B`d7xtnd1tGtoKYen_-fp)mPMb!dP>?u|HAZd1i64*0QZAR(5wqD$_izmi z?*LGJ0DQQ)QSs}C2MqvFaok{SU;q$`U~3cdVzD@Mfjrk-Uc24a8*78@N>75l@kVl;pL^afek$XV1IJ}aB8)h0$47W zdhHzm#4-3j&F9(zzn-7v+x@*(e>fb zJp?qHOJLv!x?Z20Lyzj1YZNt zb0;c$4d-)Eix+uFS=9#tBMLU1C|5otimjh6d#NZeJ5dH#ycmfBI4FC{;;~fC1jm-hj zbAbzT2Pgo$KXm{?ae?;$sQT!j(%b`pH39&DF#zD@B6|S7ytkO07*qoM6N<$f{u|*F8}}l diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Pain.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Pain.png deleted file mode 100644 index 32b5bbad168e94c4395dfed5705a993f189b2af7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 918 zcmV;H18Mw;P)Dm4qk|%fTEwqNOb7`fA?Q$v(m?_e1S!RaVu#Sw z8Yn5!q9C}q2s$_@WXPbn=%6S_Cr5{jjv2DOp69(i*BXzIVmO@p!jF4$&zqd{{LW`0 z5s6k;SEb!nx7Q?-T#rdpwnl%-{oxY zhg^8{Q!YInOZJ(l@-Jd#o{Y2(aB|UPF6DC%hjQ}X2RYh&X&BsK)5=?5z<&6`E0JQc zD8)A-)%T`so&ZwMNCRneF^76o>c=L`b-tz706>9XSy_=vrJ@Fu2O_!W@hsSH0Pg^= zyo-ea7{cs0cIUNWaDz=NZ($7pP@#+gYiny#tybxUn!v1}p8bGll4}gO^69q;Yl5QG8|=rP2U8ZVlMj*hmZj5IE|s0d{i) zc>Zg=OfbPNmlLhGhQSRst-J+0`yWuofX&U##DHrCu=X)FU~6kD8GWYvqyZR39Vfvg z&_U%btO2_FvzzbDfO5I~PXm(Ny(PdC6Ud`3RR(Z@!2p2R0GF1QbPwQJtJTzmNdq)@ z&j9uapfMnoGr$@E3bTOj94+aC--QAUb zzn>h1zyWSILCrPrfCG&=b{SAUe%BNnPzRB>;7-pepg{S&1lXf%>~lve{7RZPMxE=`(i-T_XTIt)S7r|K%a zxVR{%+h25KGntGGheN4G=Vd#(E%VW3HGomYq~+yh&E+$)7bxniA^aCOa?7~lfI5i0 zMWfNsiwh%Hi00%$)R261O72HDr50UO0{~=WZ-on**2=W%L#zT;|a5Wx+yoIar5acafjn7iS shpW@GRPf>I^eh#8xH>&cg&k4!3z;A6+*iB|YybcN07*qoM6N<$f(S;WHvj+t diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/PinkSwirl.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/PinkSwirl.png deleted file mode 100644 index 5bc9a9f2def53450561dfd92f320719d018306fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 708 zcmV;#0z3VQP)N2bPDNB8 zb~7$DE-^4L^m3s900KZsL_t(&L+zN$O2j}AMe7S(`P}+`{8khk1rujLPY$Xwoa2PZHTk$ML`zDOlEFE-_y4$nXxpo=F;ZVmDjZ`{Ha@8OgCP9&iCk4 z&~DrRUv7%%zqy%H2Y@LCp%Q?Wr~{_dDhH~=tJ0zgZlDYf6Wk=q~?0Afu7FarQ?gP6b| z1F$avXazu8V1-P801$bM(FPdTD?8ks0n*Y27}qNUk>ijF=$gU=W&prIEL&ilmUBW4 z!7>5FpPgsN0YDOT8~hJ|w1UNPSOA&>ykY_X^fqP?K(iYYz#CuuC=9I3%DZ q-3Zqn5)fgRYOZleKux+4uKfclA}pL!|EG=s0000CsNP4_CCh7G3T78X|a5_(iM2K9_aQa*F&D zr%V6WpUXOXLtayL%CkqwY41HZU;BT4*3`@n!?w@eig6<0%XjP)c~mv)^Gvmxf0Gi< z9y2XWYh2$m`Tbw6(@W-{8T``d#zuG{?XS*e!r8uJ!|td6NZD=S=1Pddo0wM z{kA4FP0!&|W1I0qT&n*}`wuT=nX7*m^Bmy0CYZ6i_rYzUeG_l^sC}pnm2wdMqEhic zrenUU6ko=^MdjzWx`~?b?wHzQe@QBVp)EjmdA2bFqq=H|Wy=nQI*&i%2lprov~Yf5 zKFm`wi>G0C)v-CRcpQAfot_KbSDANdd-|$J`|Oe*t^ITJYdSA;#WMMj^aHCLQYPG} z{Fr?|j@97#UB$JrevcSGrXASUVt=87v1dl*HZ^98%_Z+#Ip2Q&Jz4g@GV=?@Gshnn z#$4(Me6#1R-BY_kiI&ft3ZI1292W6U988y5+_p?sDF5p|}6e&(S(0kg#{v zYJ=xf?>?4LkXks!T6XSffe&(%cj!0BvbGq1@=j_?c;V&CcHyO`+`$c+0^OS5;uX)A zfAPsIKIv#--5asnJ%QzTv*rI_A4q7m2%lsS-m6#Pwq$1059y}4M_G;pbIxd2oMMy4 zP+VuajP-06(A{?)s6J4g&1_!5S#k2&0p2*KxJ{M?&C?smk=ouVzD4EElG{hPqlEG< pVP)Px#1ZP1_K>z@;j|==^1poj8zez+vRA@uhm(5F*Q542!#@Ekr{K${Aq80@eVI(GL zTAHD0CMINviD48(L_sZzS_pxGEu=+3fzYC&h0wyJg>6h|VIWw3R)5Ut{?5#+5|6`&4(a z#u3l|AmV9NOdcH0HW=){w(4m!2zcFIxDM!Rb0G8mrLxcx$l^eeu7K1^cNEFH+6|&0 zh~J6-b~@1ilg~c_no^QCl~mwEWwO+6){6;QYzt)OY_b(L6Y%+Dps^Zf;vrzRw?q{( zT$gV!*nw@;(`FEW{PQ9anYmD+pjL*8WvL^O0`rV@t}CttOm-EouMjZb9hcQ}8-&gE zl_-(k5kT*j#3B+mfT`r_rGzBR=N;x502c;IRq`PLNS)cRa6T?;U71M&3{iZiUHl`! zNc(a{RLTrs2v{3TNQL=)e@`?C@Jg8in`}+C0#XkN_|=mo-v?7IW7-8}j5Zb+40d2! z^|Tp1OJxDXP=kPTW&&sf2%y)Ag#Z-7O8jzPLW%K;0EQN_E;o|Du`{Z@4=C13^XyLo@Nk<1 zI5Pr5Ab?i!P5}^r0=65l`35vZP2-imX_Ub>$!L<&diqF2X|(+T0RBBK P00000NkvXXu0mjf@AcI4 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Purple.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Purple.png deleted file mode 100644 index 77c2cb44feec185c9cbb0322cffe5eb642e19dbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 858 zcmV-g1Eu_lP)N2bPDNB8 zb~7$DE-^4L^m3s900P!YL_t(&L+zMdPZLoPhI?^(>)$|86bcypjsXIJ00|!f?n#Uv zkpL>T7@E@3>bj|o)Y@RI4e3Q=`X5K0Ne)>mdbbyo?8W44x6R4E&%85pwkdg$+BzE9 zl~QI;%9*#9A{@_2FqYMOe9!NE{O`A^{Ix9+Nm+;#f+mk9WvVo#LJ?gZ|DaKyC`j$@ zq09s`GF_fl@$UzoNp9e|99(}Xg~4qp4(@1ty!B3wZ|+I{#%uk~f_R=$0jPNQN@l}Z zX-pKQdGA=G{VsGAS74Y0P<6X17~#Z9dqqy&xf{;! z_X9wv7mj%1>z%_37npNE;I>sL0J=|36u??%P1>#?b+@koC=s$tcmO{#WflK@qYUWv8x`Ao+K|)x z6dX$hYBwcsI}-%{YL@Mt0|G^9o?Gv8VuOf&l2H z1MLM-0Ej1Of&c&n0JvrakU0Pg^#!eU0MG-N1_%cLAff;mc?1B+IxBskJ@#44z!U&% zjRO!2goev%^W&NZxY^s(h8P8aU=IMnTm!(Q13UmMPxdJTg!^^9yDqHr0LESv0G~}wfhd4z zAK>^)6YM0B4zQ4=IG-_bK%8_f?43Bk kLYCru#>4?}(zUSnAC<_sBcrnsGynhq07*qoM6N<$g1Jm*k^lez diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Rainbow.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Rainbow.png deleted file mode 100644 index e1a9f63a3338d1eafb574e7d7ab2c472586e428c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 842 zcmV-Q1GW5#P)N2bPDNB8 zb~7$DE-^7j^FlWO00PEIL_t(&L+zJMYg0iOh4Ty2+^-}zA>k$=iHK0qh18vbD1su2 zB7z7Zi=s$y(M6F`DI!v&gn~#3NGWt7R6?bYQc$4~u~Jd|py;9mkuF?zRYW-EjG5b{ zja_GS4!q1Hxm-BUoOx#w!1X{e6bivG449_bQMPTvvMe#@?|e?yUe5+bgT;UjBPtq=A{-8HLr_IDbg!=u zlT85C%Mq+S_i*XsK7^;P!1TVNV6R}zcq9POc)NMmbrFljL?x3+F%pKd0G6&r(Rh`{ z;6^{(XEy|ZqP>a-#`G=#G%AhDN+c3~3RdO}w-}VA{CfvHFZU0pxNy#N%;zp6925{h{^x-WT^Y0W7ot zun7_Xn;-#H+%44YwGIF@&telK0D>R@&N&iL>-D`a383C@<8A2=0QLZeTD&@kr&pkx9hfcJ+S zyu0P1{v;ueL3`x10MM-mF!D6dZ9wC4WJBcmZvbfC1SNoZtG*`y8s?~E6YK_{@a=#P zKpumC1Hfai9RNQo4dC;Vhx2c8uu8{$0JG*|R{*jP&@ch8AMiIN0k8?m1hfOV9sa%x z08PsTv;$xRR1!d?Edk5337lK$1i-7X1i)LKOaPEb}{5yQImWFln z7>wj6l$Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0005-NklNm@_#U?2xW()3H%@137)JB;gLbvO*;QHkRkC*>&4OPtkf zzNd@Wr5)Z6R^vDh8Da=S42J2;axSh*T$MPj5dNbLU>VF?;|4%vU&hxZZcE&ic&g{F z%Q)RW?L`Hd5`e`s|6I*G-q&i_1~8?4EZSAAm~;S?xv~e~qXKxXFtmd9X#0Ln>wayJ z3IJmk&6LvrDj}Ny2&P&9bK19}d&mkvNgH^~e%I1}DaX%hDh44~yR_QI%t%uKG1T;~ zFa!Yr0s!Ys0T5LH)Rgw8-UCoN0Qy`2AnP~Pc$iZ5u|Js8{??XB1wctN#xP@!dfBQmNHa2=UGH(tr>Y6Pv0P!mipgFCfNlTMvBa~&Kz1ErH zUz=X$H-Cuqe0YXuF90%RsplG(3g}5U!?TwP$dIL;Yg{UzC*2IsUMe6%mU^ynseqnz bGd%kbT04~7k+Aui00000NkvXXu0mjfSZ4{K diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/RedSwirl.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/RedSwirl.png deleted file mode 100644 index 9ef6315fc52f612c27b3ed243496471a2f167567..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15483 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Redstone.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Redstone.png deleted file mode 100644 index b03cec6ccb1f80d8a498b47a91906557781a7ee0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1069 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtZVz*NBqf{Irtt#G+J&fW*wa5h zJyShH1A{L`3mF)g=Xkm}hGaND4L|88?I_2dJzKJLzqrk}itWY{w>O>7@5v3a8dTVSeTvx611BG}g1VYb>X*?XUA){Yv-mtxxaQ9aDjA7v6dQZq?uBoUlLn_42j%w=ZK9 zJ6RGFF4xyD+Nj4;Amg63b54z|#e{p;u4yyg`mmoZlk3RVi{G~0s^)dP)!OvQP*%)M zgYlPwH`8{7>cS$Wl_6f24oEJ#6&q8ddf@5NqcdvqQ(ag6{{5-tum6YKdGr0}GlVOA zVP}~)ecF^+rojH%>d{dvb68?ZRBUG|9)MxGqg8g;vK7WBW|V34H4;2G*T@4l|U z!}}^X=FXk^=iIs3Oeu;Ef;TTGZhK(v-DJ1y@F5OWhReH8zvg3^)nUV0P{>=wxKinw z8taM;HVN{%IUX`w@4G#|@-)aj|G|G_NQh(<%yJMHv|(BGb5BWlcrTMh#+3bu>6d*R z82WEE{jI%Ga@Yi{kgbuS+@oA*gX5j#V3vhqIhrQhJsEF&o&AFQ&g4dh(vGj4k%#9s z{@r8b+ukbZ)xfuG*ZGW^=?AYocW5wkscd7||LnQyZzqPbTC=lKv*dTzOa3-K(e>=i znG&uG3^`Zo*6Ah)wOd*mt&6lTy_K%dQ@bUC(Lp z;@8$F--+Hz+HW3YU4AfO$?Rp^@%)e1-@ARd{MD=nPcp1szJyk>GcB3OYUxrF)L`V1 zUC;m8)}_YAI6-F_C?uUY4_y3~m*^I`2Q%v&ZZsp=1 z9g8Yz{ATlUEBClPTAq5e;RyeO-}Oi0eqH!>?ben989hQh$21NSOT9R-{U76+?5ZW@ T5;l*4xtYP!)z4*}Q$iB}deGMp diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Skull.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Skull.png deleted file mode 100644 index fed7f0030303ea9329521ab4b60f57d2b90f82ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1008 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn~YUV4mga;uw_MD>9 z+2}Iqy@SyXWoFHp8kLeK%mXAOFFdw+eScT%b*Vc=-}l$%{k8f%Z?AQ>?fJOhs!R$& zK|xKIE(L{zh5cKwa3SN>t5+{Qn~`F%Z_l2XUtc0aLR$X(`SW1%g!lhiBXqvScNn}( zVb03VcD2aN$`aBM4m!TcSDA~8Yr^c=(it0Cmv&EG!+oS7<>T75Yculm#eePfOL>#zzQ!+0<|Ko=b4S)aE_Vo64T7)@n zV$|BVeS7!=iG9hXPo6$ymC8wcnWXxf$#B8GeRAyV>_2|}aVQ^)ygyUd z5ALu{dIHQ5$Mp5}CFJGZ-QC;ISh@1^@Fb+9u!xI`&zLjEM`D3`s~)3WCe!iF`XOuu zmshP?b?DtYy=l{@8`{|Pynda1=kDFa>T2oPvuAHIEK0lD@MLlSYz5cL4FO>dQU`h` zWY1e#UsKaFZ=T$qef!vUG5{^LTk-H|0u+Xfapth>43Y-ncPP&n1S-hI8Gzbp@4`oi}er zR{BrQ5L;LfE0nXj>x#g)_E%bGzD7kvXc(W4Ty`PDq-*L_Q5NPUMnC2)XFV<$%O!G7 z{r43CsacaJ3xkr7ch;hH9Urb8n{@T&QU+1)z?T1+BF6=}{N+yDNjVDNJa_68m&uJo zmyUW}W1aZsO^)EwMOOu;ZJf2}k>%!^PqD8eW;x#Ao5~ngAirT!X`|#F_BAQ732fgP zwIju69IQP6)Rji6lyRr%74eN diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Slaxer.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Slaxer.png deleted file mode 100644 index 321340571353fcbe428b6ad89c3c90b9c374274a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmV-o0-gPdP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}0005~NklX{qoN9_ z8{dK9&(gCl2#6!GTy(=D%XicB^K;MLIdl8()eDaiqz!k~gu7~@x* zkM)2`;G_ni672*J0^IKb93X8J^Er6|8uc2sU%x~YR?(=}rUu|!p_Dx!3TwDL-@~u7 z9sG$u;wnBu6i$aAEkL7QL+{Hw4BHWgU$-!5Z6fY8(Qkc7Dq*GpqOgjq_z0ukArYkd7%Il wfC5ke3P1rU00p1`6o3Ly017|>JWt#W0CrZ1mkE39k^lez07*qoM6N<$g2Bc900000 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Sunsent.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Sunsent.png deleted file mode 100644 index 5c4a219017244709a721ab91ae036557f6aa03f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1393 zcmV-%1&;cOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000EwNkl4-;y)8Ozr|on) zV-*EMlAQzL6oQa&h=6i7A%q-65Jl9AIRIKkr4|*@)_Of@m*fU(bv)0<{oi*!y*0=WT*=dB+T36QZVO4!Es~YyI%4ke# zO>>mhO%e6k;M6Z9eE;hIylK%_T7fhzC~c(#KREU5W$=iEjxluaIhmW{to06%<>?a$ zQ8F4L626yLGYdq8q-PbfY^|MTx*}YCvn6ywy?PuK;(y3mIdOZY_V2plHQyHA}@_}-KgPUvj`@Qwt2SAzd1ql>C7 z6TGD*02gjN#?=_1TuR>EG5`lHaI64^Y&5hFQy)G`mG1*C-h4utT!j@9eub3&N-6mU z-*K|c6|4~mndWjbl`=8}%6oDZG;;--n2!9oCA>jjjG{Qn$#G*gm0__|V6{|YGP%@w%>d}}MA_wyOW<7iSi*m5hcCcMt<8p!a{f-^Pzqsii2TmDKSw`j*|n0 zRdiXM^yXD^rKpDSd^a)kI_*@zi_Lw!Xz%CG?j!J|2A)djUp>kGvnKxTKg(aeBmB{^ zPxZ~49W2_M%uDz?(k|H7b5;8H3o7~1QO(mrH}h5v0oV{Z$HwS+JcHNSbYPsO{bTf9 zyT<$H&*DFNoAAk5d`E6k8~;r8t+v;oD{V$s(nwZu1BSAem#r6*JD`p;9ktr2fJAW5 zp-IA{vxG)w*grYJ(DXF^kEYmq{vq9;FVKE^4)2khs!vzig|gm);x=QfRIqHw!BDPX zt?9;A7spZ^L+|R)D1ejq2^^c|(A_BpCa$RfwqM#w_;g1Sz)&kXmp%z#eG-7V+L{Eg z(Ix=$)Un>ROG5xowc8Nt^1^)f-U40-(i$ zvDS=IXF*?W#1gQP)18YcAOPx&8Uk>|k7uln&{U_Yz^!&dw*|mNh|bv^bj=9>8MllF zRiAE;02mYi^2KP334oXY*d|wD*oO5)F3Mp6uvgI#fV*w9%!CL(>>~7_6aU<1f)511 zeF5;Ohpxq4>Nw%?Ob5t5r=VQ2qFk_GIAg+iP5_JwfXlg9ujZj#6aeDU%!iQYn;>nA zTiEi$4np5=#rJKPz@h|R2&vCHp7ap>u9MbBn@M;LlV;3QHk6wZbX>tWVIljfybHdP z3b>PpaZ^SsodjI1*DR$7S{d;ub9+|EgtdC00000NkvXXu0mjf7vq;k diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Titan.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Titan.png deleted file mode 100644 index 9d4dde8483610bdaba47727baee422c66712bb65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1245 zcmV<31S0#1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1ae74K~!i%?U-Lo zTU8v#zqho7mcrJqrBDnEp^QJlh+!BT-Q1SUOcRZ1a4}Jdi9WeZjgQ7XIOBtf#s^c# z5g?oqG5f{qFnA~MTwgU_J~j@s!;C3^9POP&%q;b)>J}+;)eu`vC8imegpd1aZH}QNLzrfaw45ZUY3y)B?uZVG=c_N zoq!snk+#8?KdU1HH2lwn>l(DUU!}=^?+M|pZ_ksR^oG!DHlWS@8m=r?(+Bwe=EW{2 zE<==obVf#swIxznGRp=@Vi_Q7+k52IE& z>$6OeGxGt&PrZlmnGuA2L0pVU=-=5+6@RT$fcxKmpTRTx+VIrdKi;$gZKxvHYOBQF zh8Qk=^(KCp_TZcI7syUc&r#d{J0u#z;pxqbVB}gF(WC@_FbSVO3Xd;LZM+EbG5q4B z21o#o)c`!*Z-&!51pCZ~WF6j*@B};m9or16CS5B<|YeSYjYjN#Ug08)f7f< zY)Ak;Iityn$mJ;F9xrgoiv}?QT_T99>?Ma&oDiQJFM`o%idLQ*U-?ipPM)K>3^?@I z4!ZC2d;cz13t4MJC0UQNk@^m{DCc{Br;Q37zxNkc-(u2|@vPu|yilqo16JMzIG=l! zEAWjBxE#;~eSf|SFeanqR>4mIAsNS3^H#j_>DY!Zg6jhNQq9LN?#gptXj%mq;J>g^ z-1Gy-h4!w>HuPtgWuT?AmthkD!X zPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0008CNklbYC8JKHwDSL*z@J;P^c_P^cz`#QTJpKC=&R{o^0!bdOPmb(8=_My~+PqNPfF7St6 znjL&>@3sgKDf7F{&!#I8Y( zpa`)1mFH3YQ2N-H_(msyoXs>Sl2Q>6cLC4* z0_}b;A~tnFlb}aok>m@I%#&fC|JkD=KVz@=xkh2NtmT`Q1~KkJ0`~()S_Tj9#*GZuKxod_6{ z-3(_>3dj(pF~4zAz?kf2ID1k+hA55sjgtb#WH-avlL9hCY0Pi@?-lS53#zWaMw-HI P00000NkvXXu0mjfJR@j( diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Waves.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Waves.png deleted file mode 100644 index 99972d2c01cf181ecc92010fba674f5ecb8f6b98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 911 zcmV;A191F_P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv00091NklT+G!Z;tdgzAR;0nA|fIpA|n3l@_bXFiAJFz2gNr#oxzZZ>n* zZSJ1i{DT+^k76u8bz6E8*SOERGXArcXJ#28{@Q}u@Zw+5tCwz!jhAj~&)r5=bbl$t z4==m5G`Kdp<~FtwqqFVSz7^M6H>E!ZgaCkeD$2`my>{DvDgf9TOCuNnRP^|3{0#uyP&r@#0Jn_E z?re7e7+Ah?PX$0ZFp}vUPyk?g#M250W@ab&lL1!%P<1R{0937@YrT^QMZwC`0{;Sl zaCQVha8M!;O9mj8HfgKkv;x7$HH70Bav&`L0+7m+`UL>(fIA8R=1JKcw~+i;o_3fz zbeq<;2>^k~=>Py=WoC}QU0IrQ0G|thN~}Z@cI6m6qHEn_og2>Mp4uZH07PPK96)su zN-Ip?iGVC2ShhQavW^zuT2Jd}7o4E>$OQm#*c_qQnjN4xfGv>E1prl_R<9$p`X@*& zKpxCo=**x)6G7PNCj!9U&Iu4fR21QCX$U3@y4u>R)K}oKmdelS@I-sCo}TCUOZDd; z##X36OyhtoFIv}orupTj0Z`K~OpOETvR0PoHV(*Ask+{?aX?*UvplzPK$c3?^`4Cb l>LQ!vxs3y|RI0A`{0&xjv+APZ3DE!m002ovPDHLkV1j#9iZ1{F diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Whisperer.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Whisperer.png deleted file mode 100644 index 99dd4d0780655233ae5b5d497387d649e11773a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16021 zcmeI3eQXrR6~Gs}MXnoY5s`8E>g6mx46Jwe?)E;`cZWaD#I|~leYnB~we{ZaoW1qk z?Qy%d&k!|EAud#uv_P9CHBEx*v{eL^kOD5W4h_WpkQySTF-d3$X_7i|EIDapNJ0di zz3&^Jr*1*&KYP;M?wdF7y_w&eH?#N0?r(0ocTw^3VuBzRHPm~2@LC1GhN6Y=_t??z z?1h&vMC#iWf>?Y(`!4wL#>FcLqVjK2Yn$5U{Te68p$cA<{h%Tiioo6k;oKaH@Ip6G z4SvumgYnEl~QCoL4B44ir|B>>x!d z#z!cof~N8ri9*^Y(i08Fhb9UX2!ap@s|vJZ^4dkZWK~wWFV<{UeSNpqNKnuJ+= zDI_xFgmdL;qkvcCXsav--HBD!oI+@*t&OiL!}@JfSd{yeawmnFWb&Qy20Xk9+;BbG zN!mox)>g*KF(%FeMV6!KEGLPch!3wUN`d}7KFns0wr2at>WTV*^&|2sKQAxYeY5aYM5m<%N= zNibFM!mZ&ub6Zo2pyW<$8=@>oB9{qjVoU-{Gk!9_Ga|__z((@GERv!{uv!=!%?K=T zQd;ps7nyM-*G95^4%Y%Bn*1zG1_OZR+DLjFTyj&8onKr6wYuV!T*#%`>S=x=uxhuJfnMBG3U4U~MGrx3h_f+XV+r z`fb2u6Z|&2$zn!4L=ir!0BxUj8B-f=`shlm?c@rN z@7EkJXlIyP(6&JUap$yVhLyH-COSy7(>Xr`v&`p?(bomSxNS7yD&A{uCyE?U`}ioR z?t~l6e0KPR*IYBy{ePmxi2^=>L}nZRIDT3tfD;6NqjqwSZF% z^UGW!pShKls@B<+=+quUI9SDSMe*_Kfu%jGEfYD>zfG&gU{Aci!%D*s#c01t(`+?r z+KxBPR->jF%ddwe)eX0~_&|~7EGz9vDRGQ%g%9<>ZDm!i?T)S_96fnb|Qg2%X` z?I%`C(gs!JHEhoqn&A-R!QzHlilkv8RauYU@y#&N3Loy_{|YMo$70q#ncl_j<3fPoMI9HO52Dp^Awck=jtkER(dxJmAb3&7h3A84bzBG# zyr|>C^Fg#aE(8c()N$eYAX*(40t7GWxbS=st&R%;f){mMcs__$$AtjFi#jemA4IF; zLV(~!9T%PtqSbLBK=7iD3(p79>bMXfcu~iN=YwcT7j;~CK8RMwg#f{eIxajPM62UMfZ#>-FxZo%t&1kpni z#AF9Sa6cu8W%8kKJ->w@3Mv~s)vdADrY_y{^h)OL!8e5)?@u;9Q1#nQj|?C2{pB5B zOJn)W(_^1o&aU0y_x$}=`$qQdY$+SBJ6<|79(-=<_18}wTT4H9Zt?y8i-!-J4-nIf zzgPH;OHUrDDSv2u`Eho9`vGSC@VjRYo`19X`r{}6_36u0)%I6>#gk`Fl>B4pyyM=Y z2Y0S~@5bukyKfyLi@XbtymWfp1Zz@ntr+T%I;4`%gV%(!py)O_6h7 z>p*GQea6q6n^y>vm7Dig6+KySq4e_S*VmF`f7(+|uH8$Vdw2!GY^f>Q_Ucm$t{JC1 zA6zNC`uooIlF|Jiw7gwl81@|aaKq(I=T57 zdBj>{Ma_dhd*;-snYUIA?0B{R=a&m#-2TzXY`JLM`{fN)e;zCS%}H-T*YU6X@kc|7%RB8FD~-M| z)U>XqXlCO@N1tuSH}_9G`r^W>jSr}WuMpOOMIEy)H{ZDFBH9m?75-r6v{`#`yrHhi KbE2l>yZ;6=Yq7}y diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/WhispererBlack.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/WhispererBlack.png deleted file mode 100644 index 2a666d61a648e7958403198dda14c7b40b726d8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16395 zcmeI3e~cVe9l+m$rRT+-wKTC5irXc{o^*D8?9S}Yba&gk+v44oZO`qIUTeh8kGFT@ z?d~i)bKSkuzzH=%Qi~x4Dm~gNT%uTdie4LIr7BPpiN%QYl0r&JiApg=Inn~v>YM$& z@AjT2^bccZv%kLY`@Y}rd!O%n-#7Ee+~2d|^9!1nHUj__bah7K=yxspxSOs)-`{)e zt{v#-L9e- z3hdX@Vb9w?Kjv}kTG+Fhk1?@K2OQ8lN3w9!$cA2ZWKb0~&zeYcC@&!gDQL;=d@7kX zrF_^^@GGJJb~Ej97rI!3VNaVK(A^j7ad#M5=;plwr7}Xm9T2@N9|-sZtK1yJ@-*Y4 zeGJ9nnrc?hSh|sR+kR!m7_!11j~%G;D$OgEsRT-!C3c7+otHB- z>t*OhMw(i&$qZ$ag`sIG4U;eh)0T6(Eib6OP-UL+P*b@G*wC% z*_3QW^pxBW=}fvmL{}SYdRA7I)L|rzEE*P!_(F7}=7v^LLmjf0bz546CQ61`lO&X? z!p3cv`|DfFiliPXmJQ8Nbxo=Ur4eHx|tRl&~&7*^$Bh_*K` za#0;uX>F9+XK}5v8mI6A#jp_Cu7i}wGmugksQHux`l!l>bj@>$zzIBKk6OL5qYnC* zprG;zd(`58HR|GA>QhjgUs3|?eG!XEU1`&jQGUCk5!B$-QK}R_)L1`Mse~U@TSoM& zl*}>$B?>$z$U#QrghXMp)SFjRRdQX9j$AiRm#icbqEA#PMhWtziF1gqszQC zLM=qswN{5!u?!VE=rhwfHv}`xXOEE^fN4@0ExIc7n%#+MB&?jAg>C()z|5t>7roY- z;qL#_-u?)QFy-wZEe$-!a7uzpP)Y)AD4&YHf~+i3ipsEDKvXpb%H=fIWD%dDy{c*e z*PmvbSaX`y^qSpCJrn=tA|A}A2xG!*AV{) znJebAz9yDS`OF#`vM(PcRDV$|kPCH>4bd~&s%xg$zt66t$)Q4jQDD%EX6^5iX{{PJ z-9k34RpX{r%iGhs72!(Ju;v;o`x>`+0k#R3kDiCgzNn5az)brj z5d0+@T+z^QOV!YahFAzzFsxCO42!9%xp68SW5rfB=qPj1#VM{#?mF)frt$ zub3|<2nK{KI=IMuFs*|N140%ZTx33&*1?4VA&U+!G9OIq;KG2AMF$s|52kf+VL-^D zgNw`u(>k~?AY{?OMdpKP9b6a?vgqI<^TD(ZE({1+ba0XRU|I(k281j+xX64kt%C~# zLKYodWImYI!G!@Kiw-U_A581u!hn!P2N#(Srgd;(K**wli_8bpI=C<(WYNJz=7VV+ zTo@3t=-?vr!L$x83`h63CAqIeR z+W?UE0Ptz!!7o35D*&#GUD3AQ{HecAt$y%vX7M-V(<8^)&d=NK-@9k>EAxN5Z0!Cg zxa0fI_j>0YY2Lf$XP;TT`0C4_cuVH@5JbQN0OMdxF zQ_`5()6K?Sg0JsCb+hYm>fYT?@49&7*1>~sjkwwoq=-lYZ zrS12vf92g}J%@zlA3J^N+O;R%U-3)xdNnzHUC+a-)^8bPW7i&>ypO$O;f=0+UsP|~ z3tCrnwzf5W{p8ZK!IPi;YWJI0{q0cd9ez*zNw7QKwESHB(lb-jFM^4!t#I#)qrX`_ zYTofk^K$q2jyrGIIPt4o%B44Nd-Ud&pI-Dk$8CXW80dAT>$^xeZT zS5Norzxd|DtENL!pIkafjhU#^#L?Fd{|>q)v*UtY7Sa#rQYqaI}E~y}#xqI3Gw=cTu(N}l=h_)Zs?^?GZdZ>NdJ^uzElntQ( diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/WhispererRed.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/WhispererRed.png deleted file mode 100644 index 58d2e994aab36b385d08396a8968dedae55c0807..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15999 zcmeI3eQ;FO6~OO;1PF*!Is;m(%YqhaU*5;=+mGjFNysKmq6-<4Xi^5u`?$M#CcAIl z_wvb*MgxkLshv1TL>yzCri@B#J78z*2v`ct)M?FtwwABzA1YrF?NFvfXY75uo9yn* z<~A+N^q;pgyYHQQ?m6e)-?``Bw|~5+YS#Sl=EB}WQOxIoh#9UVm-&LS-lp;@2LM>8DF zaTMx7>0L2H?4)A)vXql?KS8L=2{mr0TFh?x6(z0BD0Vo^Kog(zyrS`mKrubd4pF2# z#W>9tF?2p7MV_#UwU zTnecS`O#d3vIG}m=qvp+Zj#A&#v2TZ1`MF} z=%pBrV%&ACTVOfCg+yLpm@Fr$o|uo2rl{erJU%!d<|C^o?gQ12A{yefykz&y@}tN? zSW84jBcMjb2&Ch&h@Z|hX7!v{RYIB8swL2{V8H38^EKzS3TkqjxvWcLGSpEr^sFSI zR3!^{wHV259aprffz-C4XtJsZnV=lY$vneKR9Ivcie;gP5}{L}6qoFFu^xt%dFZFj z;zcep<4UiMbo&&pWme%N-c2zqgr;jR<>MJhNeon+QW$+@>3?+1bCR2L^Ncxa`Nodg z>twucnGc(z_Wf6*PR%7Z1=;x}CD5#kP)MkX>4u2%TNMnTh9VWEisu+k3Ugsf3cF;= zDWe}REBYu&W?0VSlNAPv$zsVh&!j5tdOSLEoj+Z?hjV)*C{m2%b)_cmm3<5)c_8PJ zC6AYLapQrqoJ|U}Hld>PO>E8TW6niEbKzKt7g;w)@nOzGxg?iJNlw;BDQ-7}tcUlx zxbS$0JZ>h1s#MKF=*nG}$wH`wkLI>!3L$wC#l?gU&3(4mF}~4G99^lkonGO|{aO%Z z^9&2f<~9fwKb_N>8P}_yQhpm|o^m z`OK}X@oJr1iGK4TL_k%HR+N~m9@bA!YRg1U^=~k%v9&GP-{)q~hi1*+v}v{)H*F-F zW~*`2jAeaHH3DdxOAZuk&ayI}lv2ldEqbVj0XNS(c|VOe;}$h)Cv0s9s^}Qk&Hcpf zO55OyyoQY#Lnj(yGFZ|uOOZBAr7G+3JGmLATG7Kj`d>j${IQs{PfqM&H}WPkqZ{cJ z^JN9WfRIHC7nu*HwQylT$fAXd%m>q2xG*4O(ZWUMgJ~^X7!a~(;Ue?Fv=%N52wAjn zk@;X+3l|22ELyn8d@!wr3j;zHEnH+inAXCD0U?VPE;1iXYvICxkVOj@nGdG5aA82m zqJ@jh2h&=(Fd$^n!bRqTX)RnB5VC0DBJ;tt7A_13S+sDG`CwWL7Y2kZTDZu3Fs+3P z140%pTx33&*20AWA&V9+G9OH9;lhBBMGF_152m$nVL-^Dg^SDw(^|MNAY{?PMdpKP zEnFB7vPi^Ln0Zwf#?bq@9q2{e&lbJ@6Z8_VU9Mag0-*bD0DAiXxb_XYo(G_f0pLOt z0KxzOi?#lTk5m9K?Bd~h?dq{Di*7wMaL-%ACx$QXvt5~Y@9Ei1CksZj&jomF%glJiD|a61KU)3Z z2bVXU7;fBr;xDHQUIx3pAbhrL&n8gu{zhB(yMLr@8*F2~UkrewcSzAw7rwjxV08T% z@K(HUq@|_lwYP1?;i44|+pmg?;ga5yXFNAGZHSkS?go#{_}7t(UPo{L6MHZ0cvt)I zYWt@D?dU*fP>_JEG(_bA}-g{sBp|0vLLBsxE zx}2XFziqo^aOm2BtIu8Q+P8ptc8AmX^7H#Q_1p#CIK$jkezEt>XnoLFQ#&v6$gDlv zzMlP2V02fP7dU=1tLgCGCjQ6s3r>Bu8EhWCb)>QS*FPhD>5{*7zz zeDu=N5C6JR2OBGHVx;XrIqj3A_`R7{7W_Uk&@=w37*Q;Nd*YoLfpVQhu zw!LY)QdT_{I6nW2r?!;@+lNP=?(5sRNd$Mi-PLhrdF_+hEt@Zm9_;z&VEd|ty({Ql nHU->PQt-2!%NM)9jDYn&dT;E-t;1F3E8 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Extras/Wolf.png b/src/main/resources/assets/customnpcs/textures/cloak/Extras/Wolf.png deleted file mode 100644 index 1241688fc5b6a48bec6cc55d38ad59fd8854e224..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15313 zcmeI3Ym5_B6vyu_E5YRv69@!B9EuN!OlPL=PTI2U7T5*5EbJ<~2@2DhySoEzr*x*Y z3yM{U(GPASppgU#!HCKSOf)O;1ql&@CIT@56A6esf)4~tNN|0CciL_{d$)VD2^hcJ zX1DFR|9j4v`@84d&X;+)rFqf#+WTt(0OOk)!^_cU9r|a+j7IN!-rTeWecYRD?9c(2 z@P+wb_1a?-rUBr;qPDdg?UBbtS&Q2xMTQ^keF;dme9p)(3X!YqVMJ~ zXJhhHjI}}Ad@~`_9%*43v=n6Ab`LA_9xvnd+Xc7R>+;TJ9K7J>cqixNS%*_}@uJJY z6koPbE&3KnDV^f-@WNs`WCd;AhLIFGE|baFGfumf>f!{y-_P+5&f#Fu3|8++7*du^ z=(7qz2I7RFE~nI_p=t@nj4MU8v=Ow~%tWPEab59bDN#Z%vO^TPtd!&gJI_^eQsk0P zGM$R$FHMm-7=v+`Fm&W6RP;-BYlfzGYr~{0$-^c_dlHG1a#y_Gc)Vh2-B_?5At)lP z=&85$Bq6sP>RLJ_!v*WnQf5_Jy`grNH)l{JQyKQ!VOAZ+%~T3*`BEtCPynq}Y)C=L z&{A!h77G=stYrWp)6kHwDrWWyHKAx3eNKSGUCR4ijt0Y$0Yj)BeJn4qg1b#{pkfpq zE|zzTJZ}k7n2E)RXo}j|Qz3@iB|5y;7?zoM4Aei0WJn{5Vx4P=qsU^XmWoS8NR3Nf zkV_`I0$h2}GP6`wVuKdbQs}Z^$Qj@&4O_hOl_oYNbVEwWuqhlu19nwaM7NXoMt#00 z>-6#xD|fo0tWTExERTl$yweX|f}DpKiCEo-gbr(R+Uyn-x^S>4nvBAiFUuh~WH&EF z*-lANSV4eZR)S82Ra~;iC3ty3cEf>0mS95?ElsKD+>>IKIp$gvl*|XCQ2{Cv>ySKd zR`9x9tly8`d`_syPP9x(DXpbKm?5beRUK7pkEM!HE$2_RR=95P=ztJY^CwhNO6kz- zzo2cP0ZT_(>BKU9@_j5yvU#?JWV1b>65s}nmM^R1S#(o}Zs*7l6yjUlhtHAeh6z%8 z6+-1_4If0;I*p8!g7dpjg^Z;03sDEV;o$?E`CAZE|AURtrS*5V4I}HSJKKgqC)EG9 z4dp79yQM@IR6^W90S^p}Z08F5Ik>Y14uqkd7%+dFMAXHoqNIHH2mx-$SUGcHe!JO? zv2=dE-@~I9Cz$U=SF4P>c931IGVWUTd?KM5AxAMAHf-@Se?be!dn>xxgCURG?Q{n? zd>Hp=QL`}C9#+vgtefYF$5r&fg^G?HWk)Bv#C)>6qeUn>7PiWATbA#^!YI1wL-(6p z>4tMidzMbIyZNQOqPrOti$#-QK*%P=MdpL46c+}BY*JigKA1{zVL-?x#YN_WsT3Cm zgltk=WImWmabZBnCdEbOgQ*l3283)~$ez0TdSlil zu6PVJ)@ma{RZQ|1jrw&)ht> zWwC0Tcl)84HEpAqYjY1>JrnP(f3<5LP`=7sxD~7aW7BC*5WKy8T29~Jap}yaDQWP* z-@ab=^jvKGH}^b(eZB_8+P~H|DeMV^j5G2ZG>S;P{_l_Fo5o z;C*$A-)!^)ojjgfTJ`SSNX?>U{o{6T{rtJi^t#Etf@j{?zKJJBo%7wOy$Fu)t-Dlnv@dgN zf!WL>pCW{{I2h6f8V|Xx!1Wh jVD#!Cf7dhp4}gh*2cNEbwy6tk3us!<9Nu5Q`h|Z1`$xO$ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/ColiMaster.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/ColiMaster.png deleted file mode 100644 index 03167a8520d0343a2bff7b60d2cd161d9e684f42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23973 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/ColiTrain.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/ColiTrain.png deleted file mode 100644 index 60b4192580c328435da7afe0c8d967efff3439b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23882 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 Rz;g-!JmxHP&v5ns{9nBe;EezP diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Daybreak.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Daybreak.png deleted file mode 100644 index 72b38e01b9c06d3f52ae76a9118d64ca90423804..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24586 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Markus.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Markus.png deleted file mode 100644 index a1d7a3f6e4fdee3f24a760dbd74ef388793d0edb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22907 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/RevDaybreak.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/RevDaybreak.png deleted file mode 100644 index d32009d5d08110f91790095a0f68069b06e8bbb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24709 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/RevDaybreak2.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/RevDaybreak2.png deleted file mode 100644 index d0a5f63566887eb1275beef60aad664daa4f4ab4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24267 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 U%Vp8Ogd4AQa&^r9#DCX+0r4^?LI3~& diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/RevDaybreak2Star.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/RevDaybreak2Star.png deleted file mode 100644 index 9a1b9cdfad4e9b34b7ac412629c2ddea8e729ccc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24028 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 J1ar54{x|T>5ZnL& diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/SavMaster.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/SavMaster.png deleted file mode 100644 index 8e77436d0ecae4270eecb94392fa2d299f018534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23999 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/SavTrain.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/SavTrain.png deleted file mode 100644 index 5ba731d22a6665e2ca17a0f90edd399de13b4985..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23864 zcmeHPdt6gT_MZU77YbEdsQ8HJR_hw_PDq3#$U|9+_&`w$gpgby}m_H zuHqAru8&GJRz#}E!)j$MDq2)T1>9QYrGf$i2}yQt0wE%5y4(IfyT4EF=aZXrXU_Sa zneUl7GjspAe_674!PwE0MgsuGdM$Kc27m<=&A>=Y_&52=)YI^9RP@5tVgSZWKz|sp zd#@b;9vwp8RgzWSA2a!)NJpMP6pT2oi;RZa064SPMf3RKhy)vqgbJfv9NLP@9I!%x zi-RB4o8TSohJ*?-diST|7&f~7jraC`!dj-@jkiBvkBLZ6Ez5r|Ygfs7{;a3nI5 zLSRxz*#66bH5y9JF@g~0GI!5@cks!@Axt8PX5#Vj@$ruFWJgg zK%o)^3@S3<%K&URU!oWx%mBOy_d%a%j|9-4r<*H-?(XEunD6QCK_e1f$?mS6PILx= z;^yQ=awQLV7zSd{lQaGms)vcgp!3&sm=H`1L7a%N!@=Z%4nwYk5riHBdrd){Ai4dX z2Eh!Pp{w(HHEtAQFpq@L3AkV~Pk>%qJ+@sBmqKa@IwZm4a{GG_W4hU z)U|FHh*#V!6pAIHm;?h3;lR`;%H_z~mrDmKB7{Z`Zv7C4xrfQ)qp6Z5=D`VqM%tik zuu(b-)R9hMn0Y~>gb)aP9uY?p(4BBjJPHFBOd>ns5V{kC$e_~rWHN04-@yF!KH|fW zC>C5h7&rnIMJ&0HoB8lh4Ag-Zsp0RX`)slhSg>`e& zE>76le!?h$C|>;00P4$TuZQP{@uETz0SiB1I8ZRu#2JsSMG?aP#>nvnBs!VI2*&XU zWEw7nKtXW9e7MTe$RRLzdFqmNsTB)ZA`#;v_|2U_H(5O@dA<%JT0i2l>5`~E4Q7OSVDxFMoBJdex z9?3K_|0{Egy z_DjH%@Qgw+)HT2n@R=c^m`I+4WspV&3k@{&TQ{bgC_)qin}x98X?(ciVXX$v`mXQ| z26~zlzkK@8o+jt>LSHUL2X_Bih3H0hB@oFp5|KWi;6$Jkh@|1*F=z~dqn#}^=Eguy4$;nVQYy3&`MY{HuHfBh%fff4lOE*ZC!xz2?3+@}qRA>Cq;-MBxgzJ!qRqjIg5=xA|1R%n|^ji(B z8rF36pedCITdDP@wKS;dx75YX;O(q-*y&2)yI=U)8Lxlu{K|-ggYvh(2D|jzW9t!3 zPV`h5Bbewih9$j@i7q`A#t0_5jA2QyW1>q>g)xGOE@N2I>zL@$Q(=r?qRSYT^g1TG z^i&ulnCLQwCB2S`ESy^e`4Jr%|XCc2DaNv~s~OHYL{f{89;Skmj5=+aYRj9{Y67?$)pCc5-g z7$cbIGKM9+j)^Wk6~+iAx{P5-uVbQ1PlYjpi7sPU((9P$(oq>g)xGOE@N2I>zL@$Q(=toM!H51e#r%if}d}R zhu>*&bl8B0-+00D7cTP#An^|X$kG7l)xiH|0AdLMv;+ab+zEiKXe;*zPXOL8^Ky6f zU3cekU72WNXj=KRUEi*a@L1|@`=qu;|TDe0ad`nEyvi zm-Unl{sydf_2L}Pj?buHEXs29Q1#Jiv<(?KAAjgt(U?%*+|i~`Bxx?H)VNJ~ z)ekTr_vW*WzehX1Wv{1r&vQu?lOK^G#!s;C)b5slca1r33H;_kYaRH?owep;E)*+vq zm8=){@0a^Pw#v(Q4Tt!B9V7XtOAqR$$>)C<0YK1MOwhtT%EEuv7KDbYT=u*JEiY7# zN0IF?ivTmG_q@;5K6Pgi*B|wtZVyh(jTk?F_rbz!AHUY#yUdy`Ddsd9?P^LSX_rKy zc+cZ{bGS{SI<`!DSKZsH=(2Xvc(gT>>PwOu%N)?K?WIa9G`uUI-O<-i*0~qsHPQl9Ufk6+ZeC9%Et96?iPvOPgV8Y^$YZcHke$g z;%t4+%}3o93&$%_ha`W&13hxG%8k+Pr_*+uOTVh@#THf3B^sAD7H7dD7XtQLUUMu{_^e zBTviFG#|?OIeWet;P}!4Hmt4tKrZ%yuE5Vcm^J|TLiPc`B}v-WJH``XcaE5?(8_(e|P3IS=ZZdjuRN3B+qi)~16X-N1NS(L_ z9hz8RwXC+d+1pB;?=EXjXkeXr=m8@aqp6rs{2hmd6n{EWmaS9sp8_+S@4rz*hgSVQEgXq<*nmI2fi%U z6lC6fxWM8nH@rW@N52-gvrh(ew$@wcR$hZ)FaL*m`J7vYe#L>7s4Fu-zOz@&R_+YI znTM^}eK1^8mp7Z~QZu*GQ&n$WqTXMzF;H{uLFHLL4B&vBYa84D;wK1tzvN)|w1#LN z1X#13NWU=_K>ln1)AmfdI_>duB^ObDb484jv(vJ81O!u8Bu;tq4#cpblfj?X z#BD6O@=z#hiZY`D zoVKSb8lixjoXb8Ff3M}fwC-!o=Bq`IV%xwA@H*7PiSCKf)nPP#B2#A^cJx9@$%bl?P=X2N3 z7miRC$lpa9U!DXfu~Ua~-bSBKr+i04R$DYJ+g32)M|asA`8=p#ZVmRgWTyuryZg?j ziH^}|V{(67pur`kmX$J&b}7nIloxgDoJYxs@)PSr?d@-0sbAYrTPswZu40AQCry}J ze9%$@k=BMuEXzZ4QsN$U!x@=YvSr@9d6!`7{$yI8^>uX0eGL1&(~L8>Wv8NHrNv=> zJGUEt>=2Ft{JK#bG%J1TwkL=CL> zs$O%z$;ae|-^wjU2i+G~aAUe)PVy(M>ekeVY7J!k;tx{+)%rqwT-?@%4)%zeX@aiD zID#s5e;S-R;9{kf%#zRfxB*RN80;LFELJd|*3b_fIP?QtI?A3`NvnJsG;_l1_;}_< zW_D;(Aq;MA(o#o^llsMqtuwt&Xu1x0ZS6}TpE-K;$K*4xn81s!m}{S8?7555`&&`5L_!bto{nsawS(Hv=r>TzdJ=BX^v&qYm(`%V;V zV%Jc{+<#Q3+MXFuk)c^}NP|!Gh8?m?03&Z6Isn`#>@GBWU~Oh7 zNA7bWu*c+P6srqr;6fz(Zmfb2_Sk)wK29yFujBT(>_{oOA}04}2bkwHOlpewj6|kt zs$cuZR!vR9**)>y;l)Z(JDe|s$wwVAx9jR$x(l=L+#QOkS?s=FRBTOqjwb18m0aD0 z5509n6d74_VlwvNx#)dW@u_v1yl|Fs_g?jjMPFCc-o4wg9B$qTC&9I@Tqm!sKbb#> zwS=LG;Y_(zQrz&1Zl-+xp~W|oCd=oI43zZsfs{!Ww*qq5s-)_V)cKZu)fL>>QaF2H zPc3BiyK}y0Dc@ZmX_cIRtU@lf)sU)c7O1vwLwI+?et~=V3*2SRS01w zv=f7{<=Zny`cq_2!zUhQ-Y$9sg9{g;Lrcropd;1u0}yiP?=^*!u>wwDyiL=2S=r;0 zQdnUj3*0&Gr#*K5+)kH9b5~pQzWvglVVi&%CwzMDr&vNex`m#I3A%pB{2PTpHb>pa zPW4xWwno_4ZKKf@1rONT?tSSP@(!if85-JvRY5l&%RKI66Yqb8uH|+qVAaV_Qfzaq z2q(k8JC--wzkK1JOIPl%I3%3Z)te+Y2UtK6q;h3vx-D{dr=^+OLjN3KH)8p7C^QvZ z{sRP&{nP%6l`OXAq;-m1wxtlwyca69i@4qT!=b>xI1YEIqwii#W@cu|iLpH``EnQ{ zcofubIvj$~51_)xz^mM*$F7{Qf_AC((+3=T1@v&-QM*g#ptT@9Xv-q-qPx3Bk;KB? z_t_lR4g1dlK^cWTu(op_+7{Se^m4ONjfX35$)+iDHhu5W)UL8mRPm*%i|RfM2=c{X zFW7RE|N2WpVDs&^Qsptfs)z81vpu7dw2cFeFP1mK00TIpPdo733^&*JrE zGg39_+0v%2F)48G0}tU@zr!J1xOCz%lp3qOAD}(MqPJHF8opFJCuFGp+XL|i_OV)o zK?NDOj~-)W+G68;V70n~5O3;$afmwa#vvMb|DC{ft@$qiH|VNy;;(7BafrIu{u(Z{ zy1y5=X@~%L$!+-;0vgEkCI4as;FOS9U J$L0rZ_!pc0(^&uj diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/TheTierV.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/TheTierV.png deleted file mode 100644 index 00a832a08056c4e15946c75bbd4aa3e0d1cdb54a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24057 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 GZu%c`L?93V diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Theives.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Theives.png deleted file mode 100644 index 25edf3af51aaff2219b6bf6492c8aa61cd45ae80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23660 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 Px=>kOL#|r(edzxIR_}KH diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererBlack.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererBlack.png deleted file mode 100644 index 7032a67d97b4c4e511e425d9e6594c24616cfb1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22354 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererGrey.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/WhispererGrey.png deleted file mode 100644 index 869dbf813ea6f1d2ffc8fafbf11a66b590a63de5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22701 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/JulianClark.png b/src/main/resources/assets/customnpcs/textures/cloak/JulianClark.png deleted file mode 100644 index 949a966d5332d42f5388c3c81537d6e9c096b5ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1398 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dI!FU|?nl@Ck7R z3MwipT3A>(yEwbJy12Tzy1Kc!d$@aedU$wwczStx`FMHzdi(hK`1<>L26}o0d3gnU z`-J%ThWZ9a1cyY1ghqvi$Am}5MnuL%MkPc=Cq&04#>6JYCgmn2=Ow4)r=%35q!y&6 z7N(^arKcBXWE5v)mSkp?X5F}PPMmZ(@An0}H(!qyr`WwuW$Vf) ztXw1e*I?0R@#n`P_GBtmy66ZUmDjSlwR-2wgE4DDYuDe(pBwa6dBKTSyak5W`s+$8 z7KCoN>3B5zz*Bba#l5?iB-_X9g`2=h5$|5mu6XS2K7{F20T z?kyL!^&EoKE4VJqvN2k@S&*%`p1bVAqu|XeEghI%Y^h6Jb19PD#OdQZ2H(@!uM)31 zY>yY-vTx4$D7$YD6%U!}uw@9Wi1pQ7F|}(gV~}u?+_D&!*Zqmt#AVKzel6rb@cYO? zmD1arYz{0ep5MRx@WsAo+P#K~4CjKGW<0xpI`Pz8H)DA=lf_48H|hFLZ18;_e842& zr%LhSoV|wUB<&?vPk9yc|JG_1r-##pEl%(z-5%q=sm=-cy#-)ei9C%DWo-gDlu zs{i38_M3W78142l{cZYD>+sS0uk`_c?Z@%2m_OJv>|;I|w|~Ol?T^EN34p=V)z4*} HQ$iB}_n0;u diff --git a/src/main/resources/assets/customnpcs/textures/cloak/NewYears.png b/src/main/resources/assets/customnpcs/textures/cloak/NewYears.png deleted file mode 100644 index e4e42317bebf684813408db47a6b536ead4e0e61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15518 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 YbV<2kSy64m2ZV)rvlqtfo0YQeKNNe)IRF3v diff --git a/src/main/resources/assets/customnpcs/textures/cloak/RaggedDarkPurple.png b/src/main/resources/assets/customnpcs/textures/cloak/RaggedDarkPurple.png deleted file mode 100644 index 128740951b90b261753699fa0036006d7806f6f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21942 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/RaggedGreen.png b/src/main/resources/assets/customnpcs/textures/cloak/RaggedGreen.png deleted file mode 100644 index f4cc949e10cb4c033aa5677862b8c2836dcb8671..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21982 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/RaggedRed.png b/src/main/resources/assets/customnpcs/textures/cloak/RaggedRed.png deleted file mode 100644 index 5675e00469d5ecf970c92d64e2bca937fd9ad554..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21962 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 diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Realms.png b/src/main/resources/assets/customnpcs/textures/cloak/Realms.png deleted file mode 100644 index 0dae4b22dab27c045629e78b1a5fbc97195e8ae9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1111 zcmV-d1gQIoP)Px#24YJ`L;(K)0{{c4Xp;~C000SaNLh0L01m?d01m?e$8V@)00007bV*G`2j2_{ z4g?c@2oC`O00Y-aL_t(&-tCxOXdG1-hMzMt`@hYaMBAWLtv{t$|3HPb2vye6?wZ9k zN;HD|lSc&&B02P$tUlH=^AvJ_Imai)4mZ4(lv2_pw3El5lCP(>ap=V_7k3)ZR~#NBL;RaUUAXedmoqQzWq!z^B}3wJ%ScM14v((X76|(M_w+I zUqmjJ$J^ z@>~Q}3(#|0HhS!ZSeDlb%1*>P~UB{t-ir#VLQno5K z@LT~UJ;&5!%9*^Q_hE(~hyhQ)-1AG{T`hf&ZLsV8r@3$a4LrBi-|naZSf=4vz%F

e}s8K>!gbTQ((%u^XM(rKl0$_kpQdVkJ$mzhQ z=^mVDmj4{#n;{iq7~J-O6BQnBm+^m@?9oeQR+g;Pm|>U#m%Zym>d4WcB7utY_oz{$ zbWpZ$`?ubI`Lv(vV3m}Vbnda^{r68F0JPM|4SmhwN?N)-rL~A#w$EJZ_piChpa7f!eO_;K4h3> zeM516ZZ9m*0d>aN^f8`#AJUu-T%I*o|4ks209=yc6ja1)d529_5GnvT#@*b}1%Qo{ z+*q{5i6?&JLF!;&&K*uXGu?wcRoZwkUnmDqjm~8~iWzelZg4vd?Ia7=O9te?W`oX1cNdP&x=iX&vyufplz` z=*CUEx(9&MAD`&fi?6i@WJt38>aI0dzkWS(b91|VKJvibK|QL&Hn?+qadB~I0ERka zy8zJaFMgsUBSLZj1soLa|2L2cfIp9S&|7lAGw1eL#{B|;_NHCgn;=$h5H*ze_HyPmfx!%%vS?oC~V9myRwl)m}ZRj zRp}ux4VnQ8<^jfdLus=_p#WGh!i{s2fZW}u09bkBqR;@82V|j)k(Ti{-T9}`08E`c zSr`fj+o|Hnk#5kiQ3!@0ymx&l^zWZ0Bh^O#f?0w=UEc~9G5oCnwIu%d&@H2?$01E zY$?W^Dbka2@7s)xf0(a-ZwL_B7;h}n;A?{27IO*!e+^*Xr1E$*QimkzkGzdOD*&-F zdl+Lj@A^#b0f7KimmSm}B@G{K2?0JcS6cktod^8wmCyAx%F1L>wdU8;_0Lcq5X{Qo zy9W%7kLlt8W#T%2A}mVR4ic|P)t;d<$8E@L@>RbHs^8`mre zhD(p1sa}tj2M0agshKy}0T1Y> zhU+u22Rxw9pzNm$4R}C5HC&&GJ>UU-2Bm)?zkvUvG$!z$B^&Qv zV41J_2gm8^)8`&Q0LwPYBGfj z1%PpEWq5*FaYM0S_Y2s^b4BB#Lm&v|`vFB?x_hNVuO|Bivv2_K518*4s9Z4E{en<; z0?c;>!hI+3KL;Qf2bk{{r~sIGbvCxWU7!yuuc||Setx$XB7$9%P+fpf?cZw;2nK-p z_*^Bx;@J}|LjuqDRr6Kn|El?Y0>IfLGduSQJU%xIzzY{_W`I^Mw%!3s3pn3bDWE$4 zSIzG=0At6D5veIDo%;kHpPL0RAG`B8e^(wpV39HKd|#!2>il0dzt;c+UbG|tfr^F_ zqGb1WD*yrK`@!a#?+2*P|G#$t=mF+U7y{<|1u6mhy$8fbhFbt|1l%7`0kE&|QPq%; d{k?rT`Y+QC2a%Xz;miO4002ovPDHLkV1hNKGR*)0 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Dwarf_Leader.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Dwarf_Leader.png deleted file mode 100644 index 7f3608648841b9fd120d60914baae202b81febec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4389 zcmV+=5!&vFP)(bCcayWI|7Uta_S1fZ_24mCA3 za-5%^ABGPfq4RW)AM<~Y!sX`XC}y)66%`d2H0U;wH76$_hN0J?ypC}?bKl+WeMmqAcQj2MZmtS?cM_erY}`9Imw)YOEQ@MKJy zG`V{NaQ5sOg_fmX(-pW)YZDOCy|lDcw*4wk3J7!yGQbs*ByiZw ze2n;H04Z;?*>LgVMRAd^urTE1ePi5L8j=kS}L@EU^${|9n&a}XbY%a6(sT}g>kp%2rV6pY_g znhJ9}FfdRQEh;KPY4#3b!q~Y_i{ezO?V$1+AY=(+2iZYT={o$T%MhHQLx%|f2?_l@ z0#IIFrZhA(AUr&x_1NO#BBkx`f3=p->2x|p6I{Cpl_V&%IECgYKDHHi&0Z?o$9Aq2 z#`GFIwbeDKRQo{?$PNNXHfh%)C}cu%a*E*SN%$*Qij}ai@av9qI4+87_Uzfqr1F!W3=nH(?_DRy_8+?t1qF85regj3C(8DTU9Sl!Ppw#qPfwO$&!+!I|FIdZ z$GPkWRQHG;DRifR{7pu+AB-U!$;l~h6{xPRQY;q#Z$0MX#RA1>G+xIHPhhtHU-#vg zhZI_a6lFz6>R(c#nZIwiR?a8u#itqNwPCqs9IDUlg%Xhh<8&-g<2dFsRia?N2 z+8_g%Nyv)+{S&_vfU>euh38wXVc&U7VWC5bjEwr1S)e<3@b3x*C8f3CN53Z^3}&qH zi82*!JE*j-*HCeRva&MC1}9IRM9-c*5gi>Z*?_>(=l%Wth5mF0D#XFxWWmUhqrR8$ zZQa1>yrQ@Rr6VlRz4zX`3L`p|WT4Rm)SmA65X3CeyLWG~GzY<;()=((&`szXRF;Z| zhK33Qw4g@-=nDLgO7nU=r?RpVX=xL`7XYVE=PLdBCCIV)`RA3GnAq=io+mJLnVDM@ zR&Bw-!6LZ!bVtRs)W~QaA0IE(os_+Pev%ca4F99@bdA{9Sg|_UL)vo?T!KMh$t*1m z@;ba{O3DzAiWC&smGkG%w?0{twX8g&qir6~^$0-w142SVlqplvMQAFQ-s^MJ*8|jt z31Q}od2Vl-5M@zDPnsh>zdLh-oHKsvd;xCn-!_4n)71#HD1iB!u+S<-uA|!R^9VV4>9Er|2HDv;STec@Km8x~^4$;w+wb5Fh7B7k^dwbNdmI$yy}bd(vB}T4 zzrn3NEy~`kY^++fN&w(UotA+mOO{~#kVJe-Lby%@PXPS-*Z-+}`srs+IUKt8)PK zi?k?LU1kA*fof*laX6iT(Wtt?f?NvGIj_I-rtRZ zCjbTw8l+Gz#ui@lr8&R{j#0?ZzaaZM3_x7CMX9P+%Q0HHwgE5%T9KYUStv%Ksl>Mx zGuyU(2vegId`==b<>kO@Z+$4|#m2^(<8qE|HFC;$S3fm7!j z@ygm)k(QQ*{rmSzUBK*c`0!yYnEL>F_k8{S|I>%B8D{yvkqmW;!L^P*t&I_q}+)U(?og7$xOxbmM(qDJpi^)i^6Ek z=*$|W(G-f+4|wC_l5vvGcrp4KZ@}owdO-u{{r9(^p{f!+{D6`w1z~|Y`L z*tli|YP?i7l1cBp^Dda7XyqL{b_(U0w!K}|sA~l3npGJkd! z0BZGtA_M~#(IncuISV49PlXtO2*RTE&8ToX;c9A<<3jxnPypO9Iu$Rz_#%!RIU>L% zB_(0;;>9@g&(Ba^3)H)s5n$G%w5AbHKDAWtMapYJlUckM72L34BT`ex3j;Q7dINLj z%myv)sw_iD08n17vWN_JH37{nfVUT*vxEv*9s%gv%c5whsk#m@=pj}jY;+A?ke@nN zGjv9yRC7d~KyVBnJ`5jh$%MCFk5OaCNWlB(qwRSAH&)DlxkjwD;TM6Jx8|w{?{GM< zZR<9K`1@hrgFhD~Nq;I&#W@&&X<_dB;DfDFWDx)|QYy^)I)n!SwTxXlRc3xOwy?fn z9IJJ;phtK(1F?Gsj7u~qhHK8We34Du;OpS0#mcu-JcG(g;Dyb0u!83e%w7OPjuyyw zk_L;*eDTHSSh;c~KKW!HQc{v7rqG8=OUr~^W5 zx+5#=urOxi$PrRv6A(kaQw&gf%{Ww4?**8RsyuD$3T>PFD{FzK7Qk8QzOd2-`S~fK z{yO-YftB+ku=(_0q@<*XV0^flW;=iu_Xd{uMiR zY?nEJ$&=HCDf~@KPneK~yYEgFSW;Kv;Xf)?G_wgx`VDH@dF~WUaa!j=@7`NYko3MbO zv>p9?9c~M$_J8ioZglSg)&L9Rmec?YCJa)22dYb8jx)z(Up;I07Qn{fBJh9LwzWMw*JF;t|K;a*oWy9*X?XBNDc3^}9 zS@|It(DN#MO~Co;e(2M38mDTbL=L7zy2zF-nH^G|2YZYGD^@I57`RA1-h|d8{R#>S zkdTld6y{SPEzE+0bpf}TDY$)d-^-YhY{Q0qcKjmEhCl7H!_g3hTYVjvI?M*f%5}T# zD5#G@w8??#DK`9hza5WHvEj`(gB( zO`0fk5sVY8Bni&(<0nLpSY{E{8B~gcDUU$#sqcmR^e8C-%x1vfUoE+}7LLIF{Ri-Dx|g`v-y6nDp``_4 zUV~4DgO%OLc-8&0ONXAEI_!Ym;Dnn1bOR%Gsfafj(53KpgNxr}KsPW_mx_3k0bL4j zH@Nss26O`>b*YFq8PKKhc7u!GWI#7CQkRN&lL0?8ycrn_6s@;_lcld_1k0>0m+$zh z!M(qAKS2=}7borcoZR3f$?sj`y1yX@4D+wnL^LY`x;hjD5gdq$L!yAtO3FkAU`+&)2C09 z#!Ig3MEEsg)z2f4e?eUb^zjCkY<8~z8#LHz%W1S(v+kG06i#^h`T1gEcs3q+>Lg6VT#&{e-F3lBZ39b5@!&!ekL+3D*th&YdIM z>(_6<;>C~4IXk^_<^Og{hfbYLp$Pz$=K?0z2Pt^l<#SV0C47ur5eAx?0q=n8 z0pNPX_U$`loq?;l+F*YYf#3=g*DctI#%b{fAN*PCi&?zy?|;9#Q#y3&WD2`z(ZdR( zH5H)mQYg;d-xInQkG;_ZLw$)%m2=v?t^sH?Uf+Q6`s?dp)_cKh0Gf;zSxhD6xn{^r zz)W)g{WE24f~;!0#70(JzI?e;I&|t}0>HFKE0M}tF9E5^MH7PI+gu?4a1ewBqZMlx z>ZSXHfo|J7f06YFGKA|9K^EX@C14B)7Dl}J=3AII?*U=J?%jKE-+eO#6s5XE7HSJi z-7kK6iV2+tATTgcQCu#Vje1!;<%d+K&-)tHwM2_q6@!Z{E+4CGbK!&5HZ_(>oj`DS zEWf!vSX>Txnalzt8ASlJHl5PqV)z=pB))uI{38P}I>8_f7Bun`b8QF+0L}$27wg8A z{Z_31%v!bcypf%w*G$5G1NM^ID|`ePZD?!$buM)kS_3A)tb$usqjrD@Z5q3WZFkzz<>eb4p~`QnA`6Nmj0y(wRLJAQIB>#27ceXhc0n;Oe zXTW2hA3v-Wm?3x$k7tnMaa`|b?q>za|M+3#XaC^9fdjE@*>a2=jAUPa`tuJhKv^BOpBRUNL`wQwDR5~*AVxB|00000NkvXXu0mjf5>;YD diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/ElderlyDwarf.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/ElderlyDwarf.png deleted file mode 100644 index 84720a2209afe28b37ce82c939726f14d5d8dba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2791 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/GingerKing.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/GingerKing.png deleted file mode 100644 index 450c72f4ac7a425ac3dd6908e6e09aabbb4d2b59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4403 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 tbhoorQi4SkB2)z;m|`1S(qf<( z`4P|rj7c%ZsFCmoA!3Xnp_oXE6_fs^Ug^(kd%ga;7S_C3-m$x#yS=^MwawZ2XRkA} zGy6X8J8x!praDkb!k!EPt4wvbPOBM`lmSg^H@NbL98UH-Rv+fd%YN;wPOXo*ELVNF z$t}PDC=(iwP}(-{05rV4Yfx4tJvokn2r2+*v{DTSprO?Uc{je70l1O(GUQ|>`V9a& zLfU`mMNoB~H_B3NgcLxXOB+Q6)NLqa-hcX!pJe_0x@r?Vo}K`C+s~`^;mw26P^7xp zw?81LKAe=i@<9o}KkdEn{O!vD1HgL*-HBG!XZHrIY9sCxKtU0QKz&osGzA252%urJ z1^}f;#!80)=Fu#GK`{B!1sU+Jm$v#n2$D1WA$@vSRRwr64Mtu($5q?dmLk6eL2u;j zOC6oC+bB%+4X}Gd%tpZ9G{w;s%ep6YU`dPzh=>8}-8M)H7iULhU222cgT-;&H3Z%3 zFDd(CJR3?Zz!>6T%HGeN>(SV_gI{plAFS97mL*I1izG#xQkc@;{*<#X5EuaF4MV&* z$16aL?D-sQ#}Bfy#C?_Q+H>>(yPAqCAo|36vVM8(@TO4KmzPr+%>twric4DI;eATQ zxd2G5=y;%qv_%e<)mu~v=4bc9)>Sc3cB~Xqk_=GvdNEwMJq&%nS3|-%5r*_0o+p$L zD6ncVqVduZ!DKW-{4+aMW0&$7loc;gQ=lDF)${WT!5taVtl|v!IBL#&QjW2 z1qg4O1y}zVyw3LftO6-?o#W=oX)ilcLs|~+0#mrySJbXjb{#!=m|blX0%Vq+WWS~N zNae=^f#nDf(_=pfs)h(V;staB)kUWvcwZnWhlZ~4+Z_x*N@gx^=mG-3L=dPF8jpzp zC~v;kQYXt&t`%^NfXUmp#rjPk&@*7)IhOgsBb9{c#vA@1ul zHPYPD!Uav4H8nMw+7AmCzdbl7#BULwmY1t4O8NlPDk}l3SiW5Lz@Ly3I>A#>~=dyuYJ9JvUX8w?&=|| zh=_1#X%+)qY+Ni9TtDDi1EBFWYb#-BaEO&>F3W`R@d+TP__zMI?F@k6bimDa0LOD* zvG#DhOA|>R^DqYRlJuUfg@qntg08yyxS%v%%ikD%l>o?~wL@ax*JB0f%RePE*joU~ z7}VX}?XuaEQ>c zL%{NZzzkY(a)WFLC;{O8ske$D{*9{)*mqw7bgn+m0IBt_2BW0pux9|g7~qQn&`acD z1d!gaAJ(LczQZxyzOu>{1JEdGeF7k@PXJKn8#iu*j*bqnTCJ*zR4PHU0@R2q%Si!b z(ESGwz+^IV0oZHFa z0IoFx^gmSvz5tlD7$7yir>B<@PfSc;S5FX>3P5F~ElGp;Klj7Bhf_EK=(yVf(Rw{3 zB_*cB)oYz_x9L?Cp&_kH%+ZErZd~QRwWvCxgISbXZa?vN25n zur3Bd+%QJ(WAX&RP+KemMgX`g9SxbP>wt=iat46BzI3TL-keS+OifL>@<|QKzDGw! zWm(ovD?~?&OIl?b8F4^za*8Y)gCZqd4kNIZj7Q60lgR{*5eMj__3S$07-7|;_0h6+ zC|}uUWmT2uX;1^qpscFt-8mQuEC2{buWGSrK>=E51!LU>1q7p4wb-Nc=v6H?`CS2lI$uCrVrpM`wHS|e0}jBK-Q|@}u4D%u@LMEq zd7F$T*Es;SFFf-OfG_6@==-D;!2e1CQZJ$cFvaL&*md41fX)}p3je}R@?ZPH3jfa zm&|lm2jQqGYo^oUjE8_y0l1xo@gO0=40X5aX1ukfrlg=(04mF3u|Qf{8eF+@W!g^l zyiU@Ekmpqlv`9er} zz5ve=goK1ZSeST-xvj08UEQ58pwpx7_WLoP&IaIBdQj3I?*{(?B|6ue5M+9500000 LNkvXXu0mjfYEAy} diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Goblin.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Goblin.png deleted file mode 100644 index c18e918048c72ff0f4b080a8aad7263db615882c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5453 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 DDEzC8 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/High_Class_Dwarf.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/High_Class_Dwarf.png deleted file mode 100644 index 0dd3d7ad95b2d927a779741c79045e3ddfe9ee3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2958 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Hobbit.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Hobbit.png deleted file mode 100644 index 69e6c5c188cd92b21f96cfc11916d992cdd7c63e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5227 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/MoustachedDwarf.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/MoustachedDwarf.png deleted file mode 100644 index d1899bc457d78f37b515ade15f69e66cc85ce534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4445 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 KMNUMnLSTX#K+b9a diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfFemale.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfFemale.png deleted file mode 100644 index db4cd91f273adbad929f938656d2a59fffe2c0d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2158 zcmV-!2$A=RP)_t9mP#$JqFACaQ3FIV{_u}Kl&H}dHQ*0T@P#b|qNw!+!~lv~KqZn8 zBPKqAQDXQ(O#DH#q9!Ua5g!ypOQE*i?RLA{ecmzWEax)4yL<00rKMeVlFhv{bMDNX zZ@zQpxe8c>!~vg(#bV%gyCD*ZfF=}B9X5&&4M!l>{05bvC`!(fX5G9dcZOBPlaz1S zxKkf0!s`@Zx7(>nu|yhFJ5U_olXE(=nu=fuAqbSF8`~`Fm?T|uR%6+?;HMx^S?qCS z0tSA^XRu)_rG-KvNT<{EZnN2-rlyA88y7!mS;v$HfEnQP`Cup<1Ba3ZRds+SY>-GK zKv}Sh+8+!CA(cw$x->L25Ci#1A)L802&(`35>ey zR!(mK{`&|7+k7&mkpqY2(KeG$Ad0BBz8@_BC zDe7{$#+Y(E9w%Q=GENX396LiC4)Gn+BA35Kiek_-O?QHf#*_zud$>Os1s?9gqniGX zJuT;%#nDlk$?^yy%T(QyRvzk@FKQZ`u)Y1L($=|9kV*9?0Mqa}zqJuwTHZx@D8urY zhv9=w-DC1Fj_Gn)EQ8<3@5=0^8C2oL3U@u@hmM<`qUzV}&zO^}05^F3t|emgW8ahV zvcjk&%V6H?cdms^T{{RkE=vZOfngvOoaveM+Hh0@f3*t&^;>j`*9V@Z!qE(JecMp$ zHD!X#Fk}Fh)%)Fc;cz&p+!>3W&>bf$Tu2A~_v1U%nK&F5YI=%1)5C`OTmV8*slH?~ z0X~lte0OEg{P&wTX>4y^x|-sleKzoTJO!Hw`w*iEFaY?>1wygPqkO>t7=3_ou0P`e zplR)kM`Q4KXg9s@s#yse7P<+H!~q|*FCUAn`~ow;2!hOlLIL23SfR>exe5XxQ_?us z*IIVsbQYA)hoE=nUTRCz=@lUEu7SQE-Ui>P)ifH6CNe;IT?#mzP6$Vnz!NBsQ=wrp zFdQf6nie(?ng&kQ2G#d!7j>SHb`Zv26U8(=B;EB zymV%Cd1h&~fg%II-?H-foR$D!!?7o^N1Ku_HF*=Jm=Sdac5 z0m)gfQJSi%!~#~H+hL_ZE(XXtSbcBQS20pv7Vx-iFdEM+aPoyO_Pj({Ov8%aH4sl~ zSzBdw1JBR~%1G0jx;ze{#o(t4biyk_~lw9cpFxB=MR z{V^%SjoY-~IQf7_x*BOiqoSe$dQJqO^V)6*#}w%Jvjyx9JIuYJ9#$${U{e4paR~|l zBhff0iVakI=1hSBVEOLf`$&#AO89A(kL!N34jwlE&mY`L%5dYhU2~j#fXo1Il>@e4 z-243NF~hNeFt zEdYcjz^P^cn05^Cx~ibJXF%_h%x}B*sI0pRAxXiXqBRDnE|EPtHtP4Wno^ zUr-2ZWErdTf2;DwJq(WbegU2?K|HuThe5(r(6V3oUT|VEt1=zT+-d~fmjXVo9 z{w3FV!_?~dd%^)gA8^xsuhQj;ulKH_`trpO?rEnBl5)OLp?u>%r^|oN#JVmz02i78 k(++?#11_)+m~0084{LB?li3FWOaK4?07*qoM6N<$f-_Fh4#LJ6@`3%_{NcObgK0NJHG70IXtg^d&m*ce4NtZIBZIt$;7k(jsV& zvuEEK4FCwJyu3jDqy@ak1QDBh}P>Qo( z5x)$E>k;@|KI12Dd3D(|*gODSYb<9bf-wyV0QkQ)oTIG^pQB&QixdLbR{U3D%Sjol7IP#s4w~RKPYbXQo8r#LE81loIW7{ zt28%rr9{HpD_4kdIq=bn=$HVkkAE_QO!gb{Dt6^k0euaL#edY0Yv)i zO`7q_zU&D$cy%~Jn7~HQNJ_eNKys>DCcuQTCOG(jh^H3{aQ6(guduiGO)spqvQRfy ziu@Iq1(xpu?9tUGzz&eTI(vOFo{Uhn38(`l2WF$9q7?7{!NI`_e496K){P!>a&mOP zAC#7s>he`xU9CI*vGR{~#}7$((lEM}3(zkFJRC5b*mPRk+Ql_~KmF9KS+i(n*aQ)HAc)}r1kXpzm`Cp&ZKpw9E%dACk@RipcF~XbdbCB^ zUh_{~pO9(^qw3S=sk^(IrUs67Xv^d91IQsSMkZkj57++ai3#V-nL`u(?^O)A=G`sg ze*XOVR8UYrd0CkfcudawH}>Uu@79o~^$Ha(ew>P4dsS?62(09UJ)gZ^mw*kcmeSGB zo2j$2lVTovpzjHoGG&TWubP;cNTH+s6_b9^ZW9g&;5|J(DR1?13DCa!(=_?|fOn9HAK7I=--^%9I_>A}?Ja4Gp$0@mL^u#& zGMUI`v(dC^(%62Z;qV}3$GIhDFP5Q09wgq=gytf($Ye{zP_5j>FMdB z>5?T&bhkxQWMrfu0Du7;e_Uc>VkkD~L4{DSzNdWs-T2Zn2|NHqne0(nNsFgKum$(~ z2+gRm4W)5GK@thj0052p=~Sw&_(URt>niu|a|+TKczJzQRh2#g>cB@%LU?#M#Z3xS z5b*o=KT_N$B_)ZK2Y8Se?a?Z1-6#G@QIA!cJ9jR%?fqE9;)lD32$Gou9t^9@d%OIa z$54aCn9d6Nvxd~w)#(!u9UZMO0VV*ylP6E6_>l36d9pXex%l{a zs;H=-goFgq79cDZ3w?Rv0-b1RAP)}@K|-J^%G3fB9vUiDGeP)`n=nSyw_EK25tqSc zZ*h6(^!c8dfW>0bBw%b{APvTQdicYN30~V=ptuKU{DA-z0E>%@qsq!k;kZy>ztg8r zr#*Z2NOq2PAi}7;wekhcCZ3-5zFl26{Q~aQ^+u^VQ%p>Z0|Cy!V}d_yDO3n#wOS?c z>_<}X^QLXzSS5dg`uQWxq7G!SpOO0;XGG*>E!Tc@Lu#jSzzxL@d0hY9z!V!Bs~~{E zCq;%hunS3Ywr*1h)Y{srDPa02A1Y|JM}leo-jsjAe(kKtcL7}6SGSAaUu*v`LI9+( zVY?g%J+pA3Vpym>tFGGqA;-E8iWC^&3vk zQ|NE-nA07jYx1i0{DOhe_>K5M2%8i zMu64N?-I~k#*EtEaVAimH1NhPb5(>^;^<$B!SE!0VX-fafgD zP~hkMKF$DfFeFdAu^Cuy9GEgneGRwimM)cu!+aS9{cZxTo-cSd@lj(9khS2vKL<&! bYQX;id+{XkrPri@00000NkvXXu0mjfNp%%( diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfQueen.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfQueen.png deleted file mode 100644 index 9445ae60fff2da0948af70bb592d808a4e454b39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1879 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 iipwmBPhajA6aNFIJ}H}uV@D$Z0000@UU` zW4qu&y?WK>vqeEgL^?>H8Roq8?ZZp}l?iXm%6&ffTC--(Is5F{|F{3P|Nq|#SZJZ% zkO~ZdtxE1F0Z=RCPjMNrd(CXv+i0LvD4{Rbj1p8z1vCR<6qf#@y63}( z50~=u^O2dEiFNDN;mtSSM0j{O^m;w~{QR(N*)prfxA^i9A4qw6K%)eV65yl;GIfB4 z02qOvznKe#LV?tr0@SjzLFUt9IN59A=4dOxvKD}-s3<8hF%jP0-k3gpI_}-Ohq$;n zBqb%`(W6H=ckY};8ma@>;>+FKA-QXTrv|`A2^5wA1|#6C0ZNU)e{POKez6X&jS4r)5y;KW#i2uoaQ*sqI5;@qr=NbZNP|@X zgt$R+(*h+%K&1ebkiqcK0@-@t$i_La(WnF$u;~qD$b4EPR=O*ko_j4AAwgv&0NL5u(t`&NU~g}a!-o$GqG!#Th4bgnBP1jQ zwQJY5NP|@zFu)5EiPsqcW4QvfSIJyZTLWb1s#kGmvtZQ(M~)mR+1c6Q(xppSy?Qln z-n@ycSFhs!{rhOvtQlfrtW&ZUCr2y573b=^Y9Oe|(U)5V3CJ`2z5tK|bUK|_c^@Ai zJbd_2h(Vh+ZD4C_`}=bMl_2GwT)>s5E|4Ty45$;R2&-$>a=^@)GbL*Nx^?Sf(4avA zggJBOpjNF~NKQ`1g$oxfE@HJJ@Fy=wTwRlWcTmfUj*WVazxiCNls~z8*#eZ5$!4)k zl10N=4d{fr0*VZ>*{r1jXhPY@Jp_;aQ%e9URyJMJchI_ZYe5X{{hmF0(4s{Pq2C7L&Hjw@HLz|+$cioTwZI4KhVBt~xpYHNY?Qd!RVjD++1=dDrb zH6cd$0ptjRLOnnLNFc8XjGYQ7Dw8>+mRi;s{2y`+`|v)mwQYMLBO^l)y>jKsXBO+z zPd^pPu0w|o!u~gE)Cf0X%ntp zyCznZ0B|))99NkAR4Ns2-@YwOWLjF9AeM^K+1XjVw|DPe(4s6|x>P)C+O#PY1H2)T z(B12!&^J6rtPo|~rkoJ2)KBS>u=9ocBVli=f%@I0C@s+=te)B|64Vh~Q37>hYZL}f ziV>g?NCMz(Ba00IpbO3BV+**wJ5{jf;lqc8EYF!UN8;*H9QN(oS4qB2KEZe2efP|L zUteDV#@4M{#k0YK2TN3v{{H?bEG!ht^T2@v;#p8okkqzqTX9c8N5{(s*ttGROzKY) zW6Y~c7A7Fn3w*BA8)0Xo792qDZ`8~$;i#4grx;MK_im8K88IbB5KlcqPm+YEmCD@l zhJ!2;c1pl!@Jyl5KKtx5Gf`n-VG<`z`EK97z0e17adDN1{^XNSBoasYr+%PrsAv)= zO`0U}J#xd18#l}Vo8%=hFi>jJqzM!zGq?Z0RWQUyis${pV`K$o1l(<8op5mTJV8u} z&LB2EIzt)8&RikHhDwq^9oZ}suMS?0LCwpAo}jnLX9SA<=uVSM2nuz|fmA3)j~*@U z*s;S*VE69brIRO5)=0Yt2M0^>@$u$&7A#mGRRr}JMNxi3F}RLw=PADqDtR@@&TQ1& z)DHw;@7fOq`;&M!a>2V3V}z*CBV?lzq&{E|>WwU&tXovvLl|WLfn)L>fAeq7WI_=U z5g~DRclq*VczAdSRt^phCOe}`moCW3$$_JzBMu%sDE_=tr%n5amyAl$e_?rByS#vVx0k6wMxVwY(r}nANW59!1|aNY0I8HsPF5G$Z6Bi z!FU=8Hy=Y+W`M7o6BxAaRs^gCU}030)PL|` zf!{al)?w{XFIk%^B-~EPM&RU)H3PuI%k#Mto|Tr4m0q5fRtq7jbkQg1!_UR{&oOhv zcaJFf+SIDvPgo)M%Pa*N*aN>5%AO~E68Z@A7wACM>pB!$_U=Wm?%i?xF_nU(pGxSgA<#6qBnBXCmTkI1=mMLclYv}p(p3Bif@czpiV zSI{4cf?B17qTdp;h?wTvB`660NJ#h%91zgJlHGqH5PZjvm9huPog{aU-*1T$E-#ZTOuFa{MtHi&2$8`2BAwWvk#LGbc76%!x;x2p zDJX&KurI3zAn&``QZ0L%a#I2^pp(4@hB66iwGxSsbK&7)SH1^O2&4%P_Ya)d$oFG# z*R%CATw>w^KB)M+YRBT@VsY#3x8FwM;cvva6a(%=Gd-FhTy&qUA4n;& zzyTdPbddV>>xW&tc47Yf`695ui7*VsSUgvNrjZk6C~Eog

A}5P^sd8#X)>$77hP zD%)2S0fxJ(Hjc?aCqr64{O|+LF8x3_LIkUH@OEt=&GilREW3x;bbIuuRRoJ75FH&Ykx(`U4w-jr)v6VC@7|47TtP=i z5sc)1osku4_fw}%3F4!pqXlr!YoVdPS_MAmxYf0tJ9lE#s8OQJ@#DwQt5+}ao8mCs z7ufX(SlSHuF1HifP{nuiKugh34kfeI&k1X5tQIWsJR)H zWuUQp_wM-Oi!Trn5g|M+Mp&!1v17*ypcw3AJA3x5Iq>;B5VmjME`l2TZ;Hajix-7y zT(DpPq@(jh+D)ZaKn(?ob!8|j)x*u%PAKl%kFo^&2iA2HdjYLli3VOSxSN_I()4vk zeO0{)$6SQ8%zOOmpRb17Y(Da%EYJ%3Q*!MLD zyo#$@6PjLgKuyqk75l#CfLC!S=j zBS%WxzWo;MTDF9Xt1G^p+6pD52GntPL}F?#noQpCQs?|q2YVR+Or0=6nlN>$80!0d z`w-SB2Tgoy0}?Ya`1j+0=hYYd*4hFR*`|4mO8NbXojaS;-5*9oApZP$bK*06=unhM z5@yYvD*(EA{yfGIv>(`56rcR!We_gv~PJchXejNiRPPB>!t6t`${QN2xSeR-GW+bQJ zZ{-P<)d0L$23x-#($dngsJH~R0YnEhK;!xi%p4$!mlX;G2L)mImtW%Yk3VAC!i8pn z&mTL6>xqe&IDNVR2)Sjwk1Ep4wlW7*B`K+fQ|JC>ylG2BcK89 zCnlL$oH>Bie7w{lM!@?w_xHp6D!3{VxYz6>dYXe9O4@-{oEW`;-V>oBr z!Nr_ESO?U!zJO-3V(DGG(nRp^2n(=zlH_!zyk^Y&@Ky_8$yDWMrho{JyD%faUJ(+O-oY^@M~3p6bHl#fuRZ7ADT@uoQ+TKL-pLAdbN> zr++T{*Bn0&Q=}`M(9Izqho1m3Er9K4fd-k^nd%m`0zW^s#~9BdoKU^Nv&2@3u~jc~ zrGEM47m4R`SXRfP3Z~haI_EiGrrTL3zQjuIs$a6=3xDH@p84o)#r_Ty87B|Gl$MbxSAgpK4o&o@J z2&+K$@82&R8x~*8o;@3DMl=+@{;fw@LJXSJbrT9RE3a56OgpU#21qC~NaBq0lbk}( n5;Uyiilnq$1ca}%Y7zejs2{F|UTsam00000NkvXXu0mjfWE_Xq diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfWarrior.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elffemale/ElfWarrior.png deleted file mode 100644 index e473869c7da428b0d7e2d1254e58784f01eae8b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3812 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 M07*qoM6N<$f{GBkyZ`_I diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/BlondElf.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/BlondElf.png deleted file mode 100644 index 61a8e7328243c2e95a4d186aff1a6d737976988f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2066 zcmV+t2<`WYP)7la6#m{{-)kwf)Ka3hD3}*@LyW;dVvNzi0vD#r0^PVUrp66K-4YjuolyfD6Bcfj z1=_gKg(OA^fyRcAZp1XAK>cYcg(B_iYhOF&yLZmKGq^#X7112?>pZ; z_s*P?LPY8BKk6;kWOjBKZI@<{DQrPH-)x%BmG5D8>Mq8f&SCG~FH=#^Sk3y#$wd*s z$!ikKwGTd%*^WJXPDDOq-4H;aECi;@eNTW^0e@5aLQ>r*z*@h-H~e%>6=+r5cLazE z+$B;M3J~kh%~=Jc)6)RvtDu%MTlWO?^}XhAgAH&AsO1n{64pEc?lw0wGZ9!g42IUH zWLd@xRRWM-tjDO_=*6HL9!`0%&D9!MR7< zM_xaPJ*R-LTi-KyUb*uL`g?$DUmUTDP)A?s%dyrC0R%zG=2{-Y@MAZt3P@*>Ei@a+ z8%wJtAlK!w>*hT`$lLzgHlv26fae&iu7C>{-U?oJ+ArUpw+tw60q)9K`vNWh(WkZs zO{1LRsuR%H_r?NmdsSZ`BiaK!EJ?wcVBL52Te| z_lr3?_r=L=yXpkE6MAtcyh(otY{~&Q?&VOLu_9^Ar7(DNX7ShCc6ew6Py!BYv7>)~ zm!0js&Whbi7b-({Dp9Y`Ubo*l58%=^?mWQfN1r$UpF4Ios(HEW1$Y6w4ia@sRQM-jmBIVQogT=REY&hy(3 zUq2EN1ItZ-y97oj z!&4m?#-a=#2D~x=lCasI>Az(d@Vq?VnrsP>U`@aeNtXa6uOU+Y+6TyQX)|;$i=nJN z7jQifZLXmEh6P89u>8J&0(M@t_2U3Y(m$QR#VOxE6v9OJya1f~3czUf{<-7(@$s>< z=7xSA$74C&1suL%$A16#e)YJ8RN*LEXs62wW1RlAxss_>PVajEsyd zP5|h&RiRZ$0*khG(8TxV=30pGE2#vQ-Y!edzJgWLz^rX6)-m-0cp8TAiz#5Y|J(HO zNhoeD25ra3#|bDzf(ET|96C9GmX;O_4h}{T&=n>?Z&e{{%jmSaoNaFFN7~<10(XG` zJhwtxxKynR^=hmF=Y3g%hJ*&7qg+)00o5Ww$=wW1%d58W6d?O`U|}V5bC2LfvRt=H zz5EE{~+2Ab1o!lrKl@ z0p`#jl}RQm@)u_**RnHktgdF;?>vp{ zkih$5aT!yI$egR8qk!UHrC@wQ3H2Hz$5Tt_0qmA zZ?|IZLhK_1@V(^v!!scg*e9^K3{dd!_}{=-c?kp@*cJ8xJi>}q3El<#%UJkaz%5h2 zi^b)jBlaPDm@amoA;pc=dme6pUQuro(?o2GHI!rWaV zu>z1Zzra_3&irt}6R<9E!rxKbVsZkU43oI|1s&ryt}n9otvW9Zu7Si!fLM6~66O~a z3pNEttV|-@Lf!qf%g2o&a|V#LO?~NLvNy7{8Xd8~8MhRfs$)32NmDsI>&* z^e#)%KTKs`no}q3xJkF@`uMY-F zNQ5C#XHGV0eu1&3k~M$o3=cO!LWj*6B9BUeS@9*1G{1lok#AC2b6X|RY!C(-o zs)8|w{{DXc8PqhS(`kI+GoRrC{BZMTXqtxWuebsu4M6@t7ZZwKI(H6!^~$Rdp9Dgn z@r>#Km@#7p^J^*`$3Z%i1!qH{z!fK@i3yNpe;|NRD1;|g&O^hvbHOs*P_!TlP?0xs zh$kAM$qsyzKT&awYL%#Fd`01A&6>py9XbSE*J0Z>EX#tC%ORxeeBJFoT8*N^U@2j! zGN4##1cD(X4B!}BJorVzI+#R0pW#{I`TK4_ zV?#Z1Mjny`m}(paBLkl-L6L#l^A=THqgo}Z8DCMj@#Ds^SUe6{mN^4RY03zOVeoYL z3FfYYXEFXR?SzBb>HHy9nZTKA(pyD?Ih- zdJsD{tpfA}reCoP%qem=FfEHKN^F2rMApdjU`dQ3w^CIF`Fz3MHvoK20-A!U&*wwO z8^4j>`L~TM6wsi?8X(CE^wA+GwSPM#1w;%u_{t_`DLO1iLQJtxd)~D}8ZS+oHjR<> z>S}9IbR1C5kHuo{yiO6O?O@w~ZNobgCg3C6pMu%njko828DsYB!TEFNa{AMF0xy-$ z@clx;G~Iv+ARLMCpsA<|EX(HcLsc~xxhx{l7~0$0%Yt^dKgA5o;j)CMetbv@keFTV z&oaN0K{jur>B7ZB9>+IAtt~B#gvu98t}}N7#fL~F3fs0&ECR3o_*;-{13|wArs**A z1}r0kdCS(9x5Q-a`uckG^mHSvhj~B@hjo~y1w9nxE~SUVDB3m(rp4(`fD;3}k-T%; z&saR9BGPj8kQM3r&o-t<lboU=&C!XEj#%X1 zvh2gQM^_-6I2}Fjz5`heAQlZn@rN+^k|mtR6!823KXN$(*=!b#4Wmj{SJB&d2#G`j z>2wOVUF7T{#zez92mO)n+*$F&_CZq}9h7J+oeJrYBu_C7>lbV}ZO>HeQnGE+? z+V4lBF$Da682LO;fp7l&UPN_2a<+v2oQY^afnSfpr>JPX`eqISxq|EC2I}e({G=ET zhk5X%^k-WZ;x#oW6ezB^{V7X4c>Buo39i!7b*Mn>_|>z_dny#;yr)FLg7?vE=H&4l zHPO0y4h>j$f8XIjsk!aBn^`~u4}|_uJs(@h^|%`)69`=P(4cyp4QJ5#UxCazz@WvV zxcG(D7#ltd{douRaDb=Z#LQ0**>!jfI9i%&0oc8LEeCMnbsM0m3ZLGzY_vUk4F@E1 z-m0nq_$(wo|B{mEb9O$90|yQOsvosM8UC|BdvXBq_n+Gce+htsW#h+>E#Zn+3&46v ztfK@WfiSK8CkSc^EJ=f+1>m20$?yR{3hdqAeOxX;3@F+LZn*JDXsTLbfQ9e>(<1nk zVATK+1Kd~+T(bQhj8-SYr_uRC!{KxewKFa|J^)^a%qe9;=96xOgC&r0u?w^EAT0+Q{FT^4@NocW0#csZ zR{(UjEydk;zgV)MT^7m<04;d6qT*@W;-EFDD)w6iK9&IRGJpU$bMYf+)dKjnX>wt| zqWQ7&rLW`4MURw0@G8IM$))I<{Z0NA^%rg9l*w4KYd3%FFDp#)Gq^BQf44ne34qT* zW~97mv%t6lWc^4e0PYt*wdEe9jt0*g16Hk?#{qb_1UBzmIywIKUv9!R zi=QZiK$d^1?K;%Y{~o?>lUIasWrbc^MvOWPozdtur00amcoU--3 z3J4IU@9pFZiT?B{KoB$(3=(c2tWU~s(gJwcbOEFOB2!@NQe6AR%^ZX+Ke!6H`44d= zk5--(rtgK4g6d*zm&xw$)V@&(0CE8@1BCCB^}S6nVe0Nbak^9EE}&{<26#cCdAtC0 zE#6pGTF{?>Xotgvy+sRxm_V)nqIKo@$%Nna&O{)TSR?&p{x-NT!Mmcnu1p;3t$9zAplpOZ_7t ztbKDYpLihU+{_`qr}@sgcOlw-)Xs(T0x(Ne@vvo<`;)SQOn7Q~|<<2N&SI`43eFfMS49o+c*%)_(g6zRFTl0o-&omQWWiv)kvYWf0uHZv^hFt z0H{BKAOM>)?p%Zuqxng%CLkm4_~27D_zFqnl_-K%5>6-qg<075_7036dlpib3{{cg zQv>jSWWnG7Y-ziZN1-p@`m;eTBtQ`0h|YrA;#q8|2^a!_+Mq5_${J_G!D~=ZDD6gR zTm-<_*Pn)BCSgl{NIv&$0W}C%IsQ&UVh)1LfGG!I<&w~A8c<|1(!KA(E*4Qgd+=9e z$8~V1h|phPhf@Ij1sZKwMLxxVVTJPpOg3r!c;?75e#g@MkNwl`2#&Yh(sdLLm^%}v>C(BUAsn9#u1%-C;*IZXkb37GRrc* zgkjk>f_^{$%o+x|y1GVG#u1%-C;*HdGlr41_jPtkYrl8_TldWGaIm*m`l~a}U{p!k zwR`u7$~dBv4+Ve|-RBelC)xrhdi_%jIMEh3(d(aLz=^iNpIe_XcEME_UiiS4mtUSf zk}{sO4A}bgV=R?Q%1juhjo7)@ z4Xezj%3Sqi z)5nh)aHog_7ljaU*MPpGqAN9eY3eO?_wm}GTgD=Vsk|);Bi_3JG*%Qm1vvCssr)_S zF5m?~ygK)m!bt#8Hgg4c%W9&%$S-8L08lGk(S-L7fUCSa#_JyRT z6hC5pVeuwUp;b^@)c!?DTma;C9Z^rLRQw!q28g^bE>nmF1q-MsDw?+_>eAW4ZQJg6 zUyc8%QjK2#a;&=nB2HAg0rH^$;8kASDe$s@ZiaaM*jrxTIeF{=8L9ZWe*IM-5WLsn zyw(?G^n13g!CAAvQB@$XYA{JoX-{Zy^qm54EFciPcL)Rsw@e;WzE4Q=*bd`&lkQtP zkJtFUrE&oxjirk5mu}jE9lQ5dr9)MNNucI4N53x(dQD2Db`cDP(nr!B!`_ch!5|0Wu5Vw+f7?3$yQN!f6htMAeqkAIx_K-A?W6?2d%r;Z?ac^Y7a#z<%-OsD zAXi?1Kv!U>&L7cL&WMja_f>vRfEu~pt8f0kDkD}kSTI0bq5E?Ihbqcm7I-gNJw9dZ zfcpNPcU=Gk2pJ zStSNgzwfPEcuazPeCiyip*S?hfFT9>f66RmQ-B%*EQ60>MGFcmz}Dh$@+tlwyCR9x i;gcLl6E3bwhyMp7pHZC7<#x~j00007m6^8$QPWSZevJ!DYV^{$dw0sbZffOc2jU>hw8X{;68WnsiCa9-qg80x3_1(9k)iDWs6(2wbRqL zyYKnVf6l$r=Sry3m~S(?TvCliqzvmvQ+B52TzUttD zAYh6V0kQ_)b-2;FhDP{7h*GJ9@#DwC)OFt>Zpuz{D5M#z34#+a>Vi6flgVoT0Vm=Q)3^9AgjKKi_fsIhgKv5JR zECGrUt2S`ZvFc6?8Ga~omWA#40**a@0apoy$ly?b*Uh|01tf*bnlT2u&z0tAKv(phL>{`Z?IL7}Ap`+c5k?U--QcjoFoai|y zf@v5$C&-}M@?^&2S=Zrzw0`Gnl_8^{X*(gIa8xa9dFsdpnKP>PWh zcp)G&A8yG8)GSOR1K;U}(eSxCE1;YNld=0nxPAmhH~D&=GQ3jQ@Ui}3jidNES{Rk$ zu#S@)H5T%mpqWGBkRY#16lwt!MI9Il=xy22V@LB@LA3WbZ>{LEam%(oJ+|hVtC*pK zhejqlj9=^8o8yI&2N?l9&Qd-FQuF)(ZOf-|AccwZY69>*Nc{e@D8T}lxcOfL6TtV+TZT*-fa?eN z)g!a`Kx+lC7!qqQn@kXPDF8B{W8;VY3IS3;7&y52lE#g`$%EXdf@b`fs5_4hl-^@5J~lkX-#!qAt0T+!#1_VsAU z8Cdj_)fL}g^P}VV@u>Z+Bsb9UsndQ62XUz6 z{Rsp;h5pl6C^x)aeyV^p2dvMWAT5Ey0niP|cxsme=xm#fJMVlhiD6+)8UQ`;OjW~E zfzP3}Xc{*9F29xlq!mB__MiCxCg=uU@;pA+%k>P_t-cmhXFQNV5YHjwS3W))TPEMi zzoP!4EgLr$v)+i;CfgH(Y5WW^X6hfeN2>ui4>BX;MVkc14Iu9~WDQXKQlmsht+xWm z=o@@Dxjqdqodf30JCOspuMC@mrqv*TfBx}OOq=;w0)dQwvh5rUn{q#{^-CC&I4FiN zmphAb<3%#0V`@XniXZ@V{+Uk-KtRwDCEiaPARrvs(a9eq`qO^_LC8=*5Mdy^PsTs2 z8@SJlfl+@kQ()C>oPFU64q@ekXTYAagd5r0cruv2CyA4hLh9n#v6AES)NZZ@fI=Xx z01^A-{d5ybIAs01T<)>V7|zu6L;-0ibe}YU_h&9kj27}I5Ni?f!CtMKTnW^+AGavE zKY5W1O&c!8HEqoTo>)brfxB z51z{*5HK23RRz2Vl~M8&#*5e&2`rX=4}{j&JNS(&B^S>e;(NN^m+qR5wujd8!KDFA z(lp%Xdr5yXR;Vd0UjjnsRww5L2w>{!A7bux&mnJ@pvpb@OQ>}D(y3T^+&z4Zr&L*4 zN+Jo0 zgnyL1EpiDxgK_|QJYV#2&D>RJYOoUH3Bu@on-d@PhOp@FlQH>}d#kSl1b{i${iaXv zQ^vlc^TT8YAgQ0$HhZVnj61jmPhUI=lMenGn&&*sA@tR#|GvYUuO2Jg|lLdG+5LKz*{Ao;O)*-*~%k0JIXMd7qj9u(r%*TeeUcnb8 zpIy(^fIK?a-Ng~=RvvI*brg5EN|e*mglJ;*!s>*c{euFV2jCR*EJFp^{1#*k6S8jcx5;4yUU(h!0H`(@20nj% zZkQ%QXkeiSl{RK+*5C&~r8(Mzlxx~YYQ6AScJ1=#xzPm1wYycfcxO)l-kK?(RI!KL3hcI>t}^=ATA+{m)bG zfVaJyzj~{+`ddwD0}cRffS^H(8o)!F*Y)cSPc?&kpC6C_(gl#qb~gaW9Ck1h@8*ei zf4A7s{(?VDyq-IX>H`B_0Y{D=S+S>x1}+LAVy^*xM@3g^^wKn4>fXX@gK-&)45sq7 zD2$}{0?@Uh;3?qH|7zv$Y9Uc`2&4gsSLf+cI1NCQ&EkQ_Wi`>B;~O$!0Mw|w&2vC% z4?t{ud`&t$=(ySjh|dgwFrG^4RInfw&@1zoQpS>zX&5v(0uV#$F_0k8@!e%80ub%~ zph{7C55Ry>K-zdRhH`*Vfv6M267TW8@OVqA&?=-YYX71nE&!!NN7NIm6+d^m0>r#8 zHdBZP3KdXMRJ3$aG?sIOxohU{P~(5HT;mr&cD6S_pN<)p{9#zKnLwVVuxuk z?NTbWi)1K_?wR%&Iu1LKcNfa(D%!}ICWmmx?O*5TR!#X?c^4ZcQ3)fSy#kkBwThn` zkO0#A3&iL2jF1ii0+3ct$Hqv)~LSdhk^U!k8(Fi0Bvi%V-GQHlbmcxN+_5W&js2M=Z@L{Z)0%#ETFPgs7 wv3%o@W1wZ5phpfI$%NWmIV)5%pjH6?2T<`Ro2lt-ng9R*07*qoM6N<$f+&?0^#A|> diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/DarkElfCitizen.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/DarkElfCitizen.png deleted file mode 100644 index e0610bce569339997da68ae7326f1dd8af9ece4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4234 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Dark_Elf Knight.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Dark_Elf Knight.png deleted file mode 100644 index f96303411d40092a8b7a16dfd0f4025f9f401255..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1882 zcmV-g2c`IlP)9(E6#k~n^bfFrWsI>kN;3Xz%El0qrWy@|u&cUY<3d@~5E5PJ5>~L(g(ifAg}QLV zLYzmp-otreBxqt6|-}%nH z_suyeM3iEo;6?R${m>zFb#;ZhEi5eHlanWr8yQJOjbF|7$i+2700C$c1U&0I1gsYY zhzj_h(wDMs6tI*ZcL-QdE>KSe9R;j)1vGoit<+h)+6qanB?89A#=ObN$;i7&BV)v! zqiF)Z*tZWapE-krhYy?Qe{|wROGKd+z{PXY<&v4rQ_|5c4T2EB2Ah8_UlZqL|L>FpQH z|FI)yqsE7xzo_%>A$SCCcKdnYX2t*F4~rsT9Psjk7JPbxoxb|OGbD`902jBU4Uzrb z;YZKi_YBcd1aN-NN$@Pc4%z=)XZERGn3|euJpp}PRubifOr!$1z`Hvv_`bANPPv*g zBy7A|BcPrPnk7KM4*)2%ngG`YX6C|6EnG)Kh7SN<1prCd?635n3JiFDo!XMj1xTg zLz}8*^J5`+0@lTV=Z0pqU2CC#%c4&Cdw?FtJz!#{2L9?Jww2E^B=}`y15mgQU=Wyi z1<2>KL0hR*f=hxl60{TnpUq}bDwP@&0PfnV(5fVXMO!=Q;_v3>yAa_wQVA^iVN1^L zUQ1%(f$b~SG3^5QzE46581X-wF+K^ot+}A@?CdN7g-Fn#HI7$5EMQ<@0L5Z4f`H*L z0s5#4SzBhO)wlXzZtF+d&r||WfdD*@LRz?7YYUC)s{v=dxS%1S8^~5_3Lv0*Bq+I? zscCuDH=Y9Iybdg^WNzvRUL;GuRq_>JR01V#EHCOHG0O5mLm8m#3ETy5Tuki&4lttx z7Wz8dq-dfd_WE= z-~=s2RMPWI3Y9BfOc&syMcUfh$^{nP@O+@V%gW~$dq<5}MGXCZu-}g3pV<^;$z`C& zKj+PK_Y9yA39J^2%Okl@5IlN4RKANi1>8;0SYKPtvD*HvVM4#WZTC>U;pI~H7|~Z~ zelL3d9b1tj@|Vq0zRStLxrR5{aZ@z1Ljvo?;xes(-~LNF@@ARZpG$>K0Ru?6fD4#6 zI$f^c>qdXqePcb|6g6;H1iS(_YM1`odhAimQ;1`P0KS*}_Sk%g1da(TE)(>6c=`|E zR;397_U;Jp0ldPBRSDh&{Qa%)y?{rifESC)Mad;VUW9}Qw!7~Hth;%40YU=r_?iGd z_UFm)6Vhpl$(+fhI}S~U))mMb7>et`s62_nyoG5@!J{@B416`qd+o_$+RK+^mI z62OH?tnbF?C`vzG2!0hhKi%3j|0e{*$uF1yJc;&_g#R4@N%IR_0vPvWS+g$Ciu?jb zjaekPCHVuaa|55OlMp$>@uw5Iabg!pnqRF!`pH zxMY3^Pz_!OKH1Jt*k^Bzn67cN!rW6Lu>z1Zzra_3&irt}6R<9E!rxKHVsZkU43oI| z1=(2}*B4p)R$UYZ*FfSVK&(6g3G)kby*33#tV|-@Lf!qf%g2o&eVcV&)fQ zyQ~6qj9*LK4Sbr;DnuTY1hw)6)N_G2`2|HAniQ*x8g!DwsJ{hB+O88FPUOak26M4V z^9#=TDYGJL*$>3>40XHVaYl`Qcr;K#A`FQJbFoSD3yd|Dtoc!Ac(@4?I&97mc~lC_ zin~D4`~ohJ?+Rj3v*2D2w7kUn-SD{N4K$Nmyy65T%`ae5gB#!10PE!kw32{-0q3?) UeN7)q-2eap07*qoM6N<$f?5uL1poj5 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Dark_Elf Librarian.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Dark_Elf Librarian.png deleted file mode 100644 index 1e1619bf0f2705dc6f5ee31c30b8802f97e3d12f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2203 zcmV;M2xRw(P)h7f`0-=+?S%_&-+=>B(K|M?zEHR#01)1S zz`c}z`t+$AJ9x109WM+3C`v&wTV8qqEDQJz^#xMTFhJIq<+E5|S@F^VAQpr!(i02_ zt^X_*WCgPq9)R0dujWpJp(}(SYj4e0)5fot-VUZs>N51OQE6Tv2}a?%jSx zhoV+_DHPT{c<{haf9lT_P>V_k0PSaIXVpz$$PIJv$H&KgzivQG0AMN03hv64EAG&t zL&?$>MW?5yojY~PebiY1U4khWFS?^gk9t;U>1+EkR<{5+=i)$#H7V|#i?F-_Z_O<7 z0MHT20>W44&LwMmln@hWW7qn+$MOOX27Gz;tOs%}$}>h7B#k0gi6S7}Gx`+~&_y=N zLw!qQ6tjwlqhWc9*8ZY@7!UHK*z8#%1wbe$fP?`si~$5ft8h5RR-Yzw0gy%WW`R8A z>A&Rx$e?FDI5_AZFD)&(vC*1aY_wglUW?qd`;DRi;~U3u?1Lk5V`XKD!(ORm*S^yXt z8gfsbJV^jxEI?&kT&B@zqyXSKfOYDM6o>^X*TaVor{dJQ0D!Qv&YL@(tM@hhOBP$T zt{Cv~du?5Q_%rsFRuRL*60VdED+&RqR4SfT^?KbMIda7J72DPY0BiDtuciq(cQ>D+ zupf&)di2PB{(jq)zWHOp!HQa~ma;x|#1||NK-4cUFBbv;fPe?(y?``}Vn|ICigH zzwU;IhdssVFLwZVgtbcAcZ(hN8RG~@0jGe-xFLwmW-}jvfq{WIYpOcF-?_nxb4x3$ zS1I0XIX82seJ6zxQh*@@_t!^9acuYcjT^p>XDFp02mr7F01=+L5a29U3K*{H$Jj7{ zF$GwsT|NNydfmH#A~geo=;WT*jntf*Z#Y-&TLl5-x&P@_TQsbSCFr-Xu;8Cr%Sb?k z5j6oouE2Xk7EuQ)=___AaH56P+LX5*p^_i^TCU%Ja)~78Hp|wq5^zX3rR$CcBKmmegunwE@0XV+j#ZnH%pgdOg z*6nNm76Sl4ZRkV!@m9qPw;2J>u2(|vFa}I+wOaWAeEPPFrL?8G6jThb$_pUCxOAtM zFb5wLi?9}dx<^gUM3V1|S>ohNLOhKh?hicOk5P*%%nEv>1uh4Hkm zs8*}_42Vrc(sDBNCtfJ)TBT^mysQ}jC9x=1tZaQ$b(Z!B$-O{O^k!UvG&MEl#SzGM z0Tlk0tJwBME5m5d&T4Ag``uU4E5g72UHyvlw5z27y>`Fhg+mFHA@JB~kUmy1MRT5I zEua8}@u*|WW5uOJHf0aclG7ei{NYn(2G{>MyG8Cbc0qew%ukxFIu%5 zowga!4O+d}cAEjcXw`0X+GapEX!T;-Z3gtBRlCt?BN$LBzd$EdY?81$G%+zz>ioY5 zj12*Rmuf$d1Pfb=@(VbrVwXrqU7Y^f?XIFdz9NOg`gI4OR;&4aR`&ChVbV>00RXTc zsPjF0{EhHMdwiP?0H@7Xi092O&>1DW!gk+pD+1tCR-kQgE}t?6j9@32b~eWVmeAjx zP-{H9o6KN3{^qxNS1A^k>Wm(6NV}{HBjik8Li1#APhIRK?}DAgH(?BQw%#P>HN@3&ai zo(J0G3!7;I^}}2xlvO}fY%u43Ye}lgofy^?0ObbuNklR$(cv zv>O36eS3A?gr%W4Rz_h3O|d{}b%3Q~_{gT97V$l!zBB->R?8+LclbL@inRA-zYR(QP&U8doew86{}Uwy&feSnfK3OWY<|HTAEej%S;-H1 dV3hqf_z%v8ikl5F`|AJz002ovPDHLkV1fp(4LAS* diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Dark_Elf.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Dark_Elf.png deleted file mode 100644 index ae20fa43944af877a59af176e03c8844a97b33a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4344 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Elf_Asassin_2.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/Elf_Asassin_2.png deleted file mode 100644 index 3d64c3e562045054462a10d124a99bca012bf7de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4432 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 N002ovPDHLkV1l$Dd(i*@ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/ForestElf.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/elfmale/ForestElf.png deleted file mode 100644 index 1c8d44e0c1cf4629a22f0061db59e471d3dc4481..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1595 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 QbpQYW07*qoM6N<$f(z4z1poj5 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/AlbinoChibi.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/AlbinoChibi.png deleted file mode 100644 index d24b15c1eb1272f762db97d91efe1f14d40bfca9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1089 zcmV-H1it%;P)x@;jYQHG1W6ID}tVmStgmjBKZaYXI6L&*yWI$;#jQnKy~61JEYjeijrBL10}K z06lS;ELuf-t}Wv#0O-j^7GS}+3IJm6X!;lzuHFS+Z4kWbG?>ZrR=U%vFq6kEH)?Xn z)8l5H|T_Dot@#CSChr3d4?n?dkG{xn8xjZ|4d8!QYr(Fu;g>IVy0BVr=c@!VC z6=?tWAPomlYkgepiJ5wu)R3?m^d@Jy1O~<705A>W^43dtR@R6>S^(R#;Xx3!$Laz$ zU?y({4E1pD_nAEQ|Evg+porScE^nE<=RVoGfPH_hOPK(4s>9g82x|+7vJ1AY0kCI$ zDGP{#8YAqvfLCLnMXUj=$Ck5d3f3m9j!lt#+5)^y&gkQo)#yzVYa*zr z=pF5PkyUwPZ1OB-UDg7gk3}D63nn%>Ykv{5PPTuqU`tzor_C*~AZs;NI%orD*ZAfDt13paS>JO25RG@# zynq=Fpe@F{HG9;?G@ET74gd$*W74|Mxd6PYwS4b;v2qRoIPs1k<^bS1YzGjt0a$9S zza%L3hzD~3(3)<4e|r0&eE#t@8_D;)HwS<=0}bK!O)d97yNs<%Cy|EQ(cERt-ofW_ zEH4g#-49?J6no{@y2D=qp!XPYzcB+~kNj`|EpmJJjoRQCfW7j=0eE+g1PTMNSH3#{ zePu;=9$5kIG|T_dO*MQ++=Lx|G9bHSfOjP(I%z@xYhd9~8ndV_0HXbR41#)#TWi(Y z-fr#Iwc9oO{zC!a1T4*4@Y;LcDG|EDv=(6bxpkkwvmSw`VOVZ86#zEa$Q-wvPB)n; zf*?Ddk~n|>yn8-Y#P@EFOkn}&vpCV{pwyFPP^FJ40I*Zr%t>)HVf_9-lLfp>R9Nd< zSL>o6I28b^cF&k^)-Al?D9?wx00PKXfL2CeP^{RpHw*j*Qe#Vu83u5700000NkvXX Hu0mjfs6hCC diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/EnderGhost.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/EnderGhost.png deleted file mode 100644 index e182dd129b1922131032c9035439159c2ffc74af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^Mr1aSW-5dpk3b>#zZj^X1?2 zyOdKK*Q5wUJU#iN_iqVH^u&3a9s0xm6pP%iKg__P@s2?`K!$uBXIm~a; z^l{<&-iFE=aU!LL9m7vpo|xA7sg;Z4yt$&(F{E zk?xXnG);4`Zn?X=Gh5j2_dD+yOI~+7mjP(oHZ@I?@@GEid;WZI0A#20L7-#+4v!A$ z>hk4LAV1&ScE2~p0PZ+>OAL5*b(wB%zjUWF7@GosoTaEs2ISwH1^_wEQ-A>AIj|`P zJa`eTDT7%M>Dc|=tzQJaIxnM7&hb)MQpZsm^;+VV;*$2q-m@bBkfYK`J`UhQNay7k zL5e3DN3?CbJODg82uXCk#>TQ=6#z1l6lIDm2M4hMrH7w)(-3(~IK1u2NdrH^O z((5z9w59z?Q1&kF!?WdHgL=^%cJ0+;^cF?lduCb~SYX2+@Ks2pk zfMY)ht}@Fk20&_3|GSO>T29HbW>pH$VOd(0a(HxFRvxcX0WIrJd5jq50!ZOeu6iOS zZM-3~_uMnsn~XS`3=zuK0tgZ~a(b-295r$f(TEZWv@zBw2SBd;qK;^+K#L}&_8I^@ zb+qZU^^6it=op|y)oWZEAtG9PlOk<>!2(CFP%E>}G6s}%S{p7SQPU`?38v?ar3FsP z+5pg8K+7xYFp8k2yeLgHdlY$V{ebHY(i|YdWeg}q*wX+n!gJdfmqATrEQR(;SX2Z# zJI07$Z|^feilCKKvgB#Mt(?}L=apY?T0UlEd9o;qa$cVEa@3=_6-~{ylue^GU~KLp zI}OCKz?B5Wc&1wgEFU(1t!n19MKt~cu*Im>__Qtt9NzxjS>1h@tzWY}$c;*No*d`j zUBlQ7>i_^bJQE1Z17JBi0|?6l5MyxIdR+j#dwNLkf6UsaSs$i`D?6T#?EK6itOJ1T zyaa*JnwSyG1ArW#*lEthB2)mJC3V zEmh?)yVHG|gnS4YBLFxEW#&toC{FE0Q;C~rbqXBaAQZusC gMtZV@PWg|MKT=;(j7zs-y8r+H07*qoM6N<$f_7RFp8x;= diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/IceEnderchibi.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/IceEnderchibi.png deleted file mode 100644 index c3db1c5be919efc2ed643434bf46c5fc4a21108e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmV;g0#N;lP)zCalkckzSQSC3zJ6|XzB9~Kwo*n<#Jfc3#7O$$xED}?O&2lto;&z zI4{U?f|T1!@)Bog`r!ZZ`K$O9x! z(6$RMVV?(-t{rlVF9l~g0L}r{^#E->L6R>bLGG-!Pqyyg0hq5!dmb>U33?uI3aE26 zywW(_+UE=F4W0*B?#=fwwtPOI2Q4e=-~dzvcN1NAVF5%$$Qc{g6ZtwIo}X2Q(Hwxu zGc+xmE`Lk7=+G^@&4?xY?E$F)| z0Ep-n5x*Abz1k~X06+sg-~fLy2dp+jp`$JUU>(EcgT7-}Y;ZLhWNscbz#|Uud$$0@ z;M}zfG_dyU5aupmHSsgotgb-3JDl4Wly+~m@`V#x-vZL}0cm+nVt1{47XZXcTmyhc z-T^2>K<@&Q&(=O$AaP3dOi=P!Rv`YzC|7dVv`d`Q1b{i8O%+&s&%puEtr?sH$~ZIg zb|_?WQ@XbppYN&FZtem(09tZ_1K=E>;xU!*Xz88@B>x+%9p|My!kh!r!_gZ9;2--U VD_?%DWC{QP002ovPDHLkV1gA#D(?UQ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/MrEnderchibi.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/MrEnderchibi.png deleted file mode 100644 index ed80357e0520effd442231f7dcdf25990cf2dfe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1176 zcmV;J1ZVq+P)eUFT|PSq9f=uFE-s6i+md*lxGW1Hhw$kVN-uY%Kex0FaTSC{tuPIEW1>JtXycUqc^l zGvMa!xAf)1O?v(QI=%b+s`v5Zo3G=w>rXFX`tg)Psl=w%%LBk8&7-L0Im&g;9vNkt zK1-yUU_eT#uUpn2`TW1qx!&i0f&mnr`}OZAaC8`hrIVeGWcYv0? zc8^t!Q2!@k0HSFP104HNaFtbNF#uANhTnAz&~i$aHLFs14$IQ2l*5C|vhsM93TRn> z$z#O07C;J*a@7+tY2!_qz2~05-eknVVu(<-Hb9WTk<(M{<*bo|h-Q>XppCgkIRJ9! z7Y#&X1==(zwbuaPsiQ5Yt!I>ILeBs#s$S>X3=z@VTNG*g3l=zXhgw;6mNB4Y(Asnv ziJC@9O)x!YEG=+S)&_vq0$N_tfKdcBk|j_3ZRND~Jg@wE%kn8R%cD(El=JeMm!lrd zt!QetrEHq40aJ4q*=Zn71+FA0#xvb2VEM56dsQo^HKOq!fHg+7#;3Lz@M8b>Wc7PD z+qhD3$nkSK&C_Oa0BA4-#9WbQ&xy)N+@A7Ye#d+EduWOQ zb5j3o42YiJNA3NXAGSC-1LQ#q*#C1+f4NPq{o(-Rie??4c-zz`u&=`4EDYcysEwdZ zfm-`2?`vNtL7j8T^ZPZ&Xk_QSPS-aB?+t{47&0CPG`=40ZFeI8trIEPUOA)*`4BQD z0Ibs^?c|xRQ&c4oQV5MxqL2?EV-En$xqMxMh5$gPOEO&wMAejqvjN};;h4`Fdt|;F z?+=802pLNTpvac0@|4r*Ax%O)gp3gY90YQn=et%ZI1>QPkKScw?L$6e1ZaDrsC7<)vfFmG~5Jw;&d53KGOfU#{UZ)JA$yp>E5?B+=j z6^;6WNa09c14dq(`us>9=RayfI4Pp1vdh~@9+%U|sK|im`L#Jk1pt*A>mjeY;647G z0bq)LDF%4)8zF3kfYoClBWeJ^ibB65{f+?0D4a=fTJ<=Z?68|uGgbqxMm_@caxH*p zTCo}>F)WW!%N)%+RXz=XwosAAWcL8Qt`9d>wUVmsIm&0^f=ts4&Iol@+kl?iDdxrlHeHmO!<^a59hb!Qvi6SDN2r7B8q5Q!=`BdC|{%j z(2|;$T)ZkU1{6ys$}^FUApjXe);y-^p+pbB{s*83FSOL5IRkd3`0pT`@?AqYzt-xUD+=IIa)OBvrC0CTfUUBR}P)SC0&`GeiN?{5|j%S9*i z45xc!{L&zF0RS0KhD#6_thpJ{901Mmxs8@gYz_b`!$2(Md7h^W066aPdx-?y1pu4_ zmZbh{42a$jh&Cvu%Ga{yFl};YQ1}u6D&$cFIIG!0}ud>?wKl(0Yz)0r&fXA350iyX5b=} P00000NkvXXu0mjf4($zn diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/NetherChibi.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderchibi/NetherChibi.png deleted file mode 100644 index be310d0b25863e87f32eacbc74c00659dd579dd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1029 zcmV+g1p51lP)vG%a*(f z`=6yO>K;daE}g3Y)FAC&b=Lp=fMpm3 z4KuyQCS%Z40QewL-5CIk6>L(B_Nv#9Zj<*C$g=rzxs>bmS}vDM`StC3C&tTfckTLq z4S#T4j#}vy0QgKs6JAsTY7WT2oq_>B{yyzRYL1y>A{a3s>KL9K(=Y%tui70`d&VR- z9eS`27eUOPnhTV}%03&aTIK?^zw!_7|KWXri6UmxvZg4j>~Wk%rl|nb{>r~50NC_q z*IFFR?4!?G2P4k_Ca}uCRRFO1RR~8Ejb;pFgbG0Iul)M}fZC9Opz1gh!>rS=IU*{< zXf5+q0s43rK;x)ZTZ8YhkA|fPI0nR8M*Z_JWQb>uv<^P#2)0cu3HG^~CRwW<0w5ZC zBIg)u5FiY~gRBCGW)T#>=pNNxX~N@KAgkLbdo0+9mMs${Q}rykh-Kb~Aq`-qutoz~ z?OSS}fx}uV0ww{lX91?TtWG1Q^x7l4Sc%}ZNIw`L5&(Q7#4;S!T+}%-b#4i8OZzSW z6eY7-W!X|9nhE8Ih*sMs03zkawit=t7WNTHy&`CKO#o!ADQb1T4oB=2o7DZ4eKP>P zwV!o`9_?sVdnR}+5fXrwwsz(<^7{d24!*|rAAqxGSj9IR1MK@qyZN=-jZ`Me`|El0 z$N#^&4*!m@@{%UYUQ~r&m3`DEnF<|uke$;*~Yc^*9p5Np9LiL7b)c$Y)>I{$X3qf^L&`0eL2LLJD!vG(| zTKnAr@RVhaD~IruhplI8?3z0KRQDg&faohL+1p(NDk~Yb*6*z}WfuU{$xd~GogWGG9mNA)_e5j2AQEU9x}c^#le@YSwN}|JyRkPL?N{M zOd*2m2rLr0C@8ND5jd@fp9=g<7_c^jxLzG_X8TX80Y0cKz^G)HJzM)}0PwAFR0OAL zgKTzJnxN{M^?$78X*2)rzF;=s0T?{Vw89^>nGW$)rS!SHp?G9S)gJ~Ic{{LH=( z0d)`>S-y`L=;5trb*=3D4Bte69NdxtT80Sx5qU}Q83NAO_d$SFv(n%Sk|`Ug<&Pm2 z-djr}4kspfw`3QM04*}iVT^`V>)t#@M*Pu=6ZjYbQusVWG=bc;;SkPNyh#6#^1x@7 zK<@&o;o}6(ti~>qgl!Ym9vxsLUx?=fXrf}J zR749RQD>TA?GvmHgPIfVDutb6=cjE*p<Tp-rQpa9P zvr5bhhG$E-1em&dhFP7Vg%nL}t?tyKFO+~tTl?lQ^!Gl_aW z(ao-I3k6aYNvM!pZM=2zfYW7&=6E-|x-AqS121K}*w$r{p!2f+yNTf_1k_UKZqMZl zviAen0Yw%c$hJR2ZXrOP`6=gr?wWZ2-->^nfTHT&Ei%i13-C=G+>!x!W>-Fo6I_}B z8GMuXS8O|F%F4x~?-JlGk>-FlMtqkFVhX%R_UPa2xZ85Bg)HUHGUY=GTnS(|JF)~S z36cB3io^MV=#&pBFe3mRz}lA4WS6P(-GvrSVVZCo0Yu2&k1YZsS7#!VQa+@>m;vRp zRt_u*5*N`4xkgsVFDF2AM%KI4DZr^CLo9N{_>>PRuRDviKJv WF+Y71)a~&A0000m^?%ZdAe{$ucT^>bP0l+XkKhl_Fx diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderman/Ender Mage.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderman/Ender Mage.png deleted file mode 100644 index 23a56ea128fe39ff0e984826a95c33a4d4cbb81f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2979 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 Bzf=GK diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderman/enderman.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/enderman/enderman.png deleted file mode 100644 index 045ee618a2b8b1494538b28bf379fedfc86ecf72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1012 zcmVrvH3aJdgexM9G6IWvyX0BAXc%ohMOB5XC; z^F8la?;oiFOpXKqiS%%l^|f}1tQ{fA#C4K)ng&uK6R=kE^?Gee@q9j)-|QZ04yqgD zfEDn=0noB09H1YFjpS?}wL)tTRtnsZ5OSG z3~xf7#-hwsgIwifBL;xJ=K&Bg!5M&sRQCGMNB{z> znt+`vw`0F7g~fo1wTT8=k`30-1V%(lOppWDB0#JwSX__`vm*<8IshyMx71voY0r=g ziY)LqhF(?ibPb5EFasxduNZ&`I93}KwNZdsxe6zf;{Z(8b0*_)n`r_#0q+_~0EjM3 zf|gBd6CghSBR80M0bG@NKs}IktyNAYpNryhOpdON1v(5MBOr1k!K5I9l^xIBkyT%A zMf=Hxw;mDZfFgwG0d0LWII&JM4x0h`T7_W!X$T}qNYn80@8!!x1GCP~p8 zieB~v4nCKCiR7#zJ1=lM0NBotfEqml<1NBr8lYl+9P>>BYVQAc1HhW@&PVg#_6V^a zh(a4@0*kZ7!!#fY06Q{^ z?eCg_Q855|!qEc}0suz|d7{drEZ|kg@W^h|fD1p-rkM4lvVK61rmc iw_QiL06{1Xh5rGXj2nf=BiHZ%0000B6Z5q`_Da*;h zZQRyndMRI19Rv8P4PuFE$YsV{^Ly64P4+RZ0iYOAxBo3D7K%_6sdCL9c>cZe1^^jw z_Gl9RtV!GSXWxtgeluA105Ar4f{@zm%iyvH02xqwbQX*>90Qzj+z|P1+yhPt26%#S zDlowO*#zxE&1L}qUG@xMYn;*BD>wR0(C7RQg81!KkJ$}gdFvfFl=PI)mOu55nMhPa zCNl<8k*Cwg?RJyNnN~lTSbsa7y}Pskw5@G1DMRG87q-AFU%U#9-F=qmq2{^p@U?4T z`(rDqs$}`<7duJ|z^2D<9|r(4YS6-q#^SK}iH)$La}})5FR~PRI=UO)U;HL?KGzEQ zT-LGzSshVhqfoH_rAH#x-~9ikB>*@`RG!)RS6qE7)5oBc_Z08)W)M${>aNaq)wG_!fhR&o9OUhgKHT6-BKJA0@3o| zT}l8L^B=MtDnSjSDF>j!0D%F~{(Y0W1g0GW*o@B{sDtA(hJESjM%&u`?T&4PKMk4| z-fWendOo&g(7rgCiE_zlxaNZ@k82s7qI_ZiFy&cU|JPk7Q*XO35&%^O^d3BBU2M** zkHgrUE;WqvGN;>ouEZ^F!M&B{Jv+}eK&1wB9|e*sYAsI zMh+tJI25w~*$ZClye75TmSggmcgJpm=G-SRI5+~Q)zvuKB3way5ihx$1S+ z>w8~!ZF;x91eQP-3=WT40AP*@&vw-m2!Mzlv--uE4VuI~fZqtc+C)Q!F~F~1YJ7Zo zAOP46j$L2H!B7K0d07B1Td>r+a7FbPWHK4}Vb3m445e0(_xfa)gLn_Mx@orb&m<#R4}oC=h? z?a`|=2LoP9C9HNA8K27NJ5H7aK-DLBW#j1}22FlE@()}(`wZVpk7#?$OB{AE;M<{d zt@`Ykr2zCQr+ki%Q(#~$V)Skup^HLp*!^(G&h~+X;r!zUg%XG8b-%#95R_K z)Yny8K^T4C8%hkITyEM+t;RAkMg(L)0()E{4}-*Dw|SrrJ~91H?7&_5Q~T1o43dHDIy4p5a@jY_mi3+OrYZbRGZ2GsJ<_t21u2wE`fgmBQ2hc0}-oC00000NkvXXu0mjf D3pB@P diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Leopard Female.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Leopard Female.png deleted file mode 100644 index b4e9269e3e6d6e99871e6ae2ce2820e44c6b8796..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3945 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 DWH4m_ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Leopard Hunter Female.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Leopard Hunter Female.png deleted file mode 100644 index 2986e8b53e151103c214dfafaf7ab6186d7ccb3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3970 zcmV-|4}I{7P)iPNNa#_+Gj>*~IuT06ZL)rx1c&fm@aaK?Tf2k~2 z=Ze5B(YUx>mIQom+1nhI48KP_Zc9QfadEpX8COy(i%PN&e*o|SXm@d0j(9yTb%3kp z=BoYo2)G4e00hIfZE1-n^gMn7sMBv;adVB6a!#(moXtC;hc^H$gJ?1uOUU@yL8Y~!eXmTfG=^g0^SbnZKw189j@(dO zD=*B>QD&TR^QuD|fd0pNY_#V0Sn|hN*)q1IR+_@LtbVLOX^micld5IugV}<>(4n~{ zuEN$l;y6Ig!6fh#mL&=hCct^HhhtpHi49q+O6qo< zr4QxmH6y0g>T_UAx>pJ7)V>~-x+Q8$%_I4$K?I1z63KuE%^#cdTWP4gO()*3;7R?C zkeq9lMug+~>mH~TpVyM559X<+37{|?mQTOWEsE-BBNQ5|aN{t3Z*A>;s z!s2V?#+h|`9&rK;0x+I2wm2wTcBR)zS|=apv8(3gsWZzAc#;4>Z3M!$9lJhJHtqOG z1<5+$I0?1vlxRGm=Od5-j%!BGsF6t2PO^Yi!`MB{>YeFT)4^=gZUTh5EOD@4WKp#& zDa+Mh27AUiE_*0XT&{j{%#dR7ytPcc9=C+EhRG+vS&~RJXdE!&{%TzYO@6@r(6Gnt zQeXn8>QR`O@4Hlk)4U20 z>1E$rDYcIjNH`MH$q~q~wtGD%$WhnKkZ3e2;g%NZk(sGNwL~J~vRvZ#`{eW0r4owl zRHugK@%rQdEOA7N&>R+UoIklrD#~*dEPlW4fuQX8S1i2@=$MEsoSf&V&gB(JMCH7* zJi7eh)QI#NK8<%eVUj14IAQO^0U3VB^RHjmAel$>*V}u24w#H+c(?OgppT3#eZJHC zZ(UTF49vJU{)yFy?>zU+TMjJn`pUxqfQgui0YJgzY7Kh{h*AOY&cZ?)HjJNLr~brH zp3hfa*(rUF86?q2vx3`hv;sb1UUjDc;Iqchs*}cWLh2qZkctIsW!S{Qvf}Y|QgG+R z2kcb$2|(M4oqMKR<9!?>Xs7bppMKn6V;Y!@-{+H1C?tVEKoW_BEGf>D%-(&KT`)j3 zkKnD0;5ZckEZaC+ViN}D_2RsG{ht5Ri{+eK4=nxOHvp}ZLQ8`Nk_3_eJ0n$Wzx(q~ z>`<%2jK|~R^>~${v3OjT&n|QTXdN)E9UEL;nJ}mG>=6J^2+KAKsrkiglKqnlRY~}- z1I<1yLwRF|$=S71vYoctlU9!a2Lq)@8m0MUfwR3 zUV4INs+bz98uwsMsQ|H91$Y?wK0yx;c>BGc?VM9bxs8uFKPx0Hk+=#&gx520l6VJC z60g^zNmDEqmv|yBD@upyEv}nYC7-V;mvCg423=5jZT&9&@3PBI)Bws9UWp_4pIBnd zj9QH%NwEMeF_NhufgWMFu^>;Muoc zzfTa1@B>fYqgpn_5VXYiqkEq!_IY!;g)^H!%$)neHiRa7nEh{(#hxk@!+`3#?> zsFU)N)|z0+6hqMzXd}SLqFN#2g~Gu{e=PpN_v++Um5XGo#ohPLD5nP`289=hU(`@-hIE8We?|RRf+uI+Pf>| z=@A#G=9~LC+=dCaEPGukPe2AhJloVFuAd&1#iiLYp|nmW=6qMKy0X6lb@}BdY7oY` z0L%PRIcT$14B~mOX^U*Dy!pdx%eP+&E&u=b1Q87|S*1-`07uWxe#pm-&AmC4G?w>U! z5{)$^%V&hhXmLz&o#r11#d8@3NR~(h#xYks=oDdL2Is;`0OAwDNzY9c3I**?;FffP zIK0ZaPH7CJwY2TBwB~Pa%4GQsfQ)^1=A=fK)@TfX4dU#f%FtK3;ldcx7)WDmXGGj7g#0 z`w9l>X+(-0a}mx#yO<*b9{>ZMEg7Q6{BO*WV;Bk}VN*%~UjJR54XOx*wz=81e|)Jo zKJnB(iad4)#hjeqaeNFWv1zNjePYuljMkId9CrkyEjVqn#I`xYxmgJnI2yO*h1uDf zVplA9RTCfPcFn{}U8+r#h~PMC2H#TxKpcQTI6k(!K6v*_IepNP3dp86Ka+u3M<&Z& zCbcy;M`w~?i>@xYm{uEr&T8wCCA89)H27ojHf5<%c8wMOQsz}pB4jBfpNn1HD zPnTHYkN?+x!65@c+iGv_ebw^ezdNr!A1uP89e_doy|&qnBCaQ}`P1X?a#y8{II2ALw+=D?e}ck3+e08r+p zfI)V7LrJan6u<%!8UXp)o4}^0huZ8Oo6Xd^M=8rWETA^g-K#;`8Gs3xbT`xQwB1oH zqHf4YmCYUYPLTDVQk#e^g;OzsY%O|Fiyb+wrrSG6(#`-(fWU`AWrsnDjRq=8U8!n% zhdl#KhYI@*FV4=<_21O_C~gkCse3z34>|+1zrgG(ib&DZPJtDzQmRhX7ibt^_5moC zQr|P(YpLq|2g-2F8Lj|Gy zjft##wIR93&vuv@x>3v9C{vx?YWDld73ddOG;@fWNLK@;gARZZzWAvnx|L=62F!jQ zJ3(-K>$cu1=k8B8AE@JQcYdnv?^HMMG61|#fmRTdP?lnb=`EnM4C)q6`ERGF=@X`l zjKTJHS4P?az-!~6OxudHL1{^k45#sd-+8%;?QN$CGoc;hSKqZN`Nj$Db7qhK@!Bo2 zaK;efO*OX80M)#cV7k+}o_$L0b-@oiZ>viMZkHKgytZkS;(<(*{Y0`k2Aio2Vt(>` zM%x|(^TrvOAS(qsIt7y|ztR)H{y+W9Y^l?{3Byt?tKAL&p)3s+G&?*q{n})^8Z3Yf zrnH5|NOEv&Y^=8JF(67LSYpjL0GYleJU^hc?GxZT*s?R6b^s`5^0H(k=5&X&?J1z+ z1R%_N2vB!-V?-&<7J1ctrwYuzB&>l&G&S&PHaX3^3pi9gS6gLx6NM&?xSVrq*SgKS zYy#{qLs=$6E>FXRHY>!O_W@YL3#K@Zk#>1?n9+nTZ4N-9Tji|#rp2C67)C8FrFEY+ z8LtWtI{=0^PpV!C!cnNP8wF2_k>7s zP5H}-^_@4)UDh40zNzXW(s5_5C~yY`?@^qo9R5;s-RU?SwsZXE;FrN zUSC~CAV7d@1fAi%`YN?-Wk>c!QHmHsa@VuG`TbA6`*_mHl?n7hr)MT}?>#x^JKz8J z-gIC^js1`M8vLwl+)B(EHSu8+34!X0<^&=Nf(ng36? zxs!XA+NVF-jKL!a!aC#(Eyuw4A zyDO1BWHOE(*nmDc6Or2O8#q_{7>Z}rVauvwOn9aa>y{LtV$K%)arar=_7ZSr?=t(? z!HpO&xD5Mtt;ewY%5ijm6$Xu%f}Pt}qqo)-nx>(2b}d3t8y>fYx)sIHbq&F=fnndQ zNhoEvvsr6d#|gMvtr#oIh0q-{&3R z_2`Hh7A8N}fQ`!vFm2uztbUhF$Ooq5!}s68eGg3g zf3A+=f9fOp|4G=neJ!#F^LI4{4x5Z)2RER1_5{#X-qoiB=T6k1-@RoxvTpPz8&Q2;o+KF9D?2qL{d_ZsrMxUHA{CP(u^6sC81G_5GtN(Z$ zKeP#b2Ts7pCu-2EUn$O=*o?k8lW<_qI(&Wl2gwDXUr)D90~U$ds9#wOO#>{;M%1w2 zb?XR6O{51r=w9$koUQqe7`wYmel6eW>Ugbb+3p@@MFsa~A6KZ|=ozuyJZu%YQdC~P{0)dDgy+-Pbt;C5^9dUZsj7I~@YKZ{GXH1{hfJ0}JYb3QknQpuG??OhvmG_=R+hCfoWN2`JWYN4xM(+dz>|x1Jtf?#GD5|i=M8qlj-|lhuLgz7a5sSqTjzo|e2nbP;XcW4p!{_tj z^LG~^6g@3Qjhy#-T#^GY3QYAowuMr_-^H_Pv3^N`fW`CW&o|)Ir$%xC_;MmLcXAIq z)u%hUuLETzc_@6UR*V`Wy|Wk0HaFbx<45iD7q1|%pCS5g+dzuXg&jxT=-eR%JN~du z5~dKXvR{|S>zam`Y0J4q>(95je%12nb~I*+dJ*ibJDbGX^EvbeL;mIZ0T)_jr>fPmj4#PY9yW-}sDQ|u3Okn1(7*F0?DluX;OoQ<_aEKDoQ zlZ9y*xzR)qShJ+Ujv6M$J@zVmUN1tS5d3~W)~tLC_hjCI-*0;t87Yox5Cnql(t#AO zBMr~I{c)QB)W7uy~`&RxNH2Fmzi__wYv{l4a5OQ-j=$r+!AdJBvlGfZ?= z9f@N5b<3vOUo?d<{(C=#X_6}**=+qUoGGV5yOUM+YV<88!4?uiW?($c#a3Z z(_>II$T5#g!@ao=f+F7%jv=#4x)A%9#uns%_cbw|8R_W=hC}MAHzFC@x6RB#~4HuS=6qnE+5vQ++P^PDvR)>Yvfr5|Paj zfN(U1&n~r~;>p)x7$!{1L?9&vn}70e=+ZG&Hg(~P7O5TF)ipza{o+a(xqV_1K)pF{ zoCHnV59{chkpj0689`dWhvraJ2zQvF3(*XyC{b5mM|v(dhvk~d&#rD8fU6~dhA1Q8 zLQ~L*!P_?W`i0{@Z6}rwe+Y~|oCqEIF3KFaf_tOGi*( zoA|`f5ex?5a=B6W^MA)387V?EB_kX&CDdm8zVK48y>--_DA2pV^=iVMdeWu2VpbiE50_w(!Rz zI=XjGlXYn2$pG2{s!cFrV#=HbtX-6kM;C3y>V*Xow5iBb8AL{zv>l0zwirQLd2*FH zt%&0%Ei(fm3Kln^44_DiTNC4$JL(}3IUeM?-{TTM4AaEr<_N}odxZedDI*}9OZ9tY ztzb9`uZPK&Bes;F^nefNE;NZPp(;^Y?&;bjCAYPU3*w%L;daf660!c=`?w$0iuy1g zp`nkt8d-A^1cCw`%duO7}D2gH^;iPR#ZI6plKdGk-fw{j;FBOTN6+g}9N4|*UCygD2 z7-f)xp{N*1+6bS=En?j<%`eH*9qE3F*mw|R`P7|+$w%7}qHh165u-$9-FZa_W_@D) z(n3)Mrq=|33`k3HQg#x~^qh>NO<_>MEv0Q;ldMfG zN|EC^0>r8>b?^A6>2YypKY+fO+@@jTce*16EHtLH>f+B0Qw*p2&g(N$eXYjULM&#& z<8d;_?93L4^auh0QuT%_K?_@7DG?RoUQ1@xqH=M*BwZ}Za&3mgEJFx`>MiQIa0NfRP2HHFZt zTL&?aEum=KS}PsqMya#ZV**VOsSZwR?v|{Q1k?7cej#5{Y#x+U?rqHXYf!(^kzB69 z^%zJw-po!6098OTDQ-Mw;`ot9WDo2lfb9G8MdS?X6fb+J)K)D{j#O^iB@rV%NYu2D z?stjg^yoiIh#)Z}mhSH4!R>J)NS8`5Y5nP1=~d`?=vi0@Rl!ziajr6KLAJ~__xHP{~-al1RIjLiCabjvbwwNnwN{j z#nOxXt@;JG3;>7UDzzDi(X|#nRfltbX}kJ-ql6~u01V9X*s2@FxSoN{d#|xa;e@}} zTjRT4V3H2Np8qJZ8FZ=MqAH^k0LJu(&)nR`NzwseZ<2)#CO3@T2?X;EHd7eQ2AR1inrTY9p;fJoxNV8_vP!84gmds)r+k6*(iO6Dv&R=0cMMnepG+cCrFYG098OW zJ6PG_!4e$D?O5tcRMWfdB|uH6%vjKXH7^v1|5tTB7D{p+zPXd8H(UaiOwY7g&|r0j z-R0lDe<40wz*6;~N85I5)hlO8|6fXK9vAv{YnJ++nqEs(=f7TwxZwb>%+3lCJHKqH z{p`I@QMaNS5_ss%8mmf((xt6|$+)fBME7y5}3Z7|~Y~CgeUV!DZuf z<5MCeBoPOzSIm(41lAzgaOvLRi+B;1!BM|k9RRl4Sd(KnnKix%#kp~*WZ^QAQR9dW zOX(>-j}%#lWJSa-5WKHasvaXN$ZVza+|@ls)rM0u2BW_Ab*cAL z=UMz@x0jt>g2;1fCP1pvGQdT3a626!w~qWL-e{K;x9eu2&E6u3=0r)9GlGoeTL+-j z@Dpba2!?FBbvlIiv_wqgj(ku`>g*U(^i|KFy#XEsf|Dg`Mu2?<{*TQTu9v9&ok$|u z4Z!o0y4!4%^Wad0YOeCPnl)fZtGdke4)pIVe-n&hqaKpR3cE<9b;PtFG5ix-X3SuB|a76(#1x6b5Z-eLc1k^0C2w)$E#(8=x~}K zY^GF{xjG>{HSn-1o0_?V_PwH*@2hDwCEv zeK(u{h#llF&l-^1lmddJW(#=#BU47k-#B9?$ZKfrOP;Q|W+s6Bf6g&7AboWKOttg;ND) zUs47iU78Shb(2%QyTI81H4W;_BI)8HhkvVm)8_3~0d|)uvfK>0&bLcsSix}K2cSfh z%&wCW7LLm+U1t%*0SGelQ}ePj-a;cc?uRu<59nCCh@<=DIH$^-G8rXOLif{Qy-GSL3-YVOED5#AOl?XIjnKHb-UJTQX}m04!@O9VcOj4_v~KVO@ma zBL^>`Z+1tS5#WS}^Dcrj(xQlRa701u(ZH8eHcj5*JCQ~o1*WIhm-?MIr_*VXh8o5O%loCfU%%y^|NWoko^zff zImSO98R}j=rBNK8$fD|E>0B6)(%b7~#oSU!xvuoCdgy?6IQGP^Ik}#Z&;N5yZsTLa z+{y_ETqajdX^^F}$|MxL2N5OieaymCn-Q!-{+ zSQoDO#ci^q?q;c&P%n-5RmiYO_43s0Qh_zkzp`D9dIr3?sLDmqR7yW2nF0u(h&VEA zQk|^2r(7Jzk*bMx5{bDI3^-E1utI!3M_O7Fa_;wQbF%D+R)JT4SLu$O9#+AhnpLKA zMc`;WDSn?Lg(1J}X^Bgxf`A14jzpqK@%tSaQ`0DmYf6rO0I&h9?$TMM5)Am%0Ir^2 zruyHx&@T`JAQ-OeN;IC*^Ed=hXOCTVbTi{v}?ZE4v&MQF9S*HbDEIGQ1 z0E|&n!)o1=Z9+kN=wEh6odV-?97(29(i%hXlnTuCV`{?k_>23X5{V|{n9d>TH)dsi8Gw%43Nm^0 z*3;((2?QKzjk&UZ^FCR1-vtu#_fr5up-obD>#Ne|)L@&MVDw7W6%rv1o!Fp3(a6aS z@@VxC89S{>&m&HNK>)@xMpuVr{kHrXN$1Q{0&d-cay4c}g@H5xP#b~JZBMUz%DOE( zRgi&aoFb9vR*5H5dOiXfa9nfs)CP&g-82jE8m9L!t6Nb}RR^`ny9yBM;^JVz@X7V^ z_xB(G1}gcQz^j;rnip;|EWX z*49>C{epr5iAJMp1ot&Bl)aIy-tnM!5B30c3q6`!=v+R&PM(_OxlfLp8-;NL#^u=y z5b2fNUMr3FR!VCup_3z!!M6tkXUOq`r%F5?m)2-hIu{kGP|;XSe2z~F3PSSnnwb)b zZB?Vj%47A}1K{F_6rnjR;CID@I$1WmRKeo-$h*U`<^4o{8IZjZSx|AJ8*&nQIOYbV zV$2|Qe;73)z3m?+4>;kKw+wXqT-w{aK9SNmpi_Zo`FH$%qpaWgN%kZE@Arhdj}CbM z4U4PNff@J4KH-h{jz>D@hC>UyKJzdD$ea-XR8FYZu$O=+7XYho?(6orxSx!h(WLgo zD9`7nzphsRG6Bv;BNqVJtZ~zuWN&Lqn(nXEjaM|5RQp3%eyB$Ea{*wIFra+&#d>25 zBWUM(004YvUbCu9K`11VNJI(?3ni6G$)6`&B0E3cqxV&J+V+f05OM*4+eTPo69(#K zJ5X45-i?R0{m#jN%ST?=w*U90nJczO1um|x^9*2;RS7CZ6Un4JKchn4+Wuj?Q~&^2 z5Ztzf-PjzCVZRP__vt|SSey+_K=@>I?p!4CSnP8rYAeTQuhUM^^Wu>`Qdkg@q_04K z52~qGn*>9l{}Vc!o|(V-?gl-OP!Vhc5nh+V-m0 zWx&ZYYHFiKk!-OM5`$->OD7gCrN>o{wtVHa)0*UonWZ_6Vj6&Ko!p;(a!%#gLFtFr zKK2g|W4YgH1HrC=DLqa;NxGlYL+?w- zylhUHjH+&wN2Ux>s>1{rV?i5%m<=d)@o8d-ra&Azb(4m7A6F1Y`ijvn>~K)s(O-omnE+&1{k-(@XUn zi#*LB0xa{(WwafVp0+<&Ha@dSPcap+&(kjIDd@Q6B<(&dR_(${jW~%a zi*KuwP9aD4BkVy~Ahz}+?yk?7l5^g8w8|xnHKT+uLBCJ+6XCew^|RK@ z71n^s47v<710plP;+Sp5P&-x^b!1=zV8Ei9V(-}jpQ@t`7z(3daZUi%{-)doRfJ-- zx!I<-cI&-*_B}?CNAIARx99f^pHkW9NYm06lmVI1BL9PGfpeJ#qA!Pi`> z0>_iCESXWFTWkhQWp0CSt<~(bMTrQGp=R(sCjh8`1`dAq=t+5J<8C>7z;O!5y4U_K z{RbYGPJ7wb)^5&X8y6i7$ZCS%v2!*v1HUmnuWfmrcq;${UvWK-@t!+ zB5}24*r$U@xa2h%@fqauaNsKd@&Nh~^~kRna6~Of9wu|dFn}U$?SgW3vBV!=RK4Jc z0U$HmTXsji?D*)w+2_MWmb?QnpjXhfY7}ujfz2O(NsYn_e{-d@+6zS90bn~$&}Fqn zOQQn-G5v;Z9a}ibI{@VQNo=sWA$GSkH^mg9x&GI7Z0RiT0FdS;fx+gBaF?C}Sipt` zK)&=Uu`ndIngB3eDF~%qUg= zZ+SkFoBglt*iO^K&VcOxf(O>_O7|9!s?OCHXpFEr05w1Id)B>{E6;zZjOY*mGA985 z6h3fu#QM1a*syq*TYOusbSd;{&d>Udhze=3>o@xFw$*hA0GW9|Qd*WuBZZc01xeBZ zAo)pz#tv8#mf)!G(Evau1FU#ziOgI^jixOC!wvwLmE-t+Fgd<2Tm`aQYHR|Q+0{g6 zTkip%nW=9w!j|;pMGHS|X(CcSzE)}%{IBhfY&5jcp5wM`uXVGwH&AM~3YgK$EOcZS zN3yfO{I+@l05Hh>LUqbnHnahXw^1fFXzh=BKYIoG1r|>$RuyS)pmbOO$fn)?a{rm< zWcC1u|KeP60AF&>#0+6ue<|b zRvUkf5Nnpbq5za!b$+^pMlqE^%n!vGnLP&f#u+<7N?cg`%JH=dnhnZh)c@&cUN*a2 zn>XnW$>mnF)ie8dyBRyBfxef~KXmSTQy^7&Z#4nLP%?{sc?ty#d7b zm}{~8fP!0OU?lkt1#OJq>+^KZfsw-dAk`vbs5Ss8TRsYaB8zc!h0V8A6_}p zGi0>Oo37*9Jb-At3aj6@7JEWr7`1dJt^2HaP=$vb07Ih|&)~(ZT%D^Ot^ycA8l8CQ zf>mLntdRNc<#Wr`YBOoNz7U9j2ZM>x;~EBPK^dMwFEE0d4M446i8f3+-gX%vVNl-V z091gLhQjtz_11rR9pPu5)mTfNujYA(@U q;NU-E2HN4s5pu1)k8n6DNdElJ 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 LNkvXXu0mjf{n<99 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Snow Leopard Female Straw Hat.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Snow Leopard Female Straw Hat.png deleted file mode 100644 index e1791a6bc2f32c7c68669e6cd2834ef2534bb4d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5011 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 Ritzvd002ovPDHLkV1k{jKe7M- diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Snow Leopard Female.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Snow Leopard Female.png deleted file mode 100644 index cb0081b3c665f3be464dbf0b3dc6583f4dde88e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4487 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 Ze*iDFOxH@Ua@_y`002ovPDHLkV1mJRyBz=k diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female Hunter.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female Hunter.png deleted file mode 100644 index 8300d9ad24b65b1029ee02b86956340cccf24da2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3836 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 b1K|Gvey{IoK*%M%00000NkvXXu0mjfl113b diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female Trader.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female Trader.png deleted file mode 100644 index bf5ac8d63c7f645b0810f0c42de789a2b4049462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3704 zcmV-;4u|oHP)65E$ycK765 z-uM6fpX>V^M?%KV=1D%MCF(jd_ntOMWqhfKJMxcLTBW&j_FZEbJYTL@yHD0#KT%>4k*c_> z4CwsRr3ywm>q{)^i06rX^#{*M#~)`(!;;;h&lu7GoIEz-`@Tp#=E&w{N$E^`GG|S@ zc%Cm+6|RDzssQy}R7GS&!c`UFoW`YlhBpAa*G%%edwfa69J%=JHhJ=L%lq=g5&&_eBId~9 zOrRxuN{ei}tzNQuU*@fCm(G+Y@u(xu-%>BBER+ubVbM`n#Bl*chCTp0n;ZO!m@9eT zSO1RQUUXNRZ2oCd&cCxwHr-q&jw4F#x%alorls|QSHRGvdx#C%R1ILpb4|hDFo4($ z>;dXQ41t&6{@4vX1y%z9CoURXFX8N4+vuOUe6Kv)lvF*RxvEwD{S|B5<(XymGGpal zoiHQNcack)+lANwJ;w_yxPPB)SX3u7SA7cDcOKj)>#m!qKwZ4LO|QdEn#TZ}ZMW7B zJ^*j8ndG0pvQ@U+QZKVt2a=z$vQ+_L@)$NO{?``nkar)LrWBvFc&F@XnJTU;QW16Z z*!g$1%HMARu;5x4!2(Ow19kv1jNqQ>oG+6H*-aK10048=w5jv~WZUfxGOM{&^|<|m zv^;*_x8zher7muFv|28|@pU=rgs4h(>(A@uoE0#qPAIWYHRN#{4HZ@=u zt!kC0mext_wC{>{+Cn+^tjQYP!3y+u(z#9I`M!McYO^wf#ddUg^6DG!i1*q9;^(kN^3I%xh_vjW;DFlk>z8M_nR|#!WJ?7YrCRBy0cxpqtPe zy?y$@pGe}&MJj34)4V6u)gvU8N@=zS03-*oSX5Ks!-rFv4)eFFcOH_{uW3;=3M3x{ zL&OcxKM@ZCCOk+k=gXF+A>ajypUk&laVN;@vwl>*KX;_0vYt*HriA(Jb=OY! zr%Xy0B@Yk)jPZPXmm@p&e^UO)BYxk!;iF!Yr?>8E@QE={P1F!_Mx4OV@{D8kDxY~6 z0F=&X!OU8frn$uFO?!Kt;QAjm`sZDJrQ|(N(%HO3Bd%n6a;gq*KDJ%~CpOhDz&`&LS1}%nA-w?vz9+CuIs9*@E>~-aU=5L@=Ij@ z!A`xe+JV9|N+%Tt0QCvfFz_cq3Jwzx5+h7NeFnfzyn4<^b#DMb7#sEgRN#UYPZbxR z&*#;CR8&;Ri!0~L+wXqZFBJd)3@jc6L(0I&5@C|G9c%r;f%4g&oWx^M;gd09M3wYp zv!6RrlN_JP2`B1#J>8vBk%&v)P3Z3nS8kF_CZj-58vEOAbM%~8WlizZuH#r^JuD%% z2%^h<`$x&aj&3<)T1E{ii?j%m>tG`u#?o?P6KoAYboT@iC%!EV5Cwo6#^UiK7F|xy z(%*ddV*yC3w;q%iZm(Aw!jji^BqZWxB%R61MRz|hU0sLel@)Up9LD4+zAlh)_8qPA z+pDJ*0bI7}eT_GMb5(F`Ol_r%ANL>q&H`B!&mdtl!-qQXH%rb)&oPqrj4+!}1fX0e zkEWlTbKgrJOD+%cA~&8jS}>9-$$Svl_!H;K>rXzXlShK3Mw{4&cR$ScYP2;M z`2AxCRRu~}U}`b%!Wxa_6rjSVO`h1nCSe&O5`5#WHrcxTvZ7>JO!B&iW#)NPbP>2z zB2TDoA$BPU2mbY;oN;Z&>h2vWC@_MQY}udv*==>JD}L${Jz*Mhq^zy#X{C^ z?o<#|q6Hgpww;t4+t=)D&k3++*ZYse+QUhQh{>-vu z(M5u~Oq?SJUV2#N4H>I}Pm2}1riZ+DXzUVydnzjQWDnKX<#Vx~wlAxWa8Y!97C&hZdRe`y&)%*Cq zYfr^z7HSJ_d+&Yq`IAo`Thwu+Y^*5qweSTO2?OiLjVk_W+9~N`^{CYNb>^xh>UHT{ zaEpZ9q}q4|i&^>-7&#M8i1-){1`-A7Czd3|k5-G9?bPrWnpao3O38Fqq`C?g1lM52 zk(doLd@R1J;7PGB1_I|naRxvb?YYMb+uMu5(Ye#>ltnkJ+o?2XjxaIUrSj#`#nYv> zG9oi>f1@yWJ{-Z>a6WU*=0x8AcOQ%(mtt6;SGUnAO6nTy^kB5it)OQXb#dK>Eu9)a zut?RvqeOS5lIGm%c#vn=$Yn zp>7Z_fWfdTE*E2Th_}&uyO9|f^c<#e4L|^ZEgXs40tlv5COs)#tN~NL*ivvx11yen zof%=PIwKSo%G@x{R)OYxTqQAp0Ra=jk|T$L2n!*ZFqcFoj8TCRppJ$2B{;|Od)o*x z29!pRy)mLZpgI~j*a6aPm@@lAhT0+(Fed)3*Y zEY8IkJ}X#)CdLIlGHC}kBG~*eBZyQU-uT({_GoHwv>2m2`Ycr;1Cex`(b4TmWg=iC zi^L@ocv(nHg$bZwuem@xb0`B!DfqwmeMs-zeh~usKLB3@%0u}X|7XBZkq$|j<`;$B zKdka}yyiV*7(geAmbMBYgjI6BGyo8Yu^4Nvz`s-Qpyo$n6Bfwy7l=V;0Bv{#TLfLC zwhW3UR&@$XXNNriR*+#K)?WkzETfyctoMD0VGjUJSkN#iwD?-o$k0eZbvW+Gm!1JT znj3tQFxxpM%`F`R?G1*64ImXK$zfPquCd_2$KHU>aX@e07yYCjVZ{tf!=XNf8N5JP zQL``4=SPT9Kn@P75c&%P)>Q9fK_(2&{^m`;Ip*!O-1;s*&~bnhql*W+Er%7S{6^hM8T7g zL3@v4ZYZE(fb?4h%;=SFbd*eJ zvE1cbWhQ;<{MTGDM)x1sSJ0j0lGkjYHP#=a=SOQKE?vc508X`L3a-JX*mit>U&=Zz z0NAz}R{D`m9lEg6K7;u)YgDS%;$oW_=(Kf{bB)nG<5WwPb6EAd4uY>8?O;3 z*QKx1Ag$olnV^9Q!^SA>F$j8%gX3H8_=a?J=jD4X+f`*?3=HC0RDvDhcr@6d=68EY z2grZ}fDz;&)?Ywz(?VIK%Z6rYe*pm5u+3QZ{!OycidyYVDee5QEpan|ww=%Cw0@S% z`mF-?ay8+uO$>WrZ;x_JyX^}N3l`YunI#?+5To6Dxq|Z@S!X z29Ug%{+d+L&(b8uT3l_BNYk1zSdhjBg%>el(kID=97j0000+$|IeAsh~)rKJ^# zQD^Y1KDz=pck70kMu!Fp3aK*~~SUam4kq}T3bp-*ff4xkYk;xfE z!VWwSIO%&YqGin#)Xv!x_>4ZyfZ->Hj4?no;$Xwv1X?p5E?w3P&oiiqxxx%l1w!AY zssNQ`uBZsl8CAcxe=}guvXLg8Hz!3Ny%@0p+gzR`4v*1u`e< z3Svgi>E{eMWsoaIFyuPe*pLuHFIkpEIOL#EG*~x>3~>;PIB3sWRUyNOit?!2|5YHl zVw54Flx`#pf&b&Ps)bk@#G}pl)tIM*wXA2~TB!>!JD;iwB zvKg%@57DrLf6c2wDo4m$hLGs63pg$rg1*myU5&LS7I9HDM*KVVcJh)WHvBAsN%to4 z>>VTEI1p%0Tb{(T^);YZprOm;85<-;4Ty{v8|*O}K-vu21F8pO2zm+LpLTwhJ zte)MwUc%YGa+Ddra35Z1NQjec(P_Lgd4)J4Ba%5`*;>M_Wh&3D!GJ_FuaHquO5+=PwuYH-P~ ztmMyI+$0R)=4sey@lTt%6Ys7XEf61h+b--~Q3uxrVqr&qn{;mzUY?VB#kO7x2ON#W#kj)EfF}1Nt^tk!M44%6GY>aVJ;^Ov%oaNCou&V1E$_KlFr*pYYk)k z_4Ok#b*YW@DcM0|uEm6#R|xF6Q4*pNVYXnzCb+JHiyE8o!f$56X?{{{!i)!+@z~62 zOkdF~29oRidz(a!+ESkU9hPX(U_(Pq?=yfZaB*W&4A|tQO?ak$1O|-02HsgSG4Y(! zCAuRjsJ|m8Ho!9mAHLBj$RM#TZ64luYd5?%SHWv~LiGLF`h>&^vg`Ju-mFK_n8E6u7-TCFwAaRqTEU)W}NS21AS+2>-IE4VdUb3I&6W4Sm21 z_@P_Jm%rRG{a`o;VDix2NaZ})IFSZ;2?6uZ&kWU>z zq+*~vvGhCtzVYsdyG)+8FR3+*F{qkULxMBpSVPNa9IaP5>|u{Cyvbx!DY)e^+1xpU z-w`6zC7#)^ugeYo{g!d&;;W{i=y}NGiU@~XWb*}42O{T{tse{F5ywT|c>X7!RZ)2Y zzO`^om-lCAt~rM$UF|umZd9`%0d*GmVGmOTP(s|4MSu-;`5EN4$bbv(TnpEAg<$@t zy$HD>xI2E0mtX(LmpbpSOA!%-0M;j{hSs0h6r4z)khp>bbi@qM6E7IDTihENz%VxG z0jdI1=l@fPFBXepKVq>MoNcSIVaxkI^eJ(oz-NNv1|onApn;`Fp&{j>sxiW3(ss1< z2d5PBgk`GzbALl2rwm1t6@B&68Tl^o?f6@)c`Auqx`;?P1SbNRJmiyWQp01y1eV6Q zzFs$6be0lh(4;v5;|eQH#umV~WR={Lwq(MnHZi1XPt;=(jr1^@mh&F8HDp9OZzE3H zoFIlcguKF!M3z-l$Y#h0GC*yC63yeZ5&Aj%50B%O1vNqxQ4+45j!o-d5(2m;HvA2a z<6y%0(RlOEGts{LNeQ31Cfw5`1d}P*ob?Wk*N*Y8U9fH^*4<|F4-!bC_zWg&YWS!Q zJf_JR({mb0eMXQ?aE6=|GSM)Q&XI$R>w#6b+~A|&$15Ke_hrjsz}?@OCdP_PAn^>L zx%glPHl}(SD$kpT4U1>^QoQxy?bx*WZG?8LMs^RY$abkzb@My+R|$f+>JlyDb(mu? zlVlN=u9IPOI0T7N$UH`={G^+eh&AFMmp2k^(muTVNwG_#D!BmRL<0Cgrp0-u3i(Wn zJcu`CBqwn1_|(lacF;{|hRBHVt?fx~Msph7F_qqQSB*$hm{dCrm)!awHg4J_LDQDy*URrh*o+I2*}D$WklpCH zi)^aB;@e|=J5s-PJJJ~|L0-Rkey!*=iP2sJRUvIE5jAbTTJU}pqzXzS&LFSlj2ad; ztnLv0g(9T*@kITZLi`P@c8X=??}TAnnw4Oi)R1B1`15lUzKbN+QGF=}O<92P}8-2-)scw~f5~@TOVXp>{!4vhFghoO(jAl`WD;8zEY26;fb)xjbySHIL z+(jm9Y|)0{wt?(ZuStFspaKkq331Kv2uX4~RxuEn)B(TVuT@~)SnGZKu92Q*it)ND z5IXw~=@QZSaq;t|C0F}Q7(J{-Bv-2QV@9^1JYuU%8r@OyTlU0}V-+dnS`{hz&Ks)D zpsLYps7I3LMu6*9Z|&L!3>zFWG#Xr#C^@}uP68$zhnH&=yFi%7D_ntOCI`eThyr`f z>YK*;uCLS`s#NvUr@rKi@m%Dyc|^)0a9q!~{v<@#&=Z(XgyCf~aLZ!;Cy(>DSY`N- z<5mT1i!Re%z|`g2f{mb@EN%u!E1beiU2Ug_MoZla^-QBKUiaSvC&|NPGcgaDj4K=c zv^9tMLu}Bq=!2mcTov`t<8j?6iQ|U#lbhD#%7h#7avXFB`LdBfVtY|ES%mK?d9wQTC13lz22k+A_HbQp3H{dXIQ!iB~OC!U>PCUvVjzq;upUv9`+5nct z*~X&b(}E>0q@knEtF-wWEkBzdY6R&PU;bc>gvbnzI)~A`M#E>NRg2aTKTplGrj_LHT7;sE%JB}{;3IWHF zFpr6pK7#-zWs+ZXe_3ohz24B#Y+l(ssU5LC%IZWzEoO#FUFS&W$=>kzE@ zvD}rot!LZky^a8m;W5}^(8bi2i$xQr;ABKlI@?_&^g08yAVWfQzKDb~DkW3u=62nO z==TiZ5Ei9i3oS;98d(lfaP}bT9RCQ|*;s3sglXrPg_Y9P)83%hRe&~tskrt>bSzg< z@X=>pkM6NYZ+;~D$*MGqG4ukOh7kJ?Q22{FI0{3eW9p!fx zJKy`X>!N1AX8;kv0EiVR=JL$xnftTg!o0uV*?=#aFR;ZHJ6#^ss-jzDRhV_iY{!f; zt5ReRn>Jte?D3bb0@`cTK4V>Mvp-uv-yWpXtWc3)?e~#zR(<%d@(37sv?|eK4A9;` z2P|~9;7A4-G&E*R$Ouv0BAG{I^a})(O5qzP{zvqhQlwr7#rCubtm&~g$W|SrL3#tp z5nKeS(El9)gnVfmU1th(BRT}3D#5NYm$u!{KW(=^f2h6w(y1~n){=MzOk@s2CFw{- z+(3o~F{Ilnux9Qxrt=JeR*Cs=oi~z4oYVX&a8O#karEF?cHJU7#(UOrgMjy zu>+0d*gLzID|DLywL{oivwZ|cZ@-;=un{_I^&{v!d%#R@~AcstOmW45v!@-@=}Vq3ZCwSeYZU#~XifmY|2z>x4U{#I7_KyVv@i z&)xHWp<6=i*2UbA&Kk>1LC3p;I$J=g(Q51Lfet#U1POQc7CZO!d0cvYMGw)Kd&qY^ zCPuYT#7%$P-Ypusbul-QI5i|CEl!QRwy;)ooFg_)p-o<=p|tF)Gj@Q9_JK=h3?BL6 z*?!MoJHVYgzoi{u=^R(u_Y~L~4{Cq+xC+n+@*z53z_eCFS;CqP&C>Y-GDsI~!pEPV z*kym8=XNz8Fmcfv-4bHAF6QR+kVn@rnx%o%84BX5#;2A>|VL(`>G zApBdWKUCs8-uZX_9n}BtaRiV7ht3YzF*q%5Xe*uPP~t?0&IQsHZcSGCd+a<`)4A7Q zN{rf#>wn+%3{a0VfXNFjx*9f}DJV^1^d%{d-7_VoyVGF|GDBj6ju$bBqyuSN8_+jR nSRK;WbE#?_A;g#R+TH&EBc95+1#ey>00000NkvXXu0mjfNKZ-^ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/Tiger Female.png deleted file mode 100644 index 0c0696f9ed3b275eb3518b300ae28d873a37f8cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3831 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 P00000NkvXXu0mjf)8WeW diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackHunter .png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackHunter .png deleted file mode 100644 index f578320270f3eb83f2bf52af9c12e86a6c7c8f00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2256 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackSteampunk.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackSteampunk.png deleted file mode 100644 index 89268bd6e70919b1ad5950580e48bacd5414e3d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4039 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackWarrior.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBlackWarrior.png deleted file mode 100644 index 74ca05e6736efe2f2db238f62a9ef1f9524ad367..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3614 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrown.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrown.png deleted file mode 100644 index 0ab5acaf7012b2d0deec8d04084f5fe9e7ff426a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3673 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrownHunter.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrownHunter.png deleted file mode 100644 index 4ae589e36f66f66c70df0880a88cb01db2b4b7a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3873 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrownSteampunk.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfBrownSteampunk.png deleted file mode 100644 index 1526657c16dae38c94e5f187278a61bcc47e6137..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4061 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 b%K`rbK}Xie7WT)(00000NkvXXu0mjfD@9hM diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfGreyTrader.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfGreyTrader.png deleted file mode 100644 index a08f0bf708dd63b5a4decc07bf34df848478b6a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4195 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfGreyWarrior.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfGreyWarrior.png deleted file mode 100644 index 48c9cb823e73083b60b18fc068e04aed70f98c38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4305 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%0AqL6U1Ie6M$olg zYZUK0D0_SY!o~(l&Xtz0Q&ew3JT7dI4=dP;6OPFBz4JPt^xzROh^$b{(AlKrH5xJO z{Gcl&2DZMt#ghVn>K&kfoHSK{!fO`R>ka*-2cU4&ab6>?vbsl@$7BWf04|5|B?$*t zokG%hGL%+drW>E;v1iHB@Lqrw9l9_EEbRPbyiRrC1W8ruHR(?38nt~!bL{wHGX_7U zF+yhA5B^PCP`d}9X7?w1mE^0`cwB(3Z`SyKm*8K>FK0a<00000NkvXXu0mjfwN*lV diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGrey.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGrey.png deleted file mode 100644 index 8a514cee1ef88f9dd1dd5689d9937fa259797018..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4022 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGreyHunter.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGreyHunter.png deleted file mode 100644 index 478ca0dd49b1c53e3558dcea26f26b63756782d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4287 zcmV;w5J2yVP)h6&$-i^U;8=$n)pME_{WHe(Zo2QXwVonhQU@SZ3UFs$|TT<0xbxNZKViO zh>3BC0ge0+hy)U&CjK+gsMz*(c+-8uz4x4Zrft5p?|BeNdR|j54~Qpe?(03n-D|CH zeQWKt)-h0U?Am^da%>wx7{WA77=|IAj^hAI;i{{yL95+HrR<~AiR8ReO8%v3ihk5$F^v^458!S}vTN(j7x89^EjN{m7w%VXO z5azB+7XUVGx^mGqD0mo#;vPf=UEpo6fbDl|QM9b*dE(;~Jc?u3mPHD{NWCn=QgD8f zD?D)tL$1I4np@xA2p|bk;F9Z#|7Tf>a=9!5D*$Up1_kcq1;YT6Bo(xf6QU@_W#7K} z?X7^_yS}HgOo=eQ?}^|%==1b}ky=Guq7y~J0a@4ovosZwym<2sZ*K)K3edM{QCgbJ zo}?*C41W0s6u>~K^MpEeTw=saN|u|msLT= z?p?Pl5>~Ux#TzgTo$S!pX-S4MhCZTzLQrt}Iu)W(Vaj(oN_agLLgC37N@a2%U4xSH zJo!QsYYEqHxpR3HK!{TiE{Z~F;dL^TL;8~+{}?{_k@K+szHJf(zH!xe@zV28<4=G7 zE86Wq_<;9?osJ+O&lQ4zk-=Te9`kt5^ZX4y>pM4ZUtR?e0kj_BnOj@ZTtJeV&wlz7 zBK(WLy8wUx=ed#$y=(0s@zKveg}=P`44!}CB@vK9QGv94jsoEWK@=o%&_&9=C&Hgx(!$2@dFRZ|7mFoktahJuHS@%kL< zAx(G45s;_Ej2yJKJb9@v3(mtQ4+^Z5A_kKowMoM!)SvgA6iBupe%hEnnhmB8?srnw7jTV4h1 zxbwS;))Ce>NP-5=7#+e_F1~D$%oxs?`xE|DNDg^n_9T&b|Ky|laAdL}NMIsFGNmGk zEV7?v*^Aj?zEdP;+`jeR)42s z6p#JlDG`v6rfam@ZCJLApC3GciMghrK@?z`SVV(uNkT;>=4tb?E8w*|v7h|lE^&z* z`a1M+3!FkhVPipV|Kt0&E5kHIi7C0o(r!V1;AW~?E=wXM$N=Q;Jo51K(r?{#QbauR z;La{$^}d9WhM}15OXY69{(Gl{sMlTm(;wZV=%X5@OmoyC>2ZNYsqMji_o`Mq5aG!9 z^mQsQPp zwE307h~6DWc=FNxBD`dl%o-JiP?CmIX+KjpJTbQb-!dfwWF3%xNDDijE0Kc4dC?^s_4$;Re4{f<-b_+>J)vj1$NVAZU`DyPGh_ zk>3;ENmKd9ziF_d?YQyy-g^`mlBcZHtm~IBJUWKP^a;eFE_BjIU6=cU1XBww^p`#H zKb=J;h_YA~TCdiya@AUV@>A!_IWC;x^S4j`8m)x}Ca0!Ruh-yNI)rkOgfgMH&`D&Y zg;*0@y{fm`Jjg3ls9xJDj30R!Nyu6yUCk1rr3@-lXa_p+qN10i078&fuU5(kf)0jO zu962#PaXr(tXt*PyFe-^R{*cq%1IE!RFqD6hlW>5R(alMJ}<8D>>qwFyTT}3Kx1}R zIK_r3uxFGBqX@_prkm|<2Fk5A;My#$>D)tSq8?zG@GJdjHyg;}RMK^>pJ;f6P<7Fk zs4H?QWB>iz6c;2=q$O+%E5_D{V8@Rh0#YS{)4zCrZlQ_HvSDSZa0HpY-PW6)C`%+& z9$PVrv(J7nUOqC3sqsS?JL4=IJ@Q`!p-!gEj0F`PA!JYBIGCB6mmGsAaGZj%j6H5y2h49am)G8Al<)p*7<7HbkzK&@JVGJ%2Nm6$v+E-uPLHe%exlEAYJ zW%5Cmap!u{sA4ej$x~CQ`z0y7iYFXE7wEJ*Vg+h5-|f*Njdq9u@__Fx`Z;-kiOE2J zKiqO3K6m~F60e_o_8E*H{tu#<)gnuvOM)ZO5q(5fD+~}v2?8Q6OHlGkS_sJ+U4c1W zj4tX|ee@5GV&eEXl1?n&vv@=Q=X#{x(5*idB7m7y&a`>ghb+5l%^8@QIEMCuwi+!) z=BGfk>`b$b!D<7rMpoqwn%Z7RVXE{ z#_zxW&66iq!U1IS+>cXaSiSZvfie*g1(Dk7LKDMS!E@|3zbVP7ihmORR4iSA z%AH;aFjVu=iDFcIPhiiIT8>PTCXZTw6_wf`W~NV|(+VYe@fmy;IiOtjr4Ym4-BgfS z8qEB3@lqE5=vzD}Vfbxjf>!}*1#us;{b*h3*@i<~70g9P=yJ`9hH z09gvv-3=Z-bOdp%-N`j=u@)C83dmCNe=3%WtT-m>eRVh_N#^-PTglb%woD8Tuaxyn z9UB)!Qh8JW6;4^mDdN^yhRxUCUQB{=L$?@0YnRHN5EaRV@jNei2c3@iE~5giLFi>& zt8}thNN99;2!6F6Nw+*sfk}*g1N}IB=-*NlVKU{Knze}nDz6=eh@%)0Oq6YQpKW;_ z&rw-avT%XtU~p(9CQghaY-!k2a30JCnb9(Ya@|bAHe7wn$rbSM_qXe!C^g9VZkda< zf8HruRX$BfMn9Yi%d0_o&lS(z9=Ea@_H0ak^m07<~Y zj?U!b7-^DXF6f|EawH0n1bL21C;E5@S}jwER9CSL;Rvoj?@Ez7_&pUbHV zQtyQS|6c*`1S_774F5;K>1gkraPM0N0XN_9ZN>1&(97ts=LdV=l(oGnKe800Y`N}R z%HvLv=`0M~zVprL7c9F1SdnUn9Zb)+Q1cvkZb^1@cF9I_zJ<#R5}Bna_hi>By8>9` zoNu-;+X^vI^`r_^AE={RAH-Z^5*J-|ZBN(O(}yp`I(zrrshI1Bi4p`?U^V$IsK zB;Eb`#@>$DEV}}jic20Jb`ZlvwPeBbJ=6zAWCyu^^QkpDmZJ1mU$g8AU?)k6s+|ap zW`Mqm2a+N4eO9Hu_|^42U1Lulz7%V)B9$tInT0kgt|h%g*_^2q14AqDrLSGu(>3<= z;Y(2fU4ZbP4>}m`tI7_}WtEpz;l3e!;VbKUy2hS9d?^ZeV*hT%n&NyIqhu_fB1nN@`47dNUSDF^+{@xdj9z0O>b;o&;teRl=*_Z*+OCRIRO?x zi>Al(J_Y-QdO%yhtdSQxi|#M7_-oI<;R-mo_g)otI5Vhg^elYJ7%j(Rs^vlp9$;8Z zQeC1?`2vQ17F~fA=*`!?#a!Tt{d*LvzO3I%;goNQls(MN&M#JcS+pdKMTl;zo3;BO z%`j9g%R2^~G^4eN9u`VTgeHe|6x(6lrfRqNNrmzrUR%`tEkeX;BjB-zcF8`TBqviJ zo+}9q+iFqJ5liy>e14Et4Z;p)+aZQ)mBp?vdlGucGM3W!>NRIcZ-UQY?Vn9p9(v$H zzl*@$#3co-ubwMFr?R?-AjD^x(zlb=+VP|CecemU-y&hLga6MJAVU^_Se<2VX@xl! z%GCh`ty!5*Ai{KiKr30=_)9E%_gn!Cd#|1vhh<>psxxGvCypI~O7x^D7fce=BRCOK z(}I~M($*rR^FAS=&&En?eg;7+keWZy!QP+r2)ca=cBr_AD2ggQR{&F4nFZ>O!|KN6 zs8}zg0NqhI3QY^M$-=CUT){a2#(0Lxygf%3VsElBbzE9=3(b~p*>NnFeMsAu>)A=- z=jld;)8+soKtfb^>Z?>Pi3^Ye*t+6$sr2u<{X=p=K3hPGO5fi!qz5Q3W0V|>u3Rmh zUrv9}h4_8`5?0;{&nH2O+TT4#04Gey=;Q%fsa&hbHumU|L&Du+_H1P zV-MXe6`lNr3$eIqVAYy4Wrl~XO-`0Ej5WLO8W08TIF)%oc9>;q%(5gplqwzuhgP7q zFoT8JrWlZkP>v+>0Lx|^u%t4J+TT4#00%5+MJ73P1+4(cEZ^kBQ8EkjCne&9qByeI)=6`fjwCpbM z@b`D9B-JUde(i>XZ+dEk!x1tqF0bX0@iigx;5q%qxsLC0zB{Tbk-;{_`uX4nQN}0p hT>kbtBf{w_;D4$WB-i_APZ0nB002ovPDHLkV1gCLDLw!I diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGreySteampunk.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furryfemale/WolfLightGreySteampunk.png deleted file mode 100644 index 5e5d6b2cd3bdb2be302466178c25333ab0a264ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4226 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 JPDHLkV1hg*@;Lwi diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/DragonGreen.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/DragonGreen.png deleted file mode 100644 index ffb44994748b59c15d66f35e6ddba59039198d47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3785 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Leopard Hunter.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Leopard Hunter.png deleted file mode 100644 index d12ae55f036bf1b23bd5661cb9ff8e886032dcd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3958 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Leopard Warrior.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Leopard Warrior.png deleted file mode 100644 index 9b4d9f1f3e1294c7812ebe0d0a7117d815b3ad7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3926 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 Ef{)r!00000 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Straw Hat.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Straw Hat.png deleted file mode 100644 index dad62fc37fd40e19be4eb85c3c5f1eb33cf5c7e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4999 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 R;j91v002ovPDHLkV1ndaqnrQ$ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Trader.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Trader.png deleted file mode 100644 index e88d2ad419002abe44bcc6f72284c7b17d4b4ba5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4254 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 A)c^nh diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Warrior.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Snow Leopard Warrior.png deleted file mode 100644 index 6a9f5c36e92bd1e7bfddef25e62b0b745bdea0a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4319 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 N002ovPDHLkV1jagxs3n- diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Tiger Hunter.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Tiger Hunter.png deleted file mode 100644 index 03a7961c4cd539f5b9e2dae968aed951e45e1653..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3828 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 P00000NkvXXu0mjfZ+in8 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Tiger Warrior.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/Tiger Warrior.png deleted file mode 100644 index 69b64c571aee44b4fcc2ba80b4bd2f90eca138f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3813 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBlackHunter.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBlackHunter.png deleted file mode 100644 index 568f24804c3c4548053057677053b28965ae1069..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3810 zcmV<84ju7{P)458701sk9?y)O#dczQoWwYBk|u2yvJygCx*>ts)J3h-BH9nMAf!r^R;ok+sV(X^ z`k|$pMAa6xQiW8cuoTn^sZ=aY2nhv365<8#aU8Glte%-y{my&mF)W=)n50f3o-}%6 z&s*;K-~T!HY&Rekj+W+TClm@vKA)Fju_%t?NKH+R%+1Y7I2@K$9m}OqC`cd>6vrv* z|G0*0gTbJ@wEtkB(mUq!_lkpSY-n(z(WnZ<0T2L?$z)X6HJ$Ae3b{h(ayg0A)JV~B zBoqwl`GtQUsQ8Wx8i1usmN*QM*)#wUoWJ?3Sk|JTyxl*nXV_9(TPv$qt&n`aATREF z<>CgQdFfIIfm7+UghL?}kPj+g>X6N5B@hS*OyN5$$QKF<(23E}iyHuJ0K(LGvknVP z9iTiyV*?Nz)!;h-0a`kpmZ|CKiyMH3#fu#T;{(N+RRDki2#Ub5Sj<&p$5E!h2K2wS zrbb4`#x8CEFoIAW!4WnRiKyVrz8OPUfO^1`Y%V8tv6uqD^`j?GUfcjIX=-v1Bp#2e zihC{={7d8N`&CL$8R&&O#fj* zDwR@3a3~AnalId)xL5dyC{xTw;P3fnNWhl4QfEg8EaD3YFlOn^7T9c?;WOii@k3~Y zCi|$N%3_%d=0smuG;f{YV zeuL*d0s`RiEI{UYxw$#vN&Gh7%VYo@H_L9$4uX`f?fnA-viG6u8B%p?L}5ZA3;CC85Us^@3-s;%(Y#B*n7XC)L4D|6IA%IEcdW5mdb6Y~o| zQ)8n8m6<7K&b&LQ`tfzEeUI;Wcb^KXZgC(W?JE*G>#^EedE;o8vVeO4fDb~d@x*cR zbiZ`j1VG+9??wu7J2LZK+3P*8Q30UtQ@x(c^r+h(;3fQH)e`;lYa zdY{D&3I+fKgF5Sc01#j}<0Wz)9vPWm2DBv-3V^Na7(%|U|5&HLG$Lekj9|!-x|loD z$4{PCN&^~nCKxjB(9{6|xt1jo+hNAm3?t{0^Xw_U5B*&`wrKEUKEUwkxJzZv$?5Iw zEjwdBxpkvD6F+-=KxY^*OV4XowaaWWC6P#t?_Cy)uIdGY0oixp)w0h|w6;0`4Wlrw zEiElR@J!UfLx;|aQ6C5ZgJFQ#+?-5I&H6@*+3fD_F8hKX+|cCIH@3;62i?R80Mysj zNjj5Jffv@-YM89?g6B|i1|)>4lt5{0Y;;gR^EUT16{M$jh3{{?a`5aDFz*xQ>OEID zsZ>U4YTR|ZZ}5Z;j%5*G1_lPs2!O{A2mJ`r{EDIzl1L5ia)7wW_bF^e0DwyQ1A;R% z+5p<#-YzRM{qDm=uj20-3dA$BvZ+;HO{jRMGzW zW?Z744PeFr)J>O>Ruj)nCao6I>l`6?Dpt%Ov1*yO$;#8x+Nx~oNcTy9-AXy|%Go7g z0-w5SC-0U_me@X`^klG3(UCL;E)-HKr&4K&$6W)+HLjXO)cRWYox@sBU2 zWl6&V1qWdVN5*7kdRnjLUe4xinjg?Xh834X-UX;u4`2R5#(2YAMEQArDEgRAdoe%y>t%YOEda4HU>8t^h6va1q;^+7HGk4vcKbDb^A$j1NTYUP% z62^wQ834whQt#D*F&sH#G)$`GXt_2(UDkj`be8O#o6Acy>UwVIXDXdh7VrWF!fZ1r z;sgeXzt3;cSWLdQIi(EXU^Q?gjKd?RPoGx(=fJZ>uxB5BKw8>dz($7$|+N(nR?P!e@9JjDCn@q~Y__*&Fp-xXd zbgvHp&-vZ2f2hy9_Ya4BmCy;o5i{Sxan!b`dKL;AlUS&Z&;Z0lo)G|BF27u(K|atI zUFKoq6BDXWX2bvhRe`qV6Tk!n%97m3=VfVgvn*V&Kth3nT)#f=Q~Qa-Aqj*cGIr{e zq>@SBiBV$~3i%+I@CHCzVwulMbDw!99w2ID$yjrWSSesDXOp8+v>DjBV~0av@|CRt zrQUNVJ7scuS_jEYLRCv-pd!4$tUd$n>FM!P;H`;-Qnsm~Ub5Mo+_ZK^m&E5!b*NW4 zIyNckR7&jtOCmrc7&H6SFYlAT{QiDr%?&r-A=iBSew|@{XM6|?tzjWa*V1K?v2yTk z44_?$ji|T`Zr-#>6Cz*SRFEf*MCHcy8Tr$`oLcCn#zv)+g}I<_`iP#Pf6OXWJ3TWa z@wz&7d+Xz@6e2gSnN|Q0>K|P(N#}|(a^i$CDDM?kcsI|y>xN~%?nD0-?H&4DJ}S5; znAs?cLM@Q9P+Jo;UdoN}_Vo0WUj;09F~g&@^w!wY^_2gYUSs@z>@~Lt0uTVE7CY>E zbsVUI-M9B}M481bArNeUQFmOk#9#IRA9nQj^~%PLn{}qm@qsxO2wA?-95OSieqz=u z)Kmmu_3G8mH+IM5;pb+QZhU{_C71TL%vk=%}$Ib1Hw!h2UTQ<`rZ^tgvF)}U-yts$eVEO58 z8K_?+FCQphoDBegQQN#T(>v2q{?CBw>+4k|%sE1cM02B`@GxtwU^tE%BJ(7#U7PiV zH307Xbj$~3@9VCmCxPN7Oo{mNGFNaDG&b{{xj{J|Zd0LGWd~$v;c7MBtYT*QnTQp$ zJqmKA;OMMkXWy(}LSH@t;1Zh54<*V+4ERv6T|zfqFbueA*ET1Y%gf;KsQL+&!q{^) z2Nw(gd#>E!kZDc|5Y@dcK~*5-Q<_%G>7OEDL?p0jptu_`Mi$tygvL)XlhAV zTw)F!AVO|)xXyQ*-Mj;^eaj|?Op|t+kXNL1?#1~8HUD~H-+3M5d42eqFkt7l&03lx z`$W3UZK$9!8qAj_mVf708UiE`wUw*k~5ne8vE zpOt6cZqh`GWv4NU&t2*&KtkrL8nz z>ASkR%D$7PE!&eo;&o+5hq8fZkO8Wc;i)9>dw)OY0DN-yPA#^Q&Z3&!(>JVE-Fgfv zF@W;7Rdq0gpJ{dXDR7V%Jl96?oC9EUvak5 zxz-xJJqNH!JIg4J(kI~60bvOhqH3G5t7gESUE8Ua_`Scjx4`i>O<9A4WrwZxUi%Tl zVYzmtnTHGW$nxyA~vrV{63nXDQB!dd)yJUC02vxAI2AP)2Dw9C}%6}CdAme-GU zD+4qo9tdc`1p4zVD~(%vp63B5HA}4&MWZrUWjlV=0MJxL5QBj5TL+IIUQ-p-WeOx} z*gQd*{d9)@!jQbx-KV?$he^=wDA7J5$I*UbsGH6fq%P*}A%GdlWLo+MM-&)@Lq%w_cN?+t$|O}QuZNlI ztV0a70ieO5p{iu4>ShMCY2!wxbekLlr#FW}sdbXXz1=5f(T(c(25%idt`^>$AJy}8 z+V24{AHrN?vni+;_f^|$T{Qq3Hf(Tsh;6E(f;%xesfMj#(IUCJxm&F_oug!U%mA8u zdtzin*~4MGPi)ysdJP*q+j;~zn~~)EWQ8WEN}gfW01(dFtXR#S?h*!h%M}s7=YTT0 zZJ$BUZSN6aS=rkfp-OuatWe7}){1AV0s!>&^;IQ9RX2mK^#+$B{oek959%wh>nY2d zbvFm8bmy5hK9o8}sDtfYs1#eAcLuCoyH=hB!s4EOT$o=G%W~;FW`e8J{SrJi4O!7;)lQfFh~sj zL45IrfI?{zN*YK@<}_)Wgv4ZaVy9^w`wjQq>7ccbkBM68y;_cw*5XOleb;w5XRp2X zKKtywpM@5mhwfjjn%+|ALY8H)EE`JYa9tNlDdc$$+qUuA{=-(QF`8X(HU4YIFU{!v zEgx<*0jt;r$I(K^aSY${kShhpw&l3@Uk6)`@u3Dlg^Q4;Db8IOmZRf12!a4BmoGt@ zW_Weqp}7sfxoasJjRq{sLKuefoh(SROibYF$jICV;QZT}_y7v-d7gYH3+M~#^*Y9G z-kjS2oVrv+p-|9ftQ2bXy0C%vA9x-{u3ekk0GzlmA=GyrM`+)OW0VR70f1~686BP5 z0FVKsyj}_|vHK)R#02OJFAooYumNbb%*|vCzg^E}-aL7glZ?sn-RCnI$GY197-5&ypeg2^apw;AW1!z_n(7AA-qTQO%l@p>Z-@3M6xOfqN_}NZ;45!w8`U6IVwq+qs5{V8=rIH*uhFL0kjG_qd+_*6#AJGcH zR@berMT?Y~G=-69&bGywQGit|1~7E?qImf%*Rehw9w)zc^>Um#eO8>Ed6q{yL9PsZ zZ>3U!01Cs&Q9Jy;Zq16x;7*A^T?Lz=9!dqR>C>YVLTQ3VI&(8bwh#6Ai*TG1|(Nvxca?YMT+f-xU zda6hL?tl^j2>`*o^|)&JQdFun_`WB=67)RRrf1t0_8mOh^!v_;lEE(Z zP65yN9X@hoT8w(n%^%x1APEo-P_4(PrZy8Jr@=UXw)v9P`Q{Ds}Gid}PrLVMbV5C<8WVhooXg z!IYeT`hFYF{`x4!Cnm%Uip3(n{nanx(2-*Zd{U&b$g`71p9$j3ww-p?@@a4}He`%Qd7^9utPgMAIWIz-m#xI^-c4im3j zNiukz1K)L~Oo4!MY|pg?G*Kde!zY_Bv)0Bny^5%ni$1FLL_B}sJA$%yR2*0X5~n#z zP8HQCLr|J80@R{JgrN}Bj)ffCRw(@7XD{QKXTC1aKmYvm5)y5H>@nmD2z^%s(5!)I zk%Do20$Pm{JhVK=f%8T{tz~MQ_wiFK_%h~1wITEKJt`;{aQWdiK6CIy^X<6x$OB6i zsUCPbT%~vQJ-zg$c`h$)E9wYvyxPF^x36JEe;MPo6scVnVFZ1pL?g8*Mi_Y5zB^P59uUvHAWH8N@GW_#s3jjW~aX!^2 z!g;QR@frh@96@mb>TwEBRX}qx=5T4W3IeujaU0T1A+gG0hhz-}qe+ZcB0Rmx$6t@7 z^1mSPkR&N`kp7;qgp;NAs9l-~X-}s`Ah#`#@zNU~2FGzBIbISzrI7<(IC-936G zh^Y)U@8+8=Yekns-ytaau7!yx$I|W+JjX(WGAcJlQHkiW2?7HovOytm zEkvopz~Vl!J8H7M9E$MNRvf2zdXtC0y=5Vas1;8%LJOu>=kC&XZDiuq7rtXa`)#3(YD1wMSSWUM3Kgj#YJnOj0JKZm@^5#IV$q^b(K06_ z6V7$mE6eZXkz?_*eGRbZv?a^jc%`9NBm$ad;){l_TtQb?7yk0%OZd!FJ7iprNe4>m zla&P1ESdY?yxiOetm$#p&3Y~Z-pT?_=H6xPcGoRyi3jdGOwlGC#O=_~>GHF^AjL-i5 z4}U_jP{8)>+l3Vzho-@$+_ub;s#((#fF%nYMS&VAK6n@aQUF?+}Hw z#re@k?Ao4yc#c~t73I0^WrNKbuyW-}#WvV( z`{B$Z4{cFgKteF z+p&4W^!3qw|slF0&xj`11F9y~I=JpcO{^VWOrIsjWX4Jz*D$bx!3 zl9U-)P?Q>^n)^Or>z0jD=-{r9HGxJ$=k#e3bc(OcbrTreut9OhY1(XgG!<%6wbgEJ zx|DzS{de621_lNM08=P6MN^Y=XjP5=&;u~9qeD7WOizK11^(AZFxxFOx19l7*7qw@ z#GqEk;(}<`RCF#}Xr8BMah4e-CN*n~6i%sEo;Qq`ZvDR%LvA|&6o4r%3c%0hab3DL zHh$*JnWketc;8}0@6SvUv%+p$pDc%b2Um#cR)6m}03W@#Uokz#ygfBJd{bwKO^-n< z25er}t60@Bb%HA9OF%>x5X9T<6mL5NC;;<*WC078b*p3QCp6UH$&)9Wj=A;z#mYp5 zQnI%@MTy3YK5ziAVS)8HR&~cJkt8x%_F~#sN?!FCg^<4^$R%;gygols^}3up;e5Hq zI6$}4>E0w=G|E!z9whc=Z3zRIDGQU55<2w5L zdUd;eZZg3vt?3Fc9b0?RM^e9`Yx#Kzmh=j+j-aW}`hn>IF!cq~BVYs~xU4I-Dt*m5 z0GrqKDc1P(?*nwni`t>~m?EdprGke_P4^VC4}mpX{B%bpZoJPig5Cp5b~N6ybkh8aCf!8WZZ zD|Wa99;-8elHPtx8ZD6A6fKhxEUdEPOtat$$(EZF=f^Ryq+eDHYFVn!EV;9U#?n}v zqN5y6mEFXDSh|UWW=Dp#Du2(q32a-}t_VrbxSc_iib8e(tkR zi~UnjHcy%MI%_7DS zR071*`k5qUe=)1TOqH?4hID5IxWdkJ={&88Z)jEio^=MSUcFlBwpZN&CfypoKlOtN z(;_d8SCif2rni74?&JGjmiAe_U}~+g?mlhWTNIX{I)v=jInJ jy1m}UzWw`WB*T9Jx-(i`GoWNi00000NkvXXu0mjf>Tuo zx7#i6o_*g{=pLo~zu@F*s;iA)FsK6I01yBml}f3wz1?l%@t8tqG8ysve3CZ|@wnak z{`P-{3*O_72B5yK&cFnrO#%SH@g1+${f!FBwV4Hd2U`Mxfb?{=N-no8@0>YzcLUH+ zUvEI*L^3H}k4FW>3rm2@A)QW(%jFU<1)sr!-1fEtbbV>*?gjuh0K)hzt%C(z4xl`Q zh7Ew=SQ_{YfB;%DnUsyq&AS_b>Z&ROg5d>hF}4f2bhx1WTZS4QUGxN((>}%4M1IOtpP#G%F5L8 zbFBja{0?x)1pEh}xJAMk&Mz$7*#I;(G#Jp9$zbyx0)W;O5WhjVEVe+eSC;@@T>oG~ zB9Tx=;7}HnmFe{W3fBr=BFYr{2>4!VhPb%RIh`Gyu!t=nfT5+QEugk(_-Gtq{2(-h z#DC6ri~~CYZ~-y^T3cT)DMMVa@|YMV1dT#4Y7N4u0A8Fhud=iWXuJ1c+v_2=cu=gzA3e)YX0 z^2B#vmHN6m6*?3Q+WS6)RHF$XvsneRyuADdRzUMKpzG0SX&C@Vhm(dd>djeR9t7y^ zZkLIvS=BOF08K&w7{tB#gyUqb zedo3b0CC@v8$s9rPCAuNt8kcDM_aROZ|BA1aqHT}gon?Ms&GSt$J8zWG%OqZe|c;| zuVdVxU;qHOTeXfC00c02hnI-=g~i3vGN3sUQ2@BF!w};0p@ZG_)(9aRLI{QoDG!;N z9$(&4N&_^|8Nm>}LoNphh;y+;!gkQu(lFwExx}90|Db>B{w~uQu#Ri1Ig`qklQT6n zwWG#x{YUe0HKG6jVDkM)N0qoj^%9FG#P9dn-eo>-EPe)cqr=q^XGTPsDc12d~CYF+!7}yCJF)&&6Fu<&@cc9mzPU2m6AYqMMAZ08YXMJ zU^!HH2S^aAPy(fl~wMzB_eH{E2U)jWEhAqbxG1v5z4wdieP=V@$evX>`V zH+*h)2^iPYUpZxj%R>^2CzZA%AI+KGUd~K`4IXZDngm<3SqSCz$e&JMwDW+775Y1> zB$Z5xzp6$32~Z!@oSL4Oo=8YWCf6n4_uKKn!IrRGxVE7N)%He3)aU4JE|c+vgzhGY zFPMy>F9BwPm1a)T^gj@^#p7{1gH_1UQUD+fEIf|Olh;)M9KldX1`f37XD3Mb9`Ji5 zoyo~d|G1zNBh`DFf_fcnM_qM=Z9C=`SEO%$NY0I|=wxvXmeoLat-xr~`*eoehuZeZ z#cLaO0tWZMc>oY#)6M`8?l1s_8LL~#NV%T;(n;gP*^GSVaE%HyHnS$_lnDS10FX|n zBoGMNzX6QsW=t9I^6O)!<^lnw{qe2}Juj2@NZP&6)^zmagml!pWcbRmYDr^)Ohyj3 zSIX7Jq%JcE!FU6#InrJsqf?tEBdru14JNP0woL~P=O79N>+pL#k&umzjUAV)GGKUO zOHOoG$jEF;vRlg%4wu^?q+AtpvbRz-K0Fzhqb&geV=gabWvC}Ce|UA&c5ZN|?nvkc z2Blp4B$G2_b!|<$8vHW3l(s1f-{5z@d0xK!_3!8sp#MN`bfBwB0fQ#N45r)3AgA}r zU<{5NV+}B&kfY@~^~g!(zDr!X2!Nub))jGc&xGOdNJpJl>5c=QB?Rm5tX3NU263lh-2wky zn%=aH90k`{1ow2ibvfX(F3Uhb=YZt_h5)pJ037Y_H$nlA`tnK36;`Jtv!R1}%IkG7 z1VgwHoR;$PkR+2SWyXuIjp%u0NRH<70;Be$A3vwR{q!f#+RKI?AP^lR2-;F5G8;8( z3d}7qjsO5xX1DZGb;Rg97>2#|<+ryrCgIY7(6}Coyd?mR-*=xzgLomK2~A+Iwe@vf zPjr9)0HQuYP0Msg#UldnB~RCkf5p80`Jx~4KLTZy#1@XMc>T2CfrW<4)Y zeDzgrYjI_wlpZ&h% zvne%AS80OMSYvL2po!>7jtE=*bhuUw@D24jP3%`|YV&jITfL+Dj!mK<2 zeF|);OtJ=oL8UNWD!3&WcLPSD4CEMUYl6l~xnZoy$;q8}fzHlOHG(u6Om#6j#9&(U zvnIj<2py2Gey-1UqOd)lyF6#_Akd&w^G`qZZ8`n7zt~%<$E>zVDr4>GUay=!zogM) zU2Uzh5SpgrgRPB$5c7?g2j)hjYA0r`LQO#cdU|>c2n9rOF^vgx|4d}kL18kJmimhi zci0*Ymj&gW4<_wx6ile9+NVN(>zm&YPg$+J{>txlON}K`no|I1IOvJuKaBnNvkP+S zNVU8(wq-|+PH&I#1>P}N243nYS&19W{k`Fxi?c2OKx)%F!(do<7!05BJHCg*VO4@Oh~dWtY=aHFw}IuC5AKCfFHD+u}VR!sI)gw^@tLGRM}{q@nPYS^iH-F7`5 zoge;#@y0Gj%g-f?@8>_*IlSIgu8$a6Xc!2)XHS?RA@7$pJWVe851FM1vrt&`~-^AClF3^yb@V z_H>SWI{2+H;N;*jEzJdks3K*p0tYJ4W+T?{`Q7FDZ{?oOb4m`t(EY~@)CRx;WSKPQ zkMy?IAPu?aZNP&=#|>y3)gt5^(`mD(2ulJ+@r`?Z2_PZEz9VL(SfK`03q^CgrToq3 zmwXAdx3?<*ER?cn%G7qDYV=(XKviX>7CTuJFns~DX$!y4GLIBIxw7Luo12;p!~w7i5V*6mQ`#Oe_!7EVWV;49Z-Q?f69l@Ytgd7$>^QHNSs$d{csk zSUnHU5A<6wsvD^_#!^F_%})WvG$j~+FgkI7-; z=*>Z88IwjiyUcp}gccpZ&^P#Kd|WL&ogZE2$)w!_!1L%DGg8F3xUSe{>!JbZ@9#G- z2p_7#8eNY@mHO3{l@hbuT0ULI;w#x+xZ9^E>v$L_f8#jS=7jLjYayki;gw`hST zs6F=t5zbO8tl6Wx1e2_)tW*}T1B}}j);XU&0$412vk}VKlfXhP&T)2~^7rZK>7tZa z)Wtxzx3^atEZ9T9ZW9_Su30{f0uWf)1+5wWG6$f&K#nKR*!bXdjBp)G;Dus~J!imy z0|)f6Ism{96E-T*xM9NV?_)C*x3P+F*e-u#9I`;m-qw?7^b(!mnZ8F_J{%b-N{K~X zj7jwM^%;09hL72?g@tV@d`N;l2($t0F+fj}(m9nK3Ks9C^kT_htO=VcgvZx cXN!{IzourE$e+ukOaK4?07*qoM6N<$f)S?js{jB1 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBlackWarrior.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBlackWarrior.png deleted file mode 100644 index de633b8248477ee40cafbf050172272ccd156bad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3602 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 V8pw&L65jv-002ovPDHLkV1iJ^YK8y+ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBrownSteamPunk.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfBrownSteamPunk.png deleted file mode 100644 index 1526657c16dae38c94e5f187278a61bcc47e6137..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4061 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGrey.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGrey.png deleted file mode 100644 index b04ad7ce308bf0695a74cb916c9d1022785ab985..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4247 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGreySteampunk.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGreySteampunk.png deleted file mode 100644 index 994ec24be8b51e7f5ff4b01f572faa857595c313..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4200 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGreyWarrior.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfGreyWarrior.png deleted file mode 100644 index e0b5aec028434a780f3d7dbe1b8fdeb22265dd51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4022 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 XId#*>$I6RX00000NkvXXu0mjfQW;=f diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfLightGreyModelSteamPunk.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfLightGreyModelSteamPunk.png deleted file mode 100644 index 5e5d6b2cd3bdb2be302466178c25333ab0a264ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4226 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 P00000NkvXXu0mjf$M2d0 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfLightGreyrader.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/furrymale/WolfLightGreyrader.png deleted file mode 100644 index 407b2a857cff288123dac6187cb37b5fa41fb6e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4393 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/BodyguardStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/BodyguardStephanie.png deleted file mode 100644 index dfbe8f7025dd8a1e5f3a25aabfd7bd3e3a84c023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2777 zcmV;~3MTc5P)8lLeLbk6^#-x zK_n*GTy_l@iBft~P!PoWv-qd&1YWqiig7^x3-;O!@kFzyfv=m``pbD0216+ zDm93Xq7(rB{^`A+#^jWPHET*Zd$wxsyw0Din0r?MP;^~G%xt}mg6A~_;9I|cW)35N z@R^%2&>z3`0a$x=PfYHM^HKwX!nPmZ^GPECT?+tJK*R=NXt-QXY{CBx03|a9mWw06`GKbzKw-9^x4A5+I5mFk1}} z#W4t&n>bk4Z2;9OjyQW^I@c91W}M*I0B|9{P%zwfT?ajW0hL;iuFv1gd^D*R~CSquN#bOwGeO{1dzL77$OK`6bt;_dVl3o z5!16Z)Po2G&oR;vMNvatA_uOluV1j*!O*8`vIUmYYM{quNyRTaDOv1 zGx*!fvl#&5hWK*g6JNUx{exHG&IiZwhq1lz%Y$%BZ%2d*LVgsLT!ghMrZ1eshMnKW zBM)xI)TMJ6`pNIODWgW@zOe;~5o{Glw2**Bv3ryPa^GIlp$(we7u^DCQHb9j_$H#- z6lN|>;_mPN9KYGW2mSpk;S|bn%00%|xzzx1^g3oLb!^!608T&f74!}c!1ep_x%++y z-}O+B0;3MJ0qx?5HxqylynDG(gJ;fOOr^wGx4JKWeD4U{qK_yjz%2xDT_4kvlbD{W zp?7c)eQ#R@zqbr;^LGqqqKWS!s8ld>@ikmJ_bU4Oee?|sAc|_~98tZ7&+i$_<>U*A zF6MT813EMXAUkidSZoA7VQ36SlPk|{83RUDurIdJVDZj*`K*g7L-k9p-1+5gIM1(k z-hneOpU2u&E6jb*BY(~tKWAT;b#`4hHkO@XZ}Rc8&<)ZeTLhT}NjTg1XKVx|DT++H zZS7kbG3}ZRQh$#9#n#Whu>i>88h@SuAOiS1ilRJ(V*&8kH|{|kN7%Ukbn3b^SB7Xq zAAt{oAa{O&#`{CJ-;#2lQt+jpJ(f4Vy#&yeXaN!;HApsRTxUCVB!?*81n`Nk--bf5 zhz&n_!gv=EEs3(`w5M!4KN)08=J)RSXlDRW*64t$|7d<^ac>Z5gsfrLx?aNjd^WBm} zt@hgNFMyMKTR@#{+qM~wGdLhoGEy>v{LNLAr1@<)#zO*bbFi730jWyDe-_+E2y%neufn6)GUO$_8^+Q;$Dj4lC9!rpud zkj3VJQmKU5*;%s?pSd9dK|pv(ML34yd-CK-vk=?amm(;2;d^n5eaId4wbhM%IPSfx z%4VIXUwpl#naSEG6M83ZRFa~2KUt$a06TWUylqR?zO!V2c=0u!J2Z5eW99edHszsgBds_?c7X`a3xHj_ zcEvPU$3nf0ZP_E;Ibtfc8{(H5O#{q_0}nK@T%3jovgI%_0wzub0vM-?E84uA?GbfU|AAoB@_4%XA?Bf zlA5*{bZi5dS<=zF%2-ufz?D@{pO6UG8u#l0|v3R>3D=lYLp>;$|8uRJ0&~$T=l9c|UmYpiu#N2}y**=f5y~VWwQ~|jy6+$ZAMG#0Rxv0R1 z@A#~D^cG5cOT6tJE1t05NxJ4)x45_f&2?LgG+&G7dCP=7M#0JzN ztRpqgyr!@etK0lWRt3H5z fuKC2Kj%fG~yy?uU99t#500000NkvXXu0mjf~ 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/DoctorStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/DoctorStephanie.png deleted file mode 100644 index 6b05bede9c87990e2003d096c014e506beb46dbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3076 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/McDStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/McDStephanie.png deleted file mode 100644 index c148b70a35ba29480573fc2d4fcbc0fa34b8175a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3124 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 O0000C~ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/MinerStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/MinerStephanie.png deleted file mode 100644 index 56d746978a1b97c0a9413c1f642266f2728f7153..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4215 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 N002ovPDHLkV1k(x*IEDo diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/PinstripesStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/PinstripesStephanie.png deleted file mode 100644 index 1aea63c0ed81fd47533d2ffefabfb7374fffacfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5180 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/RobesBlackStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/RobesBlackStephanie.png deleted file mode 100644 index c673b6f76f542f9bb8a096cc8a87e3082213aadb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3545 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/SteampunkStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/SteampunkStephanie.png deleted file mode 100644 index 58bf1e43ec76edc3fe2fcd32d68dbbddb7eea9dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4445 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 j#Ow$>z3JDq@i6s*I1>?{#nl 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 QivR!s07*qoM6N<$f>y8&o&W#< diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TownsmanStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TownsmanStephanie.png deleted file mode 100644 index ce46d0ea67ac91bb96c5d997c0acce0e495002b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4151 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TraderStepahnie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TraderStepahnie.png deleted file mode 100644 index 1dd1238859ba9bda9888f0bb2b9f9dc7c6f68525..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3230 zcmV;P3}N$$P)0@9z1| zcg}zIKW91g&?-tJ4t3ED1F|Hs-n386NDF9Ka&FEm%)0AouBUq(&+|P#905QAhZMyX z+O{(Q(Es1moR3(XLs^-E=4Op;sU1F)X4`%NfW-4mn3Q2a6ohU8_{m>)bx`ClXI3E+ zcE0!kj6EsfkoG;zduBkO(6M{2{3c^SzXgCyz!TQAET-jPn=km%06;=_7T)s**%+|6 zY&0fLF8bn|05O1sC#~z21W#5<8eccb>do_y7XHaU3SNzmYSfMhwW+PWV}1 ze2L2DdD{Uvjswqe2r42B*WAIwf@uRH$3wGBn5G4u=OKv#90w5EfRF?rrJ1lD2Lu@3 zHo@||3skl^qWNf|$Eo=9j1xFN0CXc+6q&YpoqNbk|v zyKlw>TtDDyf76P&sJZJ242=Zwr$<&}_*s|W(sS-Y!^%yV}bvk z9QgpEy~K;qZ3}bgnQ-hQNTvG~z$B^kCUf)`Ejyo^LFhD2P4 z8jT_}cqC*s2w~B!Osn>~pTkV2k!(4L) z!EPDQ`3V=E0mqx$4a33?b9{#`@4owPZl~4Q=q$N*GS;ka#7j@rv$5a!_6pQ3or;DB z-@w(^Ook|OZmhubFijhRz_smLSoIZb8jbt`@PvKt(L337E?jUk7B88MwQCv~5SC?wW=e{oDEK14 z2@v`m< zRtBglJ67?d#caF#*Bby$bNjvXPWSz3iH`boK3`qkvH$GZIT^tb03BwB zWyW0f`WhxYd3G0oc5m-FJ`+6FpXEl6tj(O6+3f%T9rZNq0~iw~WB_9Wckb*x0O)#t ziqroChj%dZAb`3%|9ts#KqSJ>EqJ8?s_e?+d3RzE0V0YNX4^=c!0*nkb34Uiz??bm z{(%Fixc!H0clS^421bnN9sn|#!Gql~z0H7Z0MKy{1U2Xa;k8$%ec%cLVE$Vh5mLZR zhD?bZU1w9$Z650@uWY{n0YI8=Y3T|8xqyQ&zyS~4GLTB?7*<{lUJ~87K{N2_2X8@b zvpGo;5Gk1mj_2uRl$me&%xjL#2lzEi&W&0)I6A`s`cHkj08sI-j4<*?SCFTFT#R@q-J2$X;ayn1HH32 zrh%g$y#+mOKn_UYL=lmZl@MhKWQ278&jf&9!#$b+`G7VC)a=^Cd;rZHM0paNR*+mq zxc)@9Ic%t!moXa#fR6!;{$3j~0xvghK{Om@Y|?BSqsM&>t%(F8kuc(|EijIJh*T`j z)-D`@!|?J+NNPGX(?CcK;VTy$0|Wd5=j#JXlk?de?opktMGTB#KDt7Rn|}LsCmalx4(XF;rc0!?6M2Jw;~$ckSw!^Xq*6l^2xE z3{fer0=-AjJ4EfmcF7G6a~!LZS%A(o^?7Y?c{;nU`SgLiCq`Oda+(y5af*rKc;7LQ@#oE!TNfC^z1 zbAlu{&G(CHe!zrzc>O&H2Y48U4GM$^fbQZ77FyR0!ujjN8Q|`?;x%vr58VMAK7h!O zVm1vr4hKaPaPXtI!PzFFVHL4t3dN_KiIip_psGlvlBk^hz1#qFG1f2HfxKQF`y)03 z0Q5(#<|ESp1M)$uKlUA9K!4O~J~9n3ARn~)W8VP=^hd4cBhvr_@9IXa(g#*wFB`}{m0A78;q`)dx`Qg?3 z(2c1ARkMIM;`1|$pp;sp)n2c$yn?@Z*QC6jLY+u!m`fA<*xQ&blKS_*fIpG=km zph^=0fSR`q?tiGx^#$;T0-2x-V^hz=SIO-n%*I2>x;2}3iWNFw5i zBuXYuXUR{2zD?kHl$@Wt0HV(T$R?o2fNbY)oAV+1Bruq}j7sz5jrWMhL?SSC9jX$*$ZuU$kPHP4_5;OcW%}&K z=6DP*I~_^gU;$J_m2q(I9+;ZOKH#!V3rfj2M8X7s#;QchXPqDn_^bdd9A_e;2GJT% z!r?^>8&e6*w7_u=n+9Wt_k*+3p!X}svZ0oaLolc!olJs0+A6=Ot{^4;9~-s1n+b)v Q3;+NC07*qoM6N<$g2(UqumAu6 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeElderWoman.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeElderWoman.png deleted file mode 100644 index ec40ff89091c729c31bda7751751b928073d4f01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3189 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 b=Cl6-DrV=ZgeQDr00000NkvXXu0mjfatRzP diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeGirl.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeGirl.png deleted file mode 100644 index ab7ffba22c751499e3a75c716d3f5929b23f294a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3323 zcmVRa75?7duea%07#I2IC68WK4qFB)q zqp9LY%#ToF1r-ghiAIcBFcCCF1%V*4%uLS=-95d$?zi34xjlDy(+so?3gd)ZH8pR! z@4b7z^PO|gz2~%qD((Dv?M#v+crxJIJ}j5PmwjMq)xpi5GmU93gBj8JI9;2;lNA)00>^RC4)>Vj|J(!cg*h{s>oKT`1Q!g=HbImd_OOVAC*!BClxGdzE61JE(8mC1$%T~ZKH7#boW_>PaF=W`!W@3OHC zKM2C5jXDMQ`OOq>RI5znXQbRo-E54uwBrU zXqqNBfsiZ#=>a}|viD#Uj&aljuw;Halk6gxC!@p|@^nO|1-0%v7z(4u{}J#^?fkL@Qv9s zpsNaWRp$MpVI7TiCc68wIB1oSEP61=O}HLZ&w;FH=qtGxr}@Y@67;Z%Z98|LQYR_3 zPi-V*dPdo>tTS&Ff<7oV@NqZcI`iSY5`bw_H;&z86iZ_laoOA&3TMpTDkrE!@T_6 zvwp?TZ~xDVqdrSul^hRoQ^$c)5mwRW07O+_Ml{O7Jk@IjY3bB9MhG^0$#Q0gTPY@xxE~Y~9{vcDt{Zl|XTNFzn{OcQHS|WXqak`h?}@b#Rj<1_@t7rb_2D&d0aDUz1NcqVpRU+|C@=8Uo<) z{L5T$YNXX_l>O?|Rz@qqks7TSf7)^ldV9M$0O#(!6!H2xyw!UooE+kRpIyn5b`*_Ij4@$q+VzZk!B->eA$GAW_`pbsDx5Ho(# zvJ9T%sbj&;%kcA_XNKem$qMc`V;LYxP<0h0+rp{?8@Ro5 zTOYLjh_3Oek>Uz!WUHj5yzLD23HB$zDrX_0IRVz32oK$(Yt%$v3fKeyVvr5-(6Ih% zHg7v7pwf#ARxr;lVbY|Da6Je8X$${6^BF`UF`WC+rMU0F`m+7|9ykCKujUb*tjHXI z2Ya3y5{dvIJEUM}B!MW%$`nc*FaZ|5n*a+2P$D2B!0N-sFd(Ua5Lg00m>0dbvVS$F zD81CVoVkvNmI*B|A|a#)viSSBr*To=HDJugJ$rx8g{MXUtZciMYm_sfXkk^?h9QRh zpnfSo9>|uL$Ro9QERNNwjfYvKt01ifH7hiIXrRb}48{-CFBr5D0Afons+WN$FsTvX z)tsXA(mCH{n&u-Eib7IDpefLIN~o(#;Qo)F7^1CUz+G+Mf@?dFWC?{_8a{MPoz{xo zyFMBceA<+Wd;qb!M)V|;$PE;R`b6VljBjq{*QwFHV59rNYfpHu9$`vB0YyMX<0Als z`O!Pc?5YCr!n~VUG)!hKplU1Y(5y61r>B$00h?pBCbCg#mEQzaNHG` z&^#Uw?pw<}uy8;^X!=hYX$*&k*U#6l`=26hHwLIn|&K zATWawrqDh;cU&ew^R}=XF{K14R%rsl%L^w%UR~q_Xuza-8k7)7>@AQ$1ON$N*`Kc6 zs9u1&hH+rNi%fqKzh#^GyU42tfuS*0GJxJkia0I?&~lhwNK=dOxw#lk(8W8An#?3nu|XGPzE9yCoHU(+#lzVq3=$BqNmtXRZXgY*GvwSL41 z8*nwi%ar)Dlm0Omlqq}O+{^)`MvS^Fw*aM*jdy0e0%pj7{G(u(wdCSJTt*=0@H!<<``G`eK9`|RnS?pNwH#iv!SFq*iI+#Q*pGR{;9O+CN z#gdJ>L>!W=Arvwo$sQzGhb;Mcq~{OZ2LyMXgzq8K4emP#lSxsqH5gr1od$25KYJ*% zK`$oZNMj<*tOP)Kcj1_Bopdes?%9h(eGI;&p|ATOjF5(Zcl-r*)`BDZ2q^|SKl~C( zP6-_yojBOlg@JSmv3Lw6D+@CmL$OqZ=gWwgI1BGYLG)PmMn?0cF4V^OQM z$aIAfRWCt<^Ml(6A%DU+Kk%m6PMv%tuG><&tl>J ztI(J*p(+~o?K=QPHxP*!901?*;d>4q=-Dt-D?q!tB1uE<5=BtKdH}i}Jg>&6lLi2N zh(NgOtgl0oWNd1B3X6NMMuN7!^F?%ZcR|$@P{Pv)l^H;StU9nBIm-79{=`O@3cZiE zys1^z2h@`NJ!t@t@FHh$+vMwz$)q7`252f|ZV|;|4vr&3RT;w31Q?ax>l%KsZyg7K zo)-m`K>Y-P<4Reg*q27I|~a=FqpzyQ+FP4!ozFP(;GTZl&#m}VTQOcCJ- z{jPu^(R3zq`7G`qWIzzWVD`7tCy0V<>itl*x&TFrh(8zY7znbcCW7AXpzTsu>`hU}c2~ z0YX!ni0Om(+oxDHr{oDdk;Y&C*jpzQ&7RQ1G>~9@!O?09f&;EBba-n!{Q&E5$xN`w zQv7&hq&Ps-2aF062s)aPY73~UgxW}vT(HJSOoO5hNH{}L8zABWQAJASGovC9ssuoU zv%x%mr8gEnfgE2jw@))juug%V6SV>2zo=cH1=5K!;D0Ih?5e;t^2h)H002ovPDHLk FV1iNBA^!jX diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeWoman1.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/TribeWoman1.png deleted file mode 100644 index 4f4023ed312dd3cd244568a9b4394c97f4f1d52a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3488 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 D&3r*{ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/WaitressStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/WaitressStephanie.png deleted file mode 100644 index 5197fe487eb5a6743c06b376a3b33fe1deab912e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3194 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/WizardStephanie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanfemale/WizardStephanie.png deleted file mode 100644 index 66fdeec96486cf1699812dc47abda8d2f734840c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2272 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/32test.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/32test.png deleted file mode 100644 index 955c582f0bd27b1fa353d0f0bdaaf5a56547f7bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`6$5-iT!D1%rvLvLj^u0 z@(cbC2Mk{RjGutQoCO|{#S9F5he4R}c>anMpkSk?i(`m~_uC7%xf&D%TrcKj{roR~ zC&jv%(=%S=2&-$?a|5%=GhDa#yE)3U&hdW~b4laH;s;f_9M(xk*|zQ789B|dveC3H z^}+&&_{N+kLLBZ-K69^e+V_m5sJv3{C1;uAG1;c`1zbe!+zG h7K}SPYCbc)_vdRfO22Z4B?ssj22WQ%mvv4FO#pGBZ=nDH diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/64test.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/64test.png deleted file mode 100644 index be4566757a888f7ab6a447b2d729efa126dedd50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU|j0y;uumf=j|-Rpu+|NuH}+d zX$8LCj<3zq8?FE#uFYcc$^WlgDr?@4kKaA- zh?b<>{j){ML3{44s(Lp48ILXlFRuf)gER95rVAGswlJ8ydiy!gms?#L7-u-EmdAz$=kk+(SB|mRCaU zz!vGL9m&Ub2`{)m{o(Yuze|qqk7;>4fBVai%`8VQ31l~Coi!3#a81VK`3#l~+&{wf z`F9_d%14NvtH~wi|l|QNOeSz-G?@YPEXUub5b3cD?+%`FD-9Pb# z|DO5YR(c(t?~u959O%Rc5DyZSi^U?F=}*7l`%k2E4IXFVdQ&MBb@01ybvod5s; diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/ArcticSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/ArcticSteve.png deleted file mode 100644 index 3037d3733fccf3ea0ca6d0633a8b3e2b7009e9c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3310 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/BodyguardSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/BodyguardSteve.png deleted file mode 100644 index b247d44ebd00756e88501b6c5d2f0f28db30e501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2776 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/CamoSpecOpsSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/CamoSpecOpsSteve.png deleted file mode 100644 index 32473d8f8361bac68a0fa1cad4160fb454e8271a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3104 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/CasualSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/CasualSteve.png deleted file mode 100644 index 3c41fea87de996438df9578d256647effa2e0ef1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3779 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/DoctorSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/DoctorSteve.png deleted file mode 100644 index d71019baa4021fc941dd6a795ddd245b8ecb6396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3056 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/Evil_Gold_Knight.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/Evil_Gold_Knight.png deleted file mode 100644 index 4127985ecd8deeff52b389bc0958f9fb4398399a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3081 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 XM(AUy8cu4~00000NkvXXu0mjf?1$8z diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/FireSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/FireSteve.png deleted file mode 100644 index e6185dda736bf650fa61e658d14aecb8f3b22917..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3631 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 Bz;*xt diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/GangsterSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/GangsterSteve.png deleted file mode 100644 index 2f276a3911eb0b5122bf7cf790214ecdb3d09592..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3829 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/King.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/King.png deleted file mode 100644 index bf462172a0cdd0efc05a28c4cbcd0c185304ec21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2400 zcmV-m37__fP)g%3*7ZVFzUBKCk5$4P3`k;+y6L!!?Wkpf&R=%yTiI;y>R;m>xc1jJ&zN`Ws(yt z4{+PQy0D*9oHEF2n(ICbL0 z@sNVb@pj=bA1=-xtbI#qXdvF}+Rl%8Fo(}~O})K&h5D;is-9~1_#E}lnQP4gvQg(D zLwovtzJCJ%B&uWO)vBhZMnA{L$E%8pze6q{$2V3mF#v!uf3WslI}eAPe^t*^0f0}< z{(7aJ2CM@RnOUQw8-R`dyITNwb=f=<$D8^7aL2iTodIvGTwnp9xnH0>Ks3Ezky=<> zsA_9#RCV> z#dAhRMx%b1*C{4=wm#R_pFC@h`f%+>fxz;wg3^Xx-B3wMiFz>xuUF1g>1PNJ;c%A% zv>N$zlc{L(k4NX@jZY#fy~|i{E!&N>BhGBmp23uplgSAg#3q;d+OMRO<^zwDn&a^Oia^ zYlfc74gkheArD|Z%j&ZmoVCV-1_ilSd2g1E8zB2n^oFfAOK0ZM01om8(I30-!jyF;ZPB%$Fj7OmL+PbR8-`AlcZa zk-nGa7Y9Hx++^zEb0K#H%>W4iCno?DhR=f!pA5K)kt;w6S_#S{mdLj{jx+XcpDN5- zsP}7L?8|nku;E?}?qLT3>%sE!Ep^@G`I?!GOJnzyHxB>`K*8;Ta3?ZDHY$xO11v`2plz=y9*H~k-RCE@^d+rC>{9h1`y z00fnPe@v?S^p`kGRHt=~y8!}%6~U!TVNP7!1?+wgu<4Qr+^~Ky0OXDkaTiD_*{-cF zgBGkq`WKE!F)Kv?LdF2;235Gn=t@NgUawnDldcBgg)0yHbA(y zHl7N^3&RZ<4CzvKK$r(G4q%-JuAZ>ShY6*;zpwq)Oo+nT1_^*v-u`V*g0M6_QTr%- zK6~6O4G68@5ZH|5i9vAMK#%!)&DZLSiKEok5u*cfpuwdWP-Tq4Z(thyKIOun>hhH< zs{X$^mE0j&kC*c9U%g4o$HdAp1^@uN^1(iC5`@w(mg_~KJQ-mJz+izjg9P;vAPGQq z=N!!d`ZfL57~22{Vhb-Q&#Us%C6&^#qxsB#?EGM@nK%J3r?^r%0lB7OKe;tX(mzJLcHSbxOVCMeFYRP6>%jHt{JoeYF< z3joXC1Yl5Jj;TE6zwH^|)&=Yg7&>pF1%OEZ2MpH?cxF&HzdS$C)cFF`1X&G&C1ov8 z7FpyMUDo(yg&0K>mc;S9(^p@o80Q)QP~KVt41T^~_QaVA)gWB5JPseng-_%tty4jk z-({_zpUQbC0suMH{%$z{pu7Yi)cFFG$9aGORs;)PSTIFX{I~1vbsMWhtUE#hc}hf9 zuJHS??fYFB(bZrGmpkD(3jm?c7i4D*H_r#aiU1Bi&g$;osyGvbP~|dKjIe%-Gr$f& zsM;a`U^$GHqwK|bmhv{3fIjwf2`rq@4R}_l#bbaS09Zx3gnR}7@O1_?^qcTWkp%$s zr#tXCjlD+5Knb=vRex`J47eEpXhmdvIOr%3I1m7q&!HsCXH*7&aOb$~00_qgC_EG^ z+_tt6000E>K%OUJFeD)17C&z}1MIs%C;)g!idi1|PWo(dljUw14|qlpX9eWJsumA| z%{^a$>M|@#pk6MT5whNY>YfKJXa8gl0VcKhHrU+r1)wBAKrjT2`%W3v2!N`8s#L4i zaq8ao?Nw!`M|1+kV=@e?41~7@1DbQbfIi7{2D0YQHhb+KAjk`V@Kl-GZSa5GTc$Np SS})N60000g1ldv}2g_<EVqq3w^RKTIoCtE6hR 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 Ef&{f%K>z>% diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/KungFuSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/KungFuSteve.png deleted file mode 100644 index 50f36495bb2dc9b1ecd9426aef444eb5a607579c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2874 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/LondonGuard.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/LondonGuard.png deleted file mode 100644 index b79f6b824d12688c691c79e9aaa7f83bb00013eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3947 zcmV-x50vnUP)g^p7%L-+S}U)EeKRWc|;HdLxM`=6^S6kMrjo*5`++AA_)kA7*OE{z5+C(wE$s}KX{o6_$>hwOIgh=* z^{utnS!-CX~%Jl#)SbCUT;Sp z06yqI;f+5y6a&um9DHDTzGDW^3Cgpy<8@tEz~H`8sT_F|pbwz%)Orxdh?4|<)k0sd zJI4eLMzh0V0tA4x=L|rhjq@`mam0N90U+Hdc=JYQ$c+qWwH=OGKu>q#0FxwX%mVZS zzVCNt0v}vb5Q-%VVq3OlA)j>-rsfVCF`@);EgOCuA&O!di03+>8Iq1NO*uf#kB}%O z_G#;3*>?K>q2h>r^;m>zn${YE9tbRB0W$;CYPC6kb4+B2F_k7CF~@)KqC%lS;KZj` z%>eMvjO&WFZQDXF z5&zyhH@f4%jbNlcHA(x|bQigdzy=&+BK(g6a~#@1ina-0GqAkguq9=Ha^N`@ltphJ zLBWFOIB;ACcYg6&6tY=VeIJgK#l-XkmJcq(&K=uiFh6$tEK5XQ7A z0+~n@d8jzz)!~^rHvG`-uKMN=BFpSsIvD-ud%4Ekw_yUQA4s*o_Tsa#pjgB&UVIsM zd}$S~xbw%j=AsAi)r;Ohrl*KUHV@*77ru?h?*2M{_}B*AaN*h5U#Z~d&%Z3_+tz;_ zCVhYjnhq9690&l%F(2WLAn)ZGVUzIzWP$OpUpQw4O5J^!4(llAyD_+EDco!ye*4^W z^1RPq`U&iMYdhZ9H-=o+Lywok_{=1J{nCy`xJvDdFVIf#P;tb;0Ql8?Q1cC;-^(=u z0DS;y@7XTSJ@rIfxN-$zzk<=pNleU!STa~f#)`3XSb~nmwrFV{)0GgjvsLtWc_{bw z!O0f!;%htbmu+t%Od>G{`hZq(#8C&}{%g*WX^;X?=!NAng1V2{Ai&7Ptk^c0QSR#% z;r%c`KAV&8HNTD^h_JA~3k!OC5G#cwwqZL7k|>h*-B7HAPX>a=@bt7ARgr&uyk9p_*l3bZ`(z z5&@M?)@+P0`HNYGrQ_o*@4vfLQdzzo)@pDI1>ALV8E;QjFw|R={l=HK&kN9ZoIElx zplsJo$L2UF@7a?EKAvad@0JhPS1PHcGc%Z(nUN`s(-P-p0yr`>gnF%pe6a|{c|T(O zkVx>GX{{t9Q2>+bphbYnVClHt)r@z576+;!D?0>A@LZ%s{LU;uTckY%(+ zcJQ^Df)fxPi(@Ql$AAS3l)N4@Nt4OoYlFqk05Ftdw$IJy#YX?76n=U6UheJf#q{*F?7y>ao!po-aWfhCG#AG3mIaH#CJDAC2|hhBA@|@$ z=KQWuz}dwj5;BW}=Et&7(}_;rgZIqy9vVzV^H2&7&5_3`bQppWh9qSON-hTk0qSv# zoX%Tv3{(V_v#1TDtkH!FRUAcdTo-?>*9H0CTzjp=&y1I;8S}PANBG(G>(Q0V;S>pd z0bvDa3<8!U$YwI2lX~58@Tu`}iQ)gy+l!UV=M@Twt5so-qTnX0lgR+S4=bNf<933p zX9;1E28%4PTo-;AB1-@?C=CD{2emjxflgN6znxF9Zoc_uH9I?tfq?;ef#3rt=ZS_x+PUYU@aCI%esBc5wnZ_>^FtBS^ zOP^)kdh4xQ>MHN|DnQA=*xNDCNt8+rD95E($>2?PPT=kdp7fEf-#DG&g%p}2D=#+EEW&bCoc z60uMEn0z*i!1u*x(7v04F3tixPDarF6K!T>lyP=`ttLR^$rjrd%G2SIJp@j`t5zYg z3?tb6`&%<$_3G6P0H|p)fgjo;X+!`_E}p_u>tu`p>b@tQ5X24T#1xVQ1EZq|!!xmM zXg3zoR+U06NhIPEu*`csDI12OVR51yIQK!2MvSftqh)cR6r2jv8R}XTr85x0Cvd*s zNXk%-^4`6z0l4wT8ykfO`huRG9iu*Qg5?kefIUOaw4?CO1 z!0z1`8yb>XLS_tOCZu$|E}opns7;2p6o9dV&^d}wXE{s@N(RaG1cx7j7RPww_f?#9 zWp_H?(V=RPO%jB`)q=6H)&Sgc%Poom(+p_;#`Y&BCPdpb3zL=M063+Q2_|jz;O5O@ z5}cDsU(%HV_YDujwm*iwD`(Kn$W7B;v`mdL&22QUQ{EQuU9F~eObs*T<@<1X9>JiN zSt6r{PZE^&FUQ0QBQidYNoFkVgx_@>z?5%uz(O!-+Z2{sHh#ez6D?8WdK(!SNNLG8 zMWv7@XhDGP;bF|ISdj`@uL~&rU*ZBIP!y#!*9@R$E!O=w6}qnYfPZM`OW|g8B9y|B zLH%7_n4FyzAHbI@BM1FLf3YaaymV%6#;GxI{l&x|V)tYLFXCQudvq|m7DpgVU}J7V zAYLhz8jLV$Yrfc=zIQ2h?tC5o`8jlVcgwZYv$HZi@;e1DP~(g}7~mvn>TK5cWy%z% znQb37G1uiP)%NQrdvPhtcK@#Z0JbrbYdVEa#iz zC4tzst$ zI?jOkpmi*sdz=BsqE_c4({TpO2d!iA+~W*57PUGbnGQPxq`1ly88gMck7d)-jV!Ys zSj%UQEnTW2R*&*|Fa_Re^|u`uhaUizuXW0rMa&cHbxC0{ZLU*lZTkzDkz!si&+6|` zcSqIV_a6WjTXhPIWvpdWQ<6?=+S+!2NX?OXLC?e8r!MTM0pfiJU~_l30C0iM9J5=* zw9Dx3&-M)vK_CfHGU4vim;7%7Fgi4(nDgiMs!~{g_0^I9{mPat_>eANMYUSmL!b+o z^bu0NVkwIq;7o%vH68?wn!jXrO_hlC09J*o)yDD=DX6fwpiSZ9h%*EQqk^;kvRsN6Kg{h_ESwX?g;|8USk# zy0B7y`|XbWSVtEVU6$6QE||$k4T1Jfr^ht+b&owJwS|x7axgszY^G+Se7oadwqD2i zTn)zN2HojFVWrnV_W+ol0I4jqPN7TatRht_6)bC0{XOCgxb3#v)Y#aVREtS{(=g5N zEKCrTVzCIG!_phUAt?M1wC`=%BJD3yQ_x)}WQb^)=kmDj4UlFkw(IHUXKAWxQ~W&Q z09=3l^@_BopcI`PEtA6&au&l#FZm#>tP4T@Nh?F+|k9P*9|w^Amw#aJ0t)sf0@ow>F&@)Q3Ako z4KM`b-lv|D&Ms+~V(`<{q{#|0+hT0`33h+zS-~u(;Np(*$Vf*rbaXKRxap>wRP!ng zvVrs;A0KbD)6n)My3_qdrVWl@J+Nt0+Ww|1%x`R-!AX}D(h|Dv1rWe=Rar{)N;MWj z9CatScI{easXvYEUFEG6WX8jJeZH^f)d|(d(k26AiVQ^3!sC1>Xv7)OB z6Lg$fNS@c7E|P96r6I#6Divvsxny#(BNlgbu@+92wwiT36jWA?P$(|CE*52P?DoJ# zOwFsinx`zYPS7-Hng3`u473cOmhrId=DS1u-!TCBd|sK}0S?Ygi4>Y%{$R`A%{c_+ z;WZaGhBj3V(7Skr{BHCBOzxRG^rrp*o^#!If7X!<{{h;iI@Ite+NuBm002ovPDHLk FV1iE(b`}5t diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MageSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MageSteve.png deleted file mode 100644 index b33c127bd19eef54c82e221c9c727f2b6e6edce8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4461 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MailmanSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MailmanSteve.png deleted file mode 100644 index 946ab9193d3d6652dd8576c47df8e0793eed880b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2833 zcmV+s3-0uZP)=;gv=$0g23wtWS~?ExSpN{Gj>dHdBHYB^re!P#)xi5G3?eenAa}y@S z+?mYF%f0Wtdw%D4&OP^@69GBej0r^s4T&cbaJyV=H2qF35tXoF&eW`Lc&7QkLauLQ z>z{jHi{ViKkGGHwi}r^RjRC3}M>Gz6*xZ=c`*S`_0Fb~wMKOie^&|jvf8R|vAQBT$ zQ!3+hm&&fxLSYl6d;wUnvc(|biwX4$Q;FFamh<7Ml^%n%&o$4@fIy+YEuC>4 zW593$Fk%=$!m66a!1NCIf~x_*i0}axlIU2o%d{CSdoGq3{7S7w=FkCJd2n5D}IGEt{V`woP+r2bD0P3m> z*gCHpfFKAE1p!_~M#40Ah|r+wfGmiJX)07zgD8q{$r20$kOqKoNkD&0g>D!iz{G)R ziJ}SAU~xp%f*p+BwA5v;@gyWQ4!|q(8xafux4ph22>|sAlETLDam1EzbUdJ+V9#>~ z*~Jrr6#yFSmSv`GQ54{D%ZSF+q=M=6@YAU z#F36@Rt61sr*LDf--yRGKr{s)?P{6^RWsm{>0ZDyYu7+=x#9Kr(I4pnBoU#GGkAK- zUl8e!BcbY$C4sR)*LBlebOCO+#2Aq+jyTd0&5OeM0%S74kl>O87y@~F6$S*jBngr% zVf_QkQJ^U3i^U*G3PL?0Ospu!iS|S6+Z&sAK~ps(Gz|g_$dU}f01_J66alHTC~~kk zV*jb$5dgpdjJjcJ|B(f=Q0DXD)m^Q4;=xr|x_$%hpZ{|_JpUNnejk3hwE}PLd>n87 z@LPEP&A0K5d9!dn62U9)w=x!pLds#158y$QT^uoT05DAYy4`N9Y?y>`MFI3Aq6m76 zP*GU}Sqb3XZQB@BUs-Z1PMpW$%{h$fiN#@-W=Az=>l0YrP3C}Z~ZlQHjxNzh^uTx@+sx7z~n`iU<>>}iFrCz2po!KUwZb?wM10N)<- zbAjm{LkvK1@y!Nlo+d+@2?kF)0-$u-lg3x8x7q^m#>aO-2z|gb&p|K&NPX|Zg}*ss zKxO-?r1psgFKyqK9|KBC8VxSID0(n%+!03rl+Sq9STo^wwgCM0)N0_ucIbLE34#fL z2{wJNvvX@!0r>Wq?+R;9ugMR9Oq-_(WwX)D{t0uQgRYw^gedyZb@l+XL^mG&?B6lD z!jI$UdRX6v|J?@36+r3u>5yBOqR0h=ZhVjR(es+x$2K?2CrAn;xq!W|vaBMx1*Sf} zHMTn=wCn%#uj{e`Di8oxn>QykxQ%A^Piou*RSmI;%W?_3(tXFVzhd3z_OScs|1$@b z*WJ$gi}p1p1s{K4DbCN_&Bk*OXgn95#@AGhOKy^=k8fz~&Is-L|FE$(I{=wBPcO-4 zqnZ6P7H&egFU|xlEHL-1bWcM0q|-3s$IvIuXTnpzcTWQonp(~NMszo{B*$Bs#K%vl zDaVGjzeh!x9}Cys!gh^=oe?qsGWuV5DhB|WHg9Tpa2w6+uV1`@QIw;9;p3f*&XRv2 zO1wuA4@GA!p={W&SS%NcdFJMOaH%#N!luPwe@-8eF9U9Wa5Forri(ihy6lmzI^F_|CRL?Y#M&Cm~1$5alA%IZ6R&S~qi;y4njv>&x2T-TtfL z^#QBDw}qY6Q_DQNuPNS(vz>j=lqLqwf!AuW^Jph7UJRjP&o~Cc+?A!6{=ms(!Xwj; zt3O(W;sM`ssV|Nxb)Uh7o(O_|AG@Oa4CwECOt5yE`F9HM{XVSt@yo-z3f%F~dsoZ= z0->O}7BLNo4*V3|n-bpYOSm(e)sX^#2~|7IL>ssa01i-c0FWDi!os=%A7IA*)SSct zUs(Q5nh&trrPT*;n-1)(OA1dwD2r3{x2`69{QU64OuJmmb^vgJKM?>01yd}MpSg_j zjS9sB)KZb!<^6N+c_VEVU;qqwb?Yj?y?Wq-1_l6UfwCa`DzIGn0h@yz0E`7E(|4KN z1h|QO=NGSKHvzA=c7Oq9I7*Gj0qMIn`~LbRZ##+u==~H65D2{qps*=>9I)DN4*>TA zN83KSj3HJZkrROW`g+6T@jy`&&@~#3A{L9WE5D~JHM=od#Y?u4psq%s;5bC}Ec)d} zh_Wv&Ql$4;Bgera!EaZtx0*B%s7g6NV#b;FqyywW!Vv)JZ~ye&IodjoMtH^m7>!zW zBGVWHoS-!t$Br>zG-}m}Ok)gig4SppJH~*~s8uI2jWNIpTBC977z0M5R-MQ+QwHQ)0CCj;C@;Uuu;vz>me^RU!|8N6-x8Q%2f%9cb~QgV0jp1- zG1i)(skc7M=IAu%$8&VCJHyO#rgw{kOgNFPuBygGXQd+GY92T-o1T^Ur$~$h3JAfK<(oX##`S z8%&w^)V0lks;U)+lX?P@)>>~+ee=3&+Xv*!0Ij6{igW#TwE&&_AIpoyc|A<3%hw0| zXsKCLoy_rDQeTwd;O24 z1MK32#}^4{$xS-|I6Fop090n@q@Eysm2l&y_xjV6WG#T84q||{1jd>j9uX!$g_ch0 z2~w+oxm5n_%fY08nKeMy1OQD87)*`4h jiexy+Tt!g1e8B$!dU!ewJtVn$00000NkvXXu0mjf@Z3t$ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/McDSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/McDSteve.png deleted file mode 100644 index 5204a7986dfe8d938fb4d7eb678c392c447c1600..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3004 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MercenarySteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MercenarySteve.png deleted file mode 100644 index e79ba35d8227f89d10e6a4ef2e939cbf0930173a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2153 zcmV-v2$uJWP)YoRR!F(PVwK^ox?2}lT!L`|C}CP*NFkq7}r2--*k29t(I z6eX#G8p|t!KTISB4GKn#MnY;^DHQ2ap|9<0yWMWhneJK64s-9^K9;s|=g+-6Gxywc zzVn!wd(PTG)7CGY-e)#t>2r%rDJ0FvWkLUW(*cEa~@UZ5)t z$n$i>ZB_t4VX>j$*yuO!)4j-O905S4v2g)O5Y-q8{WWyL6Fxiql^lTSZ874?K`^2x z^PvR*g?(l55{Qd+K)llhT^$~PaWQc4QjMc#*1trS^(xf zQUE1K`i0$5Tm;RYW+*#(M*QBea4!7et{$xH;yKv`xZo%p{-*6Nfxv$g04md$X~~S@ zxDtRz)3RaaU+ zFtPyIq-9s20Eq9CgCK#%HO)cdv;_d9d7OmWr*`xDW%#qM9s+>?q^G8c?(QBR#K$?s zeOI>^7R)Pv+RDq~H@O1%eBvI1<*6S|n<~i4GN@V+a3!es`9$=WmqOJGjh4rIj>GvA z9btR_p59(TZ+v2`xc+v-YkGt($V)IiJJdCHhwK)-(>X zZ8kXW=n_2Y_>;l01ON%&+|dI%21fz_6zcB@{fdeR0EC(qgzq;1^PBC0J+y%3zIb@Q zyuVYvgM&tq9EYv!`_Ei9w+NdYR4g&&jDfZw5Xllit{VY3 z?e!W0P>`1(UcomoM(=cF%z?O;-wjzBHULNnE)?E#;b=_eMz#oClP5VG@S(>O1_Ek7 zf1*Q+@6p%hi8=dAFT%~)vjqTLP$Qv@w!-JCJ56JPsRf{LDi`2=9HbcycDVUq0IC{% zw1o``oaM3$t*cyyqk?l5tl9;0+fE4(?mT48)Hw|f#(-P^h2fee0H`0Y?iRlgLbecO zfB>-7_`x%!e{R)npU^x$!}sFy=7!uN{Tjf+!{y+1*9#DKetA)AHL3|j-!cGPc+x5g zAZuIICu?wWT?|xa_(eAXhT!1N4S`WL1gCI&IaF6wL0*179C@c0cD(o$yixvh7;r|x z&j?UU0JvNIkd<;bniCk@0>q2G0pM;S2S6U&P@wu&KM?InDR$t%$a6bt{4jsp4yY^H z3GQ5b*hdnhlOkGLUvRFxTF^6=V*m$%?nziahJEA$LI}kwfLacn<%2GR7J!W`gS!Lz ze0y6vBqb-o*+W~ymPxZ^5CO%QW40t}Er32U9C>>K6uw&~h#fE82FtgUge>*Y<~6Wt z_rcKeb#U{#(A@lt@W@Va05yOXL*PBx>JZG5W{7yqjR36v^eFsV^fFZD#VS9Kp(X9v zuogZj|43NX+LbHdK*cfGw{?s7Lba*vfEdRswl`l|2Jd}wLiFi!leUjH7Ag-fGjns{ zN=*%9P8c8Nvhi`TQ0x8|aca(sfdJ%UtS~V9q8FBh z-bL?3-msN#*$c&`8wH=lFV4Z%eEXI-rfUH>yJuq`7YH9Fp>H)c-va>l(Mvc01Ok~k zZir|l&@Fw+s2J>&0f) z1b~PtDWb$Jf)NEk15`wn6j9<)3$TVj)CHn0V2(gU-87=at$6@MT_EZLQ5P^pAfj#> zQR4s07$D~w>9ab0WYHy8RjE3B7Bj!s`}&}wqhnZ=Hmt-@oWyL?hy#FCVN@$1XOFq5lVEbKfmHyE++@@MKnzm$7=OzpH?nrg0?aDC1)boZ zB~y7c#b34*-FNUka&1}IC+V*_^q5{`2Ivc`oq1yqGFJS(ka{u_OF8?2K05AsV>IsMmRegb+-&f`Q fW%^vGp}N3-FlT>YH~bu600000NkvXXu0mjfV58)$ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MinerSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/MinerSteve.png deleted file mode 100644 index c7b1e59779fd86ad46397945fa8f52d420b4130b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4124 zcmV+%5aaKOP)+DOu* zuw%z5QY4D&w2GY|2x25n>NKqbA*$`Tk!r+BC0UhdNwg%2G(|4|`l`1?;&amm}NsyWC-tfR^+)0K7_pr_V%CzK@ecu4m=MW2-gMHH3E-)tqVm{ zKx3_pfiZ_4sZA7Yeq1R4*g=JXG4K}<1PHgg3%>hefL-t*1VGPuf80PohG{yGBtVvB z+_K8Up2s^m0Q>v%v&P%8I)aeKRtx~|6)-^*U|S4|E?q+aUK3ewKfoA+>oTr=MNv>L z+p`#OwE^V*7*k=}Haw3((^T#Q48ujot>QIf0QgIYDB8tjoR$tkf)UWS_){&ZcQY(|qSfK-)I=H^|fg zXWsFt?|Xlr{)SXs_gjKtj<^)H7t}+^z-km z;Z(m5fU5d)JoTg5VBIR<;utqcNRn?RBp5xzvIs~CiLi^aLtJT)Byl>Ppg;;(TMsmS zd~t&G{|GFx^Bb^j7rFfpFZ#ZULf-iol2b*oXhG9N)a~+}sBrk(U?e=DLJyZ^5uWF9 zTc_Vmbs}8XbU(5J4)3i7sd{Ds$%QRhF z81*Ad8nf~ql|B@BHKv4Wf0~9XN~nxAFyd98Idhh>EElROp*}%Mp=ZH??zD5P%=$Ol7@-g1e!Bx^qoJ=ANI}t2jMy{ zY}bVV23e9JFu-;hAh>W`4~Zc`*QiX%Mb20GPySsH!UNxvd3>NE|uaKr#?PrmhjP z7RS$Dewhof`-AVtz=bn7J3IzmQxH{jjOQou!r}AW9LStV`xOA_I9GT&cU=Imu_?-k z_KGOuJ?q!teXT8U%_2r8C;5VARVE2laM9OaoW-!Z#sG3f8-+p%HDLwGcpQ=z!ogGL z@y6+Musw&HgGY|hb-C6p*M;kOFiQgBG5Puc;E9jk#!Y|(AfeOABrL;3!LpE@C~(^* zW+dY=4uEM}2xvP0UN#L_mVC-dtiK>?-YQOc?Tl2s0;lu26kA3Qj{^;q)zXR;uJHM~` z?sw;Z{tGWK++=GiB4ajJ;=Sco70^~jke0eV^I`|di*DAXn4sh#ZqQ+_1p zNbS_AQwsv{nMXc-MIoR0+P>ujaQJZ5Y11Gy)`|jf_XpqL1JFE8OgPeeFF(?6`tpDGL>8d`;PVk;PrSTgVj$IXKkPiEco!AqX3su(M$d5;`Z$nqt1TmnE<@{>ZNP+d=iiZr+X$Q zd_ZT8zf=G=Z}==LlrJI@O2f7dG&HP%AQs?xE=1H|baW88Viu8L16Wo6BF2Rz8-+LEy{ENW>SOmX`+(%ocXXj?0CwoT+GdF2FMZn+a$IpqWoxhyhzW zKF5m2Aapehk6CDJ%E0wTpvVE3hJQ1Ah$t@T$Pv;ukYMIVq#|J}R&@7XMnPW#%On!5CzC_WPaGMSnh|DKg# zKv(NuF~c54Ko3KdOr+~HXu8Q)fXoYE;6eeS5J4_Kidc9x!r=rwuLO_Lws#PRwq}9i zj41KF?*(!>VD)O>w#UYRWD*z}^4HCW4$am$0WeqS3IG81z4UA~CK=0>a7$}D|4lIo zIqI{gP9l?t@;wGRms!)suahIEsr$aKJU71&*wX%4HdW|DG!h5IJnHI0D3(VcOCkb# z0z-oi^2Ho?fHGnTMJOUHK@>!|P7trJ>-V)y!jWdl2T%l9U+-(2z#(c96G*T(-}IS5 zjrx-bkoKv~WB~aLO~bSQb}4Wg&zG@b(`JlJ6;Kn>IRGPlr;#@t#6ubvxMtNYeD?A; zdCbKDkT3Ni7zjX=Ez~!J;dwSBNr!+C-WeE2*_=W^i@~u~G}d>6G4c^Am>b3~H@w zsfl8EA_uvU#YDkCQ1SN-(k-nR%a{0~jQZU3_`Zc1Acz(mw*)$-(qZU2ZH9PYP81`f zBghp-5zuO(NHHX$oA^pk0BwJXm(K!;gbx4-Ptjv4<$G*8M}iLy&YlG-PLNn|1puD> z;oo!ZRyJZ|^(|cU!C(+W<5R%oAPT07kScN}w5)5ZhVHboz5C1Go*#hjw!dcN@oBrt zV`XIO>LG|lP9e_;V|4T)pYr&g9#fF2+3GKMr^Dm@e|YNhX^`xmv`qli)%m`F_5emk zW&>~~uRUi@c;W|7BNkLKUbK*m=%`=Yj$*M0UDvrOSlROk1Oh19F3KeXO>5WlB|XI{ z)IRdXXXXcB+qP|t2Q}H-;5a7g(yj1Nge2;4EFB}`Cm;wS!pS$dZMC=iPKX-ax0gIT zd1(@c&JzR5W#8sW`=nJm9}fGrK9d1-Pea2ck;wtqCwEJY3X<)qH_~~8&RuEk?AG_mV(xe*!Ly_ZbYpvMW&k!SPEJ={ymwjY?`sY~CB07DW7LQN^qoG$hy@EQ zW>$c#Kmo+N0sw8IlEB1(H_tu5*-+VYT(H1mg-c+rIsmtA+`|hhDm4VjcsCS9;(xB7 z?ey&UZ;>m$gIKtczl)|O5e==L21LMt9lf*Pky2}w+&^WP=hhP}G5vkj0if(M4MIXj zLk*~jwn5QMUOOO(A!Nsnqil`%!pljd6I*!g0b>qNwEW@&r>~s-t<(U_ttXh9PG2DX zeboWzZhM$Xl8k(biYU@ZCL7>kf~V4%7slY=IVg&bd@+k~pdPjH4hVu@f}^TIytI8z zfyGP>U#ULedSd`(mnpSYwuX7SDxHo((_Pq38IqX7z=dImf(pYbAfz`SnOF}|q}oFU z*O77H&Vj3%|G(-C*wX%&Y^uVK{8nnQKkwKsxb;-c<3TTA;4>nXl9^fXeD<~eSW`w zF9JawAw@#DT!xx%;nb(XtWYR~i*KLAXx=~~q++UMp{>)e1Ej!;614X}`TVk!xU8G$ zMJT&WwpbW_4==DxB|0Fh23*g8h!BRdry$E3qUpo@r768$i3<52uqRI-q)I4Q4q^cf zWaE`G-H}`g*5oiu%LWsv4haawYC)!vGi)TIA^g$j_by9@W!+2wP=N&rLQar8Ii=4l zjWl%n^l6_B(=`YiH*VyYD>Vj9qsQo9L~yuPJ*1o0Azw0JF`zl7qyNHrIF`l#nBj;r zLa`(lJa5u?GCuL-ca|l?vTi0pZomC@9tl>;*1Ed7swHbg^`jKYO;?kUO}DkRO$R|L z2d!oNIBLQHj229Yf`FQaW|V9XswALf+As<^D6RpB^p7MUo~%bO7(lL2LPS^aCr>TU a1pW_1A0jFtl@qD}0000Zeea3&Q)nQAvb>FMKPpyvCWywbz!a%2#Y15Llq#-mNpwQBm9s?an+QJ0Lq)llF zWdbeX=#)T8fRH9F%_NwR#E0&4wfCt#blQ?^$+~vG&iiic#*mT66={f@Z$|TKzx}@5 z?|uHy|NkD(vnsA}eD^PVlqqkJxAZnMI_agc$-rzfLTj@fkJm>e*|_T`JowDG>RR9N zdcJ?nhkNG!Bg*sr9^TUHAP@*pS*ItRh+wr?@CO2<=QXTts?b#ClUUl3tvJqK+?MSd z9)K4=cU*a4U>c|0jK?2DuQw8jgz0Iw6A1Vv0|WpMKRzzxfQr|;`ig24b*s|B~mkI7^v5es3r+YrFSQm>u@@3LDl>Gr?zQ{YE`b4)pT z#?9M~IXOG*;aGPw<5M2=1~Y+R@JbPUwMu?N)PVo|OrPTO2e6ne42=2cXtgjC3t_QX znRNSDSZaD>4}(v9@~|@Q4&bnwNW>#J9adf#^ze?GT4c^^bS9>~LAu&(yg20Hrf!FP z-{rK(VtBOEPAC+RHR1G#m$x5n;YVktXlu4GF&*S>N1eE*y)-l#@dbjkHd|#XwK!~y zyM288+vl!16u*}91l5zD>Q&s{00x5*k1s@Lo0VidBq=T;-q&g8%!rr14jV5GdFg4l zGBO#!Cz9cms5{**ST3nyyw0;cy7M&BECcA2;_l zGcw`fV~@Vh06h1=QDt)4hu&afV9d|aP8+dkNEW++aUaLJ9Gn{V(Ai>@5$tNS(?9CL zY&J0y4dZOi6~l^J9aG*AEey-?dO@>J? zXE;!#VtG9)1Fcd)o=U~O0u=>nD9l%}u$rN`D39%oLZMp4#@QTwbNOmmS>oi$?$<&I;buw;cKTxx#zCm z=AHL`f!j{}E$=@OrtnY+UwXQh@4fIBJpR`o;`5JxpZ6W>U}0^IM}9ntTCFBem5Zi0 z^77PII=hp}$aDK&2H_VA07XqUo29U@kUP5dR2(d0b$f%V{RgS7(~w_O##1Lx$`0KA z%g0H?1BB<6*jH4*p@My!yRgh-Ls7Q2w#duNlhMBnfM|cZ^Wxku1OP4CLyDk%L0&#R zRs+XudNP}9EG{q01x;gZ6@{t{kH0X)JDeS|Q_oJ1^DD<)tgdZy@!~q=2MVYvD??pW z!YN;rL4Snp?2b%_tfI)yi>Pm9GGww@HrG{@mFE9q0C4|p-7*D42Slf9s;b!9*yQ5Y z7W3yX%G?&rmH?PO6G~ukxxv=f4mITms4hK3Mp4LS^2k$X$?ojP&l86L z^2y1-RioLhtriK~J>MI8eQUr^kFj6<6Q^?S!Zrts)hG&lJuYF{Njjaq@+kzPi>suL$3)K|lt0*o~^Ztk2yMDfy zn(r&jV`+7Z;(cm;UH_kOEVrfES_Q_5Uukbin|ic8zb zA!$1Uqw(DVP#6A&a{gow#YF{dZtqZ3n9qf^O;*=7Fy7kF7eAPgn6IwyP+eNc^2Hst zcCwU}{A)5m z%v>uD7RdCRU*6==|JWk{k9_i7%1UwyXU8$(-hOI~UCj6fF*%kWr_S7k zXY4G_jw8&6hpD&pkn|6ruP>v$*@!O~#bnenFdm}SuE*n#aqDLqKv^aBST*7340ZJl zj7){G8k?A%P19;OFf=KyH{kX~>1;7F>JDSnYgk^Ir>eS+x!E*ELld4r468|tKNLr& zZItKBDr%UWot5`{15q@ZMg}KBbhQ`>MrJS@ny}sV_^ymlefxnslo|gB=9a^F$IoJI z?PWeZLP>oK%QF+$Tt{&apQ5a(mF$v-N<%09$$l)(!>lI8*k8P#6Wvx$j|MR7o0ywR zQ(aTXh2;g_`iTQTKB>n``N^Q4<6RcUro%KeG>}N7XtwGIMQ3QJZy=FOqStAd@IERz{}8gP3vqBE0?HGEgos@a0NY&&^X+Q^#yNjaJ)8I+ey^ z)H3al;q_ZuH*sbxC;Ry3b|78;nZEO#5TBHyappM`VOO zfhgsbHN<98@_PrygS6Q7OnM@;It(%uT5LKT@BQxX0DS$v+m*%W1kTQ*M5gM`A!0#&h? z1cR!SZ+$ezi5?r%{)l8kB$kx9DjwKw(cufmWeOydN!ekM<07Y1sT2oFt4XKRG&Iz6 zZgCF1u8Cn;JM>KXq8t;KL93b4#zCpA7os_toC|&D{a`{^#yeQo$jr4IPBs zLujoXBm$#!^xnky;7e3#TUky{VR9ZOFxij8b%eR#kgNr9?;s9+1+{hcl8Pc1MUm@j zHKDs>7C0b_AgFlu{w+$&tC^ddmANT$_2$DiPLBj+L<8YCHIl+9nHs@xTrx=%)vi{f zETXlw^_)L9CyQewmXIlM;rs&HCXI}^*`UGgk8xACRo-7yTaWYZYcSxepSn%Cn4Y3c z)5iIk3F?d;q(h@fP$quIr3auTDn56{?XTDy+p9yx{6P(icJAR}Tj zXqfiL>2;Yf-noIIETBRxj1Ka>dlu1X8e}9L79Ejjg1Y*8S=>6BjrhZHtVS)#RFeAo z2F9l&9PP9);fcum1i($223F56P*PgO%DH*WMjhkRxlu!;lo(~=GfApzY9+&5%?6Bj z{M+sfc=Ge_RhFV7ROmWcj10@j`o{ZdFn2H?8IwhEAv#W#t_{wMQJ{<2;1EsrUZT@y zsjWPS#n{A@FD6?-Wf4(9<+t5i1ngt{k^Q-dH8siyH|VvzG~|~#old1B5DW9Oa#-^O z;xgi*7WB58Wi=NaUpcoRQzRBoNT!I-6K#AZMX$>&fe@d+xG*P~B7p7duv|L@zH#5} z%GSa(`)gZRNlwTJN8D#=uyivU8m3g!#^(GK<=Rdn9#I2aoQschu%U|bB!AF8M( znM~8>$c^WM2_j;mV`4lO-`t(2V&VX(`ideU7XQ8YZ z&aJ`k|C)muLkIUf_$|4mBo46_*w}{hVkjF0m{LrJj1JK@ta!Jfufx1#LN6&S3<&xNsgVOyly8(tq<7ENC!u$)U|OTHHlqUfzu|2qae)|9pRM&M5fQuVD6R^E}gwg z7F}C=FDd^JHI)ak8pZIJlr>^Jr6v^|W#3lAs{(MjlOeDBXBcu_030!)h^UK0K$XeD zzJlD+SIqyjirA!tY&N%HSzeN3LQ#J1?|paO&bgThS~`z0IeZFRTOW(jVGcC3v!0%y zsHR1xjJ{dajDFcBeFKy>xmbvdP;cqRKhaOEps8h_GE^QaWMeDKSD#qgllprtFn;a;{L7!WD7B^@67wr8 zC#HDxS^pJp!Ttg`9oij$AAa_T(q=cXxt)@SdF$kWel?8yM}f6jm}e8{d`_7;ft;U7%1mC5ZU zi~YuHF+lu8r=~1toDf!>XP)1i1?Dve;DO(@C=OR2v%z7?n%X%RACp3B*xgT)tw##3 zT6-_<(NmN*wxFE%(r7(QIxr}`2=?j?xfO1==%olEl-=cX^HOe$#gkV&0b-{(91$La zoYo+;1R`M~g=(s)ld3v|Eo$IVJ!rGw>}Nt|8B@Qt0Otf`H)^b|G5oR`4f-bZk1 zfF^4v8?%!f(zpn?2c#FFQ?tX+M2MbtlhhT3GQ6}nM_pa6qeh(ukI)QETB#if@x>R4 zT`^bO{^`Lz^WVhUAub%r``x(IsUy;U$<24odkg9UP*; zlJg?8bR9!evdY5TtW<)9`$LE-BJv$ArYl~6lV`o$++&qex)57l8V=BG(Mos7FMZ12R zT}Sbbox$MfA?_QZ-qay|MdeLxEGH&7P~XC;aHL5Y?Ij$pqZrH9m`$goYeXo@!f_T1 z$D~1OZDo-|<<-n2Qdb05;RhO8W`V=P@GHj|Vc?;i`IZE9eCZdNitv^uSZXe>c#MGlBw zmxZ&V0XZrNX59SIm-fWsJ>4v7z(0J@rWhQDIUgU9Lg-3jf;v+dslX5hXCGnrSxOt* zxHLCKVRf_g6l6>7Tu4n(p=~EVnz%~bm@&rc6-3 z>}25nkKM_9WRx%eyN8OBoSa^emy@5x`{EEPvykHNK5@%c&-h9Mgm~kX0LTkpp$-cV zz_knzuQ>oMjly05+dDabf$$Xwce(Hp2vCHXLih{BvA+;1OLFUi^{t#C<2}c2`I!h` z*7x5K00;&M->xt~U-lA+dB0c!3m<{-8DIWQj$lK+_<_?-?oTl1?wkIH0g~zsdI{EL hhsP@|Fs}sz{u@zxW5-SWm%ji2002ovPDHLkV1k63mhu1q diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/PriestSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/PriestSteve.png deleted file mode 100644 index 1115ebbc7260ceed6a0d1dfeec08114b23686ea6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3684 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 DD?kF0 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/RaggedyBardSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/RaggedyBardSteve.png deleted file mode 100644 index e0ab972e2ca19ceeee7ba4bb551cf1afe17a0567..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4768 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 AGXMYp diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/RobesWhiteSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/RobesWhiteSteve.png deleted file mode 100644 index 0dc57701a74af7327e58ecace591ca0a16ce0f97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4919 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/SteampunkSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/SteampunkSteve.png deleted file mode 100644 index 5dd9bd4d1b8abd72a04c149ae2974e7ef48345bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4864 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeHunter1.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeHunter1.png deleted file mode 100644 index ca81e051e628a556eeac883a5997b43225a5eaea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3324 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 P00000NkvXXu0mjf01ySO diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeKimba.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/TribeKimba.png deleted file mode 100644 index 5b44dc3168c4a0a2bd50b610bb9c00056087c653..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4402 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 Rvc&)Z002ovPDHLkV1hy6s?h)d diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/VillagerSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/VillagerSteve.png deleted file mode 100644 index 4ea17b3892a37a1ca4e35455d3e3b2f70f0d5a3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1887 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 QFaQ7m07*qoM6N<$g8z@%-~a#s diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/WaiterSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/WaiterSteve.png deleted file mode 100644 index 58f782bb020ace1cf85a33b94255c95baba797d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3038 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/White_Knight_2.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/White_Knight_2.png deleted file mode 100644 index d5b1c20a6dd4ecea1e93fda60e75850fce84969a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3884 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/WizardSteve.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/humanmale/WizardSteve.png deleted file mode 100644 index 3480c2ab5dcecae9671e79f8f680a369f16ed3f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2223 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 a0RIQCCG(q~!g0U=0000 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/DemonSalesman.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/DemonSalesman.png deleted file mode 100644 index b215142b80fc73312d9623c71b820cd0d83673f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1278 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 VWe3^oFE;=H002ovPDHLkV1lcC77PFY diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Flesh.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Flesh.png deleted file mode 100644 index 43e5e8f114c713ad5ad213dd438eb09694e2092e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4585 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Ghost King.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Ghost King.png deleted file mode 100644 index ca66a9ee9704a7ea1b8062763b279ec0dc2dae09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3333 zcmV+g4f^tlP)3xt_~hc4jZhX453iMroUswzgDIkQT+_g^Jb|wbov&)@p67{%D~^5KVt5 ztzs|QHbt#e3WcI#rB*?Nh)5wJkYvr)&5~w!XJ>Zjem`?QdEVKx#2WUJ*(>aUWoFNO z=bZ0-zURGs@B1DNOB|6%M45(xh+!Z%H-|(bfpVpSdc7`JT9zf>eLf#FO+!yl4`#Dj z7^aC@t%iI)uPybAjr@Jd$(g390)YTx(WuPRX}1v!1_7mzFBIf_E}w^Knh1x(D3wa6 zR;vhyLTEV-ipAoR&)C!e*tV?#e!r}Ic6L_gYFidst(FL#$z;%WUBu&Y`2BwPbzRQ& z_V!|GdYUZQ+5qg_xl=WpP53lTR=?3`Ael@G<+<9CNQ5*;bea2#rWY+#=~uAuZEHAQ*(xY6%CLt(K^ZX<0aP=FH{>VDH|& zDwoTNG1GlMSxp)`9bYM*!1wOy zeSZB;sHYD@`|daWN{h$iiZrHRoHSitEFKq%yY04sz=OhY99jMo>lg zd#PL&p=UA~ahWulyg%(iu~d?K_x1J3wI9D>0=nLY-w!wr?Fvw<1L2U4c$_NapzUf1 zhg>*qAD0EG9?nQdz5r+%&~n;{gn@8aN2}$cQdMZrk2NAdrP{g9uLBBxxNaM+tB_3i zpwZ1ye;K%NrQ4i^rU?+7I2l1;D0HP#5y8oX{{DVhc?Lvuj}(}{*Xnij_4cArEP??P zujlzBy+^ABvW>v;dfsPhYHCAOM5CMIs?ldBQz`khY+I;L9cM^8H#-a4Y@*rG3$z-!4G!J@@ zxm*rCi3E6_*KIfhhK7ceXW47js;pWl6cS6$72|gb$sj0dbTBB@G|^#t1{zA*4$tCK z-w6PhmF(en&v?@6S1T1!D>99MRjbvFWdQv=4IpXHAcg`_XGvW~e5611m!aR5qL4SO8XgEBeK|prCXV@<1e_ z!Bq|#bq#@lABNe&ONTqY`C^a#`}d36uGeeu`E-QCA(*CtdcBEav4F|Rm3ft}CUYSn zZn{}llcz6y+oAV5c=fm40dV={m#J3E5w)Va(Pp*V4g!H7TCFBVNB_MdnN~D-IjeTd zZ9X-AoPo#xAD3U};>Bm(uAaGX-#$g#vt!2&lq+Qf{5l-Rg<*sRkkhB%UeWzmGhEY#aGvQH@~K!KP^qSv5c z^e8l%#X>=LpW!g0$<8@?CK^{xJQNO#m!VNE6!M70;sQpkR)uL=;-!{~G`j{M7K=&B zj4=aUC1Zp4f8Z?sb!3;s7W|`tH{4jl-`~)C-!Gvw z0~|(=bfKK=M?Xthp`=_qPmmeJ$*Gcu^ zII^OXgETNceg*^c`v_jkI7I?4*F~jLhGp3TFbyMtpPHIpTL6;Dq~gkWxdJ|oE6Ql{ zwM+($w|uzu#*|Eo0n^yn*aauVc;uHqcn`vQ8Mi%_5!Lzi_jlr+LwNy$&!C`Z&z_a= zn}9@Z8?ks4#bSBEEpnGRJDY{$v_*Bs$0ybnfFmzmrHpU@4onm)fZJsB7y*0%Xe0lC z8gUSM`C3%#4nBGRX}tNub>g!lfifCS2u37~kKA)qR`QQezYk8Uf_$NjuRUJGD~FQ! z!ed1V#%Sb7ZQ1~WOWQz@`uh7t&HR2H#bQa=Lh3URI4<y?$I&NDBWo}L!>N44;>QkHGOZFhp9T&^HtH}6N+xaKy1 zDK)yIH=er&8eDw(!O;clP6|ubI1oU+(GYMrX)lnGdLr`+#iGOk+=)t_pj^hAFI6rG(F zutNa$r%{fA@v5<9lfMWK9_?X zjf&trXd^6(>G~WJi5MYXdjKeGp->Q%_gr#`I_D?cuf@|!}!NKB?Zsr<`!&%RHwrc1cQE@I<@%juxk}q zj*HvOW3~a<%&W5=bK7RXdZ4_SpRvt=&AdA6F}H07tOv@Q`5D^`*vzZ59&_7fzoK=&2CN6lD|v=wmRuG!B9iK2N<13%>Vs9BK7HZB%1WMb{@6{&0JiNh zuSemT-DP&!tNrV`A16+nSk*bN>dh{870$nI_`tBTOp8@rNs8*aCW%gFcv(+4apKgf z&UsaDwi*EJ*|SG^Z=O(a=Jr_~s@3X}3_W@BdCIlA)`MFGk>ZU$cAnZpE@U8=gqg?v#OC8Uv}*~HM$kO1TL9%>p}f+@HxYQT|VA~e*dA^qv$Mn>+^bS!ay3-x@4-6oi&5BJRQ%a?xw8ODb%8t=3&j1!hSw8Qy>sKY%p&P8% z8{+HZ@x(%J0MB>I=AGLAa{2%_Jp+b^hm}{`?=(TzVOyrWckI2O-P4nlK0=OTT%hYd z%*k6^Y#h5OxO;?KL$K}W7X>o=z!Efvq^SzUdbC9TUm4Ty8-zxkv1H0WfrO7 P00000NkvXXu0mjfHfmT$ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/GhostGrey.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/GhostGrey.png deleted file mode 100644 index 701a4015fd4d42a657aebb9d0abeca32d91f1e07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2071 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/GhostYellow.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/GhostYellow.png deleted file mode 100644 index 1c32d822b6634432e94d82c95d7724e009865fcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2411 zcmV-x36%DUP)snQol*?nb^}=4I#Qp65L0W$rl}S;e^U zz0_@OIe*pkbYxRCvpaX4wcFvCv9sf>UXP6HbWZ25{pEhRXhcWltJkKjBZv3WAK&AVOy4#v!MWUVZ>c<*<^HIeB2cT(5sI@`I25atEj*bH{fF_SL~ ztbG6h3;+;d@)dHJfS`T-hVX!)arO7Z4U^Hu@2B3$p)H2?0Rc8JVTAtR-xfim-#f3N*4sZZ~`^5q=N{kp81~6+_fY1U15aybZ7rxc%+J2S@P1ek2 zW@3B!i-`}1(lXBo4C>}UrW1ko?fdS4nE)2&e)Go>VL;go5K5ZF%YXE7$3Fg~W3!om zxU=o->~l#D0D#Rk3sV6A`2+;z*#J`xr#e3pCLp>qQ8`5RaauSr0JybY*e%zbo{#OT zuS|G)Lw^83Z~*~`@(sP<@Ju3v0P1`1+=#rkWD3%pSRfD(9v|SrO2XHngv}j5 zwu7+b2r#1T2>F>vFmwQLg0l6pGeonpX#hY_IYNZzSoV%^3VV76T9=S)1!fr_t{pl6 zy&8M{)i_9=jcb4ER%VOk>;1RGMDJ6>ar?g6vtKBp#DlK7{L}r1zVE_v;#iYtZH36y zI1$;}EoTd-!}i*rJAKXfGZ#M&0LovAWg(gHVF9@GgT(P=$~$JJ%{FeE7rs^tZ@PS? zzo;^{0KftP(agS7H}5*TdTj(4FlZBy_S<{0%{HB_u7xCQ>FKC{20;0RxyaTwoUz@$ zM?&Om=?n>t*}GQ{BKqbJ69?T^*U0+Jwpy|6XNw~~DVhzW>UN#QS?(`0;9Q!7RGS2= z(RY~TLH!3QkAo;U>O+ReLWX;L_~m(Ira;dQb==c5GCgNd<@$aA@8 zx)CDA^UsnuIG+tJ%*8$=3K+J}EyXzq2#^2p_C6Qq!UIIdb@LA^-pOF@H&>l4JssPX zcOLE&A{c=141ge{p>;W%UIuU-AYf~-;l|C#zVVgt=J)^J@q)8rgg^+-z*cicxFT-= zgzNt;5-eDu0SID%C=Uop6nijNZif4&rku^6N^EC09P@q@z&io1k^u;D<(-ZPq8##I z#^oyyrjPF7g+F<#=Kk?P#|!)XGl2mNEr>|)=E=aAx!J$~X?u6y*()z59z1CsAawp; zA9eEY3ZC1XDHy=#I{=`x`c!P|x5EdU60a_c_<-x522Tu46$Y_+n7}0P2RRGw1h(WWMOhS( zA^>1#hsu(L&=|Qq?e)~2jQqVk10OJVDtuIx!ypl0aUm3P-uvx!E#xa241A?Gg3fw3_DCYs>FQUF@&rtxND4+?K zlb2kpnNQ$&{#1zn41mDSrCBDA^JCy26bj2>5N}UD0Wgd-b>0N9e@3HDk`{6RMr9sw zSRViYgfMaeOrh)qc{X$=Mb&7vg7y)xHyoC!FEG3*l)nBv7}?5{5+Ojr2Ve?{0%G96 zogh(wf{DiBQ$bkFpd124N%8Nq{~m;vLYtwGH7m;r-8b)260*coux@;dc@ErGG7$HIte|7@$4xcUWuOcg2|M&2u%!~M-U44@zjLs6cxp2C3!aq0ss8xI&*`Ez*r?NYQ1k#)6+e$0 z0Bl&j1#H!GpdJK-r)s1o3tuG3x^P(?R_#w9u>Ma`LZVzZ~!a-(7Hcnu-OU~AoU;4OgrEG!Jw`%atx?Ky!ZFz*Al1dt^kns zL-|_`o53lTJ3x5W69WLkP~XD|mdoEV0m5QvfC?37sz8+1-v3*Fjhwv-cb{s0epQi_?YCc0} z08Wr}S8XwvK)C?|yH`tW@Bsk;#>hs2D%8ur!vKy|<8NpGp&|nKp2gjRVURq)htwNg zpBYw_zpLglbOy)-RO447#KcL4^fz5)gJgo`|1duhQJ~x((B3a<|LOrMx5>c(y1(!N djKfBO{{uKRz8bdDTYFu5jac?ubGkyIy)m=T+y*)kY>}F?ovh_0CQ)jyC z{La5l)y%1t(4bv;Nt;V1hG|0AG-geIQ!^_Hwp_nD@eZ$iwMT07jAr&X92@~4hx3_? z=d|Ml0Od!;s7@*uSY08N&eGn1wXRZ(IAY}@`*D3FicbT#rB zcm4xdeNon>=<~?)X+Tiuy?L!hAhj_R0XaJC_V^H0Vb;!9M=T_ll=u& zmOW7Q_7TTN$_deM* zTqv>(!}9D!07?6Z-~OsJ7eL>#cGoa$K=vG<=-Rdo%XXoubS>efN4FxQ>BwcHJ(Q-G^LQzW<&WqS)QBxs5P zMOExwFm0Ms1kz!< z$a?#TeZP-4R{?wqczM8!{)0DfKzBZmcX#f_6ZhSV+n;`eIs5rjk3cWvvFV9d+4cL+ zJd8I!{1^}1xB;iiWxVsaKZhD&U2 zlQQ-mIRVLXplIH=y^YtbN3~jkVOS`370}($4%>C%*fM0rfn!Z4uF%>mIhcKri)Fd)2{KO6{|?BBmXdBC@94t;*g8a}cod0F3eIPw1KZCl(G zJ>Bdc#|BT~p~^x0Ia2oB%qy07=GwJO0GVo^~7^9Ao{@jxO=+s*~aSXL3+gFR@a~>fY~;6~p^U z&7z&B*nE4kBb#V{q3eQ>dFiwF5)~nV0FWc>=_vuwXQY*YQT0BrXQ1ZWyn$O5gTS3H zEXuLJOT+)v>;b4<#lUHC`jGP7e&n?~(#ngRj54WKku1EwgTDZt@~3gFWw4#3b@8O3%_RYNBZ zfxvJGGXp?mn6wIz9pwP703QICJUPZ4;V=RK{rDL`~MZ4!*E0<;n&0-*WK=QK?fKM9Jk>H%O*2@;P2h?^oa10V@d1c0~< ziB7SMO?f~B5RzIqjVj0v*Ap;4S$}KIZ56K=ON|2v-stRQ$&Dwv(Scf$ez}{767zjRMYshpnx>ATG4hv0j(I-G(IgTAPucnv|Ug@D@HYqPYVi2L#q{S7ZlKn zQBC91j4NQe<@K2^el~(J=Kw_O|LcGLdRpc0c?UpL01bY+2O#D(fSEV~bM678Jzqej zHC~3J(NSGNXjEPgYX4MSj+`e*TmGIq0B9s}=MSQlCBOO`)Dj}+38LlnM&<9h0f0tP z?*vLhWhw4_!2DD|3IH=*|DPQN@aWRh>Xz2x&lkM8ZdowKb5Z}FJpkeykDf0O6%aXJ zzyUNWeQ`(9*8gV*K$67id_h8gwDt#~^hG5w@dSu?K7ej{CiVZh1AvbtGDTikvX~u! z2u^wU0JynW{XLuV_v`_v;~=;K8UP3e8UujCnUeshyuRa)gFx0l>{urW_AmDSyDVB> zzoN7+6r{NNzjy{HIz<|t06FIhnC|%k0uYUG(jlmp1i+)jK=iI)m%$l;k=iji))7gP c(^bI#0hsY-j4B`r!vFvP07*qoM6N<$g5(177XSbN diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Ogre.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Ogre.png deleted file mode 100644 index c965545e62bab0b9451c5b127ab16ec9cba6d3fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1102 zcmV-U1hM;xP)S^y`%zgAcb&R=hZjSqmyWReYs zLos*pnV1T|%dJcKn2&c3@^Aj1-w#%QA{hV29P94bpP46eB3uruSIE^mO$vu z&{BE@KugnCc^G#oEC9`(x&Z#x!m-IM4S-J{?pAcTdHY>c-Sg|020$y?8U|T706wSM zws?G45!v0|aBf4=wz_p^+sSfs^Ob7+qm!f@2eMK8|Mtm6uWhm>ybJ(9S*rBP0l=lF zR)EJ=!U9YH&}e$r^WMd{OYaO?)V5XWNlrJp)A&j*I35Q z-6PwNj^e2<5|9`G$g{Ic?7V;84geUXfB=)n$82uq`EdtSlt&0E0I;I4k`SRmA&k^` zoND;}($7(vY)lUqldT*xAj6e|QxpI~sa&G4C>&4PwXDwqHsx%~o&EU| z#piC+Pa9T?%Tnb_|0Y(DLn*dB=>-gr526J~`*uwusu1}NO2H>SbHV8n+23DNIfRA2 z536eU&E25{;EDmoOB#SSI{=%XSpZbDHeD+O!-^F!6Q_Yq69cG~NSWr;1!kDAb(vj? zN;?9z0D6Pt!!oK%0QkIg07$T+forDSVO9V(%i_x8q%;;aNX3V(|3Q%ZpDWVZR*Hj+ zqR6x(_<*$rKgpVko9Hb-NtRE(41P4I+29qE#%n6U&_V_Cel0XA-z*3kR?{>I$O|xo zG@YkeBbBpdpD+f^NFhI|K@bulpNAuJ9)LHn1xM6$ZM{sI;E+vO?dqB2Fw?BKf@6ME zPGtd2CfA2+yBf2LLzp?JaOkl9$H#|4ssMQui#c^HLX#O>=~%yF%j_U~I6^ zR)`gHwcY?iS5x^}hzqpRZ@_{e1U^&eSa)4OW9qi$VU|HVzW@Sti|zw3^%A)H3jm72 zHEewX-34G#MDj`B9ie+cP}#X5f-tzjJRXkP-vwN~1*kPmaCkQfyWW%swE1lC4}{wg UZt{|$cmMzZ07*qoM6N<$g4s&@rvLx| diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/SandMonster.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/SandMonster.png deleted file mode 100644 index e773d76efe363b80ff27cdc3661987a150b49644..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2906 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 Ef;KyjB>(^b diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Securitron.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Securitron.png deleted file mode 100644 index 2df68421f555f2fd0bf1c8ccb95032ab663cb41d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1211 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/TecZombie.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/TecZombie.png deleted file mode 100644 index c51fac9f23737da3c02d67d41b8c597d36c674bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1349 zcmV-L1-kl)P)5zOk%?z5h2yQjOS z#uU=DpBV}%ARwCqY3)5AmjeLEw*~+PZgaq7 z(rk0Ucg+EssOaj9Y3uqi9-uj(kNnD$patOg_&7X2KeyQ)&j$ww3&clx004P=ds}D^ zSqorS6sDpCwUX-xNRM-U)iv)oNlWvv8NA#i(p+b~0F=A>b{#f6<&{9hxJ18_+F zqE&zcpybSEv$oVAe(=L{sWEm&OXW%d@ao5L{tE#BaB+c@7v=zH?35UyOIY-Sx(&B3 zku3qhtDlaM1b}1%;eb%!-^Y4-S`V=B7!~Xz=fY^RC zT<}fHkj)ES%iW>$OL^A9Y;rJ-`IxdcCs>zPx5qQHFqP1dfb7-P)qJ;yZ4l!(H#ZAm z(^tQ)uv(y!b`cR5Z7v1P5c z1u#}t-*r`?oPN2a+J-=?ldktP5L_P5x>B>7mP$ml9pqqmE(ARKRRO?EuiMZ1PIoD5v?d{FINGnB66`+v{ zfX4d}`gP_29U!&wVB65`0f46p(0C04tpIj{`smkL1;G6546A_sMmIzoJR^qfV#6jh z_Qw#=9Ff}p<9n}uM@L7U#BHPlH%K;a?Ev}19I6?!HLBu zOQB|YrNXiIvCT_Oq71uSBBSnh!-V0}83OjBt=Xl6$Gj&saH>yhKuq4FU#!3E!luMC zHo46ffK8sgA#~q*zz`^U`p~@stqMcl0;#G39%K5*etdkiiz)6A*m6p$-KXyonU#kC zR+C-KF~{Uej9hCE=-Tjr;x#;^4;X9V0bTnC-`)eZAs{=(+bZzy3asuTZ>vCNJ>Mts zsm#ig;E%5YKb{Dsj>YJv8^;5@=l5Ru+MF+US+GfU*MHr8vvjPFId#vFBsx} zLJbH@@c{1K^MFO~804s}y`chQYUFE-M_V@l-t&7N!$BF({e)V>+1?F+4(vU@_saJH z!3}`-{N5|y$LK+sVD5Z=+22vPXPMLuM~jV`vrOtf;^$- z{NKvw4nK3?xILiu{9f+?@G5T2{RAt&asa&N_c0K3)^hg~a>Q!s9^gH{hl2JxjVf)o z$=II6Y2_YJat2R>V(0fYTi<=o|CjCob^!1By;nYGu>JlA3r(;|F9(Q{00000NkvXX Hu0mjfy#AY% diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Undead King.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Undead King.png deleted file mode 100644 index ddf82eafcd17bba1e1f5a3c9d62d4162802417e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4795 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 VxS#GOC87WT002ovPDHLkV1f|HX5|0? diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Undead_Monster.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/Undead_Monster.png deleted file mode 100644 index e0c3dc1c659695220e1ff4d1277b0b619e8d62ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3591 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/ZombieMage.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/monstermale/ZombieMage.png deleted file mode 100644 index fd7a1b062b0c3551fd2e6e434a51f2b6958b4a4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3024 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 Snl&^400007V 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagafemale/Creepsnake.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagafemale/Creepsnake.png deleted file mode 100644 index bcfc52769cf186a4d16daf43eb455afdec9c2c08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1808 zcmV+r2k-caP)s8mr%2~7$?y{Ipss#SriAtn-s zkZ}1o6iD}Gd*+}sV{dky?0CH!XR}H7#Tl>1nfcB+-*;xtEQ6fS^`BoudPFO80aUhw z@R_-$_qnib71`&6XWKVl|Hb}sNI$uQJN5uv{pnR>(st9D(DxG$@a$E^$^DAOvc7FS zz)POH{pPQ^Adk~IatC+p0l4ym^#GN`z8_e7Y29nLX2Z5?)Arh|+w0x8C)@*$Jpd^Q zHlNwpu2hql4{Y?rp}n7agrD4R*X{k=Z%w!d9C-jzl1ueH46TJ{PFV{-`^Q=`sM)sQ z_Is6ZKsG-p+JD@60z38qq%NLXHcB!%FUjP{(rYW5fK`CS8?zvNfb|<&fDM52pU%Sc zOs{9`)t@{jY+6sE{`6@is0^s^4col&2s}_L!H@6^c0-V2g1OT}5qt$so z$>f@i#8OG7mvRF=^WgTDvEIAaXLmBgN}>t_^rt78u+OKN<+$?%HYflz`KV0(c6Hju_}aBi09p@FvkI{Ei3K2C1?Kfn)gtAVlq+t%aY#5I zZvsSwOP|jIP2leGCMP1+9xDB4g#T0YzN4g3C4$CnGh$~W^y21xD@0iq^?QW~UWpdtiu z9w+3zKd*ltXR%RZmI%%j^HEDVzt7`@y!Yqz&*LmMOw0nU2pvp5eY(<#dCs)^*%xgl z)sJ&D6Hq3nuwi1BV%){#Bz&j_i^tsbRO6P!& zp3Gxb>zVHjt>awsLb@*l30k|e!|JJE=<(#`Eo}A40%oON)0 zqT==f5VFvCisUV9<diYEOgP?`4ossP0}ZMwLWfCc5PEsO_b^YpNdg|*i;0WDZx>vBm8rJc1# zwq1H2aB1UZ%;xF!|KgFfH%1&d_iwgU&srnfE*c_$8l{oduBH~>~2&Ld+CxIj~fh}*O`K(zxjr%>0I+;xbe z6V9y*jQYY!>pyl995-Ok0T{Oh#{K`Fd%%8Mfa(l>RoIiG450Be1kd9T(^&z=;K9d# zx~t10_Aff0efI#WGted`Lk1cV;%01ske)E@dl%f*2v7jjH3PXI3*8|kvSk6vw}>{0EA!=wv;_0BN?D(5QhqMqM*O6dUXidmIZjy(zka(Vz+v1f$nj1m3jC{+lm9MjR89?r<=&rucPl+ppn z#;n%d6goTtKqL5p1ggCeDN@O8=Cs#Q2x`|}@Qga7oRQmqMik^2X5S2ejCjX$l_XOm}_15X7(@Uqf{yiYX`D+|F>8w4{X*s=tA z`=Q;pQs#`;d_LdFBmR&7(0t1BeD6BezFaIa>pO;QH-Fp>0M&rHt{cf`4QBWc>BZWY z%cTkOMQA{>0L*5y#s{eF=W6?G^Rf2TrE5U)0Kf^t1fT&~-kA2TZge5mzW8}1tH9L) zFr7}l2!mwR%fqHI@v5r)GeuE&Y0JAT%Wmm+j1e1u=v5*+764iH1O%D5fFN&P0$&4h zv;eS;Bf_hz%Fj-F0G`ti-V-+!EY|IW=meRZqvU&8f=kDuNB z{rz4r$78gkMs9n0dKy*(ECA#OiwTHRgzXDB+wIoh6BFRD_@V%S2^?sEMt))frFwpO zM!@BuLZL_cMslgY%@q6K;GDp>-H!bvc+*=#Qx z0M5i<60v;Wl33fMc#L*V;WJ9&6y%;27g*z4{dv9z4k&p55EyaZk5$3)+UU=m0XxQ6 zyCp$ue5=2y0m%UnR9@qE4sRhjB=0V)eZq-UB~!Vwiz@aSpXg%ANN>awmD{oAhCbm zyTRP@8O$NFCdK*}s)=tM-&_Tf2VjQEj}jk<&vWASLIkDv!S=weAu0A5T|S|m6F`$< z{bBoW9e=f2y~;Oa$pgTYSctGxw|UTjqNyj;dY&NE z0aPT6Jo+7+JW<;Z6(rr02pa!fpU|5Iu(Qfj0e~w@T*JdPPL^<$nCtr1J^~!>-+n>DFcIEY5RT-iMj+ygnN-jeWS3{2PCq*ixO4#i0(`p1ebBo* Q2><{907*qoM6N<$f<=5AbN~PV diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagafemale/Naga Stephanie Pink.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagafemale/Naga Stephanie Pink.png deleted file mode 100644 index 12e4f26dfa7b6e781ba486ea41c4599ea93618a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3947 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 Z{|8D=;F||VaJ~Ql002ovPDHLkV1mfadJO;o diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Cobra.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Cobra.png deleted file mode 100644 index 567f3e3f94ddd8bb47c5a7981b64a5b3ef7f3036..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2930 zcmV-&3yt)NP)Uj@B4k49lIN2;_YHaZfCV=Aje(?BNx-B=We*?e_NHSZf z#p4qikd~S(jAjO`-IhW1^#Mvxx5pf}{HU>iXh0+?k;87MhQ^i{2EgZ`0V|$KjWZr# ztY21l;{$*w;Br_M`hx*zPKTAuNhVtPt5oq_j{yL|WO~(5Xm5xpfQMw|XAtoH@t4vQ z8V^v040)q(1As7h;y)g$|8E^x%t;iEL@E7q8FcFx+!P2#$m0*_hCq%6CNhcZr|bN2 zV~oylh{@HEBKp6JdIG7H{4 z6QQZOu}M*#&q`n4xsT=$(Gx^;W=a8l?eGM^Pb)X01Wu(+*KOl zwot$_m;%8d-JEGv+!C4IqtB<&pg~q@Y6`_1A#y1$yVCcQ%OSGcY-A5#qpO}U-IP6; z>^3t&M3E&j6XeX%Dsqb_w(RW?0JXK>knjv>c#f>BH#>Bnk-nHVK6;OYw3Q!DYix<> zRWSzgy0=?Ln+_3d{ahw3i~;6_A2cXq0UWpyj17h(3J3_J{y;#8Xd(u9z4Iie(?UL9 znE2>&?Gi?7ui;!*#nuD{)Hitrwb}S-twv*DHxX^Uc#*QRV>7;s7cbKC>}>L=AbzJ6 z3ckYG}-uF=C8U zr%q8$P7aN$sZqvcCiD~ox?)UM?hy=tkLtOB8U(mNBZIAo`;r&$m!EVJUULhhH zBn(HBfoKw+!6=@282Qw*o5cBbKU__xEB+`xV@y6jJwH`2fL(NdWixHwJct%Au8y01 zoOt0U-=&X_$ggc+fgu10dxtBli9vt{toWsqDl6sqU;eV}^J=<62xsiL!;3sJ@w=oI)7}B_^lD+i)r1{8-%aV`cirf1KvFy=ve>|1@``eWV2yVBF&K=rCL6fW*HYq?O zC(k2~$4iIadL@Pde>rwpae>J>+zuNhC7Hwo?I^Dzhr`jKD1h-hqybxZAED)QCW;?G zOSYQ@1CR?O(g5^>5ZcUg;-b|6dFJIvkSGe^4OCFxVirs&S@tt5?NHg)b;5WgMm1Mt zEmG$J000f4P}`2YZdam7hr*yX6U2b&sVO2E(o2Q48i4+s1OWuj1GMh}=%>vCI2po= z5rcq!Y&_l&>l)-@42Qz1>dPV%WEN-v=yW24D8Lz=ngN^)ZCrIu{01AT)c{V1`T9%y zszfT>#(=h$BBa90XM9mN6J!u@A7-9kkC6%TdL=+WDvXvW9e!|Hu95|!pJ5^t$Dz;I ziB7#a^+#+50O*gi+8LYr3#CB)sI`1#&bp~ju zuLa|JyF#x6aPnkvy9_8OxW47{UI$>n1vKhE-~t*123(-OM}e+}&z`!k*F~_W4C(4P z0|0atxkUG=%j?=zW87o3zhK>W?v_yV=RE-0-|1}q-^jimX8__l7C!Zs%<(Wr`wP~7 z`!1=`<5vozD2%FGp9g@;<9Z-`W*EQ=qS_)zR~Ud@AnInc#%Dx%?e%WE0DN9uHsi(A z)2D0b;C4$)8C|{jiV_^!^KX8b@R`4omqNoc22-;yptwX&1JZ2(u+5GuJ+Nf@GT9y! zRkr{1s!~LS@ux0%i1#9J`Fr95`A=8s_P_&Y#8=b|vEc#t@@6Q9P1XdbT`sy96+Vm@ z(QN<{F@SfMs5eraxNwblF9I`Q%93~hJf5(q{zf7ZnqN3V*&EQ%*esUkVLSt96jiP} z09pnteR`-;Sk*G%(D5_GdlA@xqKD*dG1>+YmM*QO;<0Ih0oWjcdO=!>ymhb70)Xl; zL{Luyv}Jf0^5S1V(FFiyuT`s>=<1>}rAzB8Yf3IsmA`yh~Fp#&>X!jrpm5+p}Jq=j2=p21>($E`A z10aGZtH1YKc_#@oK)VNl8PHx7@caF=s3=b`AR3j(;|~fA=u;x7rvbf{`2YX_ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Creepersneeper.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Creepersneeper.png deleted file mode 100644 index bd148ed6c530bd74274956e86fa2844bbfc859a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4089 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/EnderSnake.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/EnderSnake.png deleted file mode 100644 index d3e54dc802abb913164b9406ec3b3b5d6d339a88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1092 zcmV-K1iSl*P)CqVfRqhlnGN^@obW@ zyL-A`y?RysX_E12+xDO}+3j}f2>boMv3_I8_vYj>0A1Imwrx}Xn?LY>{(Er%WTW#3 zK*<0cULDfy_07nUzaF3Z?`OpTY&cj840v;UogSZl_m49eX9WNl3tp!T$luQz0M2k6 z0ssJxfwN-3#fxA`8q9(SpXP5Q1d$GI>Xw8Tusp7E!)X#fDuP--Nu z1F#Unb6O)%@#N}=uIrWu0DFf+l6zm$N9$h|0MwJuvn<;m7gW-PgBl_~DS^LJ5`D%L9NtjlC$vIT!1gJ=DukK2xNs zU_eT#&s*9gas6LtTyOI#7y#aRe*QCZ)YaANa{wR}J<_Ccy^vBe0T7r3!_)}?x1PX;d$R&|kWgPN3jh^W znhtShi2}gYB^HAy3;R--rZ6ij&{U~WTLOT~CR#Zz>4{dn4SiHb&Q7d0JxtC!o|JMIjK4SBd^pMUVqX0+ce9*rJOdKKPgt zuUt$^BI!wqTG(;((?Vz%%Lc$JUeW}nsJLc~2Lx@-gem1|Pzwi-7faOJBedFYTJKB| z#x(Vw9S8P@T1JrAHRw=sy z5JX^c25ccPoJ}f@JgJjTI=GXam#qO?2smkSs%ABWz^QC=jk^Khf~lZUG^V5d3#QsP zot*(u1Mp!jcl2iM@T?vHyh$r;tIg`PSqIA#o`V5&19TX-e_R~{B!h=@xsem;HaHlD z+j4DS5F8SyZ^((E&Q6aXcWJq;cIs{Es2kcbyT&0KLY*l9;7RUid!X;=&Y*QF?CcY= zA=H@zfIFg=o^b$Rx~~cV?0s(H8r8MXuviim#aS7^8L5FG8D4lS7qTJL8A3o(ap{r+ z6*TSKP!T`SlaLLe&YA{b&kF?&J;QTd*rwxF6#~)`b%_XSH@<|6Qz0jYI%5WSM9?8< z>ec!x0kAGuSn)0$cYAdqx}Xa)fLpw1XZ+Urzm!QhO&M4hvf&>pW|@qYmKQPr0000< KMNUMnLSTY%r0$de diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Black.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Black.png deleted file mode 100644 index c19c35bd787990e6e8ffc936e95a0c1f1de1776f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4247 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Blue.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Blue.png deleted file mode 100644 index 162c150a890099a7612b7317a51fa91fe614467a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4940 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Gray.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Gray.png deleted file mode 100644 index 83a8ab6a6a76640d06d80f5d14449dfc7154f43f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4411 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Red.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Red.png deleted file mode 100644 index 5bcc778889b4c6687a4ee0188e4b600bf1d82265..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4830 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 cr6JMqzpK=k07*qoM6N<$f?B^#q5uE@ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 2.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 2.png deleted file mode 100644 index 2f4f3c76ef511ce68eb1b3d64db106fb4913fc14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5118 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 bi-!LN-L1m8X#JG&00000NkvXXu0mjfbhmqa diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 4.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 4.png deleted file mode 100644 index bf097cb51130259676eda8d8b1dbf054e23d4816..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5107 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 Y02Bg9$e!kohyVZp07*qoM6N<$f^e|}-T(jq diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 6.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 6.png deleted file mode 100644 index 5e25c6efc6dfe52d22a6c61135089937325fbd19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4901 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 XBv0G98@juF00000NkvXXu0mjfa7|!H diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 7.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/nagamale/Naga Steve 7.png deleted file mode 100644 index a5502ea69dcb1a7bb34699af6050b6ffee4e1c56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5146 zcmV+#6y@uQP)+!XXn)ev(_8NLb-wRODw)hkVPs-Ra~V9k(p|pu zKj-|<`OZ04V}v7N>q65tG)J@)hA<3`C=%F~L7@~VFeDH{2<~2d0x`#6(xe6q(?HX8CC_i(+JzrQ zEV<|95#RCA2cRqyXi{j1TQegJfGIB9b|fQIJQM?Llx=9N=(b*hzsuhcmp6^K-a)9 z%NjOx4IK?-1DeK9Ze2*OH%E7CmTYex%eF{Wx>VIy;3nc6xoqRd9{^30vI?bnO_Nk8 zEkGxTB7T0yVuCQDzo(!6-U4pYR$O4mY+{KRhb{fq#~T0{1*Eo3T~lr#rPno0{V#w2 zi#wMR3PHXni(yL=G!#)JQYl0jG41>fAAbO36p*1$TEHL~n!2Gl;k6CRue9JTx2S^Jj>wdrrq*3Ua z5?ngRAXzG)%0!{UrHmYdRwK{lpTZFQNE}drvp_Ab{aeQSGQY|5GULm`R8|0{ z2BAO+DupUvCjl&9DARx-6xgOdAheDjh6+r147!ngk9<|pKfnN_Vup}}CKrh)3q2@= z{JmuT*Ppr_H(o&)_!x#wG1p5WyO$F#yh#aJ&I-%Gl{GDuuVETGK@ee?y0QXEnz|-| ziPX6e8hI}|uojSXbt$%DcIg696e-PE$`1rTd*mie+eOn1wP-1T2tBfyZTR^-r!L<( zV9t>OZ_wn+))dM72t)oOtwf#=xdgJC+Dj!r6-qT!HfxUqUxUVDc!^MAc| z87=Sqf_+=Nl&~?!!7w5ged`sKFZh0hDR)Rp-{p)^*9N$SGB-$02qJOdEub=P$!(3& z{^8?mSaHVD1YSUUN0vb7#2rg*c3ysSpYro43`x2!M;}&;?}c=A_c6XPO(HILfHte1 zdYyN7cMkdc05f3fQt*M$Fu*mEOmoHHz`DSOvyTv!6)s_5U(*}gZ&g7yFYfdKuZix+*dUi23N6~b=1Y&KV{ zeL{t?WK73#bT&NEI{XVZ-Y({@Uq`Ow;g|+q5Dn}iHC|Zu6&C+^9hRlDWY(F~C#Cor znY_-LdmbefH+kT@9m76<`Wr7RRBhcLo6m9oYnyoQ?GC0iSM$#H3>SX;N23Gak~s}x zUuTK+SIt#qwfwft3|fS=f{`>7-?B-Z^!2M%*mEsYxsA*cUEAWRa~E^|s~d0~gMA$y z6$zbW+*HXBb#0VCk01yJ#v}x^XWA%gUm_E6N_H00NQB_ZJXphPsRK#^OkV-OB+;5ETe?V zy#&g&q;*M9p83!2VFgHk_aV_(*QAoNz3r{s@*fW|c5IrKmTnH3R?ErDpZs6|oPBDI zuw=|0NKoWrmdu{bVdG5|#P;>QJ_Nw(S6aDz;pCz7OP}A(J+TW6Y+Ed!*K{@mY6R>M>}+NqXhwa zWd)&WK|Br>6Kmz@(0~^N^cOtBc}s@{L|Z(wPPn$g zww5Ae$Jn@zⅇ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 Vkh#5m{E+|v002ovPDHLkV1n2%b}$r3fm`ASEgw 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Butcher.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Butcher.png deleted file mode 100644 index 802ca166cce0ffde3c875cb931d87ab492e24747..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3433 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 LNkvXXu0mjfM4ffU diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Casual_Blue.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Casual_Blue.png deleted file mode 100644 index 22ccdaca83e330f607af437bec00ae89f9ee8121..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1825 zcmZ{jc{JPU8pnUszKbpPgd`$}$R;8oAqYxiiKPfCG)}9cjoOtCrh2f89UsInVQa-{*P1pL3pb-t$%q!h`g6 ztaJbX&=2PGB4OoxPOV*Vy(}+ZfkkaUH;fAaH_qyAr>es}Dvci*1^|UP04S>f01zIP zy#s(;5&$fv008qM09Z&b-Hl)YfGSq7J30V1#CbU-`x3-{t|A{oraw{0z>2x9Xd#H|4bPU*C1oo7I{gpO0 zHnz65$v%WwFI)@*4yObbKGoMHiRBFT9D@d{q2W{3*4B1*b`l;jj){x+auPC};+c5x zZW-8L0ge6>UMZgGB=T`i)cyW$`C-%}p_Iy4<{>^QKb)4u z_c$Cv-r3oSpgCp*kuv;UWxFZIgEFp5J24HHIj6wolx_=P~CJv4Ss zsZ>%0)fN^OAs%Sx{#Ve$CP+~Wjhuxb$kdLOA5M+&!W{^74}i`0>Y*Xf)cv!NCm8aCCGuLwTCoQ8YC*wY0P}G&EqfFf~P*nHd`z8W|Xv zo0ym)5N2>SF@Xk7=FMd}>L%rQ9fMy*MHU$z1#lLgXMAq&nQ3$`C^ z7R=6MKmTj?RrXQeg}Mg|U4)F>m4@3nYs(14+dsxCa>=Ua@C~UFg7f?sC{}2^4HOoK zTxGe1H8uDlt{^YGj;lJ!sCj(NGm~oBc>8ct#y8=eSRJhn(G#5-)v6A+1o?M2YsXh6 zR$o$Xp57|>+2$NR(C8u_+tw&Q_~V0_nx=~y>Qjhd)i$T|@kif3?ArV3)r-U=Q4_H~ zPSx1s(*oN{@xEIv>kyaQNuL{3rxv+Ef7&zh|J8N>!sRR%LZYmdojfNX7+hQNP+$!d z#&t_wev5)PFZF}Y+WO}FF`X%`##en?@gz;yH$3t3$yh_dXuOn__WL6Zky%matv7uw zW71S^`48gdfZM`F*Vo_I6ThQe3U3#dOg1EDIQJB{Zy#0&^GotI=+~o#3SsQiY0;6V zJ+E>*U%Y6zy3|b&w)foH0Bfv0ZBfHw9Sg1I->wd>4n*b2Th?YvDLrL!f6N`IRFx6cO66S6DpcazS(k;O>t*rg*065?KM8{4Jo zZ)Y$3@{4)4NVK(<88tJ0vap@fyuiTBms?#b;jD$SDvmEcn=S3Z7uwk^1;$qWw&dE+luBenMyCkD#Yeswo0QPJ*BMuDmb z=^$rA9iuEQf2YeIk{8Y2891ogog9~V9Tj#0QqNK0ZQB>C1frEljKrc%p^XCQbN8k< zvxlf^FvnG%r0i^u*x#=#9!_q{yCphAr`E&29xDrolZjJh>CCjl>97D~64}FzL~|q2 uqe&#D2ZKqWxxfb!DW4l*^FKgVwm37R;Qs^KHj7ta00<5U=XLs}9RC~s8|CHz diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Green_Jacket.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Green_Jacket.png deleted file mode 100644 index ce83ca39cd20f969c347799886165abe02b37c6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 922 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Knight.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Knight.png deleted file mode 100644 index b0748f805af6cb363e4b09e630bbadf9c1a5e17d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1189 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP@+A+C&U#<@7T3%^}3ac zii*a@#uKOY&s#L-*4Fy}|NpDG9DM%bDNq3q&=snCrKF^e9y@&b%Ejw9u6{bzd-BlM z^Cx!Sx^sh@m1+Nhy{FHd)YQ=yS6sex*LFrG26iR}4kiXpE{^*8`jnKEsHi9p4-W}W zhVbxkJ3G6OkPs&)Cre990|SG)y1I*(&i~smF9~Q9V@Z%-FoVOh8)+a;lDE4HN87!r zRX`4ViKnkC`x9;<5k|$PIps|Z49t9-(@lJ#NaF5!A5l#DwRYSwhm2CiwgJPY`(bXr{y&VT<2yxoSTAF*3XF7j(Sf zPbc%^HfNs4ZA_<)8t3c1JA2<|6RV3|#_!#~|Ni@z_rCr-%VvK2qW1zf)Vo<8_JnKC z(E1<8=%~5WUcqYr*B4h8$BFWd%czvk~z3e*2VVko(h4qdT(X5vZrhys3)U@-&lYEX^~G>SPlegWgCU)pvhT0I`JU@<_>b0HzKw;6vUeZZEc*7> z!{MRvlJ2z|6a{C7eE9Qo=elUtS<3$Zf>l}H_=Ngu9XRogOH<&Y*G8sGL7|tq^cX!H zGxyc}{dRXnSfk-tty6Vb;SWE3DtZ}qbIaiZ%Nl#@4dhvbO)G70To8ZsBJ5bU$lkA=bA6)hrN45x zIsRO5|MBxud5O}a+fA2kc$X?2w`%e3!oG%erDvRU8P%sgusNf3;P(di16gmXSe?Zy z9NP*N0?yfA4pj+#>|2xL_o%v9Vs^2m!h+~#jtvSubxai^+^gQ($!}ni@ZPZIfls-h z=7nDz_jb(Zuera1={a-dgdMAW-rUm8wX*#5VVBvP)@v`HnTJb;b@N;Ks_9?VJh5Sx zt%23fD96~x-OX`}6>97`PA_UY%`{7uW&6K6(}Q!*JKAyF6aQf~eRu3Vehc{shWQ7? zM0b2=oVi7##_mDW+Wi^lvJ-N+pJV_ti)x8$L`h0wNvc(HQ7VvPFfuSQ&^0vFHM9sZ uGO#i*v@$l#NJB^mlrAc=}iv+v;k@ zI9c_^q-Ft)U@Qsp3ubV5b|VeMN%D4g;rw`WDae7G1s;*b3=DjSL74G){)!Z!AbW|Y zuPgggWDI_R5L$d{J`NL zX{&#ym*qCw9DzayAFJ(pMaQQq^DO>p#=w#sFWBIEobCS(-t6u2={BFYna-~+$-ZqR zTCpixPbK2{U7xH@0=v%!)}Mh|tq*Usl&Al9Ss!ZtzXc;bn_ z4f;&KOng+9WS)4)&-Cx=)4s)LZn7G_rYBdt z3cC+P*!moj-?Go*;<@dY<^C=XRMF89=T_LWQ)Fk)UA--@=b!%iDdFK+C1Fu`FA~-+UhZ3*X6djj$+=}gYso3 z>Mg_=9|T<3nAv<#J>lK&xW*frs?F@obFbxEy7auSYG0I*e!^q%o97jh8kKK76onQf zJjly;4eYRc*>pX*;RWM@JPwAA39PbT8SP$wt7nuwr4h(0xg!>sz*S3JBT7;dOH!?p zi&B9UgOP!ep{{|kuAxbYfw`5jft8Vowt<0_fx*r`hYS=Ax%nxXX_dG&oVfhs3Qz-s Mr>mdKI;Vst06rhOrT_o{ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Samurai.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Samurai.png deleted file mode 100644 index 99060f826a53baec3abf77e93cee68a754bdf463..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1286 zcmZ{je>~H99LGPK*=8m}F~Sh$GWXq3S*zP*iDsCkDKciILF(-|Mo8R6T?mTlkLc}Ew0%loS;roq$xt^@!WiLkYpbOgj z(@r*2-jd3F0B0E=ylW8Lej{jTCMYIymcu%qOEV`9qm~d$Q@m5jq#QLZLV?)8Njm;66SjE(zdewcZ{}W^%L)|gfmAP)&0+sUf#gArnZX&aB%oFrIn4?||js4r`OHPd_Q36DMV z?owXoQis#0*l1d%T3k5#cK^7;{E4#aWV?K^xYuA2VKQMF1QcJt*0GjSiD(!@;;w%TAgSzGiR>K?Z;q%7=ym60C8@byplAX*z~!4S zRC38pnOKSZ#kfiPy0*MkeR)NhyLn41sjW%2R?tP?9j{zVvry0jq4T78DAoQJ zaKqu(ya28$7se$^sM-M4&4G(9HZ$`izxLyqsHWF_d-@GT3ih znA`}GWjZu!2U#lEvLhGjx-%yZ#ecuq1F5mTwad{&ROu@Jz_dIyQzJ{hUX)%PgE%H!)}wWSK`VA0!OhW3C6m+jbwG zW~He6OpC;;ZPrjRlNdsf@0NFGd$!va2ZkgbNU3*t-|edQirmv39K`QQ%fY_tDXwM7 z2W>)en^a@d-wLq^rK6rVG;Zh&D|M4T+41%E3Nm2r+l;=FM~x{pg9#*N3tl#EI|+F2 z)Ci4Ci>V!T@(hpjX|3M&JB<1v<1ywFm zGR|MKmR}9Hj~*}<#|LY|aqk!!jSs8tWB!Hj9!T0ZN0~}TRG}p(D-%dDm%BHP%JmD4 z=`()%_=H2x-DyjU&%oBw+YD39U(|iFlZe3;#YT$+6n?5e2SA3%5RpV8k~}zMGQ|U; oc#yV05CwwpQNJzxM>v`kD~!wfe<1`83(*O{pTY8N^x@_I3)b=yD*ylh diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Scavenger.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/boy/Scavenger.png deleted file mode 100644 index de2ece3876881b0980c4dc61e54a775b6e50ca38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1666 zcmZ`(do&yN7ysr_3Gs-iSC$IuHKL6OshmU}qNIdKR7|soAsX>WEmEZI5G$Q&tvy<{ z>T;^TU#nV_madAdrn(<}u0OBVZ>Y9LixM@o{IWmy$L=}ze$MBf`?=@d`^P=Tj|#Ie z!E|CYBd1%%Com(XaGPw_>r-p#)3_w836zSg+pQUN%RN|24ib$>)_zvNeXr) zP!t(a2lGYI3G|GtXeUpHqbj?`pnV0Q#Fc{3-+}zaEl+UDcDE<%#?m_+3^}e??J!O_e8}a9y3JO5`Q)j3}hQj0)7auonA>#(dQ3;cilZ%UsJv}`wEiETcp44i!89eIV-K_5J?wXpKq!8k# zE_epn&)Lz<%3>>x>_u?g9)S1c5eP{%e=dilNRRaPr}?qM1_lO<=gHr%4>7ies{~O( zV4NoO%FBmF4*4P?j04$(`u@*I5GpP&6!8*{v-P!WfQ$=`tEwcm5Jvx zbBoU(5(PD=S8PZH+Rm-yfUu^%Bz0fj7_M1rXXj-Gm%`rJx_V6`%?v9@eb+LYaJo6m zTqzhC^xdwEJUncNUxJ};g*3e()DBv`GHB$`&;3hwo##ay zp;*QIlE*Hdm`VJpadx`rKogj=pSP#0ysK~*r*ygH<+`l_kCzr)RtQxC295X!_cauJ zj(Sv>6Va%>P0#ytY{d#cekb6a^~d3t4?Y~;*xA=jnI4(AQC?p+_{8VeSIcEz$}AUz z1>mjtpbNRg+8+Xave}DBL=IXw&9=m*%jNQ*juov=U0>$hq(mTMcJ1&Nlka*%Qq)dv@O(l>mnb2R{3Xk%eD0fTw zJI+*{Jg{}5lq=Y=UWNxO@a>&wRWOF$>B`x2hd(8|IFiw(%SDg&R>*{-YV^~<_BM)w zC4EMEZ0pVS+!fQ+g!!()o;M%UupHv!s^8r)76+eJ9lXU*BXyV=*=NUe%dQtp?maim zZCvl@SXq+H+fR$016@iQ-dg4M`Fb#~WWLmJ+AY|Jd&gR5+t=Br>0Y+9M8nuIY%j+* zv_I6a`Ze~dONFyRj{JCpaRJE|e;c}Bc=y{wYcw;1@od!2Jludy1;_&A$BoyxU&;V= z961>m3EVrP)#_%Nqf|Il;-OBr96eY1^hP;hk1H(j$G7uoz=My!^6ONkKw0e-1jWhe zX%ns$ptTapKCWj32L%NM)3@EuTV3oOHyHBZf7X(55=chY+iZ+3n#^Yugk=u63sN3&DnKzD0 z@+{*%QN;=Mo!J-d%bXv*zPi^hJ%HRU%6$3(uPQ&Jb6P;pRo;DYsU{-UY7RaeLcgi_ z_Xg~M%iyw}*cEHl=&7XZ+j^JB6(`czJrmm?VPTtD%so~8{ll59no*QUboswOL58*e z$?pcJWJ+8MDX?^KXeu6#Rcevv1L{4FKC1SI?znXA0+~4+Dr8iyYG*ZFn!fC>*z-Gs z#o|M{rOCsu5Tvh^^zj#AM-*WNXR_#v-^Y)9G9sy7)$Rlv-(y)bh~dVs7Z9yB4oP)g zAJ$v!``(C2f3;c#o&A!gEwhimsT;6L*^ov7_zNO5T-`-QtevCd=Pb52z(lib^^dDX zXBkBE!zY5GEj?ZD1&(C=mdaT8!{!-m5#e8|FPx~%3^8$L=--14X+e{iE(QBcWVE3p zg$9%L_1uRcjZWfi#qVLwCMoF4qC+HuRbAT%4Rvp<-uP$SRiW{!lq6LuH905M2!KQ+ z`S}vbzNB5TBtI%SfJ!3y5Q$VGafa18`8Ppkc8Xk<|IdOSa43mU0Jx!1oJO{^`2Xi* BvO53( diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Alex_Revamp.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Alex_Revamp.png deleted file mode 100644 index c7f6685ab7ae8ceceaab997f94c12359b75ebc42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1806 zcmZ`(X*3&X7k*=_3WHBkOH*d1ni8Z`t7#c3K?$|jnqkP)PKhl+LS=$dN|Kt2iZ;rO z8e8r1+4rhZOSOb3#$MW~QB+O*{C<4rJoi5L-gBQn&pqd++1Xl1NhnJI0Hm&4q8$Wm zaunjif?QCav@Rf#Tc$Rq090i`zxap>dNp552O9v08URpI0N4|ZD9ZpuApuzR1^|@@ zfMPhS$^I$;5M4X06GpHgD7z?_aq16a)E~Mjm@W!>k&Yds8ZXjq77Lvh3Y``Tofiw8 z#<{FgGbQjmM<{phs&(W&=ivKa9hjD!qEY)T~l zmn;G;i*WB~5}%YFMoAAHZY~;bW@j=I=7wtcL)GMXA~~MK%+6wF->WPwdB|XtunQ|o zpO&y6y=-PLkJP+uE=r6i5d%F)fgV+*CDcefDabQ5CSYZx`ta~j6?W>jz%U_#gRLU~ z(YZs0NA~?>ZGradc-wGX&>SONx4|4+6c$rd(fSmXTrIfK%j;-UC)Z9c6Jqw({6ug6 zAT>p@I8cioyfN`2Z>(LWFWK@p$GVBRF3P~$rlzRb!z=5DI*@PC-Q`nq4c09?%{wzZ zZp^P(1ezo9YRkf{Bh0-2#o)VqPPUrY**hB58NYX&KJ(t*cKPX_aeJ6HJ#%q^@e5Ri z@0epOuA-JE0x4Rq-~y!zovXjc+Uy?YK#g=Glub!dwI(|j+6Jk~%d*xQm#8$TtnezrDGfIH3q}ZIsWD4}=LjIiiQ-%nY32c|9T~uJhBr zxv#*j`>phzN<=+BQ(U%1M=3-cNYR0TN-!iRtm$|@7qU} z49=%@eR20k9Vt%3WH1g{Y)M7=&JU~EIqSo0zjZCV$CnnB0 zd^rQLdptBrfhLYh|Fcsp3RDS2Jk$m3NCIy|!q{*50q2vOtyOV~D7ObEO-wpLnB44~ zs3>P5o$JgqZA;)Di1EPf=cvjJ5&nz6J1TL~opbPouU*tj+PS{r6uBYby!zlq8KRB> zVwaX+WL+Iynm^Btjs0CM!knN9(u#dLa5dAtKYwe@aYW0zK zM{})JpWk}zRq}w@HIm#1Hxb&rp+OO+;iM8fabkBf{4iZQhZc`irWUPHYYy`cb46qN zI$hN1h1CA9yDm;lJBFE^!+q(VndOfWU2$_YDIx|@Q)L!AqOiN}OeUJ{^f1Q_u_IY| zS9+@u5^5v_51@Q1Ysmq@m$x~h7UAs!h_ekkm#4^kL+~OoThHO3+V8$NGeLMJFHE2P z`t!nm!8vwajVf4eH+~g+!+q;q>2$Pi!(cMNs|#JYMVS{5*R7O$5T_(Otzx@CiP+iJTf3*y zqr>_J@d%c^da(DatOpWC%B>!Tsiorcxt5VWCwZCP?P*Xwh?9LD{t^_|H0v_cXffo?aL+YK^M(S%LFFNVzqx3GJF6e0? mktie*R{c5Ve*__6egQwn{eMB&rpcf{0Ip+f(SKa?PW~4O&`dV~ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Bunny_Girl.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Bunny_Girl.png deleted file mode 100644 index a51fe392709ae74eb92b98e3d9c272d2de4f47b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP$DhBC&U#<{|5pf#lZ0S z!-qdWaQjAKUfcioZ-geFT-aIv|K-!4w;pbu*|TfG#Q&F$w-r_Xxp!q*Z}a4;o?mZY z|9|q})3@)H+fLrQcW?Ejd;hD~i!*h@TpUD=t>vd(7olQlIwf_zh?Oi#v|NERBmtn+n;U_Xg5<*Pq`&H&_g6zd!xYr z&Hv*6$TY-w+*!3UyK@(N!G^gPr_={Lm2FteDx*3@bXCjK&(9+#7b>!HG$qu0;ocb( zC=wX<5Ncn` z6E|_D(}l3m-$Lq1`_!iW?7#Zm_FUb{!@K>|mur4Hd~!xKLz@YE$Zv+)|NaaKzn$;3 z#(m!#Ypb$Hvf@kV(YFQ}mlkL)VLrKh!mZ7A^V1pDGFmy@X1v8P!MmYkW{vs#ZztJL z?n`1ceJ0e)`om&Jn@e6r!^LBDjf@q|=Nav+lXv;gK5lYA-^V<@VnM}b7L{0m#S-pJ zF=-4%4~3s^W_^;Ru;YIg%aumPD~3-Gd3fy%h!%gPZ749u?OlB&!<*Azr%LkQ2 zFTfmiDg0UEd=F{E5877t{2E;Q=WRFXXo_d{NfLSj4#EpS8m4CSHl_;{Rr>*YXW5-?IGiw7t(?^A$Whl&F5d?n$rX z4=cx_haUuU-v(}-GI71Ii8$YO=0A+W@)p|SVWBU|ndHh6g&)+{FXo;uFVKA2??8Ma zcj~pZrAwXw6RK*7YeY#(Vo9o1a#1RfVlXl=GSoFN)ip2+F*LO@Ft9Q*)CQ6U210jt f96-^Ko1c=IR*73fasxvRPy>UftDnm{r-UW|ytcik diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Creeper_Girl.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Creeper_Girl.png deleted file mode 100644 index fba796444c79732fbd94c79fa7712f5d786f4b9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1304 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 D+Vk$y diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Neapolitan.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Neapolitan.png deleted file mode 100644 index ccd654478921f42b4b68d044ab07d9ad6ae534b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1256 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Purple_Girl.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Purple_Girl.png deleted file mode 100644 index 7620446c8841a3d5fee87190a72c692a390e2e0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5094 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 Cm*Cz2 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Summer_Girl.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/newskins/girls/Summer_Girl.png deleted file mode 100644 index 4a71062b3adbe6589733abf79caff851ea057c08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP@*EhC&U#<-#$I_{Qhnx zCPp!SHZ55mJ8hwjxO9r~}=+Zr$UzKh8b)yrib)($b~D7NS4CzWVg~ z>g$IGrmWa^^~skbEBJu!VPGx^@(X6Dub-5C)(gmGO!9Vj5qz}Ob{CMtUgGKN%Kns@ zk4;p1N`0LL0|V19PZ!6Kh{JcMbr#)L5NPv^qj4(y22TKOT0{mUddhAC`J5?7iyH$P!9 z5KDDyxO?|*-uI`c^B4tuXE1i$?fd^(O-212W09$GHTY1-&D?Y{h)+8=>lslL}+I2w$;ggdbX_*~$(O_jg>bNYvj z-F{C(RQ?w(d;jF$AMwYTPhNPlIY+bveLH;X-Q9;3HeoMKMYoopDR@~KTP^eC^5=}$ zx9JS$b{=NTU(JyIRvVB|Qd(;10ObikXrM&4490z7J9Lz3DVd7qW19@K-Ri-D3 ziOYTKdVT$&oJZ&5+C&b6T8GOi4BHzIA3xqWJ6Y$GQ_<#z?>psBQVNvViwN)nDfW&vRv$|5XsrJL0;s<}uIHLv;djKdN{aeC&-n{%nW*mJQmX z-zr_7uBf1XyIdf)uFLallZv&?1}*R0c5r5>2yY>mlXqAp$p%owUAt`Q|Ei6yC4 z$wjF^iowXh$WYh7Sl7@b#K6qT$k58jT-(6F%D|v{k9i-8hTQy=%(P0}8n_& diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GenericFemaleOrc1.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GenericFemaleOrc1.png deleted file mode 100644 index 1f7f4a965f92019b0de46a612301811b8401e6dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5347 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 B-3tH! diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GenericFemaleOrc2.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GenericFemaleOrc2.png deleted file mode 100644 index d41ea62c430cb1ab31c78f6188cb945d8af10aa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5242 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 A0RR91 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GenericFemaleOrc3.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GenericFemaleOrc3.png deleted file mode 100644 index 228896464963197a494f1238a8b57df8db55e3b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5241 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 LNkvXXu0mjfCo>L@ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GuardFemaleOrc2.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/GuardFemaleOrc2.png deleted file mode 100644 index acb39e34a865cb7b5657f98c57ea28d2a6851166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5875 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/LeatherArmoredFemaleOrc.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/LeatherArmoredFemaleOrc.png deleted file mode 100644 index de753de1a9d956bfdde32a7bd2ba7b94fdd62fcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5984 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 O0000S_I-a^NmB@NJ`DjxVpk${rrKooco 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 QR{#J207*qoM6N<$f+F4d_y7O^ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/StrandedFemaleOrc.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcfemale/StrandedFemaleOrc.png deleted file mode 100644 index 8c82d2477ab032d4d01c2b4e7e65e8908e77cd39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5209 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 JPDHLkV1jTK!|eb7 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GenericOrc2.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GenericOrc2.png deleted file mode 100644 index 940f80724d4c684b732052cbc97400ecb44b1d50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4108 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 KMNUMnLSTYwpvz1E diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GenericOrc3.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GenericOrc3.png deleted file mode 100644 index 3e19f92b47a68e1480ab4e956f6f498323393bfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4128 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 S9i^xM0000`K>-^64yE%JzlTEy7Av5{@ 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GuardOrc2.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/GuardOrc2.png deleted file mode 100644 index a4af5a3d2e7a484c6901bdb829f85ace2824dbd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5097 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/MercenaryOrc3.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/MercenaryOrc3.png deleted file mode 100644 index 83831b748ad2a739a8e9d761cabe7c89c58f63e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4282 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/StrandedOrc.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/orcmale/StrandedOrc.png deleted file mode 100644 index 88ca0085ab2c810e0cd46f4367898acf5c3e41a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3942 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 An*aa+ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Ancient Skeleton.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Ancient Skeleton.png deleted file mode 100644 index 146fa50c468e1fde95fed94349608d552363e355..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3765 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Bloody Skeleton.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Bloody Skeleton.png deleted file mode 100644 index 41d6783e8d84f3aa42e6cb8a8d031be80eab61e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2489 zcmV;q2}bsbP)-Ob~y8G0d2us(Cnx<43N~`5qgs-Q&p0!zVY_mhCHFDUxHKd+*un+k5S`AIG5Q z^)*1?9Hw)|iZM7Yf&#z+SO;*z+ATlf-BL{7ckJfhdvETm&Pm8w4ZdeB2Bm-|CxYM{ zJ}ZL98Tn&tW#0qvEkITQWNYyS0G}9xLn2r!1@ImxOPPEC==xa%#{jGWI0RtDIe266 znMnuWyVlChQZVa1DiPet8NnDhV_>YsGm{R$bASvsv6M9ituZ)S3IxDmYbQGd2*6PQ z#W^@;0ss*Je|HZmq;paLigP zk?6YEUQbD5{T_fB5!~RZJBO8=afo4HEsBU-Frj=+xh8>JvnSpxXmZUgXbKo&X!)=N?MrXh6in;j?olimT~%hqB6 zz(2bGf5m$o${E+3!--OG4L~SG4P!XnWtwzOJ%OHLNus4--g~Tc9P^RL?uNkgA&4V6 zrKIVNdEJQMrZGxfCutync>w?JPW($9XWVrTRnAy;4l_Apx&zXdqQ=u}=sg64F2CqK zrb26mnk>rl2geB)t zQ$1RXwiNXqz6e|$BZki5PdV?d2M~a*D0s1R_s3ns@NuOm=`|tfi64nkjh-SOgn*S8 zH7f``rQ;83ir_u2wC(N!@StI@0g?f{u|woUz@u}RF9juM4U<)RQYn~ug71C7dri>q zZnxlc<1n&9dgZ=03n~m5J0Y26VbYYJh5UeuJ$xge&oFzNeLIX>3|*r;Ad4O zciL9dBGcSk+w?^no^}?Hp)sm1sXuP;=NL6D@@D!x?|DGe2ECAd1EA16_%*@ zV$@Vpg#<-=6Jt~co+&%`dz_wW@fuHRpGsREUrORR4swbon0P+CqjIJO%Qi@if z{2gBuW$a7(7}ax32%14I_uOA!m1P){WMFh(?!1R`SsvVTYQ6t%QIQBQB3if@i&#m^11SK=!8!B*Ily zDG+^GVB-dlF{M#ShM+YBwrId?EWuvU(SfFTKxa@AVgD+Q^pF=(1z03PLHuQ?~L z=WGZL3!q=8q(Ap{hfY~5boCE6o$3a_YwRzuGOa2t!xvbqG|kw0z?}D9SpHhZWzO2& zp{wN>L2kJC6lvyVKzP!ZJ6GN?q7Q%btvn!1OWDI!1(FjrJ$c}rFEhiuL~1^^aQhw2)xt6JCDY6Ea(TmZh`HNRN@ z^Yj^W^CFsu=c@{Dj7Wl`82sS11b~9*Q6$K)B%iEQmG&a%V}yh-eik^#(HG0pt}sc? zp1AOP$!ytmf@7{$f+;V^5RwOjQY&GdM>ahM>tJ6w(BLPOK^#`M_`go6*Rl(gkba$AWrd)Fwgn-*I;&(j@4b1i7R2dAXu}Hds0T00000NkvXXu0mjf DfT#*_a8df42DUkTTZpRJCggct5oNl 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton King.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton King.png deleted file mode 100644 index 7bbc10eef8807ad2b2d9df856ce15daa0c0deebb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3673 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Mage.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Mage.png deleted file mode 100644 index 566b685d31258913551342433cb04be90b08fa92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3092 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 Hu0mjfc@nzc diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Priest.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Priest.png deleted file mode 100644 index cff0b4ace4d958189bf2bccccc21651c17d3c028..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2398 zcmV-k38D6hP)e)wYN($Rc93vg#Ty1=)gv^iAl4PX*sZ@S!Ml zQ4z5|bY)#}eNgLaw=LA7#TP~JMU?F=P14*mXZil^NVldLbrL3ab3mq^l|(vCo{9=er_(ewHAO8gEm_~t-rg>$eM8UZs>H2Xy;?-$ zagq!MN+uE{h{)^pQam1~l9CeIwQCp6$7DxGhxpJ162mStq4M6SMwL%C%(~$_dT`qQp z@mP$eqfyp|g9i^TYyg&3SBtN_UP`7?B+D|{tX3j}f!@7)M~kYesA>1^FFOo=y=sw#GV)8Q~-4kQl^u-okftuPo26pO{!BoHA=OG{~de4Ky7 zWB^ty9%s`jaX8p%VooZVB&*Fv$z+nAK7Fbhiu0K#NVT=K0tt=PY$mJSPLdE5PbR6< zZl}=nG)a;~p-_liE*Asga5_2uLjwSWeMTb~93o~Ef2Y!E4wY_?hZzO)Wo2a)3I^Gn z03J-}#fumE0#H*^Bfvat+F~+MJdq%S(a6M2PEK;t1ESNi%;ArOAd}h5l0&J0GMrKARMY)QBgq%e;~M{ql2fkx3@D;r%#{e-)(Je%qUC* zwhw0UeD(ln3bS~Q0jUaJ$_CnIC!v2$hfwqzNg9rlv?H;zS6lju%x{ zR&r+Nbh&um=;$bwdpw-=!7HNeu4pXA?}o&oEyxBDe$%NG4Gj-#1K`Y= zGXex6rf0gU0kCDu7GaVkPI*h6PPXmIi3v_mCj$Xad67D=T)C3dT@Vfca8)7$fC3-@ z0os8K6iE{541`le7+jrYWel(+%QO)PP=(h^40vf*m_|(jT{P(~k!Zyw4;*M?*6v zFtcv531pk3<^(s_)d^IOP)%kwmEsCA7KyML5U^vWX zkVqz(d6*N{AWR-VempA=YV>^+0I*lsSf*=RTU%BYYiw*3P)iK7$dD|-yR-cZ!A#-Z z491M~QMDn#vY5?Wf$nT-qC2;5)4myL!yND3yT^Xx(4j*a=~C!bqwk{tfYi7|%y2z% z;zU*eYS*k0s2fn~qAW&Of?v3Q|Gorp;K<;t;MkB+LdD%PStDngi3HnrG8Q9)*~}Wl zWw^&fCaab9?Aeo%E`?q-`cwfxW(K=dYWulYwYdDghHdxt_e*s!i+G%d zhK3}c&nHkb{MysQeFFFf8IEzL7cej|Abr1eD~HCP{C<}9mCKi@yrP1^z|NBv`cwfx zF_dkR8UWv}UoX%t!ay4hS_F>{vjCV-p9j6Y(l<3VqSWCahuu!&fxvsuu9yyNe|K{; zufKTV0zG~9OloXs5a>E>siXHTv=nz_xAM z1bT(MWrox?kzh{`Q&4=tmWBoqf!8;g=+WcH@9%Hgv`L@``KYgtP3XwcqjaOYo1JGk z6rwVhi+_sR*xMzs}wt_j`MLH6=P~^lN@O0QmjZE!x%8#NiLkNmP5v zz;E;w!T76JuQ=UB&mmhyi1(llxq9^~jf{+FrZF1`d40JW`i1bk2tXl7K~EZr8lWfo zh4Ag71{8u6^rWGv0eYfe2;VMhKp{v$Pa29EpeOo;@a>`o6oM4=q@kz*`9dGfR&<6x zw{5L;{m1f^Hx0m!69D+!rlr>Px&ff|e8Kv4>je6XXslv0^>JTc-h>2@a{hAcHe;tq zIb-mtdv|D!qiv4O3hX-n`K1AX0}$BSp6|?o8X)U^K7kXYe7qJ1w6K3@vHZI~XtU8@ z8V^LwHI1BW005ZptO4$;ojAcJ%J|qAZ=VZnvm1@P(W?BPg^}mab4qhgUj}rwYJk@D zAM5;-c{v9_>v;pM>vabJ8zu9dHNbr}AE0%;?f~Ez+n+a07*qoM6N<$f~yf*#sB~S diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Villager.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Villager.png deleted file mode 100644 index b461a895a0c105ae13498b62d7a4146bea30a63b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2037 zcmVns8CmieAV9 z5k>MMQC3klD4}b@rtC^tITEVWD1;g*My>6{c6^`nI_NuPEaP0yaWePnTDC{BCU?#` zGynhn-~XR)&YTEnj!Ty=Np@LSSU_K2pX$wj^Ds>luIt9$p;Rgf-7~t`t~HJT(BYAh z5oKq!T3rT!zk?vaT27YBWw|K;$mMd%`MJ3{WHOnp1;F|9=Ov>bMLtRcg2HR}@891V z44||1dR;MLU|?W59kv7j^meuLQ9ala0ML0xeQ|LSp69{$eeB%1bL*r49j43sMh38Nlr97yo6Rb);&epU0U!ftI31v|5g23wY0rq$5ng9MrU7-q)YO!UG{I^# z8errjrz45XHi8qUBTk$+(Om{aDG<>-iahH;p-@ozzg#Y>=2EGofI4^XoccXJKCYOu zw6vu1KVrhloF!az}jU0?i$ zwCoh51R9lDz(^tR8c5}eFib$qcZDVP14%vJkYL$n`7W&~gE0AFb8TznNIS7Ps z>lK)pB1|Jh(5&I)PrlpIuE zPhc1({2+jBSqiLdp$G{BuIIv(F1!E=1g|y^!_FXZ>qzH%aQ4*~JIjF8MP)T&x*|CA z`DY~zM;ULL2HbiTHZ?=&BZP@sWgdmz0l01x!Z2YO0*!hVmSrOdLzN=+Y6Xx!a=klH zTbzS13|LMMzFWhar(cN;qRzf`F@RN>Qn%H4e0)5%2JAWbf~2F&`_OMHIs*cB{wYOi zM%2z0Ra!Lb50T9kK7CHUAN7Yb2&I4!fMKO!+m@;YBJ|(~A?$P>zy8_xTG|!atFv!i z0Pq!-ufeU(Cr_S?1z^{{=Ol}ja0-xt4{3)#nQ){xE@;Rh0y2vDso zA(PGGty9NZ+7;Qm9{b`z5PTVm>!5qU;OKJ_enUlf=A&C;_x`WSAe8ve?e`ROcJ2L& zym$M3v1|X=WC%mm0k=Aj*{Mk}@YyfPLT^8$uoMGADG_>g2rC7*S%(OHluNJ022p39 zmI15R16B{v36sG+&q~hU_da-643Bu5SoaxBe_XcktWtqg#IwWQtpx zN2cc~$e@XT|KqP>WdGMCX+QnJyQ<%>UVCx*J!E+AVfp&2-;eb{XJ5ww-~&eXJug}0 znES$X@X0^_E_Ofjg7p1Qr?`6`{!Q%Mb4Y&tugT?lGVt_4X*pSZeCItewD);wm=4|? z{{i0m!`0o zPrRe3{`RRK;!OE6EGL6s{Pa6&+=VOeD2-4Wds+Q%ht$>CpZJxR0JL)@`S+LqgwoG{ zq@1TRO{(-d4uI|f8@)X-12(#YI{UT(&>^(h+qW68*(0p;Z<_%+gf@HoHUl<$gmwOH zGeC#XW^dnSz-EuI&cAI2=n&fM?HywP7hAbW;z^gSla60+;5r5Xzc>+qCtb8mI=*WF zB>jG$bo_c9kNUNp0sPt=eY@xRalhRq9p7~TxB-Iyw_vS32RcBKj^7XfthLvG*L6Ei z2tbnY8v=kW&48r)4U&%UIs^EjWUajhysoPONym2`0B(a@Yp(&X>i|ePzUu%`!L7B| zfY*;5I~F_jCLO;a0Eja}_dP%9eub_BkaWL6((&5>JSGBdm%@+v{H}N3@&No78&9W< Tf7B?;00000NkvXXu0mjflcB^P diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Warrior.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/skeleton/Skeleton Warrior.png deleted file mode 100644 index 440bb7f789fd182da05f35ef14a7291849e9072d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3724 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/humanmale/32test.png b/src/main/resources/assets/customnpcs/textures/entity/humanmale/32test.png deleted file mode 100644 index 955c582f0bd27b1fa353d0f0bdaaf5a56547f7bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`6$5-iT!D1%rvLvLj^u0 z@(cbC2Mk{RjGutQoCO|{#S9F5he4R}c>anMpkSk?i(`m~_uC7%xf&D%TrcKj{roR~ zC&jv%(=%S=2&-$?a|5%=GhDa#yE)3U&hdW~b4laH;s;f_9M(xk*|zQ789B|dveC3H z^}+&&_{N+kLLBZ-K69^e+V_m5sJv3{C1;uAG1;c`1zbe!+zG h7K}SPYCbc)_vdRfO22Z4B?ssj22WQ%mvv4FO#pGBZ=nDH diff --git a/src/main/resources/assets/customnpcs/textures/entity/humanmale/64test.png b/src/main/resources/assets/customnpcs/textures/entity/humanmale/64test.png deleted file mode 100644 index be4566757a888f7ab6a447b2d729efa126dedd50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU|j0y;uumf=j|-Rpu+|NuH}+d zX$8LCj<3zq8?FE#uFYcc$^WlgDr?@4kKaA- zh?b<>{j){ML3{44s(Lp48ILXlFRuf)gER95rVAGswlJ8ydiy!gms?#L7-u-EmdAz$=kk+(SB|mRCaU zz!vGL9m&Ub2`{)m{o(Yuze|qqk7;>4fBVai%`8VQ31l~Coi!3#a81VK`3#l~+&{wf z`F9_d%14NvtH~wi|l|QNOeSz-G?@YPEXUub5b3cD?+%`FD-9Pb# z|DO5YR(c(t?~u959O%Rc5DyZSi^U?F=}*7l`%k2E4IXFVdQ&MBb@01ybvod5s; diff --git a/src/main/resources/assets/customnpcs/textures/entity/humanmale/Steve64.png b/src/main/resources/assets/customnpcs/textures/entity/humanmale/Steve64.png deleted file mode 100644 index c5b91d054d4def145cf9666442a6e6b75983301c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2696 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 diff --git a/src/main/resources/assets/customnpcs/textures/gui/menubgold.png b/src/main/resources/assets/customnpcs/textures/gui/menubgold.png deleted file mode 100644 index 84a2dd38d731953de207f59c5fb1d07070b78451..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1672 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP&_m=^w_au|Ns97vPZ#a2#lx@P@L251woXQ?SFsf=Y9si z(zmu>`QQKNIKUggc%MPualONI#(9o>4;Y|mMV~VtN234&r3y1B3NS&?LLFwG76%Rl z+QiuaR~j&lQO!w#1%Ym|Ae3sHW)OxO17s}BVL~XKlG@M-HwMTEFk^(-s3>sC=zt57 zjSd>K8IT+&nV^JZqrwzl1|-Mv7zjcg4z~J~8Uw;{k!&*%#sK|Gp*L>{+*;36e%3y) z+?S!ebo>72f8MKHh~4~?Q(-U51iOFN>lu#-7cf5(KVa^_8lo_-f$NBVLpUi+h4@DK XuJ=UnptpkJy-RA}{!Li4bUWBW;<8Dggo7r=fTfRIkon=;k>)CU027`oRrkKXFtPhk=h(6%T@k^*= zT^AJlU>QCHM0rNA9cA?_H?eQd#kJo!K!XWvK%? z_P!PW{_?yQ@OZ?XzbMNrBQn|8K%vssy_}~Yz~|h7h9_TT?iwC& mG_+)9o^-vqm)^5+<-BQz1#bUt-!V8M$yjg04BYwk*JXj)Xv#%8g8`HMbAS}DG_myv(^Z52nWylV=; PU}Nxf^>bP0l+XkK6|#|^ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/TecZombie_teal.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/TecZombie_teal.png deleted file mode 100644 index 3faf1446d0494e545d263b4147bd94ae29dc6ef7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;OqaSW-5dppIEugO7xCH=32 zzhlje6Tv?uoIQ?YINkA<&)8|prAS;V@7$&~55 z;bTLY*`MA=>V8)_|2jP3WY0r6L*M=HzttZ5(Y0f0)iF=L>X5}z`=X7Wzny+x;9mQC zrKEjU4g6d0w!H1;*4aOQb=HB-w^Kuy8(0<>a16zVyqD3M?@Z;2I~hk;ak xLc_<3Nv|Xn4ra(SF&=yDxhk1vip}#6aK)L(I?leuzyk~?22WQ%mvv4FO#m1jf-V36 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/bluecontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/bluecontrol.png deleted file mode 100644 index 7f79a2243e16bd22bb0cbe091aa6a0cee5ca16fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=&pllnLn`9lPT9!Y>>zSqftXLZ;>FA1dDc zPWe*TyZ+7o@8ypxxe~;F>1J!%?^a|uzG~Sc_vPLU@0OYWyvHEm^~{HD#&y-ZMhyW* z=|%_k=)IiA*fPm-GUKyS&+R-4Q_jrfF<9@tE0tkk%DI$=%GgV~%p9u4YRqR|Ps)>Y z(3oi~nGiR<p#Z~hT+oIGK19?;7Sp00i_>zopr08O@b AhX4Qo diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/orangecontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/orangecontrol.png deleted file mode 100644 index fe248e6051e83a5fd84648747fbdb6dc3291e8e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=?>t=`Ln`9lPBG*<k`nyC_9yc-% Nc)I$ztaD0e0svX~dmjJ* diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/pinkcontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/pinkcontrol.png deleted file mode 100644 index 0f5831d4c98f82e86c1a75766f2fa53499971857..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#`WcLn`9lPI2TqE;huzsZO=e&9H=4(M?P MPgg&ebxsLQ0F#q@sQ>@~ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/redcontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/redcontrol.png deleted file mode 100644 index d097dbb8daa98d6447c7ed5c25b6042fae97cef8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=?>t=`Ln`9lPI2TqiI`5 zx%=7`^SoHaxq{Lrx>^-#eyXt7e|$sif6vkP_n9Uzb_>7Y)X{UOZ?bKici<6=-~0o0 zyWg`f{#aA<_uKvNX7iRa^flM@?>+VLePX)U?n@8n?_SPu=D?;uW(?Dou9zq3FmdaX zw1!m8Rq1R2DY`o)6C%4_&14jb^v+|8n6{`YjluQWq}hzLP`Y~$qyF_XB97Z>zS<2k$2L zZ}O_uDa?zsHH0(|P5I%|8F%pW=k%Oz`{a-Rq8W@53Yq2}c*OKY_zjCy<5A8z^A3F8 z`+oAp*M|Ex{l9m=_qk?6(tzcF>q>zS#uj zPWd9Ye*K&M-^(9YawUlU(#_Vi->t}SeATi??#sOy-Yql#d5=NB>zNPRjO(g*jT!=s z(v1%6(R(?Kv1O9wWX5Nup4)j8rkt6{W3b+PS1QB8lyfN!m9dv}nK@L8)tJw`o|Gr) zpfS@}G9hky$!P|slXFfoeBQMrnvGZ^b@LCfKMWCZJa@c@9q45SPgg&ebxsLQ059!z Az5oCK diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/yellowcontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Control/yellowcontrol.png deleted file mode 100644 index 16a46de1c98ca914a5999fa3f95c8748a2fe2641..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#-QbLn`9lPI2U7G88#_>vqNe z%N4UH3dU%hxZo-_^Vrf8kN@tuVrlmO%-Q$yj3*k-a(-bk6JKC|aGryILNU{H{|6O) zk5f$K@BbJ7zi<1;JuC%sU#j24_SN(6-gILw-~T&%SrS;MJ>AZ@LC5v$8HTPks^-i( z-hsBp4NBQ3&oZ123OUcS;6zlB@qtYuSB;r9Hch+3LldQMc`F!SX!1KAz54tX(BBN6 Lu6{1-oD!M?W~ oD3x3l&K9s_ttAbWn%--Wo^*r5@z(#fpdeuIboFyt=akR{03dX4vj6}9 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/darkblue.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/darkblue.png deleted file mode 100644 index 97ad8719fa3fbb60345b7f2933b185d912229bdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cRXDjLn`9lPBG+a2@p9VlAp5i z`}*x4+!pP48WyJbAxXW%IPFvH^oQ52{`{WKkaD1aNw)DJ(-+}493?Dm!Y?@X2tL?6 z|N7@U-*40%`1k()p2NR<*dnGctV(5Yy)|nx?W~D3x3l&K9s_t)*l_ oY}>1;j3SxYel%3tYyN<3as`LuypTn5Kz}lLy85}Sb4q9e0KVpO6951J diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/ender_eyes.png deleted file mode 100644 index eb4d92181df5fdfa74aee77ae074bd15ac95e034..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pdr^5Ln`9lPT9!Y93XPU&R6XO z!X2X^sX)n?YXbZrjL20iDmrx?1nn5r|cIUTUq ws6i?B>`8{#Mj`8Y7I;J#8_`Z__8!LgV;guJ|3{_Q0sYJ1>FVdQ&MBb@0MG(-0{{R3 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/green.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/green.png deleted file mode 100644 index 29eaba72ff0be0e5e8b9c738ae56f4b3d18b9b1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`9lPT9!Y;vjHjN6@|< z>$@K96A_RXicN`(nyjdp_Tfjw@ekR&|Nkj7NE*y>a8KC5@R!A!Nw)DJixrbKQ_cGG zUv0|Q-Iu@dyY9K{wREEcyLhf@GizMBHiu_}p7YmJ3|(7H)tT3v4%lndpp<*|B*SZ? lko7zZJfe$fs5E;IqxsYd4#!J#u7do{;OXk;vd$@?2>@ESZjt~1 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/lightpurple.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/lightpurple.png deleted file mode 100644 index 88ba5a2f795b20875aa1410d59d1dbd6e2a649f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`9lPT9!Y;vjHj$E1C$ z)_1Pjry?LP6q^zmHCa(H?Zc0V;~%nl|Nm2FkTjU%;GVF9;V+9dlWgNd7Aq!era$|x zf3^8;d0qa-@4Dx**V2s+?Bcnq&8%_h+8mw@dd^=@F?4M)RcBsvI$*C+gHrC>zUV-`Q!Q zFO2-H!V=AtmiD=%M_L6p9jX5DGh*}4t!DrKaXPT&_$^T0u#@30i#3yM<5|uUmU%1| z?_b+JGk(73dBl484fWsW-Ak^W$9OGuMVzF=#BI+~8cHQsg|h`LS!*eo5Zm@@Dx*kd swjW!>^o3Qa46e6kO{SsJ+tMFc4@U4fUUR#(8t7RDPgg&ebxsLQ01k6;b^rhX diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/orange.png deleted file mode 100644 index 765c733a3b800dae44f0afad951aa74702193dc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F0SuLn`9lPBG+aa1c21?%u22 zHLI1%!on0cY!p5sX>9pjs_yN>`}>(DFdpVCVQJ&O;J-onf}n)o0_6|x4X_hw((4t>dDAYiIr1l0cmsXN;OXk;vd$@?2>@lvY(4-0 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/pink.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/pink.png deleted file mode 100644 index 7940205d4c4b20d2671de64396a197343e89eb18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`9lPT9!Y;vjHj2iv|Q z`h7zC83p8pVpAfcCMznYefSY^{6jYH|9{F1k_K}e+!J;%{AICbl5Kp*V#Q?5^k?7o zuQuN;ugl-~UH4q}TDsAJT|8H{nKdq5o5Qm~&-v>qhORB9>db3S2kbR!P|7`flHs*c m$at=`Ln`9lPT9zNC_v;$omv84 zSVH|qrs9+)mqxY~F>3#oF})OdT2rT!{OP<=<$u8jo*8o-)D3nr{N*fTntR|0ixs2N zf#Nl{Csy~|mcH>n|5MNAv>lA=OQpZ_H+=m2cg@)c)vOFnzhY~>m@1PLn`9lPT9!Y;vjHjN8i5Y z^>g|5DGSI8#im3?O;%J)`|u;;_=jxX|NoR3Bn{>`xF_sj_{(C=B-{9q#fr(A>Ce9F zUv0iyUYEb|yY9K{wREEcyLhf@GizMBHiu_}p7YmJ3|(7H)tT3v4%lndpp<*|B*SZ? mko7zZJfe$fs5E;Iqxn1z4#(+5M*D%@WbkzLb6Mw<&;$S=(QSVK diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/red.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/red.png deleted file mode 100644 index 2cb83884158df14cfa6c5e35417bf504063a563c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=H#}V&Ln`9lPT9!YU?6bhgx4E; z=P)KmPuJAQs>_Os?><x diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/teal.png deleted file mode 100644 index d8377252e017aa92fca2affef91ce368133daf14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=S3O-ELn`9lPBG+aa1c0R^Wnd~ zn8=pRyR=x$%9<>a)t+0m#b^KcF3)(P;US9^(_z*Z>Nf;maPX*K5WFGuVAuQaJBw=% z{QDlQUuZXl@m%bVFv$ZO%hXaEipAH3vK6eE>nZu*PHXm5Mw#sNAU2Eghf%2v$8XJ~ erP9Z|6$~>DusPlqXQ%^ukipZ{&t;ucLK6UARccxQ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/turqoise.png deleted file mode 100644 index 14623388548c93810811fa64a504f8a3d2c0ae27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cRXDjLn`9lPC3Zg5+HI!#ClVk zZguts<-j|S=h?I#=r(tpV>tQ!E}s3@9^T*2qQKlH{DOl=e8Kz#_XWxZa~#|s^fLVZ zxp&_4zPF#5zt#VLCVMU2=)f+XtJ=&Om#)p>*`VkA^%O(b7E^WRHKzmi8Z{{8o;}I% o+9+f_&jOF=Vj3#V-ot1<`v!-jdRp`vpg$QrUHx3vIVCg!057(2?EnA( diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/white.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/white.png deleted file mode 100644 index 290c5315e62e5a76485b2bcc5ac7f8601fe0c707..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=mpxq^Ln`9lPBG+aa1c0h=fC|g z7jNy=0yl1OKI)k{r&xD?+RyLtj3*kNvRE;lW__W4L+}NMj`{_`AIb+TpWB>2dxrZ> z_5bIx*V2s+?Bcnq&8%_h+8mw@dd^=@F?4M)RcBsvI$*C+gHrCk-0B5-kHOQ`&t;ucLK6TQH*L27 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/white_cry.png deleted file mode 100644 index 21b61211ff1385c35d7c1b8233d543d59c5ba896..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=_dQ)4Ln`9lPI2UF4iGu==ezwE zeXgdGsY{6y`iT{>^4GESLdI-T)aYUX+#B8;>b`>x=~RND~_^eTg=tDnm{r-UW|`sHpU diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Eyes/yellow.png deleted file mode 100644 index 5aa60cdfbab5581a6f96811b635bc5a623854f96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=H#}V&Ln`9lPC3Zg;2?11-L8%Q zv);G~*6*unJ#cKk!nqkIcV7RH&Hw+OXakRg-vVWWn1;G0*~Y#D1x&Jy_DnI)cg=hL z?c+a_{om{FCDy7juQ?sC*Qh}$_v}fA*G3`hc@}s?7aJYe#dB4gS>w{RIXoNmoWGu8 j=-OhcPD7=~qzjm5HLy9lB(a|c`jNrY)z4*}Q$iB}4|Z`~ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/blueFull.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/blueFull.png deleted file mode 100644 index 187ee6ea730e5216b0c915563dfafbbb77134ede..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=e>`0rLn`9lP7UNb>~CO6NkON~>*0_N=0=(IySvJHRjHDLI4VEI#lhMoW3b4utqFg&|EpHbqJ{N5Ft;<=d$ zeu+n%W5_ynx#$PWys)0S`wRg=*J9WrrZ3%V)G%q&Gou5$bly&7oHE69I^(s}%=J7A zmaN&yvq8_hI+Z~+^=xWGY2+lz;3V`9j;OXk;vd$@?2>^L^h&uoP diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/darkblueFull.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/darkblueFull.png deleted file mode 100644 index 6b17b8baaed97c22db27160d75a9ad0403758331..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=|2$nBLn`9lPI2Tq6d-a$=iZ6d z@A11oxGf6#5#W+BEw?V_Re;q@o9U;Y%uoIFZ#qNDfhR0hjVD=O_-_!tVcq!q?N_;( z$3OpK{q}zM-sdu3%X1EF`x2FQz#_}=SDXYx?Sq>|90wx)e`nzlQ($=fZaV|d)9Z1J z3(R-VJ9vdHARztpLt%?(!(aOt7c5z`lV^jTcXcX*YUYL^sxXEd={kWOY z`mcXkzrEkR`FYIO@|*)3zr>{-*pX%UD^7x;_QBmEjsp?@zq9a&DKI>K*U!N7^m`oR z0`uMT4_;vl2q-`OPIYHT7(2LuuqKZDtM4Y(3^Rr!U1x zI(SAFOD4ol`*w=K>(s2%46iqB31;#Q%OJVIqR}s*knxw`8Af7LQOct#dWCd5wrc8bC4)U4ACuQzQ8XA20r7Q+@Xed%7KhDn>A z86DWA^L8rZlqsgu8Ly>guIE{>WX(>V4SL?ysSK*AXHy$WBX4OlYiMTcF|Rp&DNd3I aBkkPNbsR6U7K8wUfx*+&&t;ucLK6UJ@qg_A diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/pinkfull.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/pinkfull.png deleted file mode 100644 index feb394d9b7f771304f758919f354861e7d029d3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}W%gaSW-5dpp&U>rjBm5uFO5 z_w{Q2N+D4{0$eht<<`Z#3YgVeoYIb6Mw<&;$UUZ-4Lr diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/purpleFull.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/purpleFull.png deleted file mode 100644 index 78567fd17c2ec56fe11c9e898d899f5194ebe1a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=e?46sLn`9lPC3YVC_sc|a*@ul zEZt*8N`iJQf=0(v{#9I2O-X;gQ*UzpwUfW~8Ba8v;cKlXmaQ?YBoZ-dU zcj*RO8AYz#E&9RoF05x?K7)p4wjT4E)0g5T9Xun8B@<$&eLKbAb!ygWhS!_6gtG+% zU5jChn7(wcQNyH7&x{W2(s?_Tamp0a>5SJ>GuQJhSh8j(&jvm3>Qn~R)U&A#rIEL^ enF$+thrMdKj^n!M-cVpbFnGH9xvX9OYi$9 z{J*!m`dqO6akd!m`qMlT{e{7RsGPw5Nma&M=KTlb?DW03D z;HUVEa|~IhZWsMvxfj+`cb_33=voY0#Pp?mjT$CxdS-NBm(JU%j8mqVPG`K9nz^25 z!ICvQc{b>ISEn+lrk+i0D2=?O&8(rBt;f9P^rbjS2hYf2$%NQx-%c@jotkx;;q|61 e;cP@0$#4H$$1!_zn=&vY7(8A5T-G@yGywo2{(_tU diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/tealFull.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/tealFull.png deleted file mode 100644 index fa01dc0683dce19030abb48d16de68e0fc66ac56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=e?46sLn`9lPI2Tq6d-aW>I2KY z|2^{@R)qWraLJgKTNm>xz-p$=_0&)2tt$VkGDsR&Hu@zLG5!*M!*b5=!Op$gCswZQ z*WXZof3EHGRr`~f`<8w;Vm=nyeewGth8N85r#Ukm`?X&^VFLrBM0q_+g2w*uTnu|} z{^eO_*3h&ons5GryImK*^D?NWo=t5ijl8AJtf85$$GqnBr8r3k&&XoQgxG1{PBD0$ znsu7t^`qXWBi-cDtlGR1T{l*+5e)q;Q{I9HZfzICPk_PLddiII4ImlORmtiuv_TQGVnU&+fj^D}*&Oi5tGrTza zF5O@&qsW!JML$^Hh4t*qXVB2h)?;3C`cj;vgJ)#1WJ2t;Z>Jc%PR%;a@OsmhaJGP; zYcXsQ)0gfwYM8X?nbCn=I&Y^kPMKmlo$*>~=6aq5OV;e<*`ViLoywq^dN#G8H1d`< dGhrj|um_6kI8OSyI1(5T44$rjF6*2UngAOdexLvV diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/yellowFull.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullControl/yellowFull.png deleted file mode 100644 index 9cdfe0e79a7f44cb4fc8d91dcf6048e42c9a1f19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=|2$nBLn`9lP7UNbi(1J{(hfn0%N!E3l=f)1@Z^|9=u}t_WeeB+MaLB zH}-#DH?R2m`HhUvFWom1J{H@3@qH`f1$H~#c7`)w>-`TTFftju|HpG6;Gae6syEl0 z80P$Aoo3uH>(dq)yT;|Bi|?B=OqpUjo$*>~=6aq5OV;e<*`ViLoywq^dN#G8H1d`< zvxa829`l;hm*ONHJR^%G6Jn=*JH_C2YSw9n*PFJ4vjqfQi(!kHzI3lq!=z2mj1KJ5 gc{`Pnu#xYW)4uCCnl0B+0EPsEr>mdKI;Vst0D|g-*Z=?k diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/blue.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/blue.png deleted file mode 100644 index befe9c5d2c60c1fbe89762855010619f73ef1ae9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pdr^5Ln`9lPT9!Y93XNeVGGYh zOC#@RCj@%LTuz0EoG_|d=InIm;pg<&w)oc{-p4adU_8uO!qUcl!GDAD1wjeF2Ui3u z_SoHTzWlB3-@O0(_ZuH(xKp`Td)IuU2VDxUt(g*H+g?p&6v@o?V~d!+uqu_o_13J( zjMq|E#7R0#-1aP`p;U5JI9tGywU&}JQTmwo2IJ8H0Y_nl#_2%+GI+ZBxvXfx8C9Pr9ZywGoEO8$YRBGnDvGF4Z#;2Jn99nIQGoD z{r$n0e>QdJ|KGnqGm+ulo_nHq{Ur-rCw!G<+@R?M z!?hHqYiAf{HmFSua$n>)?c!`9#djZmMjm@|-RS4{euk6-Pgty&CUal#-=KU!aK@Yi zF9j=dk3ZkrzcDY_=KJyYKkL80J7vgF9{X<9z2$5%qA9ih3~NpY>@{jo$~}9M;k8l7 zdY%Oy(ZxmwcJW-*X4bfLZ4S={J?F2d7`nEYsx#9U^#izYx$KmJaZ?(l||M;HIc%tDUixtyh))(qG1YdCQs29BCcys*q zkHV_;=YRhB|97$^+k=y@?_T^niLsm|^1dL$Yon0$JPSOci;WKK;<>8Lta0hu9G(q& z&RbP0l+XkK0(*Bi diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/lightpurple.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/lightpurple.png deleted file mode 100644 index f5af1eb7bc54eb8b90123f2faba24ac84ed3e65f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?JBQLn`9lPT9!Y93XP!hjOY` z+Nlu9PK_xmH72Bf@o8__arpW9TW#^#KfdQPo@jW;V#Rcr^@aKk!517n>IE-3YQ8=G zQCPM2`p-ZA|4x=@{jo$~}9MCQ2pq4~RdQAmF&fUVJIguMD29elF{r5}E)N)pke# diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/lime.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/lime.png deleted file mode 100644 index 0ba4530d379b78549059bb97382ab2c16ba51b9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cRXDjLn`9lPBG+bF%UR1ssG;N z9~v)8?uLq-Fp9c-(V+SG$+*MwZU6iaXD~{zXzV*sz_^RWnn||tAxoZYySXvXf!Wuq7yZ^{p2xANPMP6a>WVl?hl$&sr8JaEt_o)hShChqG9k9@)l^22 u%xpili0KQfQW;!t&6>Q8n{m%;&EiH3%LsPCxfS}pUXO@geCyEGm22-XV1p1i4)78&qol`;+ E0I-d94FCWD diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/orange.png deleted file mode 100644 index f77be882d404e008e10ef8046f2891f0a8a4449c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cRXDjLn`9lPBG+bF%UR1Y5Tq1 z71}RK?uLq-Fp9c-(V+SG$+*MwZU6iaXD~{zXzV*sz_^RWnn||tAxoZY}(4imRMOKB*TTouk1uw<>JWI}A)tEr44 unc0495z`k|r82nQnl+h`7D|opHE^F+;&JRf+GYdvCxfS}pUXO@geCyBk8dyl diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/pink.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/pink.png deleted file mode 100644 index 449f77b1e20fbde62c81fb8fcae93282a021fcb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?JBQLn`9lPT9!Y93XP!2X~4~ z+v$$T28}5zH72Bf@o8__arpW9TW#^#KfdQPo@jW;V#Rcr^@aKk!517n>IE-3YQ8=G zQCPM2`p-ZA|4x=@{jo$~}9MCQ2pq4~Rd$AmFIlu%Z^|R|Zd4KbLh*2~7Z(+jm0% diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/purp.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/purp.png deleted file mode 100644 index c5f9274067ff92bb7cc7b8ffce31c858d5c3cf1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=KRjI=Ln`9lPT9!Y>>$9>&lS@i zy`X+4>vc!gh#QA?eBvv*B)2@`#<+g0K?m__io3XpU+tO?=Iht=Le@TPVW~xaI&qM?{?l*^98ae ttuz>}#r@nSH6i_!*OdWaKIZ+w!2MOuaija(_rNe<@O1TaS?83{1OO)Wjn4o8 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/purple.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/purple.png deleted file mode 100644 index bcabc1c4f4ec89ec4a25a0e8ef579675b950f9a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?JBQLn`9lPT9!Y93XP!hjc1) z+IhB{9U4kIW8f-g9D)C*p6)O>sV zqp)i4^`C$K|D7z!_Tc2}yBGgXVk~Egyf4V`+9+f_&jOF=Vxt4Qc&=(QYh1cEhi8MH y^Vd@hU0Y1mnb({S*lX0Flza9hO_WOJ9}vI2LBP>QJNr4%uMD29elF{r5}E*1;daCT diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/red.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/red.png deleted file mode 100644 index 8efdda45c5580a792bf2f4f5da4c48fb983d2c97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cRgJkLn`9lPT9!Y;vjHj$Fvvw z*`k;}K6Ga}VH7o4Q8DeqkBHkJvU&gi(`Aq}nB(A{u!G?*i#3yM<3koX*~a4g=VxEG z>bw8>|M&Pbi3a`k-`&2uv+WT~sdZ;qb2?zJQG-(M*^>;fjY8J*EbxdfHaf72=c+cd v#-(d>csA%ce?7&}wZ&AOnHEaZ_b`ed3lMPhRG3)?^eBU;tDnm{r-UW|OLA|d diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/teal.png deleted file mode 100644 index d016b7b8485e855e27bbb56e28cc45bba7c5c4c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`9lPT9!S;vjM)X2<{k zkC^$-oy+3poG5PXILB~usqEqPrhk6-Go&0SV3KWo$n-_{4Mzz}oA3>5ru(1&6#rWD z`seSz-HL1vjy|>xsy*M}zG#jGi4$zwnp00i_>zopr09p5OApigX diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/turqoise.png deleted file mode 100644 index e6db5f4b774658808c3bf416d24fc480a90a4025..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k33x*Ln`9lPT9!Y93XPU;iiUh z%9}G2dIJPBg98;#znIC#S=fGleyL>L+Qa+nIUU$|)Gr81=sDOQ>~nBWuxJc+f3S1! ze)i?(AAha>_y6BH9_E7QU)Q~;JJq1wwB|iWL#gDdaJGOYYb_-cV%uI#WfaNG_G62f zzOX8l!S&Xx$&A-hSHwv=Ox*S?g(gaS%oEtJ2M9O@%k+N(`j)}d)z4*}Q$iB}r@?S# diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/turquiose.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/turquiose.png deleted file mode 100644 index d5f5ff87013b6cd12bbe1914791ffcb82e719fb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`9lPBG+bb`UtS!~eP9 zPm_sG?xn1odajjtbV%CRT{HX>b$I`O4hJ?K^$UU$dJgsn`yAX8EE@MJ7u21%U;cIH zy#4q0OC&MG+1yjU`kkjj<M`Nqf!};-nZu*PHXm5Mw#sNAU0Yky;Q+mci<3@qxGy+7lGbn@O1TaS?83{1OVG(ZS4R6 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/white.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/white.png deleted file mode 100644 index a8e54c8180e97518b8b60b44f0810dbea3f14594..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>(`OLn`9lPBG+bb`UsnZ+u+vcn PdYi%1)z4*}Q$iB};}Lba diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullEyes/yellow.png deleted file mode 100644 index f0ad1697f496b4e27fa65dd447c0721e1dbe5047..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cRgJkLn`9lPT9!Y;vjJ3-L9Yi zRxgyk@OpDU$Ar`^YRZXh{qMg?{d@E9|9++kjE6Z(SlYNRsNN8K!NH?m@S0=JajX4v zzCABb|FeJp%tVHJd+rI}&6oV(GU2N<;|4wFucsKgwwS6juQ?sC*Qh}$_v}fA*G3`h wc@}s?7aJYe#dB4gS>w{RIXpB``jIW>QWKA(^0Ma^K#wwby85}Sb4q9e0LadDHUIzs diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/blue.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/blue.png deleted file mode 100644 index 33ee4f2a2eb3ab97b1e319793390235bdbc52bd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=FFjoxLn`9lPT9!Y93XNeVGGYh zOC#@RCj@%LTuz1TcbK*`-Ad(%tX=)L+#g%{|NqlvkTjU%;GVF9;V+9dlWZd^Q~&kn z)wX4O=G!O#doLchur}o-M-Tggx$oPOyxHzdSX}GMu;sGDQ6mPXwY?`9-kJn#vqmO>VU!bQMJYD@<);T3K0RWfG BX#xNM diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/darkblue.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/darkblue.png deleted file mode 100644 index dc3568d1dd42abb60b3cdd94d9e2ad361f8aef8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=&pllnLn`9lPBG+a4iI6PdPl?c zUHtMBy(&qkLiSHce9${r;hmNB{aWd|w}HYC}#;%H}?hi4Z<&2{5WjB ze}7(j=Faz-#|wW;etthw^vO$39sUEm-dw%6oGpfT(?5NNYfo3)lXRH4zopr E07`;;6aWAK diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/green.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/green.png deleted file mode 100644 index 27e8f946d4bff5f46ffe077884a995d347f4d1c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=&pcfmLn`9lPC3Zi>>zMtM^I4A zszp1dI8CvsyvrOp?b@FS0>%|JYm$F#ZL9w;*uW#>zMt$E2Xp ztVOG)xJ%|JYm$F#ZL9w;*uW#;z&_fMHYa)V`~UqUhCFOD*%xd)mKRK|Zd zw0kV`zVOWT^E2wtuThw;zQLB^^(OyneclSGl)v!|YfcC5HEvMKJbRMiby3KBo&_FJ z#YP8q$y~K&)|hl{4$lTX_pj#|x|W!#Gt*A#eg|d=$9K>EM*;oJ;OXk;vd$@?2>{GW Bcwqnl diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/orange.png deleted file mode 100644 index c51e5f1c536f40e7a0578f0ba94d194ab9bbef74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k33x*Ln`9lPBG*<>>zOD-Mv}m zKi8Tm#;(%t5m%-^6$^q zGylJ5Uw^@_sD$Y;W5)C9g*PTL>OaYd7i4&A60nh{!67@@$ibR7M2A`7!mSxR7yOt- uPcv|AF;ipSa@pai5d+iO-jg&`%6|PCkK>zMt2U}25 z*Wx244pVF@?=nYDyY^>-fN@35n&cl_+v@)dHt#cIMdx8za+Zuk6+eQx>W!`EtEtt!uHH}dqBiDy5V|im&Dg#TD^kl|c ynG2F685*x0OKB*RS`oqKuwbj9B<+-bWBqbKz;P$@|C>M`GkCiCxvX`nAOxTaQf&u=pXc3Ak4rLmwdbb zhLzlM!~gpa#>bd7`6W~_Jg<45D}R1Hqy2sT-MZBVDGm%q3xpHcOAm|Gv)|buQ~88J z!0VY0+l=d~ca0hXjM9w`?9qEUjj?5t7X&wSTZ4QddX=9r;~F|GJM{(B$|x~Bl)d0RU8YG^=yD1XYh3O Kb6Mw<&;$VVP;ICH diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/purple.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/purple.png deleted file mode 100644 index 4077801a96d95095426467e581b019f6eedefcc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=&pcfmLn`9lPC3Zi>>zMtN8csK ztmVxmE>mnO?=nYDyY^>-fN@35n&cl_+v@)dHt#cIMdx8za+Zuk6+eQx>W!`EtEtt!uHH}dqBiDy5V|im&Dg#TD^kl|c ynG2F685*x0OKB*RS`oqKuwbj9B<+-bV|}wgz|p+)&1RsF89ZJ6T-G@yGywq6Zfqm~ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/red.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/red.png deleted file mode 100644 index 8daa16179c2c120940bbd46a5d6394346ec9fc42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k3C%+Ln`9lPC3Zg>L7CD&a^lC z*`kB~9IwCC+;X7X+;NWKrMas?q^6jP{1VH_>k#~@EeX27Bh}J&nx%$uYLVX z@^k(Ek6dq+qump17~a;%i`+JP&@A&-n`yyZHmzxl0vWkJY#GZNyHXigqNFD?-pX8% vB+1Zt?N~}fnbe91HirdU4JB!(^c%x<2LZ=omW7vq-evG~^>bP0l+XkK0L^Nb diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/teal.png deleted file mode 100644 index db175932e0e3494196870ea88872e0a2d6888514..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?JBQLn`9lPBG+abr3lc^WmSm zn8=^I>$go1sMsicMAA6&y5XOw!~6epII!`kUl5egbFe?y=ir{uexUUJ`{d`pBtO^h z|IGK&xY|9zhT&yZ{FPhA54u%eS~DrgvaO!VD3O&Jz~<3@Fe{azElO$%CSTyz>C}8}>S;k_;#LY7A`0r}l zZzsKqKiA#bK{0`Rld5=!x*`etEyNe-Xd1F^9151?jWX4;W3z8%m8m}Eo zX(*Fg5y9rLV5_0zg1Ky3(-;LZa(&onr*!TM2LVT)mpapdUS{xg^>bP0l+XkKzA9^< diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/white.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/white.png deleted file mode 100644 index 5801bc81a5e49475142a2ec608ad977d97532967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=_dQ)4Ln`9lPBG*<>>zMt&;R-_ ztxJ4LTLqh@S~q{}F||6s`OmDU_y4mfFi#VH!J#9*V19!80_6h72Xl(|^`AX+e#Zab z-QgMXJFS>rGiE%mUU*|FqyCeOctM7@CIK6H8XU5djU23bLv)xGF5H^IbHR^U^fUv< q7Be;GEtegR8Zj`f?LA3DrTkp|0*=aCS6TzT%HZkh=d#Wzp$PyUqi4PV diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/white_cry.png deleted file mode 100644 index 3cc61b8fce95e18eaf020e6a473f3034fe095100..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=&pcfmLn`9lPI2UF4iGu==ezxv z>C?C_g-)9_eO;79*W{DMvWM-nEB-4pNE*y>P&bHah-;ebpw7VYX76|PZP$KDef}@~ z=V-F>3zlQdJHqx$7u43j+4AAw1V+XmcWc@1#5FzkW0-g4bCG)93bX44pNWhQRqX;`pj zBhLjt?(S3umZiO^4P{XgI?M_hxjM{SE+0ygB*I9)75fbwf7s~B0e#Hi>FVdQ&MBb@ E07?#Ux&QzG diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullHigh/yellow.png deleted file mode 100644 index 47dcd1c89815ea651eb60dc918e9174b8898f4b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k3C%+Ln`9lPBG*<>>zODUESpW z`;YD4$oVoTHnAmPs$PPPaIaZ4@BcRs_tFt-W6U}@vNFh4>40;i0?j`gMW^0(*T zKl!KLzM}Qp#KpoA{0`RlxsUeoR4BUt?qbMT-q@AOz!D`rnekTUf+R_X#%sq?8p@tDYdJo^GlQqApUXO@ GgeCw0d~~D$ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/darkblue.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/darkblue.png deleted file mode 100644 index c080f9954f1af5b455c1537d359da32b47500573..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pd!~6Ln`9lPBG+a4iI6PdPl?c zUHtMBy(&qkLiSHce9${r;hmNB{aWd|w}gTe~DWM4f D+O2kp diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/ender_eyes.png deleted file mode 100644 index 9e99dff6da0cb87c5a08e618d285f8fa3adabe1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#`WcLn`9lPT9!Y?7(njo|>?M z!?hHqYiAf{HmFSua{t8^IqlvQg~Imp=gq|SZ#%lbo<)IKO#OmjL`*|nlWb$(fk!M> zOva3H$G=w2PkwV;;{4~2%-`PMdt-a;c`)-d_Jr7X>*9i$-*Ii)r_OLKbw!+{!^CaR zQW{DnSB0|$ELm$QnGoCdYAT~hX0{(&#Po$#sSK{SW=&?Kh0@Qg;*TX9HA+I%fF5V? MboFyt=akR{05LgpbN~PV diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/gone.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/gone.png deleted file mode 100644 index 7dbfd0e8596751dcedee64f0fd34fd3da63e0449..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?SHRLn`9lPC3Zg>L7CDPTQOP ze9}RGj@RF6ZaL6x?l{MAa;fa$^`?J*_cNp%C}5Ipe8}`g_zg!1OPlZujyD_y^Pm5< z+rI8K`SKtQzOX8l!S&Xx$&A-hSHwv=Ox*S? zrJ+=ERXAI~lC_qS39)UjrZS3TX8WFVdQ&MBb@020}A A7XSbN diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/green.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/green.png deleted file mode 100644 index 201c00167583ccf0618b074d7ae53dfbc88685da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pdr^5Ln`9lPC3Zi>>zMtM^I4A zszp1dI8CvsyvrOp?b@FS0>%|JYm$F#ZL9w;*uW#1Mdw(ZqaMv=^HKQ>w@Jtw|%fq>(>zjl>C|1x;G`njxgN@xNA D)#`H- diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/lightpurple.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/lightpurple.png deleted file mode 100644 index 381a5fe7da26739c4a5df1c134f2c5b7592fc887..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pdr^5Ln`9lPC3Zi>>zMt$E2Xp ztVOG)xJ%|JYm$F#ZL9w;*uW#BO%-hKT74t5O+UZ_S#_crA5BoTS6V zZO>8~N+nl?vjr?!Yblu!+xBWIqey199~&){o)bU6K)~^rmqbLKU z=Wne)@bA6=3Ep#}${Q>j`wns8YRkAm&-v>qhORB9>db3S z2kbR!P|7`flHs*c$a*e*Ha8#TTIoN*PIU6Yt*2Wd-fzvlvXnA%j0p3St+Oo^els?tDnm{r-UW|S|@dw diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/pink.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/pink.png deleted file mode 100644 index c3cda022e3b99c7b7ded7efcae5387e8b7e59a60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pdr^5Ln`9lPC3Zi>>zMt2U}25 z*Wx244pVF@?=nYDyY^>-fN@35n&cl_+v@)dHtFN3G6pUXO@geCyq C=yDVQ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/purp.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/purp.png deleted file mode 100644 index 4e2d7327d6e57c1d4efde5718a253f7127239e8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK_5>S$B>G+x0erc9x&iw4S4ylxU}`mM9wHC zxt4&cZMFO^|08)B7#h^m&t!)l(=9Jcd45$xdVO*6{{0O4K>ctKFI>nRcU&M>cuj3S ONYK;O&t;ucLK6TU-!sDi diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/purple.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/purple.png deleted file mode 100644 index 648c5d9ed480fd976644b9d6789d3b9c359d1d92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pdr^5Ln`9lPC3Zi>>zMtN8csK ztmVxmE>mnO?=nYDyY^>-fN@35n&cl_+v@)dHtL7CD&a^lC z*`kB~9IwCC+;X7X+;NWKrMas?q^6jP{1VH_>k#~@EeX2mNwxR9B()Z=0E>y zw|(7f_Ba3Qp37cK-^L@se_+==@x9x4ekh&z)yEJqePLB9gX^tXlNqn2u85O#n7Hj( zN<*pSs&KY|C2K7u6Jpz5O=T3x%=TlWh0=4(TN4BvQ|G<<3G^(3r>mdKI;Vst0AT8L AV*mgE diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/redorange.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/redorange.png deleted file mode 100644 index 9c2a94dedbdb6ce1a94a56bf41153d195e5a44fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?JBQLn`9lPBG+bF%UR%V)lF4 zJ(e%l?a^Z0q_g(r1Oej;nQNwhq7Lu>&*i|zqkch9LeIheV4s6~f<``&ZfO7j diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/teal.png deleted file mode 100644 index bf2627e906bd9c34d6a38b4c988de1e438f575f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=_dH!3Ln`9lPBG+abr3lc^WmSm zn8=^I>$go1sMsicMAA6&y5XOw!~6epII!`kUl5egbFe?y=ir`T(b#uj8pHM4{paVt zW`Fa)?zQT<_HR5A{0A)WsjvOU^F!s-&q)jxCSTyz>C}8}>S;k_;beOY*C5)v) z?*03(cbEtD2B9ZL{!+!e>s3-mFAr>mdKI;Vst E0LjF0U;qFB diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/turquiose.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/turquiose.png deleted file mode 100644 index 268915010d6cfeaf8055b1ff0522f70080c1f255..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=_dQ)4Ln`9lPT9!UY#?&vM1A>_ z{mr*F2D7C^R;4*R-Fa9Xas5L!@Be?=43Y+O9NZIjF#Kh)W|D1u$YRB$&a|fX{rlqT z+PVY(-uvH6tbKN(;UmME*LyF%KG9&_wB|iWL#gDdaJGOYYb_-cV%uI#WfaNG_G62f wzOX8l!S&Xx$&A-hSHwv=Ox*S?g(gaEb~Xq&zW%gp640v*p00i_>zopr02r5YwEzGB diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/white.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/white.png deleted file mode 100644 index 167736f8b8c09641c4f79654b988c596df89349c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cRgJkLn`9lPBG*<>>zMt&;R-_ ztxJ4LTLqh@S~q{}F||6s`OmDU_y4mfFi#VH!J#9*V19!80_6>J9NZtcH58xwX=iS1 zpYZ>?`TGra#i<9X7_NQ2_o6iQfVAVaa+U+Tc&=(QYh1cEhi8MH^Vd@hU0Y1mnb({S v*lX0Flza9h!)v3E^*jqaqKl1aqSWri0s%*H{US}EM;Sa_{an^LB{Ts5h52%s diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/white_cry.png deleted file mode 100644 index 6b21867647f86b9cdf9189141900512e25f90f1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK_^ca$B>G+x0emM7!-Jz4?Oz+e+`E$i(vZe zyFo_kybKHtljj-b{Y=%>H_v_?dTai^_y%#HHW+BgQesn87k?izN%R^>%+uA+Wt~$( F69Ac9F984m diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/FullLow/yellow.png deleted file mode 100644 index 202497e22dc89569030b5d3b4f9f81df32f750ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k33x*Ln`9lPI2UFaS%9?R=4?o zeeeFjX?x#h@(D4?<~K#8YCVoSyx#WD?{EgA1dGPL0|kt~ILlb9m=1H6u=ug;SYKK{ z|MvX*{-6KSKtQzOX8l!S&Xx$&A-hSHwv=Ox*S? zrJ+=ERXAI~lC_qS39)UjrZS3TX8WLPqDsPL*^)~__2UJc#DNwlq^e3nkPzqE|Kq*kU0rVD73Md5%Cvb50v0Yt% zwkp;SN6q)`vCGx2&JkGw0LDcKZx?4SO|H%n0h~U+wgA|w22f=ROm$`PDIfq73CIBx z0TzF|98k&>V!@NH@^<~Uv0WO&J79VKwB5X1cH>ONAqH`2JncUQM0fxYh}GWv)mJAJ zB9}L-ZryL=5Wcxz{{r)u3&I27W(NS$1^{f>2Qbd-0AStG2cZ}M7(7LuJRY_?zZ3xD z1VAWhdK3$QyFCDacs2_GaRA`X5dDTWN8ufi`z<8^xd}&qz8nyJhH{Tj4#-V7`t#+0 z=rfdid~!f;!qJ~E2SlHt+~bo2aubgJd^sTc3{9>759tf<0G7Y`^~ZYvVm1IMWatyu zkYF1R?|?J~#(d+O9RRN&Z~yQP@Cx$w7XUA@x%HO=<~E~VJs}+6sr^&nn9}zc7$E>~ zptjy`McT5sJv%T)aL9!agrMljRi3Ty+qea>k8s}e?+)Os+mbiy`y43ayv{QC)V)Cn z04#a;mAe5TjRQamYc>G-4m?0S&jc`@*8cZ78*J0%2XJQkL4?gQmH+?%07*qoM6N<$ Ef(u9RZt~5JgQFX>){>Ib6yV9D^cd4wo`V$V%ym#%8cFWWnoL`NrQJJAnAle^?LW&NM!{ z#`PNlpaU8wz!YfQ0DK8D1(*Vj6JQE7ZUFuZFa?+bl@l0W&3JuxA}%k+bZ=>CU404& z01>Yc9={s{@b%yT=x7>1lPQq<3akDdKmeHp=zvUs)n85r)G~##;0afGw~pi3EsgLF z7(dO}J^9sLC{AJ`ZV?a8KLP?CfC!Y;-sQs!wZaF#?q9`adE76-{N@6909xz_fW;X6 zk<xdy(K!dLg<-EP( z2;Kpu|D_0^G-34n(*fu+RQmbofYOA~?@tGy&rs>-qXSA4M!!EDfIdT|pN|eGO&I2Cv^kFX#l8@y-!?wg5x;61Hu$I@{R9w08#~|o)7PUR6(id z6F@4lvz<=|oNY!^^*}fvrT4D_kF>szz<>ZSi;DXFD=<-8Jl;ESL@?w+NQ6k!Q&)L* z`)knOU&SL3_XyW({@nq(%Oh@i3xIIUas7R2gXh);5CF90z1i-TjnGp|+{Sx%{8z;h t41lc-58?pb6QFV33}It;Y>$uA!wYn!Qwmq-X-Hi{?C6} zJLAd~-m1d&I|85s3Mar6DBJ-25o8K51qvs?6e!#P{1;#fFa5A}awP<5CE_>cynV)EN=LrhV`Lv=t4Y$P}3C%Is5s0A>=P17-ru{&6}W zmnoD5Pq@lEcOA#hX~cIxy=vXlcR$VpaT1dj#9h#T3J81v&N*4_?Vg)oq4la=Z*Tf_ ze;oJ1oBbh}6E=Vcpqm{JAZP+Wo9qKLuJ=8F*c}59vH>7tSCN~?t>5{D05q-udMIIf zx^}iGWq$Z61emVeshEk7@4oFQH{rz+R`V6HW zA03dIF#7xH0Q4D3Jw7@hHDUDk(*fu+G`IdgrVri$TK?9rKh^^fivgfQ#y)Y436A6N z4hU0V$~V5n0k8_P_J?CPPfpCDO_OAk`l)k6HfB?`BG^+O> ziHyqP;aPwwVu$)*0H{~36g_p7cU0ex;vzgeA8@I7dG7xKbh93py!-lor%vN~zdr|H zJRFU;6z*nM1~ydgmit-~_eWuyy}$me%@KqHP91pgYya*{fC>(4|CgK%jvep=myhm2 T`jK=M00000NkvXXu0mjfmgN7W diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/pink.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HandOverlay/pink.png deleted file mode 100644 index a692e3fe64ee6184cf6cca93f6fc43ca6070b3d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 574 zcmV-E0>S->P)-G*$ zdljpfhi3owJj&HkojtMw0E~+e+UuPtO;Mda0_d(jdH`%y1E?|uQe9bm3J5?V0XZNM zVDY!h0i{eK7Chl9Z{24bTc^>z1D-DLyW^X)VVt2j#2_w=hyCY(a1Q_ivD$lneH?^B zOr3_>vgFnEeQIymWfejxzH z34l<-^e7epcY6Q;@oW|X;sC&%A^J^ij@&yS_rH_?`Er2w8Ol9AIUqM-@6VS5 zyw6bX@yP+X344FO9N>M1a*t0A$W7S$^W^~VGn88YpVH^v0W5#>?N96hh{XV)kf~Q( zQ-W>Wy#vA&nDdTraR6ck#rAjafLKAX{RJSF*wXsT0ZW_FSUoNr5L5f7z&WMwIWSxR z;6QD?--@(laeH=Pj$oGyAqYXyldC*i-?woKViV!R$};8VzqpsPZcE;*@AEqt=XI9B zQ}+h{o&ua*2pubT<2p;?hyy?fYcT-E4m?0S&jc_Y*8Vp+8*E+s4atoCL4Dg8c>n+a M07*qoM6N<$g35*Y=G`P)wh^znr<06F9$JV9E)j1-7hm%zYfURl(Ri?mPR~DZF0x*++ z9554L@wdwXrA#3fJn1TL-ESLPr!l+(uJ&$M*Y6koI8$+mL0lS7`%eK89smSlwRit= z*9(Qnqpjn9-EZR%{`~#)3(Q|G2oHdp9RNrh0I*>nz&Ni1fOW?Zgkk_-@DzD=c;4;& zQUHt-0HLJmQ7i!N_5c9l*(?Oa0f0M0^c&k8g?B*ix0C?nCLI0wazOMM$~`_gAUEOY z&zA$D&rt61$pN_uM}NK?5PgPnk53NBO*s1V<$&ljG`IdgrZ2n$SpMeMAMXK(#Q>m? zu}@rMf^9s!1JV?j@{MnC0K9^{{lh!JE6Cel0KCMO)?W@-+KhVjgm8eT_D_LRO5amp zgaE*S+IqhgY0KjF?7$SkAs0drf}$r^dA7c9;}*mw!g}M{P) zH<7$*o61{Tx&B4~HlmbeDnG<-wULVe{R-KBE z*L`#G^5k;0t8+wF0Dy53Li@0DX>xUr2;gwH=>V`*4WP;t$aUrHQ$PSR3CIDN0B3)@ z959zD#DXVXg89t_;Q?^70|03Q05bFC_q_2}ggv91wkmN{>$tC`~x}^W}i(GgNwf zazJUq(Vs5|M4zG33a%{5CAw(Tkp3b zZCTu&9hf3Gf zXBR?;%H6omk~rc3kiuFFfT05q5YICKjHk8#Q_cok*M0#)M)N^2Ja%CK0000;Qs=i0-gey6PV|DYuk2Lu`El~b)Cx9s?HW!0RYBD2z6bn zG^sjU1h8$}4uGv_07a%itShrm0S6FCz#R|?F#Frx0l7>e7Chl9@7-q^d#BO71IBUO zhG96y8Hz&;;=*{?{|*TA03Z;ny=j^bp%B?L&9Uy6aR^`6^$(c;TwopmH#-0jHUMD5 zK7esv2LS1gGYHuLz~Cve@B4k{7Xo0M00<>ak8A;Ow+8?a&n6)t4glO4qTki#$h-qm z|4TW5)P$`+-yL9mhEk8u9gv!^_2;_-tj|#D@wo$16Sn?*cYyU7N}mbo0Z*GztsWB&(A54Z@J{Lb4h$0jI8a&dmm+0ZT%H}cBiQ6Z2trWwrlCFfKyaw0oB(SLcWTx_&zVV5=HHl_{{)mBpuk04yXR2P_0w z{Oxi;DN~3APrAxG_S?peX$YfQLmm54)E0eDR55ddk%~c060)v z@3$gtS=^o-m?JpkLI^@o^yDhf*7t4Pf;dGu@A-EJaMo?foArGTlyP2X8GPy9AOrxG zyvNGj0FcH3AceIW0AmLpAf9Ie7*A{er<@J8>GBO$eeOXe(kKJ~0000YGs?_hQb{g3Xn0ZhuIZzgN%gz{aC~fs;pkL4N{>RxfzXGOz#j-=|-! z`tSe#zdt;!g8RTJ)|dO)8#r!$=Gma{^Vf*}tdDFp46{FQIPPm`oCNeBgQu&X%Q~lo FCIEOKbF%;d diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/ender_eyes.png deleted file mode 100644 index b687767bcca139e292988ad456720374d7497369..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?SHRLn`9lPT9zNC_v;$os?Pv z!?iOkk&_u`G_a{;E!ojKKiDn&Nlo3&Yai03@71#^Ft-W6U}@vN;J*Px3tQMWKL7V` zPv6#ezoYsee>?rZx;(URIm5cBp1N`d4b5yl<~64;#YsANMixsZ#7_HmioxsDtkVpy zH*E=L3kbRv!xk}p>0YCTNt>P-9oVJwb}HkPDW=mIucc>zODN07$3 z(47`ujRzMBPh2ECGo5o!lx(*2zcmm4Zf8h2P{1_zKmp?~jxrF<)bID8_}%lfFL(Fd z|NVde{WBi~8_dO*{Fh@;N;z+QV4uO))AVN@mo8wO`+>vpvKBYUuMD29elF{r5}E)i CuysTL diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/lightpurple.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/lightpurple.png deleted file mode 100644 index 04c750e908c5bcdde63d7071804d042dc8ab4d9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=mpxq^Ln`9lPT45f>>zOD$D|df zOm}K|H62_iJaLim%yiB@QL@?6|JFSGyPYBBKmpU-0|kt~ILbgYQ@`JXA9J3c&HTUa z{_p?$@1OY~*kCTc;T^V(kFD0% z+7+Lv{`U6k>HpQ=L;AKe%!}%&D`(Kq%+_OGbNW)8q=RQ6y`iT{>^4GESLdI-T)aYUX;L1xwcKzopr09bBvd;kCd diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/orange.png deleted file mode 100644 index d25aeb8e7e8689cf657d867d44d27e89c7fa4766..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC==RI8>zODUv_Ei zI??|29+&xxge5m~uD-hQ`iFG>_xqV9FdpVCVLHtELj4Aa=9HOx;A`yl`IrCQ`QP*W z_iRZy#)@LcU*8x66szYkersJB&qjBa-Mt3+xms+FOD#VY0lmiH>FVdQ&MBb@0Kv^< AN&o-= diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/pink.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/pink.png deleted file mode 100644 index 61f6bef2e628c1e980c1b4d2d06690599cff8758..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=mpxq^Ln`9lPT45f>>zOD2b;#l zqdQ%s8V)WLp14SOW;*AdDA{c3e`_B8-OiA5pnz%afda-~9AzMyso(Fxk2%lJX8vDy z|M&m>_s@I~Y%mvJ@?VZYDdoKJfqe#FPt%`uT)Kd9)dUX5&^P>2K<_bly85}Sb4q9e E05=YGEC2ui diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/purp.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/purp.png deleted file mode 100644 index 3711238342d6e660694633e980b08e73e052ed83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=uRUEHLn`9lPCdxmZ-QVRIPc$6mEMXB7U(lc6zCd|{1!D=z zyJY*gIeCwZp6#EXp4P!IhgJT!;ktYV`R~Tt()W_)0$cK%exIa7^i zGMFVdQ I&MBb@0Le6WtN;K2 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/purple.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/purple.png deleted file mode 100644 index 950afe04b429beda8ad3345a0a2046e515633c17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=mpxq^Ln`9lPT45f>>zODN8gJB zTX!>CH62_iJaLim%yiB@QL@?6|JFSGyPYBBKmpU-0|kt~ILbgYQ@`JXA9J3c&HTUa z{_p?$@1OY~*kCTcFVdQ&MBb@ E03%#?7XSbN diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/red.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/red.png deleted file mode 100644 index 63707273b920a7dc962051ad6e79e043b4a77939..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=7d%}YLn`9lPT45f;vjH%$Fvvw z*`k^nC%7!haQ&9tw0%u#?&0~Sd;W_x@JRSA5SGw$kUt2b{T^KAob$Wx-kfWNHt+Y> z|DX9#ouOXO0{0xGdo=Yag&-j%}f7WB(9SrlO*c`X_fAa$RjKR~@&t;ucLK6T6plav< diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/turqoise.png deleted file mode 100644 index 7b98dba52d8cdae3d5bea0a5fd24df5eeb085a85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=S3O-ELn`9lPT9zNC_v_0}&olf!bVZ+;?kxHI1MEuzI2?_3pVk9{IHV!8kT diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/white_cry.png deleted file mode 100644 index 08aa5195a365619167f9fa23d22d88d93e292e8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k33x*Ln`9lPBG*<>>zNY=70Sc zR%sr!skbg`P2~-)FuAoR`$sbCno*pl?6n%TiKvRE=9cG|a73|^;Z zoo0BwX-ha;K+v@qwutFV_Zl@!+Vsrmz%HG)QyHgBF`dqMEj4pJ&w?ducJge{^R7;1 zP)$9X+E5yKOPg6kGh2^&&FM>Vl0+DJO!@<}#dQToiH@1cK;JTWy85}Sb4q9e041?; Al>h($ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/HighEyes/yellow.png deleted file mode 100644 index d3c4d7e5c4844c6d81774de0b4f2deb90cdaca99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=7d%}YLn`9lPT45f>>zOD-|oWy zS9eI;$QcRMcKM~8QCkysJnry(+dcoe9N2i&FL3gRFPNVIqSXsZn68({*8BY~{%<_* zeSTU6%Y(D5FK;tDw7jWgyCJ@;PLl4dpB2n?3vRJFE=*Jq1^SJ_)78&qol`;+08Q6u AfdBvi diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/BlueIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/BlueIgnite.png deleted file mode 100644 index e74b389853fd69965d8b336f16bed4a38b8742e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmV<90UZ8`P)M^>vwzDp`$zRLl^S==Q6)-sgw!q{9 z;3CKtU<*u6K-2<{=jU5EyNpU?jt_ie0JF;#4kH(@2B75^_D+!1uq&YexV6CG!ieDFC4@6S|qW}=~ z+K!$z%mJVTP{PPAeR$gQlN3Y?ef2k41A3Ct^t=R!#HZxBy9R7~7*!bAB?@o_&{Hvs zF-M@J71ibyLIG$EGG7E+5=PsIb{iV;HwVzFzz6`X4AD8De4l9xXcNAYf0%913n~G4 zk&hCW3W!n(uRN##FY;01QUOsa;gts!;6*-4Tq+<+CA{*W0=&paiAx1Usf1S^RDc)x zC~>KPD3$QaBaH&m{VZPJ^=WkR6zPgu#g>*@Z|vX{Qux+Ta>ho)W@U+q`@Qj Z{QyRw$WR4X)GEWfYP5_9|)$LTk z)hmqVXQF^|Qe01sYXYs$j%-{1qp@g$$lg5KN&=z@X^zeaSnKGG;@1V(1JP8#C;&vg zwxeeaa{wp-lrXYOAD;I7Bn8nzU;RzifSzPDJud+w@hN%kt^wN~MioYOi2_^!^i<4Z z%n>MQMYVZ_Pykwk%oo9ygwZyl-G)Z|%>lG3Fakg;Lv#)(-)Gta+JvvhcI^`WXE)u8cvb~6R^ zCbW(lQIICK34k*ckQ#ud0uo;<`Ip!s6_9=rEM!L{d^rF;|35g|7A0*X^)YDyY48Ys YKWz}mP?5mf4FCWD07*qoM6N<$f*_dD4FCWD diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/PinkIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/PinkIgnite.png deleted file mode 100644 index 2973359e68a63c32ac64c3e305c2e1202e344f50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmV<90UZ8`P)wzDp`$zRLl^S==Q6)-sgw!q{9 z;3CKtU<*u6K-2=C=lfeY-CvKtfBil)LjuTLy)$yB0?weA`8z}k$UH%mI{_dNpU?jt_ie0JF;#4kH(@2B75^_D+!1uq&YexV6CG!ieDFC4@6S|qW}=~ z+K!$z%mJVTP{PPAeR$gQlN3Y?ef2k41A3Ct^t=R!#HZxBy9R7~7*!bAB?@o_&{Hvs zF-M@J71ibyLIG$EGG7E+5=PsIb{iV;HwVzFzz6`X4AD8De4l9xXcNAYf0%913n~G4 zk&hCW3W!n(uRN##FY;01QUOsa;gts!;6*-4Tq+<+CA{*W0=&paiAx1Usf1S^RDc)x zC~>KPD3$QaBaH&m{VZPJ^=WkR6zPgu#g>*@Z|vX{Qux+Ta>ho)W@U+q`@Qj Z{QzxW$WVyGx2gaD002ovPDHLkV1gWk%t8PF diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/PurpleIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/PurpleIgnite.png deleted file mode 100644 index b4d99e8d3a7524fa5a5a0abceb84bc8d25a0a965..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmV<90UZ8`P)wzDp`$zRLl^S==Q6)-sgw!q{9 z;3CKtU<*u6K-2=S$LCu(J>U1gfBil)LjuTLy)$yB0?weA`8z}k$UH%mI{_dNpU?jt_ie0JF;#4kH(@2B75^_D+!1uq&YexV6CG!ieDFC4@6S|qW}=~ z+K!$z%mJVTP{PPAeR$gQlN3Y?ef2k41A3Ct^t=R!#HZxBy9R7~7*!bAB?@o_&{Hvs zF-M@J71ibyLIG$EGG7E+5=PsIb{iV;HwVzFzz6`X4AD8De4l9xXcNAYf0%913n~G4 zk&hCW3W!n(uRN##FY;01QUOsa;gts!;6*-4Tq+<+CA{*W0=&paiAx1Usf1S^RDc)x zC~>KPD3$QaBaH&m{VZPJ^=WkR6zPgu#g>*@Z|vX{Qux+Ta>ho)W@U+q`@Qj Z{Q&%s$WWpQL}>s3002ovPDHLkV1iOA%?JPh diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/RedIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/RedIgnite.png deleted file mode 100644 index d39d0bc83edc3b546fda44592404cbcd473b1745..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmV<90UZ8`P)wzDp`$zRLl^S==Q6)-sgw!q{9 z;3CKtU<*u6K-2=C=i^&A-Cys&fBil)LjuTLy)$yB0?weA`8z}k$UH%mI{_dNpU?jt_ie0JF;#4kH(@2B75^_D+!1uq&YexV6CG!ieDFC4@6S|qW}=~ z+K!$z%mJVTP{PPAeR$gQlN3Y?ef2k41A3Ct^t=R!#HZxBy9R7~7*!bAB?@o_&{Hvs zF-M@J71ibyLIG$EGG7E+5=PsIb{iV;HwVzFzz6`X4AD8De4l9xXcNAYf0%913n~G4 zk&hCW3W!n(uRN##FY;01QUOsa;gts!;6*-4Tq+<+CA{*W0=&paiAx1Usf1S^RDc)x zC~>KPD3$QaBaH&m{VZPJ^=WkR6zPgu#g>*@Z|vX{Qux+Ta>ho)W@U+q`@Qj Z{Q%36$WT?M44(i1002ovPDHLkV1lAI%)$Tw diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/TealIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/TealIgnite.png deleted file mode 100644 index 5b5f02167531650dad0a6500e63e7bd504401f14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 484 zcmV^Lsc}u9_1Tea>wh#BO%U0eM_WliG$GB=83Ah@y;1zS0DB;s3K#`| zsMmJ%tYHoSC4dq}cIm^@o}Z*3TIj34$r{j;jHc%$KqNjT&)qd(+ry~B$SzTUD}bJg zS&TUXC9SA7uMi4AYmoUO*pe{XMzq_|h`%|2Rs}`?Xl01b0p9p8xKu!tN_gc#1$dE<5|;{yQVFj-r~ohWQQ}eoQ7Yk;2NmE&K1y6FAW9{?@}L5| z$VZ7w1w^TYR~~5;knU&k`mS$#*N7%l+qD-X8a0_IKzkFkO*%b*p1VF&HKZCee$Q^E zfZl}GaU%-S#5MtNh5}Lp&{RO;YbE~@JEQ{AFM@^ah=eZ(py&SwN86&LZKOUXEg%gZ a!S4rUugFjV0>v5t0000wzDp`$zRLl^S==Q6)-sgw!q{9 z;3CKtU<*u6K-2<{&+A(_z3NpU?jt_ie0JF;#4kH(@2B75^_D+!1uq&YexV6CG!ieDFC4@6S|qW}=~ z+K!$z%mJVTP{PPAeR$gQlN3Y?ef2k41A3Ct^t=R!#HZxBy9R7~7*!bAB?@o_&{Hvs zF-M@J71ibyLIG$EGG7E+5=PsIb{iV;HwVzFzz6`X4AD8De4l9xXcNAYf0%913n~G4 zk&hCW3W!n(uRN##FY;01QUOsa;gts!;6*-4Tq+<+CA{*W0=&paiAx1Usf1S^RDc)x zC~>KPD3$QaBaH&m{VZPJ^=WkR6zPgu#g>*@Z|vX{Qux+Ta>ho)W@U+q`@Qj Z{Q%go$WZU7Ml1jT002ovPDHLkV1l#2&W->8 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/WhiteIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Ignite/WhiteIgnite.png deleted file mode 100644 index 6e325952bad96deff54b38c58648c32d29945826..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 484 zcmV3q5Um97Z;MM~$KfHCj?F)5bN+_}kOMYXKrOJj0W=A!1=IqY zD`0AY^E}T>rp#)gDdNXpD17@hW@)#xutV|H)E&-52(c^MJ^a>+>E)KYM ziqEd`Nuc&yE0*J1&mw{-UftSSUWf=WTW2I#ZR?HRUl!n(5LE|^3V>8E658h=C=t+j@d5a(x%-yE7<1MNf8%Ovjhy1wR>R}5x3+5|8PsKc* zX$fT|#OC!12cS8~eG;rqVrUs*m!T27y8yKcj0nKm5bXoXIf5O(g@4T|Fq0HBmIPqb ziinj1B36~*BnL2RMa0Sh5v$5@k^>mEB4Xu$h*f1c$pMU75wUVW#Huo!&Ke4ViLmtG+%g*Z^y?1}?#R$X4tp(VdpgigF+2sW2x$8q!TdoBVArv2R z5E?s=yR^Uz2P`cBQvnOs%l`MoY)OE{j5=WXN$?VE#KPeO==uLaYguF+*}}WDz{~`_ a$NB)w&B#!HNl_L60000SX!s&5;{r&6rnHds5=IWi1I~8yS#mwI!Qb6VjqTC4p5xTma z3b=ZO(fmvlP)>^Lsc}u9_1Tea>wh#BO%U0eM_WliG$GB=83Ah@y;1zS0DB;s3K#`| zsMmJ%tYHoSC4dq}cIm^@o}Z*3TIj34$r{j;jHc%$KqNjT&)qd(+ry~B$SzTUD}bJg zS&TUXC9SA7uMi4AYmoUO*pe{XMzq_|h`%|2Rs}`?Xl01b0p9p8xKu!tN_gc#1$dE<5|;{yQVFj-r~ohWQQ}eoQ7Yk;2NmE&K1y6FAW9{?@}L5| z$VZ7w1w^TYR~~5;knU&k`mS$#*N7%l+qD-X8a0_IKzkFkO*%b*p1VF&HKZCee$Q^E zfZl}GaU%-S#5MtNh5}Lp&{RO;YbE~@JEQ{AFM@^ah=eZ(py&SwN86&LZKOUXEg%gZ a!S4r&kH}Cz_KzC?0000&}9E=O1UEd7p25#P7f!xr?^U99_?PcnsFNmz-y4T4brreCD;_UE_uY8Rt$ge6Di& j&ZD3)%h-r^O8+u-C2%;tsM`1h=urkwS3j3^P6@1PLn`9lPBr8^w?J4z&q4nnhz7F{)W>zODpZ7wG z@TZS7SdX>1@J-3^OYtka7A5<}^v})1|NnD2u<@v0;N%fsFg*c8gV_)EuRrkIYMuOw z_jdBh_x7I^ux9*R>zODpZ6lI z>rYl`a2{)M;hU1-m*Q7;ElT!{>7Sd2|NrN5VB=B0z{w-NV0r?G2D2aRUw`1|&UNxD z9`BY!Xnrz}>DPno_5y#di+_MiV;G2egN zJvY5>^V~)*KDq918tYBYi0O-~(ivPY&6>=3?dghpk`5EMJWFXPwOm!s7ND}$QZga7 m@6}vJ5zlNtHrgqzXV|iY$8qU9+c`k5GI+ZBxvX diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/orange.png deleted file mode 100644 index 6ec9e16979bcb6acca5151f0c7d0dcdfe066e12f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F0SuLn`9lPBr9fb`Uu7?%t{0 z71|sZ0|R$#y!KLQ;l&3Z)v9^_zj^q6Khp%p!<;2dhgn~^ZxDXL(gwoZAKu45u)6-W z;nwlrf4=XQOj1vX>whtik;S#xjcvwt>zODpY#G3 z@#jLB498kr_@-p|rTCRyi;{g~`se21|Nprh*m%@0aPo*Rn4SQl!R!b7*B|(~bDjK( z$Ghc|@9jS;V9ofs%H=zcg2pUkqXT>7F4{74bUo|gF<9?ja-N}Sk)<;8nb(4MjT;tZ foIAllJEhVy7jQWKy(B#w=t%}oS3j3^P6G+w-*j_9x&ixc9{70`75ru%EDV% zK5>zODpY+kqpa2#uK;hU1-m*Q7;ElT!{>7Sd2|NrN5VB=B0z{w-NV0r?G2D2aRUw`1|&UNxD z9`BY`jElX)z4*}Q$iB}QNCzT diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/teal.png deleted file mode 100644 index 1da126d7538a136cfeabd0f09bd2378519de408c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=S3F%DLn`9lPBr9e2@pB*=fPip zof=1L?QWBYNAqSUnoVB*TH@cDhyVX`II!`kU*O~sUobrZM1$E6o`*lU^_#JD-Srvo z^9_&sIoQYr*)j|CJet5G(BB?%o`Getg$nbL$BI{t84hajon-h};qjHn!Jy08h;~Z< ZvQ0{3bIjfMy&vd522WQ%mvv4FO#m8$VKV># diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/tuquiose.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/tuquiose.png deleted file mode 100644 index b10566854cb97763cb0fe97c267199bcbf17865a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`9lPTk0RC_v=MKXK{Q zww|**IV~Mdo~{p%Rr$FWTh-K^j5|Ev_Rs(I3@HZ+nC2cRV65US1JPjizu#Ok@1H+s z`&u<8KDn-bwqhC6v#%ZRBpm`w(o-5LZ5LIu35cAPluU^0e=(1d#kJUtZN_!wUFi&t g7w1f5q@7an$q5{eYVQ|a2YQpi)78&qol`;+02H=tEC2ui diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/turqoise.png deleted file mode 100644 index b10566854cb97763cb0fe97c267199bcbf17865a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn`9lPTk0RC_v=MKXK{Q zww|**IV~Mdo~{p%Rr$FWTh-K^j5|Ev_Rs(I3@HZ+nC2cRV65US1JPjizu#Ok@1H+s z`&u<8KDn-bwqhC6v#%ZRBpm`w(o-5LZ5LIu35cAPluU^0e=(1d#kJUtZN_!wUFi&t g7w1f5q@7an$q5{eYVQ|a2YQpi)78&qol`;+02H=tEC2ui diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/white.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/white.png deleted file mode 100644 index b6c3b7ab95f2ebe39a8d1bb4ac3df8bf2994a5fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=mpok@Ln`9lPBr9faS%8>nwe&oOZ>lsoG6fw;`P{dfpSq7rP?0>ba=PaKyni{V+ynjEf zV{SvG?V@Tn0gbP0l+XkK3|(a~ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/LowEyes/white_cry.png deleted file mode 100644 index a8a99bc9eebfdf7042a40090fc5ae37a77dbd5a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK|4G+w-+|@GAQscZ|M48-=@ke^r-P# z+@c;&Mh1ot8>zNY=70Sc zNogL%skbg`g)#-Fm_${_9=6Y}_^-_%X)wn@-5{nxu4yii2D2HyiQTAv&weH9wdu3} z-%kpBlw^t`K68B|lxrZ$vD-qL2)(9G6jUUT|VoTP(iWU*vI r?6hyE7`#r+I?eEU)0S{HB8-%Nv_isB_zRmj(5nodu6{1-oD!MZoao?~6Y=_doYUfikN@7!{*lgK|6jC$N5XG`u!Nq2ebZbAb%QxT9Me$$pXvI} zb?jH{?mgds|Ez#Dq_`vy6=n?2)@@%goXBtcS;7y?e=dhNeZ9%FJh83*I$u hSdek<1Ox4qN>5Q^b7bFZDh2c+gQu&X%Q~loCIA=sY~cU^ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Blue.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Blue.png deleted file mode 100644 index 8004f31c67c260895bc4a0ad07877395defc11cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmV+d0{#7oP)Po1ovuW-QtUv9+kRDc2b%ls@YntD`fmh42OLg- zEpWI2I0V@OY=OfGumv;*c)ouB-an6juxg)aVtHGmazH9JC7vP3_uh)K$& z!dmsNuFLAnIHUZuZBTW9mfqFkJnVPxfYxmq1uw)9L={_$6LJV5fe-+aX2e)@Kt$D$ zInx11nh|5s0TES0=1d15X-14i2Sij2nKK=Lq!}?59S~79WX|p!u>1E&w*Yp5AOK`P zA!6-PKIiJz0UDSHSS|si;!#h2Mj)2}kjiKuQ{`ke`w{A=>n#INs(2MZO-0uL^5d+L zja&8{{U5*zwAThp93U?^lW?i<%>M&Mz3=ue(3%5fK`8q#n*p)~W*yK|akjl=%w;Wr zR7q>+nRQzL%s4<=UUN2Z1z=YJGewtsmO0>RV!QT#01a6@P!I07w*UYD07*qoM6N<$ Ef~`-~k^lez diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Green.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Green.png deleted file mode 100644 index 81f1c3878fe2bdf041aa4321ad839b75a420fa8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 509 zcmV;+UAUXAA&_{8gfX^-9qRe=a5&-$-tg(nOH$jU-Eiozm{U+E#*jT*o zu$-G*$l`$eH`s?n$__Bn>lU}b0?&5=jj(6(z@~<#6=M@bRRQraH$gz47D@mbq20&n zfZZ#s>7xTQLc5RC0lQaN(?lrjHKL2<<*j2kc&9P2YMBaQ;1VT>wrX z2tex*_i?AnXI<+$z(RfitTh1`PIQV#`W9#+W)1*Z8T4SoGJinzFBbCv+^g6Npj6qV z0bB|9B&hu#00mlUjX4gG7i>xR4shb>wGV)X&8h039(TEHg0cl#9Z&-|==6G?0|r*9 z#X#0MJ^)%Aa97YfKjbE8En#QeJO^|p<~98d@LlaerG+R?00000NkvXXu0mjfpu*Mt diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Lime.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Lime.png deleted file mode 100644 index f3f22fb5e49fd1bc45456bb6a2ba1926d7baa88b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 510 zcmVv01i41{q7sU-aul1frRJU0n57Y&EBJTwT_|7--O{j}oF#;vg#PL;!Ta;RM(M zhZ}&KAX|Vfa5w?BfXM*gpFip2>p!g0XQsv03bHxi5_`Qe1o?g~O;9#A0ML@Lf(am2 zy+pPH_Mw;#$ifMraCZVN9n%3>fJ2>6Wh3!pR!Bnh@27LMizF+ne7Q)8j zb%*8LVND+$pb^@AoDSH%!kRuhKqIvKI32Kig*AP2fJSKdaXMi43Tyh-bAa>jk?R6* z0zm*;kGPLJRX*!l*8vvt17NKQz;L2dJkqy76ESlD$jYDx8Kn`Tzg`07*qoM6N<$f)-)f A;Q#;t diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Orange.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Orange.png deleted file mode 100644 index e9ea6e87b01c6ab931db571d5d52444fe65b40c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 510 zcmV>qcd|Mlx(>pti|M(%O5L_163>xmN*L zDO!p_t?ddPS*Qf!IU(RMl3^@cf4%Mtl(3&$~L|Cid z({)*W8E2HAwhgKd(9(NaoQM7H9niW>qu_-Yf~aC^aY7D3BoG2X(u^334v454GG{sf zNi$+BIv}EI$eif_B+ZDi=zxf-A#ksQ2C81zK~UEC^-)Wivpwz^ns$D$cf-jJd1@kSb~I zJhN^KfEfo!%WKXCt^n*RV5aDD&oT!*O>EcxKaOneK|N!hM*si-07*qoM6N<$f^GlW AW&i*H diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Pink.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Pink.png deleted file mode 100644 index f94da37626f6e1985aab123433e8895f2f18ccbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmV+d0{#7oP)Po1ovuW-QtUv9+kRDc2b%ls@YntD`fmh42OLg- zEpWI2I0V@OY=OfGumv;*_$& z!dmsNuFLAnIHUZuZBTW9mfqFkJnVPxfYxmq1uw)9L={_$6LJV5fe-+aX2e)@Kt$D$ zInx11nh|5s0TES0=1d15X-14i2Sij2nKK=Lq!}?59S~79WX|p!u>1E&w*Yp5AOK`P zA!6-PKIiJz0UDSHSS|si;!#h2Mj)2}kjiKuQ{`ke`w{A=>n#INs(2MZO-0uL^5d+L zja&8{{U5*zwAThp93U?^lW?i<%>M&Mz3=ue(3%5fK`8q#n*p)~W*yK|akjl=%w;Wr zR7q>+nRQzL%s4<=UUN2Z1z=YJGewtsmO0>RV!QT#0225-P@@RKIsgCw07*qoM6N<$ Eg3pW7^#A|> diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Purple.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Purple.png deleted file mode 100644 index 58707ee2c0ee6ab76610c9727b71dcecc3eb6e6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 513 zcmV+c0{;DpP)_CazepPk{n)~hW*ZuJNZv;RG98Q2O zaJT_D1la;?fx`)~1vCbDzkdIoKaYQ~YM*Ihd0V4$Kq@vRo*~Hh-ios1qXJ+F7;P;9 zL{qHH7cqxIIv^KL0F}Fw)zKjxkc&Ll0X+a#C}ADYI*VA(C|>}zO;(cD-m|Q?=4Z*h z3cyOyQVeQsuShchnUo~}s-RvR>rvbyV6z2w6sEmK4S@V|HY;MtA*gYvW=(?DoB<=k zTJ^53%j(NGqx`gOP<4Qo-qqqf?04^g)@>REFT@Z;69#8`AdMAeWv z(*a1D5o6H-5miIxOa~xoMvO%VL{tr#GaZ1W88H?e5K%Q`&h8wr`}at<0Cs^O0AxQQ zV(n5s=jzr08kh)JE&-(CQBQtGAeR7;%4i=`V9ne#8w!LJ`Wi5bI zNo(hsbz1<;I6zunb2e}VU{?V%MVEV)IpAtyyY_zos!2Rh9{jvQ00000NkvXXu0mjf D$v@QB diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Red.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Red.png deleted file mode 100644 index 241ac28ccdb0b68891ecb4fc955f5435be9a69ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 513 zcmV+c0{;DpP)bH}4+>JGjFpd_u0*y{>_CazepPk{n)~hW*ZuJNZv;RG98Q2O zaJT_D1la;?fx`)~1vCcueZKx4@1K9LYM*Ihd0V4$Kq@vRo*~Hh-ios1qXJ+F7;P;9 zL{qHH7cqxIIv^KL0F}Fw)zKjxkc&Ll0X+a#C}ADYI*VA(C|>}zO;(cD-m|Q?=4Z*h z3cyOyQVeQsuShchnUo~}s-RvR>rvbyV6z2w6sEmK4S@V|HY;MtA*gYvW=(?DoB<=k zTJ^53%j(NGqx`gOP<4Qo-qqqf?04^g)@>REFT@Z;69#8`AdMAeWv z(*a1D5o6H-5miIxOa~xoMvO%VL{tr#GaZ1W88H?e5K%Q`&h8wr`}at<0Cs^O0AxQQ zV(n5s=jzr08kh)JE&-(CQBQtGAeR7;%4i=`V9ne#8w!LJ`Wi5bI zNo(hsbz1<;I6zunb2e}VU{?V%MVEV)IpAtyyY_zo#hN@&*4LJp00000NkvXXu0mjf Dsd(2P diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Teal.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Teal.png deleted file mode 100644 index e069a0fc3335a062b5df80116be5e467e3f24a3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmV+d0{#7oP)Po1ovuW-QtUv9+kRDc2b%ls@YntD`fmh42OLg- zEpWI2I0V@OY=OfGumv;*c)frBex8qiuxg)aVtHGmazH9JC7vP3_uh)K$& z!dmsNuFLAnIHUZuZBTW9mfqFkJnVPxfYxmq1uw)9L={_$6LJV5fe-+aX2e)@Kt$D$ zInx11nh|5s0TES0=1d15X-14i2Sij2nKK=Lq!}?59S~79WX|p!u>1E&w*Yp5AOK`P zA!6-PKIiJz0UDSHSS|si;!#h2Mj)2}kjiKuQ{`ke`w{A=>n#INs(2MZO-0uL^5d+L zja&8{{U5*zwAThp93U?^lW?i<%>M&Mz3=ue(3%5fK`8q#n*p)~W*yK|akjl=%w;Wr zR7q>+nRQzL%s4<=UUN2Z1z=YJGewtsmO0>RV!QT#0Le)_P~-3#>Hq)$07*qoM6N<$ Eg1z_Er~m)} diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/Magic/Yellow.png deleted file mode 100644 index d1fe73075def3ec59bfd034563b332a4f7c8ef00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmV+b0{{JqP)x}~;41{+pNEz3EIVs~R$cacuoW;Xt2V{%MzeM1*zZrW;HurV->pr~xivZ|=!wIkj z4mSXYAX|Vfa5w?BfW`p7@9XpW`9CmgpJ`%wTcdJ7DmEpaA;|aMin8RR0$>RkZ7l&r zQ>@GvF^57rAQw&mmAjMG(IFj>i#*l=JpfiHVI9yqi&)PnUjVgDR+84dQEz{IqRQb%2)M)8ahrckh7KZ5jnH#1KRkTZec}omZj{115m2?6hKWy*8uY4tdWgd z_8k2mzzVe221^_uFF2EMsqoDI14g~?_Abzx17$%d`!AaTvIS-x&{J`?y=2T~Er3)> zYv-ADTL8>BKw4gNHgE-CR{=9cmwT2u;AvvJ_WuDAJMBS)ozC+B0000GusH#?z~%zr z5M&Fm1vV$Z7ElS`{raTG^9oD)PUUPZBb@?rviT?w>d$NCWQs-yz~nNPF#*J?R~0Q_ z4#iYJNt^(L-N`8FmS!)aXrlRyxFMkZ5jCRM)Vw5|dsQC|~4P9F5+=Z>QffLg}Z z$L*u*@3KDq?g!vp#Zdr;gsi4M0CE%~!_4u0fEth=fb*HG3aA10tXE254gh5^7qbxs z8P4Yi;G95D1)bju@V^e2R6#?rMbmW^Fgin&Wc&b3N11_uN(ZzguXO+clu}UNMLsPci6QJ|?Z?^r$oND6D7q*Bk`Ags;t)iMqX0yH z6`!^MDtLsB1YrDe=DkkJV-V@k=?p*-_Ex4p>Ld+Rd?{wYD#Ty=k9WZAm_|WKF$7V` zimenWoe{s}-q;8+JJVuvgt00>5)$nHDSAr2TPxizWP{g!%!0eFM( zK3Tf+C=3D6ZfALKU`9RUWBW;<8Dggo7r=fTfRIkon=;k>)CU027`oRrkKXFtPhk=h(6%T@k^*= zT^AJlU>QCHM0rNA9cA?_H?eQd#kJo!K!XWvK%? z_P!PW{_?yQ@OZ?XzbMNrBQn|8K%vssy_}~Yz~|h7h9_TT?iwC& mG_+)9o^-vqLtWEc2XzC> zM!$r9hU>?RcgtV3zYvzBR1uSoW@@&xe_?^z6 xnsGk8q1N%1J+p>mwH@;t?o0n9Niy<3>(VXUj@%p*`+%Ni@O1TaS?83{1OT&VdAk4r diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/ender_eyes.png deleted file mode 100644 index eb4d92181df5fdfa74aee77ae074bd15ac95e034..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pdr^5Ln`9lPT9!Y93XPU&R6XO z!X2X^sX)n?YXbZrjL20iDmrx?1nn5r|cIUTUq ws6i?B>`8{#Mj`8Y7I;J#8_`Z__8!LgV;guJ|3{_Q0sYJ1>FVdQ&MBb@0MG(-0{{R3 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/evil_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/evil_eyes.png deleted file mode 100644 index cd312daa32f658aa2b16973ad798f86eee40b122..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F9YvLn`9lPBCm`HV`?HNxrJY}(Je9H8Nvy5r(fg+~441y2#Jv*2D z>`$%z+28Z5{~JI5`Fnl_n*j5fnLGyTy?3QDEKE6<(oh+DNtc;JwOEb$%o>badq hVG0RGM&=)2pSp$JG3vwIlRz&rc)I$ztaD0e0szr#Z7Ki& diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/ghost_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/ghost_eyes.png deleted file mode 100644 index a4b03023177ea815e07f5adc5790ceb8cb636ae7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=7d>4ZLn`9lPBG+bFc3Jru=~xPd3aZ-MfLn1;G0*~Y#DMNG1d(TwLT)6?t{{{O!H zeeL=v?#J0Vf$|#bV?Z*}|ePLB9gX^tXlNqn2u85O#n7Hj(3hk6$ cuVRjyE5YIT>fQ1rpywDoUHx3vIVCg!0M|TciU0rr diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/goggles.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/goggles.png deleted file mode 100644 index 3672e81d69117ff9f7cc4d658aeb474461892194..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=pFLe1Ln`9lPT45f{vROG2g2@8=Wj8IC{S&z@lSAo9C6+nm-J|M?p#Z5LIu z35cAPluU^0e=(1d#kJUtZN_!wUFi&t7w1f5eD<~Douos6NqP!Rl=9>skbbjD%<)Vr RcOuaH44$rjF6*2UngG13cL4wZ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/gone.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/gone.png deleted file mode 100644 index 7dbfd0e8596751dcedee64f0fd34fd3da63e0449..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?SHRLn`9lPC3Zg>L7CDPTQOP ze9}RGj@RF6ZaL6x?l{MAa;fa$^`?J*_cNp%C}5Ipe8}`g_zg!1OPlZujyD_y^Pm5< z+rI8K`SKtQzOX8l!S&Xx$&A-hSHwv=Ox*S? zrJ+=ERXAI~lC_qS39)UjrZS3TX8WFVdQ&MBb@020}A A7XSbN diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/green.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/green.png deleted file mode 100644 index 0119b1fcb884c751828f62f6844a50276b5f5183..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=FFaiwLn`9lPT9!Y93XNeVS>&K zRwHMz6HPoqE~i5FJ4{=eZl!WW)~^0r?vJhf|NrSSNE*y>a8KC5@R!A!Nw)DJixrbL zlTH8k?^W+USNv`Gdw>0&!@tfysGESt9QXGQ2hlSSqusc22WQ%mvv4F FO#meLbQ=Hw diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/herobrine_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/herobrine_eyes.png deleted file mode 100644 index 290c5315e62e5a76485b2bcc5ac7f8601fe0c707..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=mpxq^Ln`9lPBG+aa1c0h=fC|g z7jNy=0yl1OKI)k{r&xD?+RyLtj3*kNvRE;lW__W4L+}NMj`{_`AIb+TpWB>2dxrZ> z_5bIx*V2s+?Bcnq&8%_h+8mw@dd^=@F?4M)RcBsvI$*C+gHrCk-0B5-kHOQ`&t;ucLK6TQH*L27 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/old_ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/old_ender_eyes.png deleted file mode 100644 index cd883f2061a4c52c6199fe0ddee04dea96ad7e7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?SHRLn`9lPT9!Y>>zUV-`Q!Q zFO2-H!V=AtmiD=%M_L6p9jX5DGh*}4t!DrKaXPT&_$^T0u#@30i#3yM<5|uUmU%1| z?_b+JGk(73dBl484fWsW-Ak^W$9OGuMVzF=#BI+~8cHQsg|h`LS!*eo5Zm@@Dx*kd swjW!>^o3Qa46e6kO{SsJ+tMFc4@U4fUUR#(8t7RDPgg&ebxsLQ01k6;b^rhX diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/purp.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/purp.png deleted file mode 100644 index 857df985f714f873b2504d131f8f5d0fb9261fb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=?>t=`Ln`9lPT9zNC_v;$omv84 zSVH|qrs9+)mqxY~F>3#oF})OdT2rT!{OP<=<$u8jo*8o-)D3nr{N*fTntR|0ixs2N zf#Nl{Csy~|mcH>n|5MNAv>lA=OQpZ_H+=m2cg@)c)vOFnzhY~>mSKtQzOX8l!S&Xx$&A-hSHwv=Ox*S? zrJ+=ERXAI~lC_qS39)UjrZS3TX8W;+UAUXAA&_{8gfX^-9qRe=a5&-$-tg(nOH$jU-Eiozm{U+E#*jT*o zu$-G*$l`$eH`s?n$__Bn>lU}b0?&5=jj(6(z@~<#6=M@bRRQraH$gz47D@mbq20&n zfZZ#s>7xTQLc5RC0lQaN(?lrjHKL2<<*j2kc&9P2YMBaQ;1VT>wrX z2tex*_i?AnXI<+$z(RfitTh1`PIQV#`W9#+W)1*Z8T4SoGJinzFBbCv+^g6Npj6qV z0bB|9B&hu#00mlUjX4gG7i>xR4shb>wGV)X&8h039(TEHg0cl#9Z&-|==6G?0|r*9 z#X#0MJ^)%Aa97YfKjbE8En#QeJO^|p<~98d@LlaerG+R?00000NkvXXu0mjfpu*Mt diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/white.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/white.png deleted file mode 100644 index 167736f8b8c09641c4f79654b988c596df89349c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cRgJkLn`9lPBG*<>>zMt&;R-_ ztxJ4LTLqh@S~q{}F||6s`OmDU_y4mfFi#VH!J#9*V19!80_6>J9NZtcH58xwX=iS1 zpYZ>?`TGra#i<9X7_NQ2_o6iQfVAVaa+U+Tc&=(QYh1cEhi8MH^Vd@hU0Y1mnb({S v*lX0Flza9h!)v3E^*jqaqKl1aqSWri0s%*H{US}EM;Sa_{an^LB{Ts5h52%s diff --git a/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/yellowcontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/64-Textures/yellowcontrol.png deleted file mode 100644 index 16a46de1c98ca914a5999fa3f95c8748a2fe2641..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#-QbLn`9lPI2U7G88#_>vqNe z%N4UH3dU%hxZo-_^Vrf8kN@tuVrlmO%-Q$yj3*k-a(-bk6JKC|aGryILNU{H{|6O) zk5f$K@BbJ7zi<1;JuC%sU#j24_SN(6-gILw-~T&%SrS;MJ>AZ@LC5v$8HTPks^-i( z-hsBp4NBQ3&oZ123OUcS;6zlB@qtYuSB;r9Hch+3LldQMc`F!SX!1KAz54tX(BBN6 Lu6{1-oD!M38lf2oDok?Pn z?aVGxOY22ERXlj{pa(BXLGhqS@uCMo@SqpHc&=0h!Gj>IFUia#^Jez3XvND5>?XhW z{ryQk@BQB7lGm5dJauU9{yC204lOM?y;`H2<0>ZyKC~{Ph;O5H$E^y#eg1{OJ9bq# zS87U4zm7JX#q9vCZl7sc+ZQdv7EadYDgzTI=%EPmgI?DS%|TU2@|yTM9tHxRxI`DL z!hBqiUu!P&buU1CsZbUzsjTsuQIJcTR@9#06-h1uNd>ATDymtO%%Z{%51}@PuPTAv zF;^O=hvl$U6*i*CHv#DP`-Q$*@Pc(98-@WS1t^M$J;ZR!jo?6Z!xL$eQJw}0t-$dk z$8-5OFKm08QB@G)LgQojTs?nW$PI_=FhwwcK9CC%m=$DO;~0N4=q9&jTL5)Y54ll@ zCDKmwdEtQfYKvdNjq6f3*lI~q8(9-L1!RLc&+)1<>t5Fj z@NJ=*S^=|$b5Y4kGnd>jg06*@8Z|sna2(rI+B!m7M-sJ;DvRY}u`RZBXozi1S4y(c z(e+X>f!J*3!>3X=JZm%V7MwcWSZvS2>9gC?Bq+626^cle5uPigi-s(#qOKclt7F)* zS~f<7a>=F&Jrg*1--F$pPy8%4E@nW&UKw(E=U~>}}@K`JC*m zQMXQaVkQ1@GI1B<6$O*-kt<+oEUTRQuf^Ti-Aw$Ak|t>ikR^N!L-R5jdY&Gdm&wp9 z@>$o3YRa%0F`SEve?imjeHFj#p<20AQcD#;4wDhf&H#1S8V=rv!+1X_Fr7XgHBGF)^%gvxLcKN`}ZZceS zK7`6}5kTlB!$s#qs0Fr7XgHBGF)^%gvxLcKN`}ZZceSK7`6}5kTlB!$s#qs0Fr7XgHBQgO{?pKu}#25!yI?z8pr*)gU`1(Zd2m8pD%En`8LPh=e_yjSEsS>V5u?R z8vJdGwR+tq)G^YhSr`{OhK9a^ZUK<^%h%`|$7=!N-Tc zd*hXz{l(ATfAHN$e)whomFqW!Z+<`V(~+b19yojX*R87~--+{Ij~~bO&dy!jtImf< UZ(M!h`B+|BIMcXs>cZ8(0X?2YcK`qY diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Control/TecZombie_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/Control/TecZombie_eyes.png deleted file mode 100644 index e99e79eb1e40b349659f872a8c35a5cf4651b2ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5J3yE*%kgV8P*AGGHKHUqKdq!Zu_%=xATcwqM9KLZGVM zo-U3d8O~29I&w8T2(bK}>3{O_rz@S@*6bT6iE`d;*VE`&x?%0jRj*cay@**V5zSh% zE~sZMlU4XiS*fL0_Tr9`NRtcXOGMR01hrKR#))-IsC`%e-Qt_cJ;MO_;$cwJRJh?@Xh#d z=G@$GF9T4#>(tkxwc3lO<#lq<_8KVH>-e}g0HtF+A6gqI;u@&sxMhCl^DlYMvCI4^ zttQp{d9>~X|q|2St$Ub=q!d_R4$`*Tm0pv&eHvmuRER z&&3J3wc0W_?*)j{as|PX3Oc73bF!xEdHq>Vkz`GjR8f@#MK$x1nOC^}#aCwWQz@{U z=1TQ=KOMHp{CX7mrYLs1-CS4Ac|l8*i^ZZSDWakXxQ7sKxe@FMZg?~eGKf<}p%plO zUcYysj0(g;XFprM>^FrtZ(^9TtT6?8CYoH zJf6zYX|s=<=4f%oBE`zCV@Ew_7q?hR-IA@4u22cj)tnCyjJ%-kdF@KN%a#WSx%v5I zS8-3Da$MW%hR>8l(q**XqiCoKBUHir(GX-=khHpNn37>CI({}KDH9~^NyMmmw$t1i zk73j$*;HgxHL@`>J;@ljery=QJw?g(&BU=Sv*`sL7*(7OY$4HiTP1PSnCUs(Rpz|c z_5wUCR8dRfwC0RgveV2ZH;kZbp`~gCH{=}0Hsyvc*-c~%&4#85N-=K>(8w!-E-99x z+L|pH%>-htmUW*9UG=QZxLR=N^kA_)3x^*K%h2t-lyBGqQe}kK3K>FCmQ}$piVdq- zv}LtW93;vFn@IFh;NWu)wljU=x!5>a-j*~)F%%)+XzGHU$I~#3MnTY|0+bY}>aZ}J z%akw^sTQ3O@7Ar%F2;K~IoVdxE90#Lq3t9mln;Xt#r0R_2L(7h(uOBi?32{739a~S zt5|V)AiE@vwT^~0^z6Gilgqg`1Zn(?`|dfq>&T^*R~jnmwR@1zYerodpt%;_A$zI( zH0rn;8NMXOzXfgQKUjzmp8t2tu(zuE$ICEzLj8ZsFxth|I&@peu84yTJZRY4%BAZ$ zURi?!VX_iS@sE>LS?uJAas-AqVpkChKm3~HyJKEA3|lg2q1Km;iB^)RECQHLN^&MIv+x1xCkJ0 zli{NCAykHo075qzE;=7VWw;0+bd%wt^C47*ivU7587?{>LS?uJAas-AqVpkChKm3~ zHyJKEA3|lg2q1Km;iB^)RECQHLN^&MIv+x1xCkJ0li{NCAykHo075qzE;=7VWw;0+ zbd%wt^C47*ivU7587?{>LS?uJAas-AqVpkChKm3~HyJKEA3|lg2q1KmifeZC2`6&# zcbi@Of#yfw{dyID+{sysD>VSNp90{Gw*dI#9=`t!z@`MiowER#9|G{W_uiSWj^n-91y`S!Wf8#Om~gQ53b6& z>mMBUw39op&)ms<{m7+j?Hf;kD{t@Y-?(t(&wbzAJ_IkH*|~6W(0%Ow*L57}-o1U` Y_n9xQ-1+4053#zmaH9I@^Jg#q4d)I^?EnA( diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Control/TecZombie_teal.png b/src/main/resources/assets/customnpcs/textures/overlays/Control/TecZombie_teal.png deleted file mode 100644 index adf1843576cb1640714d22e6f90dad48a4e7c859..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15077 zcmeI3L2TPp7{?zl4X7xW9gsK~S4be?*p8Dpv68H%>1ZX=l`gPWATh^&Y0MJa*lv^d zfF?jlNQeW1X<7#d#1Tz{3rI*zLgD}i4loHckT`=TF(G!?W#idSV)sk>RKXCJXEn9I z_kZ8_J^$YOo_+C~E6Yz!Pdz+^5Sm_EtgVvsEctQw9VY)jeE*f#$?1M~aotDg!Oz3r zT`$eucpjnBHLI}}tks{^45ypXO{a-7{jN)TBUC=xcXi`54!9=Xuu#LjZV*g0*KO#Wzfs@&H|fG!SnuHWt0zSghsQCy8&hs`3-MO}i^ z6@D&E$gR~^xOvCJTs~6}45^@UYAGY!Mm=zYQVXW}5kI5q4W zp5+FXV{>6#z3FTQ6`l_hjgG;6b=^@S+aIta6ve*oigHF0CpnqM$j9CEI?>QfL&P22 z#dhEmKY5~`+jauSZ#(;>9Lf78CUa7+k8)2OZ?`)!wI3{O5d;II6FvRLwu{A8>^qyD zffu&Ot;|fi`@m`?ld~sMsO&p-+_&~|3zgU{S_<(DmC3zo^B&d%$7?uFry8%al_5fI zem+`N++!y#+jM&V<7E-LB=em_!!Va8W49vO=Xmgu-=k$q3^r22&SVv=Nr*~*c-kcGTdl!T&@YYBR;pbI&vsbZ<6 zs#!@LrkD_BEY+grlhwMNTE%27M?2dI{PNz`q0q6S9m>@`ABXi<;fDn{+R{clR_GJe zv8Eg0-c~ij^1xa~9m-)RLs-NSPm zWQ820^5dv`-C+2#7(NR+)_*V&zP|PErr}^!^^d1ve24n~rXg9yMq9Txuvry{3wYRY zu$hbJb8lr0t985*%i+UGBUMaRlpa-&To%XLlFV`cwXhmHn^FH#UX|3WC`;rRxTa<3 zx=wdZ%g{CPeAc#tYIcwfG^f16CuqFApCB)LxLU~Pm3&!*&Cp}T>f_E@%_94-AMPiG z+`tD46CKwRM}-VAN)|b$gn?r`RjJpqs0QO!^3q4%H^tEl=U91;cCkBok=)Upj0$40 zBmfBAWVq;jfXZ+IAas-AqVoYN!v%oQO@@ok2dE4e075qzE;=8eGF$)%-DJ4ve1OVu z0U&gf;iB^aD#HbU&`pMm&IhOr7XU&x87?{>pfX$l2;F43=zM_6Z~-86li{NC0V=}< zfY42bi_QnA3>N@GHyJKEAD}W^00`Y=xafR<%5VW7bd%wt^8qTu1%S{^hKtSzs0 z+w74KG~ey*zCb?ilB=e)GnqZ$CSVe(@jq_|G4&9yv7Zot&>scTbFMA Se8hh))Rq>OYZsq9_3GaM=uYYY diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Control/bluecontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/Control/bluecontrol.png deleted file mode 100644 index e48e9e99feab66b3848867a1fb14f850346b1fb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15269 zcmeI3Pl()97{H^Iq6-zIpy(;23Kh)c?@T6PX6kmQbr+qwY)869!M;h}%%+`5Vv_C5 z?m^Ug@hS+th~UYS(2MvFJ&2&-v4Rwlf(QQ~?ny*F)Gx`*B=ctWvDku_7uZd{_x*eC z_r3Q`E_q}9%u`2}9$Dfz?#S9|a|7;A!XJO{Vfg><+b_QkxBG(C^AX40|6%fX*Tv;O zp65903%9))Z?>MXY=2Nfj^Dwh(I5b8j;oy*1<1aHW4?oXu2&cKKKWeWU8gRbE4SoU zu!6VT)!h)E-96K`cQ4tdBb;a~)kYQs7~mN3qe0(`tWjM^<67{X3`+u^n#7mt!g7+3 z-)yb(D}IRia;YNPa>d{cv!s*_LpPq_Raq%ZvLNr*`XW6uJ7?l zT-5QmN~)-?CR`3?pPQ%CWs%Ya~vbfIU|-U+a@fg^uAwDGCSu#{tq zRv)|Fyf`zF63xDI$0K(iw?vbl1|h%1XMc_~YkX z&+&)R<28wN$?Kg*!%Y<92JFYGs3@XbZYxzwu3D-A&z39~f@GFNjF#`X-JRJO)wZly zs&46(VvK?%83WFbgJN``C`H>s9LKi0emFpJ!yTX=mIAL=lk&lW<#bnBD}LV(VOqGM z)uctk3%#1Yy`609WzWVD6eB7W2}+e7+>@v`J33MH-A2|n9N%^wD^H5cW~Wlo9I;~C z7%G9QqN#Ko5u0Tg=@^=++BGRTybvOvR}wcJoy}NW4sE{4HfXi1H7|-0EN89RfPs<= zGs8|-?#LBYG>wiSDzdJNre4)Vy`y$D)Io}BD(T*sbQDM5L;+*fC*Wni!Ww zq#UnT7lZ6q>nyy(;zp%h)}V8d!=%T$JHq|VrVGDXQPNK; z`q+n5EOb1dJ8Ce+G+F9cP>db3QWf4d(`J~B!n-WIMoZK8=(#>Q?P7QGAz#s*j7r2} zNeCcxk>R5AA+!t^0fa6xTy#E!mf<3R&_#xe&WF%4Tm%rh$Z*m55L$+d074fTE;=7V z%Wx4u=pw^K=R;^2E&>Q$WVq;j2ra`!0HKQv7o88GWw;0+bdlkr^C7eh7XgGWGF)^% zgqGnVfY3#Ti_VA8GF$`@y2xLd$RwKTdbp=G!TAas%8qVplN3>N`}E;3wnK7^LxB7o3EhKtUJ&@x;E5V}ak zwUmFEiaq!obqL>`9=#|Whi_JSdv&A5al4Ok+$&c&?yp;L|AphWWsdvx0(|azmE#`r z-+b}Q(_s6;T64KQy7AlfYY)JOviB_ieeLK!dq1_lxqjHW^7L2VJ^bFI-+pvA*p087 zKV1F#cWaLe_)phAJMro}5B_;*qRQ_de*n+7ZXM!&KKlLITR+~onW)xIooT**^1^HX E0whL#Jpcdz diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Control/orangecontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/Control/orangecontrol.png deleted file mode 100644 index 90805ccc8235bc057a6b38c7b6665ebe6ee67587..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15267 zcmeI3&x_+!9Kf>(q65322n(J<7e&D|znZ3rZFgtenVkVU4l|XV(Sw^GubsGUl1(zx z&ajBT5SG0Of)@{Z@umo(f(He4{{l~5Jg@lUq#_>1Z<3}-UptS%UGVY(Gs*XTf4%ql zzV~e|xwW}*d+tm`OZP1JYXM(OvjzAmwj-6&mEIzq>9 zp*?5qC_vjs8(r(@x~18ri_N9_Scd>Z6dCMzIB-LK+$be+b$E`4`4XF$MAsXoVe(Ux7w?d zbRacKdr{=;JU<$Z$|Je#1$|!BG>sP|UXnPl;KD;UGRB-6UPyyvaoQ-f0>_UW&t>Dd zhUx7`jZ!I2G`%M48v4^jZa85F6#22?^I}=x7dhG1)W_cs2FcWHi$?=AL~aysI8A7(zN_G|d)K$l| zy;1mdoyT4Bdgswl+lWvT_G66`MNUw8{dS-oOiBTBs@4 z`9;GEz1p6&A8+er*Fqr_BPz*`T-v~k!x0OaI>nqbv4W`qpp0p?3 zu;P~8wBl2b>^eU)nokRNbLPu=Is|F_g8RuiMtjI5b&WJsVs&zm(CbAbBS6c2I8Uc( zXlc}0H$42}Qv!^VlR0qip%9^QaBpQe-KqM|WteZg|6dtm;AwVi&v5(5Zt~d%&IV3b zxwM|MCo4Ox^Cz($|K{p&ieX0?$>|a6{M=ZcIkn%3Pvc-evDXw;P$gaz;F`D=)wt^} z*|n&~U31SDTqkNulWf>H+ZWf{%iZyhzx?p&Bk-XtBmQ}#^Vgj_8@tTb&DNFQSV?~JJXmGdW52%p#qmw% wo7;M1& diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Control/pinkcontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/Control/pinkcontrol.png deleted file mode 100644 index 536b3f3b7eb6f2443dd3221fcf1efe75317c65f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15267 zcmeI3&x_+!9Kf?Ihz_hE2n!x0bWvO|&9A2UVcT)G-Q5|m<1ka%89lh^%WEfYn`D#B zwlgf^uZ!%>lb1c{$%}#@D0oot$6ufq{{TS|J*^-j<2Om$q_3UF;4XN1ftlp{zQ5l4 zeBb*vm%O{RdG*}N6Du6Yo!eM%ZNvR}_~Rdb2>yR~_w{$+_DHb47jfL9UnGBLUR%5O z3ddRBxSid2xBY^J{9)O4{4Oq!hXGh~Ty1q6*ysk1`7Z9eUcL0kmtU25*QuATX>F+; zH1WQ>eiY)Jqs4%ut%2feLRh`$(vaIQPMSqr8Bv}(BRa7NGQLTz(RTO@5l^QGXR12M+wcWZh zNe5EBv>(TTC5ofbs60~3e%Kdf(=Z_UuoNAhElDZ_$t;N&ZQpTwhx0LvjwD-( zX31tTM!}Md0q4iDWBXK5infI~4zhZFIJD!2JGA>)47`3#%m)jWvt4C1{ed6Cv~WYM ziOYtUdbNCXkZkKU58()k5fzFArAiO(CA&XAI#mqZM%FeQAGwZ|C&ilCtyWb>s3L@+ z64($-x$6kn)L^8mtEPf#VsdyPL_V)1ZaO-jvA7)Ce3Na^Zd)5(6x*3`am!O%`;iA_=CW>w@a&6~%!$Njl7D!9AbZB=j^pgkHXI2_XYjkR)JL?oAgi ztAb&eUDPujS*@DWM1^1riCzp{Xy^8zV3VxHfwdStrDABhAz;nu30k$%6O5{?2(pTi z-jf{U*xhN0C1Dm)t-DFx4~a4)wb{Wp=STCpr;RtT!w4sBrCyr$m070-)7e!^+mmIZ zq-8fya_X^D6X!DYUl~q!s{V5s78~#XSB3<5mL2WeULQLRak_!01E;H8 zR?qp9H9f71C$X0N=2~!yVMp2N>5*&V!dRX;v)@flR5AA+!t^0fa6xTy#E!mf<3R&_#xe&WF%4Tm%rh$Z*m55L$+d z074fTE;=7V%Wx4u=pw^K=R;^2E&>Q$WVq;j2ra`!0HKQv7o88GWw;0+bdlkr^C7eh z7XgGWGF)^%gqGnVfY3#Ti_VA8GF$`@y2xLd$RwKTdbp=G!TAas%8qVplN3>N`}E;3wnK7^LxB7o3EDz26M z%T(;a=cpt2?)1rz&X(buRUWNxw>j?UDUN&NZI1iv81BDt+=0Y#zg~yWUEk-p^Zt9U zes=|IU*2e~b;dva_QR)-!H2S({O8T%d*6P)xyNnaZeIPJSJbD^gVpqU{NuZyAK&J_ uzO(hgXRB{sx%2m#sV2YgJO|Im$7i|9(a%2)oBv!)R2!E!Tc2FI{?@<8Zg@ig diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Control/redcontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/Control/redcontrol.png deleted file mode 100644 index 7b83108ab68a7da226a573f625afdede836d926f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15268 zcmeI3&x;#X9KdJs_eurzAXJ1QMNn`uzcNW?Oj5U-)?H}ovW;|0h4$sm+w8c>%yedU zlih=etp|^K>cxwHfFO8KDtHh<#FKbZ=w0y#A}U^5zcZ6$CNIfju>~)0Ajy2+_t$%$ z?|a|OW!~91_wupjwT5ul^%LOqpiFWISl{lfe z)!GnOy?}^Du`FSwToEf~Q8g-+Qso6vQ&dA%bXiv<2X$c;=u7E$8*Iv zF6wxDQN2)z6HTtsy88YkksFTK0Y!O;d|53j@;oOSPkj8npqEU|#xm)VK5?TE{M5OA z{*D)U;f}W;M%OJ4+us`=X!?i1E0v7B=q(IOiu5^QclcU zedKIs#hHo}YZlI(44nmTu_kp(wnAE=8m!e?4G4<7pzV3RM!L&3#t6mL)nr$R&s}g_ z+Z%+>*JRoyt9KTSG*Ltvupg_Es!EE{R;!j$wX_P{TZ)nkl3G$RTAuA}A56!nwiVUV zN|sj5$H-aIG2r~zC_+bylDEypv9Y!71$`7XoIdIj*>}4&IUCGbPIi^G>h-(;rbQZh zO`bPA*Q@E_y?9%%xR``cj4)RuC{=QBPoeJg=vdKn8fn|GJ?z+4mXsJ~r(D);sf;m! zN|35#svTP*rU4_Jif(GSCdY>tLS*xb<0hli8S~3w%{Sf#t(LX!h7p40tT!7lP;_8s zs$L?RX4;Z!RC|94xoSy!vJj42 zb_2(!p1>5RMzd+rZq95ukA@(PpL1WFW3WS9R@X>FC02`rgx+>EKml3l!g)GMLrbGh zyV2q2pAuk{oXnnc7ljDX{@s<~Xs7BwmtnT?{(ohNfv4H=4syH1Zph;eJRUe&<X=&ge`JhY(A8hJ}U@sUK50W?!fPlg0QCu!cSM=b=Mn$@Rax7YE#{f!X-l_;~-;?LU?T v`PAFr-oF31^y@=oP4;{C7r4K3=RV=x&wdzOe=>R^R;`~t*ZlC*mAC!{gXwrI diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Control/tealcontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/Control/tealcontrol.png deleted file mode 100644 index 048d6cd8724903f0df3ad598d4f32ee2ffaece8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15269 zcmeI3Pl)4G7{H?=iw>^fMbT5}DkzvHX_}-7ZO7Sm*BP|yFk9JK6x`S3wG+2ZVv?D5 z<{;{N@#<+WB6#v7>_uFaRS-d8k1L1=*^~HZaZe(88NVcLlfHHygS+761!j`(egEG3 zeeZqECGT#WdG7e~Up_~Y+C2LC^N|BZLx_JF^3KIFKEK8^qGd2RL2 zmpRV-+G%e^TdfyN%NrDt?R9W*H1NTi+J1n~?w@H}`xh<4F09m-t0NNv3~+?_(V*{!=BQRk;+pUr4~qppF^MkL3afEK zeyg>?H@pDzYEcs`Nz-}VD9Wm?m-T1(k|e95q=l^Xt;?YT!;Nw5oB4A)V5qPrHWb7;n|d=T#(d~h|%(Fr@J>BqtcdS zvs5-!EgvIiNydQlW1|QiDN5cp7ss~Dt``hYRCflbhehA*RmE&DXF1(fX2a`y0Za?m zm8!UCc%fI*vv%Tbz3N&xgkprbB0;H=gL@M7W=AKAzEe-zhV5C7ZDvWaYIHPBu?5Yt zFjN9p1VirF0yb0_>FA14vZ`Wycp*eKuQ+ZpI-4=S9NK*2ZP03&>uwk!Sk8L04g*C8 zW@bsKqLvg@&?Ma!I(FF>jBceXAVsn}67HZfE+>0q);*iqIP@etgkHSxE=FBVt7rmN z_)5!s#V59r)wBO z$ExVMYT1TTMw1i^!px;wbK<)15oL&La~8ioJDSx!X}mrPLL9f1T4B;xrkxs0r&l#; zPbRYBmR+~vQ;+ScI5V0}i*$45%Xu^eY5bh~;W>ue*rj!iG*n`Bc#zQRMne?f)gGLu zqcpTM>Z}_Xe(@;*M#;(SJ9kis5bfSs8IE?U{&N}T8}I*Dh8TF7-P%TO58HKdvVkW9 zN2^>~&)JhTIj!?2u^Rv8nsAC?N1^2O$W?J}EX$nQZ^fsvzmwP-sxIjzQI_BuyXMuT z>v_6sUQN1Yo-eshR4Q$WVq;j2ra`!0HKQv7o88G zWw;0+bdlkr^C7eh7XgGWGF)^%gqGnVfY3#Ti_VA8GF$`@y2x zLd$RwKTdbp=G!TAas%8qVplN3>N`}E;3wn zK7^LxB7o3EhKtUJ&@x;E5W2{4(fJTshKm3~7a1-(A41D;5kTl7!$s#qXc;a72wkM& zTF$;q#V&k~I)v{|8^2tC5WZREt+mY-$L&AKac^GYxW5nJ{wv4rNF4Xu1^C?cGRHmY zz4z)jr@{7>_2z1O^y94?S008BW$#=4=gPsgTQ^(RZyd8PJ^$?wkA3vS_gC))yYY4N zr_0~{VczC^{)>%kD{p=9$X`nnRd)aE6L>y2SmLgJ_4Cs2;-w%~t)Dv6{P^UBxBmrM C3WAIP diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Control/turquiosecontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/Control/turquiosecontrol.png deleted file mode 100644 index ded3ba0d4db4286b893bd103602cd981587cec34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15268 zcmeI3O^n+_6o6fU3anHl-~d7#tW-#VaQq*~#!1<3w(Lq|yV?eIs~)I-CRx+O4z{z& zt`Jnf1&+Xh3l}aNkSbLOsZtLdP_LZe02g`%A@#%oBvhX5ICdu4(TY~$GM0AjH*em1 zGvAx{;)_4p-g@oS%CjpB!<^dOXzjrLRrq5cJqiE6{NmjY;r7^Y<5I*hkKauGPQ11H z=VgX5zV|x2@oxKd!wCje%MEN)oeYLBn_G$8^?lgN z>1Df*y>5}5IZuh^$hD)1cZ6A@$;{HDkY&h(y&7vFvf?1@1VO)t!FMnYa(AAJ>YlV|gjhE%|XBqZ@<+D{guNtB3fZ-!u7Qurzaas*JUuAB3?ZNm*5&ozpmNY(9HO?J7O z;~>Zcs&l$%yByM07_l{3mmHH%iWgiI>q`8lqw^8V+aawtIR@>vvFS>4zdHDRFY z!O9f3u324O;b0{;XWNRvS(e~(TCH0bElI1@k(Hi}dGlgrQ`dQPaJ_uvf?{i^W(ypW z#csZFQReD(-FCXVE6O!J4^(ot5a@j9K|8nlr8&u7T-b{$tG1@P4(BL}#0k2ha&^E8 zO<8lgihvYbspTP-xLF9b;U#%Lz|xT9<^pqhpNskWcCwnX7cx(N3bE8;`9Jt@fav zj?>UGuk&WO`{h*vjMB>Nd-suu$lAZZG#sz0{&N}@8}I*@h6H#P-PyDJ9&(#}et`3V z<7F<(=X_=5)w)=TX7ZbBKo!G@veN1iO@3jlh@8#eO{%d!O6TjUCTJ2b3UEzL%WB;8 z64|t@#!U;$H+(N{O4DfAaLFopG01+kF2Fl1YSvV!Ym>)^af@wlg8I8H4}P_xq@UE3 zsSU1JYIvzIlwpZ!u+*@mm>OoOD!px{%`h8Vor!L$??281k9Tx33&mg2&IkVT4%%m>p_To@3tNO6(* zU|Na`140%lE;1iXOL1X9$Rfo>=7VV|E({1+q`1g@FfGM}0U?VN7nu*HrMNI4WRZw# zrT8)x`S3aF7`{7wJ_nwl!J@NCMC#C(9FKv#l!>s(esY&15 z`r#GkxkvfW?w-H%)$Mw_=ode&4ByylF#cl9;5O zX%DjMUIZ`xIf$?x^yEeHWI<2_7d(3K4E&Gb>&6)!I^llQ!ic7 zTXHLyCtL2~en>9wFR$VKZEQNFbB&qWz@hoXCrY>?lQPU_=PvF)7FLv5D!Nv|8ibQ^(uuO-&ue3%eA-5b0FUXl*Yb(khAkoe-0S zU3x2Lr`>(*cJj$N5-CxR9XlDg$G9a*=9VsnY=&y|Uak3%*s&k3`F^*Nt+JI7LScSB zT~)#pS6t8W`_Yp%3A*I-okt^0J0=af9%n__5EXe%QLTz;Y1FJ(vRnv~^#n0mzT<&A}&<5gwN`&~bz z!y*l>CQWNDc%>`NTJoaU_Aps$HfTfHbsY29cj&nHTE33xs%g*G6Y%tg8T6~`dh?fl~)!j?R9*R$nV5`J0x?PbcLLx^0TN% z-C+2dlspT%?td^5k-d9o({Qq?y0d9GvP1oU(~z%Xyk&cv#A!&Q1w3jv+0140d9<=d z)jC;;wdCPs(JH1Z%1*0CsYw%UdFHJDdQy$uowUEHo0>i=DKb5Vu0z*OZVX@*-wnh&<6@r9XE1E zjSewQmO2)Mp<^~xh1asQ2D4WB(nsGnrSS{rM0t*PvAcPZ-_hNS3S#jj00`UUxY&Gv z%5ec8Y?I?+^8qTy1%R+kj*HC)s2mpn!ZtZBHXopJTmT5$|e1OVv0U&IX<6`pxD#rzYuuYDO%?GF) z7XZRGIW9IIpmJOQ2;1bi*nEJ>aRDG~ljCCZ0V>A@fUr%Di_Hh992Wq>HaRXfAE0tv z00`UUxY&Gv%5ec8Y?I?+^8qTy1%R+kj*HC)s2mpn!Zw+>X7W!siATTN?9&f4KmYRE z`{~D>0$yBgA+-NELf2kL=&wV1{uQAe8KK{&RFl>zVy>aH~$$4 h`T5$%J!%{t-h;I5pC1wbIAtf=(!z4{lV`5J_Ah+ELGu6r diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/blue.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/blue.png deleted file mode 100644 index b478e8f3ca77b25fe3010432e71059b04e7f23be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*o$)5S5QV$R#+j+_h*91M=DXTE5X4BE-SCXkjOFU`onu;E1b-`jFP cl?)ci3|69?nVWgO%?EKkUHx3vIVCg!06$qGqW}N^ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/darkblue.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/darkblue.png deleted file mode 100644 index 1b8609d477d8dccbaae739f88e4d1473b74b4acb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15046 zcmeI3O^D<~6vt~>6n9|#Ktb>ndKDBlov%*k!|q*=#cWTAJX0k)h-P~?Cg<5=#U-Hua|!R_Pdhcx%JXDy(PE8 z6|(EC9Y*Bp;gz;?xaU}I=~82?lQPh(k#!%hDnz*O~Z)`%y0&n(IiUNBYE1V(OhR&P=SBcuyGrNMECQ_=LICe7hPH;<=+%4M*`3lwOTXc9rn_ zHP3g0LHt5Zf-ckbo<<{0oR9|HkEW<7qO7+S)0RzJHR!V~%Y`6$PY|OOxL)^QHip@j zWm}hRRV&6Q^n@{J{kS;6r;1YSTZrR2b~lLnIB9r&yhEhW->FH{#zN1@uCiBxUJ%h? zk%m^27Bv^VvYlqH`*DJOhpaanw4v;Iu5B4+2b+c^cC@N2y4{K_V%Z>~Vs4k8nQ!F*)g=qTo#0xOSR_3 zbhjQ9b}`+{*~xa5ygA!C7J6QGLWMYrNm_sP(zpO8N804XN`10Awy~3*Z4D&2 z$uh@+FmlY7s_ArZakwQ9&%81OQ>192c7pP&qCD zgl%$MY(7BcxBw8g$#Jpy0F~ncK-eb7#pVN4jtc-`n;aLL4^TNS0EBIFTx>o-<+uP4 zw#jj^`2dyU0zlX%$HnFYRE`S(VVfKmn-5SqE&zmWa$IaaK;^gq5Vpy2vH1X%;{rg~ zCdb9*15}O+0AZUP7n=`IIW7Q%ZE{>}K0xKT01&pxak2RTmE!_H*e1ut<^xoY3jkr8 z92c7pP&qCDgl%$MY(7BcxBw8g$#Jpy0F~ncK-eY|*V6P8PU6$=HV5LKhtREe5c=zw-hV}CUqk8&D`ZTmS$7 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/green.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/green.png deleted file mode 100644 index cc1f5cfbeb4fb9dbf8edfd71f2111142c1ca3217..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15045 zcmeI3O>E;t6vt;(grL$QaRPC&yg~vA$6s+0TS-c{>C#H1RBh0{Nv$TfvE3%^ z0j+=wM>uf-2~M0=+5-|2NDD|DIRGb+I3ffp;;<(!l(C%;=OrCgu!zf8O6)iPdGC#X zGjHsR-`?JO;p*~J%Lt*Xn;VTCdVZe%ghw8x{~x{o`djq$Xt1##A@tan$?wXi?;QS) zka^~|_Ts(fi_{V4WM8S1x;!UHeG=nvA z;BK6TWcPHdWuG3}rX#M@m#agI2I!L*3&VcTi>zTyOygSgI%$?gA?*?$*2L8$p|IE7 z7S{Zb2u7hK*-EJ_l+A)_l*`5PbAqO*hOFqau1K106&0(f38O=-FVm}P=ya@|#*I-r zYSqMpI1VgX9t;MBfnM;#uB@7-DJz<+X%g)rMJHa2hmsdv%YuyKG)QEJZVChZoCOy(8UK~+Bb)jEy z;KzP+;9rn(B43!8&PlU5$-QvA{ru;u%`dbY~8#|VYBwRBYp&)jr9 z#~(z`R%Pfio$qNh(!epP)Ad-9R8>-pmRhltilvq5wWTPzAX!fkqv<aEvb%CEqs}$FZ%BANFxvcl)?Y99y$ zugZ&>b6)96vo^gb#-2?!8+F=Ha9zjJHM^*{bwes?#j>QCMNKkENtK+W#EIT9$|{XM z=ROy@;oC<^wb0Pn#^U%k4L=>0rkF;lgNqW;RZQoKR3uYXb*WM@+jhrvRJ~-56Xk-< zC3-1z>Ar`1xjxCgI5Zh98HS15rsQ;pDq*9jNNvY1N)^Q@Yr3gAierycEC@4~YQv4_ zYCXxVV!D>ooo$!AHrqNDdTzQy1vrdIQhzmZT!51;ZL(t}K4~3W*iQDgx}B5vUKX&ykxuKb@CDkj2lrUz}rbKs;7?Wueku7YB*_PCURNS?$sla+%7{qRzU(@Krf^ z7WCZzU?L)X{O_jWa#i(@r(u4F`v0b3x{B=s>~)D#m&Xfu+;F*>%jR>ovc}aqUy0S^ z;bhS&rYj1k)uUGBxwdKMtp8q8jlH9^ziF7dQIS=J9wXPh3|;rxu6Y@{PCZ}t+_o-<+uP4w#jj^`2dyU0zlX%$HnFYRE`S(VVfKmn-5SqE&zmWa$IaaK;^gq5Vpy2 zvH1X%;{rg~Cdb9*15}O+0AZUP7n=`IIW7Q%ZE{>}K0xKT01&pxak2RTmE!_H*e1ut z<^xoY3jkr892c7pP&qCDgl%$MY(7BcxBw8g$;7oh{e+Wv^t;Ug{Xp|jxhK$%I|X}V zr-{(%(+J&u6QMuP>G@ZLjueD`yM>VT9zsv}@4ou=4cd2iv$5J5{&@D?hmRuxE#1BI zRdBX)U48PQrJ(Wo$KM$J`_UEJZG3$3$q(QDbhkD(^XJ>Yyh6?M^CeXJ;ODgM`Z8>+i*I~A@Ga$IHFRwFk+9W2K zX=e^1>O~MiPkQjM;!Rlaw&Fn+@w7LOdhxol;#m;Zm!wTIUptRMSG>GHn|$y8zVCba zz4yK3k`FhozH)BmnH7Z4x%IWqCO^N#f6Ak0`Tv(+yz>D+Jr=BOM+iM}C;2^c`;)!j z5wh;Py{&kw`>IX-QJFY?pOq)0fcHkId2tdDy2oOr&vsm|Rr=$*?@Nm7v`W{_uGS4! z*{-{G6tZhaS9|nmk6KRYVtb`Iv3YF z>TW2je#jKFTvMr5t1ES@tef?Ewf>?~(R34Q1~xRcV%Sy9u2z)kQEIR7t7hm7?9I-V zX*zDTO1p6!*cgw;T0^Gl;^Lz zp5u?B7n&Hl%;$R^jde)O+I&4WR9#m!v!^#~tzlQ{{My#ELXfN{h|%>OcW`(-Mx&=` zwrSXUtr(-w6UN~6{Wm0hkRJ9 zZ8Y(+=7Lwc((H9Fiit$K7D~ zCQhCOL-#+Jh=?5gyJSlprhziF7SV!BJb9p<$0Yyr<2PB(Med>*f?S+y=! zVl#O-*}RJRiXv(C=uN!PHqV^(-%6@+xS#g7Ov^AESl9S5buG%!bzAIOl%ea~^L5XS z+m&fH&|L6Jo}k(GevQBEv3AWg4YP@1GxXSSCv3RYarr(RCHqOOI`x6VQpfGNqrr!m zCQBU)!qhRFs={koT7y|Df9d1zn>c^rTqw_c7kii&^E-N&Q9&%31OO465|@|{P$ez^ zL~Kf2Vm?5XxBw8bDRGJU09E1wK*XlRCFTQEi3zmAC*9 zu_>Z2XL!|)B~*qMUsy&6om*dPZ_)2J=tp?sEdBe{=kI+;zn=8hc0z=nx)*=WeDm?a zeS~Tk?Cy57-MOrpo>MR^ZARseYKTc*jmB{^7KKC-9W=z1xS+7z z*%Vq{Km@f=kxaQ#6{__@QLR?X)z^iRTvV~FU`3WnidL4ja!JT8vAIkmJ+OM(R{K&` zj{esW_oK+yFdhzvg`raLf<0WU*Xvj=;ZjMW3Mo8vBV#1F;rTSlI8U2|W?=h~?YTmn z*Vy$2Q9~5tLiv^5m*eM!+%RKDDdLgg<6=R^^GueRd;CGrPljfhnDmK5+$f~J;#{A< z??qm??=2{qcP}hV=cLogYtJ381Hwa9!dXwJD`FVFA z*}ci+Ol69D7LJ{a>;<;CC$%L@A)O(e-mBIMh!J@~*Yo<#bd_z65eltVvZ{oaui38U z4Z~M-JZqWE_aqx>8xd*J^;naNMM+k>#hND9v{IGEnk<7Psd6Sq$FuC-;dG8#SEdWP zrl~5-0hF^j=>D;c$attMPz&-{rq=TU$B3G?W9$*^yL&pGGy-M5s(a^rJ{bF)C6;F4v^GVwqCWGHTV5S+PvhOdxhT z(0(Fy+cO98Zpl(xkC+^noTG{iBwcljcOJH9Ms1^AN0Cx_Xnd>a8$n3o9oG=YTP{Du@-r&-Bs*6#%=k2Gn(>ApmX4=dC&S8}na%#c6PV@) z_Qf@Z`@}tML#3$_)#44`{Nr{`z9Vo%Pe z9v^BNT?=$vMluIQ9iM2MR8IBV@tpPtiN3DZ6}5(oGQBb@?4GsmoNk5Pv(}08s%uBh zQdVuI8Mxw;H$4`v(1!%ltf;D@>Ug$!*0E`iNPoL+)BPL9tFltgJhL5hjXM*gLWh_X zON^i+Gp17oe$JDbOk3&00)0-w`Gd;zBr3({c5 z92XN26mVRS1~cZkn24Z&L7IV5<>6aLg?RP`u#gX0~w(|t|O#M znWcOG{IYcW?5&l}yHCHi@!f+9&fnn~sv2K+?|k~jgZr>$+=DJ3EFpA!yo6ru{dU8D S?)I;7&-&^{`|CHafAAj@Te~p; diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/pink.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/pink.png deleted file mode 100644 index 8a6884a08bf1719304e63fa9b7a3151146f36c39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15044 zcmeI3!HeTm7{K4UC_1u&C&g3fu%KX?q;1+Jv|Y#PtTSN8VWu)OC-)_J?SyHQn55Ir z9Ar^1dQkKviirLJ1A?F+B75*6cu)_5M{g^;>eY+mOVXy9ukB;d6)!K)HsAZ+_kHjE z-uHdYC2wqPK6hp5i6w;4m5uf0HvN5ueuM`fpx>W-_{!__=OJ%>KS1b_ThZsz7w;V2 zMM%42xA(%m*7LgQ_Vd_s4U!-AJvtkq+O?5~%|j9j2I<;PJ@@;UU*`nds^@mqmfZ4I z$$`Co;**_|&9-@RXlhpOT4Sj;(y4oQcj4cgopLqN)%Ao zYi$Xuu1^FtUlvWdToEc-UQsKRQsrr(AS0c-vp5x!6ROd@>Z?A%q3gF@x7SFrY-@s0SY3^?N_cYD zb}V-oJXMpR$@ILZ-bfRNq(SqsDk_R7t8JyK%T>Klq4&BhXPhK6fsdAJ*`4F_KB{e* zCbXv0D8)XXqZ$)Q|l1XP)qcyWR%4UE>$(nunZ!r zF~n9YYd+(;>6(M6TBz%!u~@E2-A|V#S8++UjEYE#3Z`d8s-mVSMX_4d46~zIO0ld> z0%e@d1bV@@Y2U-W%$#U177ZrLs)>yf7K^4?7Kv3dM9rYVh-#E9OI1p0CEd#$H#4Eu z?SN+MaVCptF2|j1hrE1#bfW0lafkA-ACRd2>bXe)rY$Y)SdmR!$2vBn-qtXq@*q}C zIyX99R%$smvuBU{_p0(IX;C8|x_Q^_@X2?YXt8CFNN=xc(>@$T{iIwP+d#!!!~LmYkuEU~ z78_<1W5eXAGLL0(4JM=Xp^rXqO6ddVOnIhV>|WkXcXThk0$)4`0KyhIE;b*a<+uP4 zw#ad@`2a1)1%R+cj*HC)XgMwbge`JhY(7BCaRDG~k>g_X0a}g=0AY(97n={za$Eoi zTjaRde1MkY0zlXz$HnFYv>X=z!WKC$HXoqnxBw8g$Z@gx04>J_fUrf5i_HgUIW7Q% zEpl9JK0wQH0U&IV<6`pxT8;| z7CA09AE4#901&pwak2RTEyo3butkoG%?D^XE&zlrGI1?UU*RMUeQ$F}U(o#OZE=^r z+$osr+bx7nt|D~vHH7{=qrbNi8psI!dIKT-J%k=}-+k$u>vZn+MsuY-`uWZeA3ur& zbotZGZ~uD#{x@$4kKbJWWvzc|fAG=6bXIzue)s)vZ{59=%9)$mPxm2oc6J$k_WA8U UejHw<(Gc2L+iadbd*ju=0d=K4?EnA( diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/purp.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/purp.png deleted file mode 100644 index 4d014d80c5d7c16c1e76d9aff4eda0e28445b85e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15057 zcmeI3L2TPp7{}kV32lXOMdD;-LIMfLb{sdcm1HZ)Mk|q0bw%q=+spGyYc;Wr?KEi* zXc`>ggy6)53lh=}2#FJDAZ?T2!g=BV5(mTu=mZB2AR&!sJ8|4E=~JZ*ae0y2_Awo~zi~ml1 z@!rk@gv8-pzhV)uU&OZ8p~X?(XR{Hiogev_?9fQ+&@IQU7k>ZpPC;_)df|%E zR@;7)Zad5S0lmDxx<(yg*;l}pn2Q)n!(t6E@p zt@YNWaXMzz3)@lTTZ%Fq4vRy*=mlGfW}2p=mXuOSW;5h)&yDa%cEfXNkV%{t4N2hm zk>j~i92a-IK~ygk;zZeJd|!P(OXP-Qc8sDj!oH#vRb`%&O)?*U5cHCz*+ii|+NW+5 zGCysupTF%zUbyWYkusByOw9JA-Oh5)U2nfXH+2|Y++_&HNauQn8+$%g)@kSs0zxnD zvRgSf@9ra~JKdZ^kz(b@wbPMvgj=knZpl$dcc{kh)oKP5M_#budA&w@%GM?brDiiZ zRnqfU9M|@S;R`hdx=iufpR%LZj*3=EHWR*=zXJ*+_)m)HtCWz7YY^S?7 zCx)S0nwgK0n+apE`mu3@j};|9Hy6hyR@V#qIBGb3yhRn?-Kr_m!Q9O3R9Q{0=LKw8 zw4v9OdBZucv1Mu+Y@}1s%@Ua; z$_1NA^lIR+zK46cIq|*NELlaz2PMDcg z%TCBn>t5~@v$LFZw#)SO!=n?S=Oi7<$3aNr`l}Zv1(>z8tYgJKNgZ35#J#OS;_{$& zO*u3=T~_8fc5`O8^LPl-_&N8Za}2ks%PX%mR5I)6AfeZdhB%;0TkM1!r}ERNhuvWK zniBsO^ql`-BSO6UXxnhSs(Q3-IMkv3zipVFVzQ0hEowKE$pM}W9B=2+{XAS*lWLu< z#9I90WU(q{CkiLkqt%p|v1#UX{$^Z_y+JbHG)Dw@hZW7oV4U9a+8^D=audcNj5 zQG@lMWT9X<=N12grtSSQd)T9mMZ?fp7ly;oW6c@S-e${TeK?H!$zplz1BJPcSEr6T zTVj$dam)#0$8@W5k7Y>>rlahkk3DZH*#qZHd1hVgab8UC=y65`u|yI8gl`I5d_F)G zxBw8oDRA-m09D`uK=`J>#peT5feQfPn*tY~4^Raz0EBM}Tzo!26}SKpzA13=`2bbm z0zmktz{TeSRDlZs;hO>%pAS$4E&zmY3S4|XKoz(E5WXpJ@%aE%-~vGSrohGL15|+v z0O6Yg7oQJM1ug)DZwg#|K0p#peT5feQfPn_OHA(^ojD%ih}@vKKV(pKKnm zmpdi0yxvA=|2c$iyou1?583xG2n|$(e!Y&6^#MZ9c<*2P<`SEGZKbueG5Y@C{%2?I zUU=%%z2EMrpZ_tqbu;|wXRUbmpHok+TcJB diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/purple.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/purple.png deleted file mode 100644 index 4054988984c641566d56032d6cfef5f2bc82e5b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15044 zcmeI3O>E;t6vt;-2|>{!aRPC&Qh`9iu^q>WZ6#Ss)1{S2soJ1zPwd2=v{n<_Yr9R_ z16lzWkXQ*$pcUfd2vQ|(NF2}};Kl(iNF4VBt6eyAp^WXsabD6<1&g?hr6hjypZA{q zoA)NZ_??aQmoF_my?_w9w6@yZq`xoHkMPLD^!xLV-*}t;JnFCRga|!;JN{hw`u+X; z2pRXB_I9-0dd0N7ei7SVhZKi>pUy_8c6sPyYoA0yhwM6Tz3|63-xdVNt{1LqExF|{ zlRankI3Qcc>uu|J-!kmN<;Fs7Xwm?E5@BK3@42BltQV5FCOwabrGk)5iT3M-r8uFm z-P#bAy?_W>u_9V>r7Bd7qM}u+MP9h)oslw=&rD3$q}9rD&%NG$e{Sk9S~;W$Mo8y+hV3JtNSh?|4g!m;9MW4^ zoOkz;)155NRHRrr^V-SKIm0bhQn#cO(iN)Fdo`B>f+H_zdtR@RR@ufFp|HH1RF&}D zRmZixLHK-4f-aNwoGo6Oc;aqkBuXIt|$ix<*;Uaz)fjDi$@P+z}0{R1rHW)>XMv?W*OD(`Tf>Um zgHYU4qm#?ZJV$QM>~fwDK^i~jes+$*9&uUim4-@YogF0fy3qg!WNDXH$ay+HjXLcH z!`Gzvzo6&*2MZD6!+*C7=j*C}ybQBD)c>~(lPb3Mu)9m_hBPkV@xb|3E?v**&Kh^? zY$w*@KPQuRF|8<^bdOS#X2vF&)A`$RH}(#a`G#hwnl33aJw~p18M^MUUGp+@op`?H zI#HuE$_9pWUhzL@y1j4Fhdt7$Xqu|kBsdH`Hk={pZ8sgd4~Ox7QYnvopfJ~QXX2>R zOH7g_jyYlEm@ZZBu`KDqbd)~y(dSJmd*GaD&ukZakSCKndXP~;ES>}aVVfKmn-5Sq zE&zmWa$IaaK;^gq5Vpy2vH1X%;{rg~Cdb9*15}O+0AZUP7n=`IIW7Q%ZE{>}K0xKT z01&pxak2RTmE!_H*e1ut<^xoY3jkr892c7pP&qCDgl%$MY(7BcxBw8g$#Jpy0F~nc zK-eb7#pVN4jtc-`n;aLL4^TNS0EBIFTx>o-<+uP4w#jj^`2dyU0zlX%$HnFYRE`S( zVVfKmn-5SqE&zmWa$IaaK;^gq5Vpy2vH1X%;{rg~CKK1f-Mxm8`5{72dLO+0-4!}_bFI159{zIgr_Y{1 z0=oE>`~6=x-+TAA@YIdPJ1hMY=hi2W(OKDX^23k6-@JbzvvVi4pC3Z#^zFy^&~nh diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/red.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/red.png deleted file mode 100644 index 7f1ef04f3e6a42ae9c97934f2303d2be07544881..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15043 zcmeI3&u`;I6vwB#(h90w1Q(DvSy@0JaBRnM5?e`@(sXGhQc5>y+Y>vnCyCX>Hn!8G zJs`vn365}r0|)p6K-`c3!AfxDfDi}7X(bMz-Q@rh;(*H7&JX7$8C9@|%UDX{H{W^h z&3tCw#23H0v;Fji)dyD*LKn6+YrFLKN%|4)I!C`hc<-gx=+E8W=6-GrbNa+@SO?0K{|LghVXx~1#;}r!;~MlnYL+rW+$B7yWY(gD z!d`txSa*FQXxV~j%7vm()U%3KEar<(2sv5NBw3YIS zWuc$faYHxgxJyz_n%(jgd2wx!3gO>&!BPS5ownMZr?Y_#vz@` z#YM9Z?bdX0W+Fw((y^1Fy~Hh261R9OBr8;=b2Zj|f-TV2wR^ZtB+qG=rDu%Te z>99yuElZ1cCbLSopb%0J)sjNQmYKIiy`{*aT%dE&u&g(W&2fqa zVdhe8+5z3IN2y&*_i}u)T_G>dwvL6a9iLDh_5%{tUnMgxz{!y|Ik6(2xQ-2MMrT{q zjLL&pWof2$I;@H3$jzQ#&eI`C;-}n~=NNQ|!z!;NRNQNMkicz)1MHKvHr*kosr)4B ztQ!npmZJZHuKgb@M1T+f-7=i6s{ZjZ%%4#I-!e>hvDv{+n^;w8yn)9Jr(3yXJ!dOx zT&?q!SdRXj3|hr>N8z}7l(IC}HqD&$-;1iT+mHL}nyzXkNs;L_a!t$7b)W5;mZ9s^ z^LfV(tGQ7&(46v${y~%D{R(~9Bh`YYsq_?v&Cp}V9+K`}&8FvY5S=H5{Ky9i3mx~T zjw&5uoGf-s2_wg3sZx(+aSbM|^r4SFZ%UH~&bjiOoMLzKW;&xg85P9hNdOSG$#Jpy z0F~ncK-eb7#pVN4jtc-`n;aLL4^TNS0EBIFTx>o-<+uP4w#jj^`2dyU0zlX%$HnFY zRE`S(VVfKmn-5SqE&zmWa$IaaK;^gq5Vpy2vH1X%;{rg~Cdb9*15}O+0AZUP7n=`I zIW7Q%ZE{>}K0xKT01&pxak2RTmE!_H*e1ut<^xoY3jkr892c7pP&qCDgl%$MY(7Bc zxBw8g$#Jpy0F~ncK-eb7#pVN4jtc-`n;aLL4^TNS0EBHaaji~Y;Uo@yZ*xFj(0t?L z8?V!sI|Xxdw~o;9!w9|nDnfsr(BGdC>dOfIat$Hl9fTfm-+tli%e3!vTeY>u@Q0h< zzJDJQ?mc_`yWju%h6xzWvqhhkCySE40`6`ttL4Z+~+u-7;3tXWySe=;Y)q YI`iXC4f&Celt|gy*sgu})U{Xs25iebQ2+n{ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/teal.png deleted file mode 100644 index cf868b416e94ec970855abd431f8151de0d3b117..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15045 zcmeI3O>g5w7{_N>#7m)^Ku8>rl~pB>aBRnM99v0BX}Yx1W~thsZBOjP9yeAK+t_ZC zRtQzVg(C_Xp3ol3*v^adBpp?-h|5@N?Pvbai~XB< zCcgN??VGPJFTJpY5L({aZ0^wWtMpHJ;xYRF%g^8afS#TVHuochp7}BPyYlTvhkqhu z+;!V~@m}kOY5Dykw*3w%4*LQ1MyR$r46t=bVxdD0T(4fZ_ucme!L{p!TUtwQ1?!~i zZk~o@_w;7lIz6-uyRh0=strw=pig2f4EsGVGKcj-n%AV)$*@!qQkVF!URX;C3VW?> zVcidjpcN~kC0BGoH;Rg;>t+2Fp(HDsB&(7tizU@8%VxPGjE+KMiC)!0+c9^V*GJ{3 zRWEeoI4~t?Fc=gEYS9l5B*iccNiIpHl1M$o=){ZhQ1qf}S(0&{CW)-j4Pw{#gd{KS z_(yTQP)G_*j?r`VgGnJT8nL4kr6CR^r6@~_f^2IN6C8!T^ww-kB0bV4UL4UlWno;< z^(EfJi$e@{dA`Y#h@^xwh!( zW7nBZ&P=96x$xe}(7hlmQL?afDP%KLqt9xthXlud*!KNiBU@$LV}!!`db+BFmu|V9 z?GK`tYZ45Z&i6DMY2uhP=z6S*iXzHdTdA6I)hy}s+LYy7lFSq2X!*A5oXqB^wq?4Y z4VosOBj*Wo(EhP;j4zcX@0-hGTc+cOeH=I3K0Y8);2qSY>0r)tvZ~B=zvqYawn#&* zNsESaQRzxEx4bCEo<+8r4LVSCUE7p(qui-hDq^RC9Z@Zp9kFWbs_58`g*6R39jlr` zY_;;?bE%uYb(C}qO`UBlwr|n&)7x^KO4YDC9g(PtLFbB8MMF_kv061cmSfn8S~13j za>?cjy%D-}-^0C}Px34_EoN0Z9i7Ow=;)3i>gBQ~VqGSp(IIkK*0EmFD5(s^f;4lb zHr)|1>SrfWIf*>=g>v!i37=cYSUfWwF+{Z}uH8*s9vO?Ip#ChcPrTgl$mu#)y5 zc1@ZYo!-_YaunvyPv_+jWchR97uOhciN|WMELG}tagxY);sFlH+5uf5m+Aa0>ueZI zUz3vGf}Z;yOhkl_|J^iPuB-m>G|cZ%|KBuBSFzQ_-T|>2(s%)n2QD{r*?i7+*0@{e zJF%AhIGMDI>59T>_b4@KZfsgP^WRIlv3HdE8=9eNRY{TQF$&GgFm#_CnwMedH1bW) zjT@y=H87luN`67J?R}TN?2$%A(^Rb{!C@G&?G8zAuj$f#I7;@DN_i9mg@u9p(?FHp zVp=Q>%n75wY^rjvWoZv)qx7YZzHdsC7tXo%oa|x`^J4l$4>K#s#ftzSY?I?+^8qTy z1%R+kj*HC)s2mpn!ZtZBHXopJTmT5$|e1OVv0U&IX<6`pxD#rzYuuYDO%?GF)7XZRGIW9IIpmJOQ z2;1bi*nEJ>aRDG~ljCCZ0V>A@fUr%Di_Hh992Wq>HaRXfAE0tv00`UUxY&Gv%5ec8 zY?I?+^8qTy1%R+kj*HC)s2mpn!ZtZBHXopJTmT5$Wa3(ye!@vS`rYP$exT_;y7LJA zxKpq;cUlOYt{`;wK0<$;)AR2L9mxp&aT_7?GlZV^KYr_{>(qC5tGU)5{(AS9FP4$~ z^wqU{tI^7*pFA6%ef{{0drRg@|9*6Zx{Z$?9(3<~b@*Ux&YXX~Lp{&WucD{OZ#SNM R=S)r1t&N+_Z(h6o-roi=IJf`+ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/turqoise.png deleted file mode 100644 index 0cfdcc1e7ebca65c36ea0fdf2eac9f0924cc5a37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15045 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 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/Eyes/white_cry.png deleted file mode 100644 index 6ad8dac176135d440c944d9e2e90f48e89c44ccf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15259 zcmeI3&5zqe6u_rlgxW>r!U4p|N`(Xxj=$o>wi1`^re#+mWwj0J_CzP+an{&o-zR-ar20G!+0Xm69>=g3Dm^Dz1T@Pk+1BtK`vjq5Q0kA9VYPJQ;y z-fsX{Uwhr1WT*3jg@R!fIzbOt$HS0}2B3Li9742*6QPIup5Lnc@%a}O!E;)bYkEiS zgzI?M+c=Ey)x#@Ybhw91r*gqwZH_GxV2BeajE4h1w#KbW7S|&8samQC*^p$fRar|D z3Ok)GVLgbjpjYc6lIsnjVOABr(Wo_^6;xT#C0Ua+SyVNvCR;UCm|PWmmE1KW$F;WG zmnZ3n)T-7bI40%Hd~9M;lTK%rd+B_K!=5K8Dei zWlOJF%3O@nNIC{NKMqXbiK3Lpmf|?ba)W3H6WbfYK9)ki-;@evY2<8IS?j?dh{&|C ztu>`(>ZM-o0PUySdd){TCdG(LMIxoj4(>(RpVv+e1JBOeh7%yqv5KTfb2LLkNUS4- zNhPo$no7?Rv8fYHuc4VLYD($hB_WD=rExRue8%!}So2M{L8oJF`f&ouayHvGQB*xL zGu@SSq`I0YyLC;3MokwXhNg%VQ&Wkt-cy}yZ_K+FGn<5-W+$PSFTAJLYlhQMMXV`s zx^P7k4a4jq*K`!EZcY=Gf-NL^G4e<|hlA3XbS(~9OU-e#Uc;%0$n3eI>DC%#L8>bn zSVaxJ*HCn5Oj9fgvyf`TOY43>l_9OoRs71lwy1m7ctaS)IBhGf%CxV{IyD(OyP8>h zvLH%ZwvEzLj|uKMZ80s{&08$z$q?l6OYX<#80})8)iv@^*{I`##DSZPV1(EDuEABBkF&HF3E$xhXOF2iEu{r}340?)IfUFi3*V@uNwJXM^m za(O-HPuBFbE}q0@`k!l&Q%rUg%ubKelooVF=6w84dKw4&*?3boHQkUDnOqasvYB?h z&UP)EY1hK@CErVIb&`!zm%P#kgZy9XDtU&*c3sysy(!UZ+GEQbUh0y)W{UGWSL{hFmcRFReIXYnqjUb&$8q(TADpaFZ9V-7kiL5#flzeR4Nuv zLIGim92c7pW#zaiAZ(H2V)LP_92W(IEpl9JK9rT?qJXePj*HEQvT|G$5Vpv1vH4I| zj*9}q7CA09AIi#cQ9#%t$HnGDSvf8W2wUX1*nB7}$3+2QiyRl54`t=JC?IT+<6`rn ztQ;2wge`JhY(A8ga43J6=|xY&FsE5}6vVT&9Wn-68>xF{fOk>g_Xp{yJi1%xefTx>p+mE)p-utg@W z)#A-m?333~N94Uz>&}HPd1qBX8`~WK4xa+xwKo9x>xlf`17KeU;FlZZb=UU*cszLb zBPXTarv;wN)pIa+W^lqp6%}ZC>A6>lh`oFD%dH(Y-77k z+5hBNq=9bAK|Gd>GxM(y#EpXdD>sy2@!hcZu~j-%_sX0 z5Yq2E&FyHran-QAZXVlSi{$%VpUy_eyxjM(wNE0UMRpyxn)~(kw>iPFtGR1hLvHxX zWY1YW4#?K=deb`Iw{$yqxwdHb4H}?JA}sW~9XB-k)m#$Spy%9|WD`(rim29nvLk6jDEB zrk}s(MP9h)%}F_u=O(6W(rAow&%EAlcV_A^S~;W$21sXmhRq|NNSh?|4g!m;9MW64 zIP2~sr#)VriAb?B_u5I{nd25KsasMC=?ao$h9Hffai5=~w?|x7d!?b0S@VO0UOVdHfGq9O3OP&Xr%@-} zV0crC{|h?Kf3OfCKKysfaJH`c$ICFiL;ZitFs@>254*d>u1UiJ9uAys<?5tt8 zPIsai|2Y}7i)lsSq)7)h z*NJL{K{ha)@rwUJ)9rnWKJ1ZNNz+u#l;AM**l_x!vt4)SJ{-pTNvSySfx=A3ow1`z zFEL4$IA(-_W4ctC$Figc(^2}+N1r#P(F5mHdyaOo$9XcoqsJK)#NtT+5Vpy2vH1X% z;{rg~Cdb9*15}O+0AZUP7n=`IIW7Q%ZE{>}K0xKT01&pxak2RTmE!_H*e1ut<^xoY z3jkr892c7pP&qCDgl%$MY(7BcxBw8g$#Jpy0F~ncK-eb7#pVN4jtc-`n;aLL4^TNS z0EBIFTx>o-<+uP4w#jj^`2dyU0zlX%$HnFYRE`S(VVfKmn-5SqE&zmWa$IaaK;^gq z5Vpy2vH1X%;{rg~Cdb9*15}O+0AZUP7n=`IIW7Q%Z8C8!j$h#&r|yQGeQS4LciQV$he8n1@F`A-(R6~-(IUPHT(DO|8VPh zBs{lp_xI~B{`kbn(#D-i^^t*qC-e&fc6e*-aOJqG{) diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullControl/blueFull.png b/src/main/resources/assets/customnpcs/textures/overlays/FullControl/blueFull.png deleted file mode 100644 index 867606a97986e83539e88b2faf0fc98225fffbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15512 zcmeI3O^n+_6vwBksOYN8hk5|P#Y$BPBpi?9IR0povTU~ON~B$FgSx%6o!FDC*~AXE zv&pUms`wBp7oZ2k0T6INLP$uxRUkw;aN>#p!G%LFMIg=F-{tm#gkDc0jxL$q6w7hl}* z?S{ElIWb5_tWstp3_GSI^?JQ*Psw_IQ<4qCkYG;AJXu@ zxEQZ0;juH0YkR%m@uEb#jOTkC4OdWz%Va(3qAZJ0t;xCxbu*`tYZJm$kfbLSqw3jC zV|y}&UW2lkE13C-7^$9g46=W06rw#vN%u{~u`RRV`E3-Ioi=J>spB?_(zr3zbF`|= zMX%-gWLUVY6s1|sDX(~?nJaD(BG1jtFNj#r*Ts4rLD8~R z4L4M%Sw<6-3$wQi7XB39%EnJcV|hAb=tsCRrhS z+4)J-NjExtQHq`gE$1JYhyZQf*)$lMUProSh;^j^MZ1xQB7zzgWxbKd$U-Qula=_l zr-4)`XsXc6DZ?uF?@hya63DYR zsE{GX$zsQpFmOz!D)mAgSI?xCysnd93exDO!c<`$J%8@z#rTfyW>hK`PeK7;Xm&upXCbH@>&&uoudF;d>Me7x5@bi09^>cuNMF?-vQtu@ACO?PLRH>mC8b` z|I=^ZUzxuq99mjvzVP;~Pu|SDcIbhdum7<6{;MBe{_cA8&2W7D^6BQ$H_kN=gRL76 zKWfiiyYk?%4^Dk~{?b9v{c+zt7v^^koC3G@4SNsI7msi42jKSY{ovTS&)@y|+pEt- O%F5Eo%4bhqcXw|HpZBrm&RXOfs? zcV-vVQoV>GSUglg1P_IJ5CjFG2NCq-sh2%?(UVgDf?gDb^(C11!(&%ROodA+#7((sa^oB4HR=NwB~wM{^uK?@SJN` z`EzPRY6SCW-Cf)X(b=6dO>1YvGHm`-ZKl#QaexkrA=m4)y~ylU`82MHuajnx=h80m zMwOpS5^}4JWp3UN5vLZ)f+dwTPBRL!s%a(dQLZS-swgR>bd*4B}(R&E`@A{D)?T_`4GX_51YQ?llwJAxtAX!f$M#HyV zXL~$`-jrmsST>ch7`dKg47`7A7{dca$@k60u`Sc_!w!sVZU?R*G4R$Z;;1p#bGWL^ zdB5$4cvz^WRK#h`Ij?l3nM+<2L(f7>^%`y{xUOxM?XvAS&=BlaOA|`4qzO>MW=q$R zDr;q3*6b8wqmg%?2wnHB&1ARW&{<)zeG7*l4NGxk)iQ8+q{t4QE2ImCEGvSp8!gK* zY*{HAgG9Mt6N#P*U0nBIJJ%<<7aJ$jTB@T-5D8YvDhg058G`Ppwjh@^$wEcR(iBW8 zLop@HM5;wM!mD*Vw~FyvPAl74^z3-+Kxn&Zg$iI8p=AG6`N0Mpmb78TN_^6NY(guk zZ8a;|9th(eYaI=1=-GF3C#UmZ2(tJ&_x*Ep*O5otURkKL*Zx5w--)|0M00C+g&bt( zXHm!9$nX_0c^0(Ye_$daxOIEeU}$;^>KfigN?8(YrzGKBr6EDqof3i;ge4uX#J@ca zxI#&$Dw#!PQ04x;X&9|yYaM!P$gYWlI~z3omuBu@_3(CPj(E2G4`wdgiQ_eKP-iD= zXeD{AFme6GwE(7dPp*g)ZKE}l^WZ%>Y^;+qwkuRN!Rmq*St)+jy#|C z+_+ZkXCs<(Udg*p_Fz7XU(->otg4Dy5y@uKW7+MY_G;b5PtYiN5|m4QA5xg=cz)!l z;31~TQpcRocg&_L_d=ak&#V={uH#<{;_#=!L}491f9~YP=#K7WR3a8jLI9zg3>Tdb zp)ydBoe!ZhTm%rh$#Bv6 z5Gun(0HK=<7o88GGF$`@y2)_S`4B3@MF63j3>Tdbp)ydBoe!ZhTm%rh$#Bv65Gun(0HK=<7o88GGF$`@y2)_S z`4B3@MF63j3>Tdbp)y# zwDyC~Dh~cEm$MdE8UXA(0>Gsg0r-6npKk%MDFN`^MF7mJ06gGdx$yaE+_$|{pKJEM z{9*UuqnD)n>Nl(RU;g95tM|TlA z<3a0Ed}wvIb@-cS_P+S_1@-bPv&RAW^YEbS@ch;HcLA`scNkoM?Z!|1)mv{R%F@D_ K`umSxy!;ml$Hh?q diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullControl/greenFull.png b/src/main/resources/assets/customnpcs/textures/overlays/FullControl/greenFull.png deleted file mode 100644 index d5e8e9a19200cee64d9a8712e4a84ca9320ae393..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15516 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 K|K#a2ul@ywh{PQL diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullControl/pinkfull.png b/src/main/resources/assets/customnpcs/textures/overlays/FullControl/pinkfull.png deleted file mode 100644 index 582eb51a24f5da3aee36787271ce7df449b27064..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15515 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 Gm;VBpPQfGq diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullControl/redFull.png b/src/main/resources/assets/customnpcs/textures/overlays/FullControl/redFull.png deleted file mode 100644 index d04ea57a24b2ca329d4fe7d85c9faef0363a2919..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15513 zcmeI3O^6&t6o5+vF)NXX2QjC1f~aUu|4mO%w=j@1Hw32LRZ=v{+vuzemVNxc46N{rKwT% z2X@<9sUI7JBT^-|9!0(-Nxfb#-_!D5uqG*{X-cvxsj5hNh~btS!M^B*hf*g)KXn|U z!0{u;bA{M1YjjqAGy8bAT8xGhJic%l?l9HFDSw=P*+4!45CmEWJB;3JW z>_#E6Q)b%v>t5uA>)tLQN9tVzlbkdfqu4XY+wIN_9Yzc134#IAnU-O5%g53R4!z9) z;f3>LDu-sxK62XQ?}UmfSFcF2YOoDrv|&j%}GO4D}W&h{(1z(P$N9ku>R|sjD`| z2eK)7ZhDKOM!j+0a<9|j?g_g^J9+<>E!HmX>$O|p+Ih~nB- zMe+8)c3GNe9S>_{IWTjk)44YUssD`m?lF4n*kx_6)K$`JcPF9Oj(RY_^J`><>}BVt zUMJ0H_hl(Q3p&m}kcbeTzr8e=MyUl$hAFnRqAc2Nva6tMU{NWx3m75@3nj7=|8^Qk zg_12@wp49c<^H`ij8`#Qhwd7-tI}|0!-oG<=Jr$%Zzprq+44WgT)Gn{YvQoZPS??cuM*4P_>hsP1 z*FW62ybnBbVBv~*_0O|s56yq|FBu^{{pQU#Yq4F diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullControl/tealFull.png b/src/main/resources/assets/customnpcs/textures/overlays/FullControl/tealFull.png deleted file mode 100644 index aab8ca3b5e2f7c8fe858532ef728271734992ada..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15515 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 L=4)3TJ^k!oi!Q}* diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/blue.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/blue.png deleted file mode 100644 index ea03dd29fd88f72362ca47fb250c7b7f26ff2e88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkao;pT^<)~0Aw+h1o;Is{Ewcfv=zt`^mK6yshE?Tuz=a) dZ~~7c1H+^~hO=HykFtT144$rjF6*2UngAe(A*KKT diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/darkblue.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/darkblue.png deleted file mode 100644 index cf982a30486af3c65d8e75df9eccdeb2132e09f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkTx^=yZY}hTOf<6B*-tA;eYf*rL91opr?ytNX4AwgaynV ehZA@t85kz@F`V^sdXx>6WbkzLb6Mw<&;$T_mLoR+ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/ender_eyes.png deleted file mode 100644 index 7229b934f062a81fe479f14fe6477d58896e56d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX^>!mPlzj!eo*=A48t$q$DbsD9OjZBzhH*{|6KyEDFV47o-U3d6?2jk kBu*)~PMUB)V*w8XLvRYiZxf-YuRwVQPgg&ebxsLQ0O2YpLI3~& diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/green.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/green.png deleted file mode 100644 index cc75c11abf404d67562acd84f5e5c266b6fca10a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkWT%tXkr$t0c0_i1o;Is{Ewcfv=zt`^mK6yshE?Tuz=a) dZ~~7c1H+^~hO=HykFtT144$rjF6*2UngA0qA!h&p diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/lightpurple.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/lightpurple.png deleted file mode 100644 index 31d4a3c0343c252ff9d6fa0032596dc05a3ff75a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkUpRO-$JV@9>`)U3GxeO_#Zt{X)BN?=;`7ZQZXkvVF9zp e;RGH@28Ky}3}?NZ9%Tb189ZJ6T-G@yGywojULs=v diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/lime.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/lime.png deleted file mode 100644 index 1a9d5532b18f901936897d4a0e0c11cad2867763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16962 zcmeI4J!~9B6o3~+Ah0kcNHm--LINp!`~R!+1;>|Q3oclWAr1|hotd>)zPmkc*YVi} zihu@DL4^=0pocO7Q9vZ9Dd-|mL_$bJ{8SXF!rR^Z9iIow&Iy6$r2BdE=DnHu-t2p` zTikoA7hjy8dwNcir1_QQ`Wk${0PoVHkHF_=H{N;|z8>o=Ur8kCiCfwGp)Wt!{#}w5 zqiB62-Dte*9gY#FPzQ*ykDW;u@OoGIz5W+|$n7^CtxjlxlICOl=DL+4I=(IIA;rZCI5LJ^@VtkqxYQk2Hs^*CFegWkFlPt54e5^O3{(LjQ1V$L$Dvl-4;q~Q44KSrPJQ5Dx=1+p2J<`FU8Hc z3)7-CqpD16o@!N(@lLj_7u%R75R7CjND!+0!aavJCtC-KW>hQE28nS*{L!GQi%gXS zj!X>=K_sXvdzxm*uImLj^oVBIURB91UT`s*SATEx+o!wM>=02q@MhpzS3L{7o3n6j zX|`*ccIMhEfCPr&$zd1-o{K|U^~f=S=s{pus&36-)~1VHjUasnt}R0&re+y4aP5Vr zijgskFd{v0iKZH|jj>aN5m|;MW5aMY$2M$iI>!uSpxdTPoLR6Ah=DA}3unL@8^mx8 zj58o~aG?i8rf?-;95{xj<6{D$p%+>P!P%_)m&}98Az^5{9tnaIxrTC7A&~WmY1{D5 zb~3VMTQwoqWz&WW$8~gU6O0c*P=J}tuH&hjmz%Sa*J$`F?IcBzx>xG8Y(5dphgzx| zs))z|!bEm06UnZp>9QK=4rDhQ5|N(Q!AbK`7Vf(qj1I1+XJXxSk%4Hwtzfx_B>7^V zW6ll?^h!5^qbq8T^%=1B99K7V2TDlbnX+Y@ri@I_kP#eYRRYVwc2Uz|EmPba7-~7n zYTVvr$;oTnCHm%M>!`-%hs+M@CNw)jEtCgmsNt!!C|mvFl^?}?gtOym4QD4D3YmSP zbu_J^Wwq!K9SrBu5F9W+e2m>K+UA{*3Riir!<{5?nC_x3UEGAT!%+@zh1W?l*8M*v ziW3APLDxZ#u4KO-GimwxhHLl`x+u(>!LC z-M$w0R+r#O3$57}9QdjV+ss<5Mm^fxs7G*bm1LE`Hv2ZLVyfYlk)Z)o%m>R2#}s|T zB2;6~MDj9Lw89e?c-W&1pY|N6aKrlZAb*Tj^dP-5zQiC55WXmI@%b=Xfr|mc7X>ap zA4V&1F+ljDz{TgoXaz0?2wxPq_h7$AI6;NtUPv;r3cgf9wQ zd_Ig;;9`LAMS+XYhtUdL3=qC3aPj#tT7ioJ!WRWDJ|9Laa4|smqQJ%H!)OIA1_)mi zxcGb+t-!?q;fn$npAVxIxELUOQQ+e9VYC7l1B5RMTzo!^R^VcQ@I`@(&xg?pTnrGt zC~)!lFj|3&0m2srEqe{eJ>&!=EPX!oMTj{H6Od z{Ify{FRwKuY5!SCy8ezN-MbIpze>`MDoJ;*N|OJPBs~>>_{R4apzo!X`r>-;_HRFa zIxm%^Q@8&3;mI?vKYmM-?tJ(D?Uz2jdG9OeG5{-sjMK|NbfI YwWT|E|9a-e^-Q^P{$l-$b64N~8;!M2&j0`b diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/old_ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/old_ender_eyes.png deleted file mode 100644 index 05d9386beb17d77791a3e98d2f7a7bcbc4c27a01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX^>!mPlzj!p7Vb%!~dXLzZTB~a+phk{DK+&|91(vrU>MUc)B=-RLn_E lkT|8_I%&cIjRiam48bW3zfFXqz5?YLJYD@<);T3K0RZ?AC#L`a diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/orange.png deleted file mode 100644 index ea69afbdd4f7ba412fea8482142ace61796929ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkp4fH;l4m+DUiif666=m@IQK@(pDf((9^{+q+(8T!UATG e!wEc+3=EU{7|wb*J<0}3GI+ZBxvXO=u<5X=vX`momfKP}kkp2|+UrM%74aj0D3GxeO_#Zt{X)BN?=;`7ZQZXkvVF9zp e;RGH@28Ky}3}?NZ9%Tb189ZJ6T-G@yGywoU?jj%n diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/purp.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/purp.png deleted file mode 100644 index f4aaf9e681b63d35e57e015967ae5e84f7f063d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX^>!mPlzj!KF08o;rhqA(_el9Im{(Ne!&d?|GNZSQv`A)JY5_^D&{07 pNStzTX_>&#&UBJ#F#{(9!|xdkCnNsNHwLO<@O1TaS?83{1OS@tDPaHr diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/purple.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/purple.png deleted file mode 100644 index 71a8f15c1add9657a0093e0802f3a36a286f7b9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkiKC5Ki0_856EIF3GxeO_#Zt{X)BN?=;`7ZQZXkvVF9zp e;RGH@28Ky}3}?NZ9%Tb189ZJ6T-G@yGywoV$|5HK diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/red.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/red.png deleted file mode 100644 index 4a4444c18bfb5f7a7b512a70f934b025e0118b5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkp6FEWEatK8OUNP3GxeO_#Zt{X)BN?=;`7ZQZXkvVF9zp e;RGH@28Ky}3}?NZ9%Tb189ZJ6T-G@yGywoaogzm7 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/teal.png deleted file mode 100644 index 3dc1be55ef8f294896983b4b5f7b8f5f2ffce4e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkY@Pv-yrA5XCQ;AB*-tA;eYf*rL91opr?ytNX4AwgaynV dhZA@t85kz@F`V^sdXx>)^&kBXs}( diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/turqoise.png deleted file mode 100644 index 5c702d6f53ca593b519496faf03e12fe402f6a50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkT&|e=b`V5G$4zqB*-tA;eYf*rL91opr?ytNX4AwgaynV ehZA@t85kz@F`V^sdXx>6WbkzLb6Mw<&;$U4Nh4YS diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/turquiose.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/turquiose.png deleted file mode 100644 index 858ed9b0eb3562256056fe88138115cfb721d13e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16962 zcmeI4O^6&t6o6X;Vipqw4}u3BCkQI`^iTCavlBNviM!y$kgR5N5K~=Mz1!@}^f=v{ zncYJW_2Na)lOA#rym}TCB?k|lg&-m*-V{ZzdWo;6=eKsYTz0dFQUmkz>eYL%`g>Kc zs{1hST)OzesfEWD6h%3;x>COk-_OIl^xy;V`O&SLZ^PHg&dRk^QBL2^-}im`-qvr5 zvJ}T_>)Cqa#egKO3Z_ZOD*aXmdMirxY`=ra7RyQ@+lbqX<=;R1vRsPkV)?4w&>Nj) zwi&PNcG;EPi)&1NfacYvt0QOSZLGUdjWO z)*F{f%So4&?24lj-Em8s5NFl5{sT!}onnH#O5#p@*98v@_gS+v%CY$;eNgrKB5ovN&m% za=$oCwzI`@IS({`4X>-!83$^oLv}z>>*J1QRCH~g5hY`r&UUvs7#bxSYqAz=XDQej zbL~2tNtUFW$vz>+>U{%4P8yAI?78D@wdRISv-39q!4T za%SGuXK^%1&WxvAv+vkhKi|w2!HtyboAE6leHAUZ(p_`Jp6;l5PuUwYY^hnAT};RJBRtRL}9O3YL>* z(uHBM8memZn&(>86SAF8>!mhfDI_DEN)n`MuyD`ejoH?bq8ZnUvOyCP(_j)*_pqhY z&{Y{SFl2&xs&5!b^*lc$kxvce_*E@myx?LouHoDmw$FEMI1y$}=pTb?Q}=D~ZXJhf z+i*O~a&p&x0VG7oSEDEleUC(r?$bj8F~bnqx@jN7s4b6p2F2zvxVDi&EyG5~;M$KY zonUkvX~bseQA0;fGd&o3~rek^3Jr33(Mc8)z=onZNM3ILG z$$_xZLJz6RU?mX}y2v-lA%U>Sk8DIqKI-9;xmPtLiX6|UVR$6hupLz>R6S}r4!rZ3 zj2+d{EvR+*uwmhNu1Oq9$UX=PFtgQlx^#y62l7 zMrvdMH_9wm4WZOG3`bYooa&QbOU~AJJrkKOY$2g*U)rY&6{2mn@+2F(~0HF?KrEM!)RRdlvRHF zTHIS*fhR4j=GbuHt7?2RZ*eK^v*vm|hI^|t-w7ORXu~V!8eW?iA{gQz*uZc~F*Gbv zHT6tnu#FY1@Wcfk_Gsg$J$rVz@&0o!e@w3EUV7zx$simMu_$qg`EXi^ivuDSB`z@^ zPAhS7K*XZNCFa9vB`yw#Sd_TLd^oMd#Q_nE5|@|{rO=u<5X=vX`momfKP}kkpBPw|I(ZD?*ds&B|(0{4F97iDs2Vw1U+3GLn`JZCoEw0 eIGn&E$-pqFkKwGB)1z#lB!j1`pUXO@geCyt$Rz3j diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/white_cry.png deleted file mode 100644 index 51ad794433fadc3e6c65f1c11c4849d34662cbdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkpBPw|I(ZD?*ds&B|(0{4F97iDs2VwL_A#_Ln`JZCoEw0 hIGnKJK^l)91H&~wM$1X9w}pW644$rjF6*2UngC{ACQJYT diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/FullEyes/yellow.png deleted file mode 100644 index 11639d80d223f883be56fac8096dbf04c47a54a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkp6#zAxQ3!DUiif666=m@IQK@(pDf((9^{+q+(8T!UATG e!wEc+3=EU{7|wb*J<0}3GI+ZBxvX diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/darkblue.png b/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/darkblue.png deleted file mode 100644 index 89b360e62bc22e521c38a9de9f54c3c0a3c8fc2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z=B7)5S5QV$RzO8+jQFIG7#Nye9q?cXpI)V13~C>(E+d28IQt{`=y$ gACCqZ!N6eP#uzRytf)LI+zrI_boFyt=akR{07&X3KL7v# diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/ender_eyes.png deleted file mode 100644 index 55a131bd12088600e6a2b464de19fe90640e4dfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z=BB)5S5QV$RzO8+jQNc$g2aIoro`P$skKg&=dw?q{mg`xqD+R-0~0 lOPRZG+qQl7KphMW8L7=OSsdIUPxSpgTe~DWM4f0oo>- diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/old_ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/old_ender_eyes.png deleted file mode 100644 index f80f3ccdb95d50ce9c8e6ecbd9bde892781c6bd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z=B3)5S5QV$RzO8+jQNc$g2KIZ?CbP>$OoHy(j^v!=)F0vf+AElf*! jdH>qA@A-im7#N~%o;|Jn)1WAf8^rT;^>bP0l+XkK8;>c{ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/orange.png deleted file mode 100644 index e87e127572a6dd489c382bda08bdba02f5356958..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*o;)5S5QV$RzOj=T&G9LxuQeQyZU<2b-zKKae!`)Ujf8(w+&-?n@I en;EE`V5CMf^_ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/teal.png deleted file mode 100644 index 01ffd6a9585c6ed72d90b9b012ef8d5cf7aa7725..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*o$)5S5QV$RzO8#x&mIG7#3&yNh)P|mowS^tt669Yq8q-pN&J>S`Z cDj68UO_no@Uo4rq#Sz5wboFyt=akR{0E;msmH+?% diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/turqoise.png deleted file mode 100644 index bc51646e55e49291681ecf0bea1180db5b36d28b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z=BF)5S5QV$RzOj=T&894w9|q4jGgPU1Sia7N|#j`yxWGhaWc-JjRL f{U1;<14BX&(|0%VK+~6O79g&ttDnm{r-UW|WFsf9 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/white.png b/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/white.png deleted file mode 100644 index 70a53b80808adac23fd00bb8f3f34eee8d775a23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*oy)5S5QV$RzO3mF+0I1U^9tC!*_<9B$J70t@P5V-!z^S$ywRSXPs Y46V!LAKHG|zz5=ay85}Sb4q9e0Pb-kEC2ui diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/white_cry.png deleted file mode 100644 index 4eedc1a7347f34ab32298cf1dd50a85aa163ab9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z=BR)5S5QV$RzOhFlB=94wCi|G#8W3_TEaVdlGC$;u223rgl?^>4Rx m_{CgOm#NsmaGDvYi6J>Au*d$O_Wy!YAfBhIpUXO@geCxx5GwWn diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/FullHigh/yellow.png deleted file mode 100644 index 3281349d92ac2b3fb7d379375eeb2e30fd09cdbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*o;)5S5QV$RzOj=T&G9LxuQg?C8naU5VUpZsR=eKiJ#4X?cXZ`-~9 e%?wn_&|oaLI9hCD-5Gy-5ZBYy&t;ucLK6T7iYCSY diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/blue.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/blue.png deleted file mode 100644 index fed5caf56093c2ac9f6e68560c78f320cadcb523..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkao;pT^<)~0Aw+h1o;Is{Ewcfv=zt`^mK6yshE?Tut448 dZ~{*m14DNb!`X#N{DweD22WQ%mvv4FO#mU+AzlCg diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/darkblue.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/darkblue.png deleted file mode 100644 index 81956cc26c46d2e413c1c5f7858009d4c9bdfd22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkTx^=yZY}hTOf<6B*-tA;eYf*rL91opr?ytNX4Awgazsz ehZA_p7#O;f7|t$C;x`0JGI+ZBxvXO=u<5X=vX^>!mPlzj!eo*=A48t$q$DbsD9OjZBzhH*{|6KyEDFV47o-U3d6?2jk kB*GM2Crvn@p}@(&;B<=Nx1&=T2T-2D)78&qol`;+0LC^Z3;+NC diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/gone.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/gone.png deleted file mode 100644 index 35bf35702d7f2921fd46f2774f5998b2bc4fa1c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15044 zcmeI3Pl)4G9LL|XAiJZpCsFYfx`+y<`O`LSLfdt0XPp5%4zrb=Ik{=_+JK0=r7hM#j^y?^*C zLh1vny&vqiUegR`nAc6GgY%Q2OL`+zy)toi;}8d22lp(ymiztdZ*!bw)^gWNEwSY` zaNpWG@$j{iowjjuXsBlHN`0+5(MW(H4s>oZ9N4}#spX=$8o3Xfg&Y@k2@Y$yjW8j% z-`eFGj)%EYUf~T@{ZRNBvn-fQ5IyGCp~!o*bejwZ~K?yAhS44>>Hlt29{%U zVO+iAjDlJ&7bZ%s>AZ$+lF0U_>h_OXkFJ?uLp&%m2UWGa`J z%|5WY>Eg^q3YC>(#}jLXTd2ft(N>68s7mIlH9V{bj@NdaK|S7OyEBAbqY>>Y?uF}? zZ8~HB#i{^Z()CWG;iewoI@ymEUQ~EVY)i6MRJ8&zi<&5Ag2X*RjFw|s-Qy)ON|Gke z#mMx8F-ZNGdZ3>vO15t%j%jFJ#~bQF-5TmWEVy>BDx{5>p2@D#8qUD+$gps|P!*On zXS|}Frfu7PpxXxCZq`Xd-m*-stICQZ7Ylqx(G6agiwdt+q%JQh<*rn&sAXO0L=ao8 ztouUfrelo4Y9XQHgT-_V5qzaEjKH`w<36@&qif_3}>sVhg*iZ6YBq4hIAJjeckS1vo6dw@T}o%D;KZld}Yn5b+Hnw;h&R6 zs+jC3J*pm3+6!%I=D7cUSdD{G)L$*Bg;GV3L~>1Cvodr&pu1*e=$d-IVOv36o@N8h z8L#jkG(O(1k%v88S4yQqsVcx`=&@@}@L<1bk#pD&&l9CM^?|}t$Ai?dK!zA4iySk; z)G=PF%wt(pgK;Z)=p)aYLh``5P@c&t_9$=C89mCVAQnpkfY42bi_QnA3>N@GHyJKE zAD}W^00`Y=xafR<%5VW7bd%wt^8qTu1%S{^hKtSzs0pfX$l2;F43=zM_6Z~-86li{NC0V=}N@GHyJKEAD}W^00`Y=xafR<%5VW7bd!o}Eq#R(+vL5?F?m7r{2!MlrWa3;75+mH+?% diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/green.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/green.png deleted file mode 100644 index c723604290ebac91db5e4cf7be84aef3eb422796..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkWT%tXkr$t0c0_i1o;Is{Ewcfv=zt`^mK6yshE?Tut448 dZ~{*m14DNb!`X#N{DweD22WQ%mvv4FO#l>tAs+w$ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/lightpurple.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/lightpurple.png deleted file mode 100644 index 3823e1900bf877640081922764781baa8d0b3cc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkUpRO-$JV@9>`)U3GxeO_#Zt{X)BN?=;`7ZQZXkvVS&2G d;RK#C28Qk=hO-Nk_zi)Q44$rjF6*2UngC9%A{zhz diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/lime.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/lime.png deleted file mode 100644 index 8d0d2ae91d9f6bf670c052e121e9455d3e04e84a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15486 zcmeI3O^n+_6o98xs$fOAa6sZ@r9uL!&iLQ4Nm9zDWmh6)wN2IC3v^;nvSt(8*xn|) z2UI~X9N~btZ~!Du2&5t;q#jTYoH=koy#oS)IKyQb+llR+WJfC~LZGpfIB(v(_h!B~ z^Ts*&t&J-$oLzZx1psh%eXX-e?$42r@bDS({o(ts-zK+5!nN%ffXD8opHpAHz56Qw z&wlLnwvw&xi?$Pt>&OlIxIP_+q&EP~3)2ueyEqa0cZNb1PRme$dB!5tCsn-$?voo)`YA}vfHX%OalsA z-3?(ih_Im74bhPdQ!uT%ted80o);8J)}f?ART34|)+Ad~gxOVVuaIBO$Q{_5oy)Uu zL~7M`k|eYtoJ=P5iCPb$A(So4f|3FiMI=4Mc;8RZRP^I>xs$n{4vwA33llH!h14(V z2YX4YR!ajF*KA(nun6SGGj@a`oT3oQbqOvra-G5^+>1up&|C-N5gubdiHV)O)Gpi! zk|5p*jtN<)j}1(6((M+pmyUNlUK%=1F5M&uW=NM>#=ZRz!%Z9qdy#`L-6T^vw`}%_ zHz<>H#8av{cIz?lh zllYk?q)p0vm)>v(CAdx2V?&e-QI>kLVr!PI5>c}ysp2H>N%`mot~b~(eaNyXHF}b4 zr*3pn(hDDzp0p3Le_WKH6M3ojt@v>rdk{opl(fAu8e$mw!zL^nD?N)RKAR@!U zZM6xPHCL>%m1eK|ae{mYuXoy{q3(IE-7s~%@E6Or%h?Xp?VxwX8oq^@bs$tCo zRh%sZdMWZq-9w{FpL8xR2_~C{gbjl@ZpZ@>DVinrEi4n!l@x6-&>UBuhgjlfA=H`| zlhwLkS;b^6XO-6m8Ob)13BqRH1ahm8|FYZ83dJ2DMSv0D-VwFDohOVo66VlDJ#fCS+@mFD?uomafgZxp>=s|j=eDNR@5Vpv1vH4J1j*9}q7CA09A4X=&ge`JhY(A8hg_Xp|l(q1%xefTx>p+mgAy;utkoG&4TzKE;b)Z%W+Xa*doWp=0j;YE(!=+Wa3&WU%tgYdE<6MUah_J?sh_6%N3lp%`N~3 zPXTc2O#psBB=?^H*pmSG`33;?djLEUyz|P}mr38v_0GlK^!_j3esC5D;PkyahcAC} z?a?#$!0pH3tI)gu!;cSO=u<5X=vX^>!mPlzj!p7Vb%!~dXLzZTB~a+phk{DK+&|91(vrU>MUc)B=-RLn_E kkO)(7oiyQqh5{!8gVQO7-;PdY96)&nPgg&ebxsLQ0NorWaR2}S diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/orange.png deleted file mode 100644 index 0b83c27922c3d09cab518493d0eee80ab9f23e7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkp4fH;l4m+DUiif666=m@IQK@(pDf((9^{+q+(8T!UA=V e!wEcP3=G{#3}+W6@f!jq89ZJ6T-G@yGywommm(wp diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/pink.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/pink.png deleted file mode 100644 index 1aa00d6270364ca8c0447d79f1d0775fea6ee6a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkp2|+UrM%74aj0D3GxeO_#Zt{X)BN?=;`7ZQZXkvVS&2G d;RK#C28Qk=hO-Nk_zi)Q44$rjF6*2UngBpOA=m%_ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/purp.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/purp.png deleted file mode 100644 index a8fea5ec25cedc7bc3181ac0c97c0149416e95a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX^>!mPlzj!KF08o;rhqA(_el9Im{(Ne!&d?|GNZSQv`CwJzX3_D&{07 nNQ61Kv`k=VXFAEGEXly|E`Z^rb$HStpb`d8S3j3^P6O=u<5X=vX`momfKP}kkiKC5Ki0_856EIF3GxeO_#Zt{X)BN?=;`7ZQZXkvVS&2G d;RK#C28Qk=hO-Nk_zi)Q44$rjF6*2UngBr=A>RN1 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/red.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/red.png deleted file mode 100644 index 681b3255d91457b3673bf49e8c5f932ad41f63dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH$P6TB1iv{Bq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`momfKP}kkp6FEWEatK8OUNP3GxeO_#Zt{X)BN?=;`7ZQZXkvVS&2G d;RK#C28Qk=hO-Nk_zi)Q44$rjF6*2UngB)YA^!jX diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/redorange.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/redorange.png deleted file mode 100644 index ad634dda79d9f9952b06818784619880220e555e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15485 zcmeI3O^n+_6vwBkKxNhC3hK#9g#Zc1-%f0jlx5ShE0MBngSsoB(uqCJTASF$cAD%S zP*u2agcBDIaDW>p4oDnm4;&E^a6(+TAV8%Y(Tc+|wiDYs$&OZ~2!X~@62JM+dvE-k znP=zVw>K`ou)K6`2>`IXzSiEvzt7yoG-r3D&kF03N-Qd`^A#&hBpj zJo}N`-HNw5FPfG=tU}xGq3UE9;NAcK`UEj8#9F5>T0^GxTmhV zp6!pLryBz4Qp|S|4Ygs6T6jIyc~R#ju`9`@YM2T(RZ|p8L9(7ijE--+&R!8il6bM+ z6(tjgQB+>k@))I_WDLB2Y#756MJe|!#j!2Z@xvjETka6{kq~(OhEOz?dgiOjT=fTj zh=+w*N<&!GT=Gg+nz`;pG4w37-frQBs_WXOCiaw?WhlH2EyN>9)%c#KL0*Hsnq#XF z=^9KSb~9d@$FL19AZ#K>MI}Ms-%6XOh z_oks(#nuk=`p9kxvn!i5{Fi3#WcBdAHqhdG%l}~JvYmLeCeG^Yd<|_Rj}<1azql5_ zwC>@eJl9sNnXLa-Qbz})w7;PlidGjS5g$|6vP`;e(_PCl=~{Tc;<<54o@OJOOJ2#d zPj+Lzf*;dSOV>0-YY1dB>9OHX&|s_W;yY-R+zE7b>O%?(9k&Zd1rISzmO7S%sbe-( zr3dP?dSg(|2)W(;))(*R3a8jLI9zg3>Tdbp)ydBoe!ZhTm%rh$#Bv65Gun(0HK=<7o88G zGF$`@y2)_S`4B3@MF63j3>Tdbp)ydBoe!ZhTm%rh$#Bv65Gun(0HK=<7o88GGF$`@y2)_S`4B3@MF63j3>Tdb zp)yM z4gmX40C4k701giE?=Jw1L;!xh4uJU{0FU|azV_uM-1p`6_DXm1{oQXrSOy$8eMeUQ z{P^*+w@#gT^4fRTzWMa4uOGsl^5c)6e!lkucr~|+liRyIHVzL@gL4Nz-aFX1Jxa9o Mi(Q@AmOAyb~)z4*}Q$iB}RXrq$ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/turqoise.png deleted file mode 100644 index 0bdf1972da6268690b8cb4c86c47cc166a9fa59d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*Hmc)5S5QV$RzOj=T&894w9|q4jGgPU1Sia7N|#j`yxW6()Z7zQ6uf f@tPmVW=NR8r20iX(EXlXABgMe>gTe~DWM4f0!}8K diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/turquiose.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/turquiose.png deleted file mode 100644 index 1dd1f601dccc9c0aa08e10008ae9b889b762d475..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15485 zcmeI3&5zqe6u<{nLafD@c5Bo1)khy(`&>H#Xzzkmzs2{-{-;9M@t*iLNkBs*G_A_N*sN&M!`dvE49 zZ{9cuzrB9(+0#ppE&%{eudQ}A$nVqSBRupV`TqFB*WV&P4+pDPA^;w_m3$uf^1Yqk z066!F+uMvcyU$y;KdK_f@8jxZ6p-EkG|o=~Wbfcu=;JNdYgYca`E^Bboo3~--j%yS z8*jU-`ysxxf3aup@7ShOIp11pOf2GHgkvO3Mnf;MCe2Ff*CO{xvs4k%F7ZyYvYZ4I zHoNOW+YhmzR}ImYjhaw1t5C1iwAxdGB12u0RY{daMYS~9(iCBORa#5rt`Rx|Yol{v z8jeWK%61$FmL!eGtV_dr+}7(^843S+ZPmlJ%r~bbZGi>=iyB6yktTiu+k!RzzPKz{DUDvT3XxMc}lf?m6HLDWGsVzND^!5O2q*imS($CXyrkt7E3rxUv4!lUwzceJdtj#_ z9ce9wm0M2D-1+4^8G_7z$^7^j<8AD*wpZpV?RC79$REUG6yoJAk|8JA`I*Tctry%8j73Kg_Xp|l(q z1%xefTx>p+mgAy;utkoG&4TzKE;b)Z%W+Xa*doWp=0j;Y zE(!=+fV+p}_ZI+mWdMG?3V?M3fHVI4uiU;s`o6f!_<7V@-cA{Hb Mx!C#inX7O91=~%wVE_OC diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/white.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/white.png deleted file mode 100644 index c716b6b4aaedfe459d19695ae56a3697064e8f39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D2})5S5QV$RzO3mF+0I1U^9tC!*_<9B$J70t@PAn?Vj_TF!x1OtPN Xk@+|Ihk1$;%pjhptDnm{r-UW|j3*$@ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/white_cry.png deleted file mode 100644 index 7a86f0619219639163b6ff6a8200cf221be1b52e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*HmY)5S5QV$RzOhFlB=94wCi|G#8W3_TEaVdlGC$;vmdKI;Vst0QZq7a{vGU diff --git a/src/main/resources/assets/customnpcs/textures/overlays/FullLow/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/FullLow/yellow.png deleted file mode 100644 index fc7f0e63de3276a6cab279445549db9acc9b5e01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D3A)5S5QV$RzOj=T&G9LxuQg?C8naU5VUpZsR=eKnwh?sZ?by#2h- d9>`>9aF!E}5Zkz-_umN+*VEO{Wt~$(69C27CdU8( diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/blue.png b/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/blue.png deleted file mode 100644 index dee4768a294a24f3a1f622a11b5b6324c91ea695..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z+zlr;B4q#hka-4Y?W&cv>GeJrKQPvtjv_vsZ;R1eqQ#e01f~xBm++ z%sP6+>+%$!dLYm;);n&Q``b1r?pN)m%}bI6z4rT;&9h*A@l~9G;fq86j`gL%#~&K3 zU*8$!^SJP?kK&q>ot-yr)Rq@^XC|(CTDz}4SH6z@!VdfDTe6{D;5 m-HK^yOZM(RmhAX1rcbX~<;;=1bNX!{D?MHPT-G@yGywpFoM9~h diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/fire.png b/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/fire.png deleted file mode 100644 index 27d42f1826a75eff6eca29d222823d0a33036a10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z+zRr;B4q#hka-4fz@rcpL)V`cE&kY_jf(YP~jLhr@yYLP8t4*GhB& z^?^Wh=e?t)mhM&W_Rf12bg5FXYW;Fc&pAwgzKSz2{Asj%l=XRK-(d-@&Uc2w{K8_7 zGK!kKY`o7M*{geI!;Sd%`%7txxWoId#Fs54@AJzV c|Cd?bV$kmdKI;Vst0ODO*RsaA1 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/green.png b/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/green.png deleted file mode 100644 index a46f3333ef6599a59e8db0b86c7f042e06666835..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z+zVr;B4q#hka-1GyR$cp4I4u8n4yyEwXReP4>E-nBI^JTLy^XUWyi zmGpZKR1E}D#(9(H{}pndalLN-Bd1HdIJVwjZs9qH>Cabj28KV4wvX;ztCekk{b5c; z$IKmZ<-r{{9=>$x-|2VmSn?UMWucdz&yTm}-N}4oht2N0vbwusN`iteeM=Kp3~k7{ mzU7o!N_D;Tb=IFnmbVxsuPlj+Jj)*nvenbo&t;ucLK6UoXkO_6 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/pink.png b/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/pink.png deleted file mode 100644 index e593a531e79d5f3a4aa60ac176fa92f6207aca17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z+zVr;B4q#hka-4Y?W&cv>IEoj+?_k)p2ufbq^9EkUM-3m;v%^zHwG z3$u@PI#fvog&^>bP0l+XkKqdj2+ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/purple.png b/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/purple.png deleted file mode 100644 index eec419ba16e14eb6ef0b3b974541e6167b9aca53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z+z#r;B4q#hka-4{|mb@U%W$_mCm)k=D7VEOD`?6tx7I9xi;ea_QUu zjtfo2g|&TynSfdt7&6Y7&Howk$u=kMcWu|^CCP$W`~3^&S+Gic6=z`Rap>Q%zBK&! zL#wyzJEMFa7vA+%TywIs^QMj3^1|-S#92>k_todh*RfyNVPAbq*0)Ps*8kM)xV;=l onO>~Rn5MR5@BU-Sj{jo%^r|y&9Dnm^)dP@~p00i_>zopr0DoRz?EnA( diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/red.png b/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/red.png deleted file mode 100644 index fc4ed784c5e9b039381f19c6e10ca685235bb64d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q!^2X+?^P2p46!aaySb-B8wRq zfKP}kkbbRd^xq|Dt)$UPl@L83pQR+oFPP!~|NonH9Xfz~M^6{W zkcv6U2@SNEDCo^H#A^i@Vn1l!1QyM70@sSPgg&ebxsLQ0J?`e5&!@I diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/white.png b/src/main/resources/assets/customnpcs/textures/overlays/HandOverlay/white.png deleted file mode 100644 index 3be6475291b5185f006105c229c41fc9d03176e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z+zxr;B4q#hka-9k~uD@VH#O_kV)iLG6f55**IayMh+|cXXWH>!~~I zH4{)R1B1r0?{+H3R$n)cRhiqpq006$?`9zJ^hy68Rt5(356bVd_gyW#5moJLk|cNj zb1s+Q^f_}PdWwtW`e%qQ)4BWk>(;L;*gx#JXZyBqQqkhYOG@5;b<+?(Q0^KzZ^He* fw)40@Ew|jo_?pE+Qs$R!639kRS3j3^P6H>n|JuORkenB|Ko^G0S<3d{>#Wg28J8#;kEidfOOuY2T?*9I5{QH?R?##dYwr|QK*W;5vZ41|T+Q_g= m`_iSBE#I$K=$x2-`Xc8V-J2B)I5Zc7tn_sCb6Mw<&;$T!%3oyw diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/blue.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/blue.png deleted file mode 100644 index bc9a165699aec8f6cb1da50c403dc597a02a6b7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D32)5S5QV$R#+j+_h*91M=DXTE5X4BE-SCXkjOFU`onkn<_@|2B4@ bN`@Ut3~N|8Gh5UdDnVRNS3j3^P6avr8O&~2nUYe1CAtx^E|2B4@ cN`@Ut4DVVwC!X$~6$9dWy85}Sb4q9e02>=4F8}}l diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/ender_eyes.png deleted file mode 100644 index 831e1d23bbca887dfec85da95d218a045e18b91a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*Hmc)5S5QV$RzW8#x&i1XvDc-z?k7Fba}$kS4%-$Pgg&ebxsLQ0Q_|({Qv*} diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/green.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/green.png deleted file mode 100644 index a7055f83121773195ee840d6f8174ba80b79e348..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D36)5S5QV$R#+j+_h(91Mo5CC>d56k(QdxbZ+voRNVcX4U5HuYoiJ Z!#;`BYg~d+6QT=1JWp3Ymvv4FO#r1GAqfBg diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/lightpurple.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/lightpurple.png deleted file mode 100644 index 6f18d283c2e25be768524dbb7b412f2dd202c464..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D2>)5S5QV$R#+j+_h(91MoHrLKE)G4d$n6!dokrS+!Xz5NwPGcd&S X+?D0I7%=liJc#G%>gTe~DWM4fjMO1< diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/old_ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/old_ender_eyes.png deleted file mode 100644 index f36edc0206a3d19547bdcede03c0684993e48f3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D3A)5S5QV$RzW8#x&i7?=;9c~P_OQI6o6qj5X3FJHWT foEfN=;m1L?_nCr!S6<@O2XQ@J{an^LB{Ts52S6vk diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/orange.png deleted file mode 100644 index b5ce0f707562513214afd28b48ce1cc33df5167c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D2>)5S5QV$R#+j+_h(94rT4-#@sfi;+j+%mF(yMg|7G*q3jsfXWye Z^x0mQbLF0Fb=Uyndb;|#taD0e0sz;cBKQCR diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/pink.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/pink.png deleted file mode 100644 index a0b5f532ebb1cf3089b217e3006031d68caaede8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D36)5S5QV$R#+hMWux91M<=Z`E&WNMc~-DF1NS9VkEj)VsG;K$@XJ YpDo&g*HZA_)MgOZ)78&qol`;+0MfA{8UO$Q diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/purp.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/purp.png deleted file mode 100644 index 6a081c9a6183d5eb91a70e266c128cb684995089..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*HmW)5S5QV$RzOhJp+VJj@4viMO@Ba$t-xpC+~7f4QWQnjp~F^rLoD p*PWkm{=poxeHID77=ij2=Izopr0O;i-O8@`> diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/red.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/red.png deleted file mode 100644 index cf3c7f04995c0e4194133226deacb24ba4ddbba7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D2>)5S5QV$R#+j+_h(94wB;vH$bB7fUHx3vIVCg!0GMbY3jhEB diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/teal.png deleted file mode 100644 index f80b16e4537258306f79ef732f7cb5e637c30e40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D2})5S5QV$R#+8#x&mI9Lq7&yTD)c#pA#W!(-f28IV$PL|mMRWTe8 YW`1eI{jxROTLr}RboFyt=akR{0LMcj$^ZZW diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/turqoise.png deleted file mode 100644 index 78502ef803598abed0ff097c8bdc8518bab7a92c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D2-)5S5QV$R#+j+_h*91M=eGykvZEMnwQICH?xjERBaM#|oQx%@zd b3bP0l+XkK2xlXH diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/white.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/white.png deleted file mode 100644 index 61966cd6bff6873b1bdac349b3cc3987ae71c3ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D2@)5S5QV$R#+8+jQRIG7jw`@cnRo$Ub@Ga&|s1v4-60hKU(ILf3O V&HwTH(y;v?uBWS?%Q~loCIDh_B9H(8 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/white_cry.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/white_cry.png deleted file mode 100644 index d79cde1fbea60e86e0c9cbe7f0dc78a90d130ea9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*Hmk)5S5QV$RzOihK+X9L$dY{=c+tR&tztpl5Zq850A;i#=D~3THK( i)K_NNAqP~?kkHM)uSfl+r0tROAg-sYpUXO@geCxU8Yj>I diff --git a/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/HighEyes/yellow.png deleted file mode 100644 index c2d88316e32b567a1ad61fb4b5557759d984ca78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q zd`Cc-ajG_-G*D2>)5S5QV$R#+j+_h(94rT4&%a>S#mJ*@=760UBLjn8?8~=RKxGUK Z`fU39xg(cey21|Pdb;|#taD0e0syh7A>IH0 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Ignite/BlueIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/Ignite/BlueIgnite.png deleted file mode 100644 index e61a88fbc1ad3eef42e853c79f0786a3c8f21c54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15578 zcmeI3OKjXk7{{GL5e>A00}pYswjd~~*YE8h!!Ex zSlV5G^Plhg#=n{Q>^=C%=*#v9Q0yKg;n82xOhkL>dp zX49GA)A!M(sPFi6Nw7Dw43$Azq%%y5Q~QCLMwin5}lm91<_5M^GFcuC+=lAadybc$^q ziCjNA%erP+AItA-r9;+0qT>5?o#z{kMzSF#9e0`+HBIA%6rW0Qs0ZiG**<7;wzoM7 z(vFjdp5a<`-*Rj=hzm;2tUr)Q1c^FF>$+<7P9ocDu|pL3CaCjbQs8?znMTK_KI>M) zp_v8`tFQ)b-$Q<4PrrJ_@g1+?tdg=LubLRmNwL_;-E+LPTF=y;KYS1&Xd&(C=}pYl zAwLE^XVx{~@IiDbn|ocoZ0A z7p=0L~@C>w*vq z67|Gl6dltl&n=IkP6(ndDS8;M6C>6WkAe1&34E}oDDl3rIHsYO9k&MjoK*wUkgwa* zS-#sC>)BaV`jAs~Tr@10ld^oT=9pKw()5Du`M@?{A)iAHNy{?zvQ(B-07Om}6vzQH zZEz(iEpVv03}je>Mn(xC7K?HB6`}KvF&pd_6gny_remP+-C>mkAZ3(PiGxx~Kyw9E zP7_6mQ&p{Glr>Y7GFm%PEZB-fkGK}9d!QQY6I_dlk|`y*tOx*dM%qYmKuK$yT9!>t z%qW5ZQ-YyLh*X54N0=3r|}3C)~$6FoN2aGlJ~_%`CsHwL7eiXUol6Ih|`m5XFzVub!h(fi`J-MWMo8s|WF% zvfltM9GpfgWGy>Cin`nl51-|OdqLIu2PVP;2d{1#G({}|RngF1$_SiUMjHwQ`%6^I zX$TAe(kfbse|s8Gg%WgG&{I;o%KdxO&|Sqw1=!Qj%<=6jYd8FtW^Qfu@M>lbySMxg zW-i)^%WGo0&aSMX+2FB4NA(xg0ua_cG0U%L>#muo|71`{tFvK$P1Yn?-m^%`MFdp8`d223Z8wU8}m4NOozFQEK72h$D47FQL727lX(l>LA~Hk zkV&_EaG|H;zOJK$h8QLb9b-bvF`BB_19ezEqgM2|j{Yg|oxchz3Tx;7b1hH0S9C3- zVzFov3<%kzxX64kmEyvHkWGq<%m-5`E({3Sq`1g@FqPuMfRIg!i_8a8DJ~2M*`&D0 zd@z;b!hn!Xii^w#Qz#RBU#A#GKguw7 zIIlf*b|>n4ypSK9Xnz0Oxra9`us07sdg+Txk8hu~Upe>C<-g69%>JJ~9Qo|UQ%{`O&s<#h-N_MVL!?b*chvHWUmjchahv-Mb5dKHD=d9{ zX5H`Sjk&kC^&RTV9QxoWA(Z y)Y6t)4s5zJw|?i#gBPBx-1O!t8->4e diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Ignite/OrangeIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/Ignite/OrangeIgnite.png deleted file mode 100644 index 0bc740524d1f534bcd3bc266564eb2fda541b178..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15578 zcmeI3Ux?g99LICjN_*O(FDgETt)f-4Nj96!pYCmY-nQP_ZaweL_O77bY%+TrZa3K` zx$fQ}dTJ4hh*cE&;2-dz>Prhk4~tb>q=FB=R?&)2B8ugFs6s)glVtzo=JtleRz#V= z?&deY`F($r&&>RieaMlKy$^5dzpI~Nm`#P@{3!a}fj;bpo6z^WZ#{Du{cNlcPkIcq z`CRbn`{>n~OANE^xHUfEPZam)hEq!d(<#AZvsOpF878~ESqH`p^w|=ew(Nn#(#M}A zSj!wp?3ar|u|5PV*6_Rw$L9Br8}l=UW+t}h`m;?P3Dlqu*k-M2dwO#q5$fvbJZR<< zY}m!08AuEU3E7F_2s`Askd>1e&JZ#Rt7u74R+O~zAe$0InHMBp61bG4rv*KoVp~Td z*N@J!u36Sc^SfHjsxGK{Nrc zyN$7)omHg|IaS9+!-6>}%lB%IMTIL(FW8RE ziK4`*s#Y?}nkh;dt(_<)wj$A^u7&CzsK)vP*J7e%N=Ys&0)U*6Hc}i=(i*3hWs?&# zieSK$U?>tI6`|-Mvm({7<)PI&7hA<>Er*qD3?5wG+ICc}utL>=>%n0E4J6tduv5}H z6)T7d_puI)ptj|VV0%C_%P(u~4yzN{3bR&D=h_fN`mylUb2KW@CT*`sD(tnoi0733 z25{lvG+H5R+4+&`@-SRJ%Ln&@s`U>{ga-~?+cap3S^}z~aV4~kIJ2AJkWGq<%m?#QTo@3tNpX?+U|xy~141?_E;1j?OL1X9$R@=_ z=7V`DE({3Sq`1g@FfYZ00U?_d7nu*{rMNI4WRv0|^TE6n7Y2lEQe0#{n3v+hfRIg! zi_8b}Qd}4ivPp4~`Cwj(3j;znDK0V}%u8`$K*%P=MdpKfDJ~2M*`&D0d@wJ?g#jU( zL|pydmv5ns-nea`S8IP9`}0QhS}to0j}{qb{vL)|c!6QATt&Y>Gt8{OFuzPOjDCz^ z?r>gv>ijO$_e3E-INtpB*9*HhFR-`leC&_UQ{OAI_R$NETsi#R;pbjF)_nTZ-M1C) zJsAkMjb9vo2r-qr0k#8!yqn2O%;`rhZ+uX01Q`*v8Vd?a_ zb-!IS=HA}c_iSJGi1kTbUHIvx-}fvm@@LlXd!Oej=P%yhH`cfBgWF$!Z_{Go?B#c+ ymbTt{aPytH^}Ajfy!2${<~PsSNdD^88<-6*yI+4gSvwkJE9~5xKk?Ai^M3)E#pF%^ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Ignite/PinkIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/Ignite/PinkIgnite.png deleted file mode 100644 index 22fc46f370d01e8b1d0668b26e086903b8a0178c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15583 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 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Ignite/TurquioseIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/Ignite/TurquioseIgnite.png deleted file mode 100644 index b555a70e234ec8eefbecebe7ba43c1c2ea863faf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15578 zcmeI3Pi)&%9LL?U0V`~R3m{Hb27)0R+p!)0S(2?Z9Stm_v}Nli0d?$`#%f|`w!5Si zf&vxN#DPBou>%Z=!+^_nS_NW=O=w6QI5NQ);(!nWG0I^eb}G+y{yODS>3OR)@VQDzmd$*Nti5(N1r5U z%giSBOGU0&9|RR^c+Lf5b9={)xoJZ+6FYPLnWhE<)PS$k&05v=v}QID#?|0?(99<2 zu!}#PO$-DH>51Y9J?OZAmXc}4;LqzAK z;aSEt%i3sucPkyVvWbfC*EN=HG#bf(?MLl2Tf}Yw?K*9!le++PzH`w8+3v0JMOsSRCCcP z8)+k?2M5DdMc=#MvQ4MqZO^c%OLxAz(Li4JK@P4*h2eRIlg4>P;}k6=!*h+}VnL#w zNQ|OmTIJc5F_dwR*92J;rFe{3Pc#PHKc?>M>xvTZ8;fHaTG?@Hx}URZ`V?U6_Ed)L zHpY5(R+TpBR2>&y7RU)1wpVk^D_m(>!S;OJHb5btgAGZ`GPRVdbD~lf8B>AdRd`W^ zUnPS{%aW)7kd_3|3?UYaarafB^NukS>=qb0DlDdB!0_G6GE9k2rAr(GgcJwo3Mh=q z^8%wNYRM?8CNHGbcA{9YRf!&PEm-&TYOGH%7853uOHx_pbif#*kz#aNR2ii#nGBzn zIRm6PLlz*Z2t|)Dt5OYH9$c-nu~iJ$a#-2Mz@e3`ZJ}y~6{@bg9tiedHqqXIos!n6 zSbnvsO>%`Vd6%WA1C`XjFiW+g?$qu-Do_Jg4k8 zbQcUv!44t{Su))2cYW)Kf;pvC3ZW>fsDd~!=G9@9+F=koh7@d;=!^52h zbVJug1+K)uJq@rzahk+wDWP4V{=I4Fu41F2+f%^IvF(wy8~#f(x4wFKH8Y3YTmA<# z7wyEAHL+c1SJ%)?@K~Y2`U`7;9@afR!>(%Uu9>L+L{LYoGhu&KQUyt2c@7>e*SL(j z9>BZCWz@Cn`Iv3_xl}6~(j4;&o_(Sl^B8T*na`<%Ke&bD8>b&Xd62ri;j2@_)aFQ=%W*WTT-SU7X}?a8I> vw;bAfM{d*Zmj*69QMu{O(>4shynG#%`*Y#@jbHzo2(lH1_U2DKF!|hHGLGc6 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Ignite/WhiteIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/Ignite/WhiteIgnite.png deleted file mode 100644 index 2290d469ad4bd699adf33f534a3cd24ef5603bb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15560 zcmeI3Ux?g97{F6otv#$rUqpQgTcs+^W|C|+f4aN%dVBS*bn9{5wpS6oY%;qSZ#P+! zTzBs(<*a|8AcEBg5ewCdScEDlV(CL$Q1HQr>Vu&8B0g38^UxPX#yeDi(Z%R6Z;gYaf z=2L9cC78{phQomDRB3`8aXrY&=`3f0timcQ!#I3(p$GeOYQdA`+ZrCUDkS|b{#hKYgF91AfHNwfqGYGUX5likmGmQA&Pw4X!1fD@PmvjvuD$s^Xk#i zER%~Yx0upoA6_qde!wBMo_RDMh)^!r6-5;Q6iulj2@%9nDQUjKbUk_b?)pvq~2 zAaSayRm`ep2~t+;21+ zJUCoKD`YJ@KlZxZ40oU7!?U1n{{xBejU(5W22D{bhN@^>Malxss%8LZ00nY_TFpSi zG>nXjR^s1I1FBE}l_y=4x)ti*OGAGZn=^(}gI0m>&aB(;U&`Ft>f!Zd4m(@^2bqg^ z;_{lNtiorX_+Z|T9@AkVE6b9cw&=8|wkzqp7F^p4{c%Y7|XWWV&*U>)(zV}yQMPcooKR5EGKcgGz74t=d zU_i(s#YN_WX(=uY2w9}K$b2v@#f1SOixd}`52mHKFd$@+;v)0Gv=kQxge+2AWImXd z;=+KCMT(2e2h&nq7!a~Zagq68T8aw;LKZ15G9OG!abZBnBE?1KgJ~%)3Vor!L$??281k9Tx33&mg2&IkVT4%%m>p_To@3tNO6(* zU|Na`140%lE;1iXOL1X9$Rfo>=7VV|E({1+q`1g@FfGM}0U?VN7nu*HrMNI4WRZw# zsQ>aUbkG~OE%a*bEAORWM6czt=GbJ3VHWOVn8jxq=JzG^dzE440K@z^%`p0F40ES@ z@`=xOqrPv97l+I3Z-4rFcxVyaR{Zk2rLTV2^VnJY^|wbaUU`1>j>or^_MZH6{w~zD zcjeAqJAZWJ;udz@z1_BR*{k1NJNEvQ%+1H%{q+3h^{2B(yP;t?rQD1G`VIe5bYJn@uIb}{0U1`>4gdfE diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Ignite/YellowIgnite.png b/src/main/resources/assets/customnpcs/textures/overlays/Ignite/YellowIgnite.png deleted file mode 100644 index 7361fb132a6cbe3ab8ea91cc32a010ab71417038..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15579 zcmeI3UyRg57{GgnA#wtb5`8eu5>(V~+iko36Em~4*ajpnSOnz1dJfmB0-4l2OY=|-h&yILb13;b&E*>7fJ zbkN0{O~(fPfb>*uoE~y&fR^G(#^91NEvs=}l4VhTf=+O}#Bu^Fa7;qbL{1YEbnA*` z2H;bwW)`)H?6y`oD5YaFo>$dawqCEt>q6YAl~`U?RhCPzi39_CFz&qV=?%tqH-=8y zezL$dYF5>=9Gmw2>IG-cOUGh zI{{p0u4aJY{ctK9d(GanirwTa^5kol9Xn`P%b59^&@5OAVTMw0uG&xy=$=!{J5D(h zuCnnqLV9Q@SXK0+yDi&v>h9(gi<)%v-Sq~tx(70FJt_>(Gn|y?6^&E0gbbfGj*B=6 zdm=t^j%gL=7yD519IpwA#!FEjk)EgzxPMID(^upr+Bf3IG_;~qtLR?Fs^}%aR_#)X z?KVbwc2<=(6+NkY%x@~~bYz8*OEz8u3MUzXaMUg3*Vu3LP z(PR`=6c}C+bw0tv8werha#8aouCtCY=kFHiIxH-vV?g)aVVR<&DvBvGKuB;fS3qG@ zo);KJQ42;fs+F7$;-P6mFKK@)x7)&lmMVZq9V~9qA(PdF(l%ixZ zd{X8Nkl+kifTThcJ=`n_HDbANwa!OYFa7UNa}l&7*5JV9Om zBuI)a8&uKLaJp+Kz##^~0>g-+Wf-O^@d;L4e>zf(y?F(Gpw;5WGlm;rSq1f(rqH7YQyrA4E%VAwcjV!G-68XbCO^2wo(( z@O%(0!G!?9iv$;*527Ww5FmJw;KK7kv;-Fd1TPX?cs_`h;6i}lMS=^@2hkE-2oStT zaN+qNT7nA!f)@!cJRd|$a3MhOBEf~{gJ=mZ1PERvxbS=sEy0BV!HWbJo)4lWxDX(C zk>JAfL9_%H0t7D-TzEc+mf%8w;6;K9&j-;GTnG@nNO0l#AX4T z@FEu1K=+sXsTMzW*;b*zDF*1>(sOBb$I(Uep{#bzb?kravhoAlR;%)hQ|0(y-xm_PVa^>N*;-yR1PH#Fq zqRm5Zooj6MCpR9OK6CV&o6S%Ak8ikeX1IT(rM%X+Z{yoi^8BA)9GP8x>f`y#+nbly z-GA`ghd%n{%9`KryE?k#``0e^rS`m8>OXhjE9UIh1J>Z<*LSTsHgNWt^T$(_v$_70 z3-`RZ^X1pw3qNhFVdQ&MBb@0HYx#t^fc4 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/darkblue.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/darkblue.png deleted file mode 100644 index 956ca174eb95b21d1c3097fd6671fc4e59eb0bd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*o$)5S5QV$R#+8#x&aI2at$y&nGS?mT#pM_@;@z8w<-LqqJmS1-Q; cRWf|&=icSPIWhF+l`|l&r>mdKI;Vst0Ogz~bP0l+XkKGVdnt diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/green.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/green.png deleted file mode 100644 index 9709dcb106df19c3120b76e7a012d7eb3fbd55cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*om)5S5QV$R#+j+_h*91M=DCEopV5BM{mu|@L6aW|lX58t)2Z^;1} Z4DT`wy0`@WgY$2Ic%H6)F6*2UngE9bB`g2{ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/lightpurple.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/lightpurple.png deleted file mode 100644 index 6e21506fa0bcbfbe62a224aa9c0ae9d5aa8a89a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*o))5S5QV$R#+8#x&qI1V^$FTEr0xv`#I;GKf25>Wm}b);!7Kajyt YZlc7-b8+gUjh8??Pgg&ebxsLQ06WAZ#Q*>R diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/old_ender_eyes.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/old_ender_eyes.png deleted file mode 100644 index 94a415504885923907c47e26991e3e7fbe45d748..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*o;)5S5QV$RzW8#x&i7?=;9c~P_OQI22^YxTo*l|NV*7#eQB$+D{Y eRRL7X@S&aeVyNKX%*{#LL0nH)KbLh*2~7Zdg(?I9 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/orange.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/orange.png deleted file mode 100644 index 0b1c79801360228d49557d0f9c9eb67daf2f848e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*o))5S5QV$R#+2RRuGc$f{}?{`iwJ+WVQfxp=fS?83{1OVuJD)s;X diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/purple.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/purple.png deleted file mode 100644 index 2ccf87d187330badd2cc8e2a08d6eee0e33cc132..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*om)5S5QV$R#+8#x&aI2atwi~s9MYkn(ac*wW!2M18Wzql~p+sr`5 a0a@PpOgyGN^}OeSJO)o!KbLh*2~7Y^dn022 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/red.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/red.png deleted file mode 100644 index f80c6f67e3d3ae948ee509ee744685322d7ef537..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*oq)5S5QV$R#+8#x&mI1U)(fBJu4q}h=Nj3I;XodPr>mdKI;Vst04a4NhyVZp diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/teal.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/teal.png deleted file mode 100644 index 43aec1f29cf08d851616f400079e8af6892b24a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*oy)5S5QV$R#+8#x&mI9Lq7&yTD)c#pA#W!(-fpfumyoa@X$`hYYu XgE05Y9R5k&ZHV1KW@l&Z#do*I?K(cY zKqyd%K3JN4D3JN4jgor>Os6a^J?d|>S&7BA1#6qAs>F)N;oA=)A z_h#PCZn0OFEFSWg7u-W%EXuIq1a z{RExXqSdu@t^TZs<7OEJu}{j~W*d47Lgh@ijqnypMW1X$t=ZDgpMF*nqhPjl(X1== z_B`2)7WO)1W$(f&-rK@%P&!kcsdPPX&?G4myUj)`@w&66o?j1+vu3#@_PV57v!%H# zptx3F66fO%5zVqCVa2jV+byf6Z5#HJqNb>(tmv|?NSf{$if3qI|5K{Yz)__Wgx+%P zd_NpWv!%^6ZF{o3v$Ip)(aUjXLsnhal@(3aGzof0$!;q}U8$9v%AE}S)JTFmQ9F&| zmYDfPe!QK|mP%Qm;irFI&Gs-*E9tWXigFjVWworx(~JThAMEb-h79kH14d%aif~gvZVn+aelrx ztHj4HMy(*;Ngl7rw8<#nBX6XJQc{Ka=t!z6Ddwu`c#7j`HXM73QgD*@q1+u@DpG!j5|$~R--1`Aac94QISWDg`UG%<;};9 zxC6r?RlOolYo2OVi}7|gt>;>pB#?}xkR(V|Z{eOr8{@45MI)-_Wh01j6nLYcih~R# z@NJ3cDuPT9M{-qFmmJ6Sap(rBZn+gXTfE?6G_L;K=(kUIty&=>mhT>cYfW)Y@NOK1 zYg4rx!>}^fZVtrPbyo^Q-*+7xT8bMS5{Tyex~XX95scb!u%iY@I|A3Ht_Fr`>PO(( z4Gje&{V39iG~WqSMVBm$?L3Xh)J+NNx}(~bZehbdWE!y^=#GwY=9&zaj2}n@<|M|x zt-BgNr0X!W95?X&!sPqss}ZViIe|Lp3zXaWz%4726C9U-4}M zrDno>RCM~T2hqXx^uptWu5G$@m{Ifx37V*Bd7y%`i9pYFBG{>+Mxjr3E*V?bb~IhH zp3A(@t8NXT$?3BkTi32ZCGR(=Ts6jR(xgj$HQlD<1$VS6Qgg}gG}Ix6YCJyjcZ z5|Zs0W=n%D!*COpSLuGO?(IB0gtOgP6=xT80)=d>bu_G@WhL(rO{Vi;2qw(;kFm2! zTC5F0?yA>oe&)`8E=fpv$+H231pWw!4=?C4g#& z3@rJ27)pU)B@D2dum0VXdBI$y#HEOM;qI{{;uij zrX#BgeEOzEHEp`iHZ7`Y(~;%#tthQ({b*Ek!7963%WoxC;K2f^S|;poDl*+nTP#Ig z(palSa4V5yR|3oE+t7-shU+6k9fsHo)-x<9`i6O`3XcGKm$AGR9x%YO4SD!*W8w-o zy#CzDgV7n?Nw1VI9)tqI7CA09A4X=&ge`JhY(A8hg_Xp|l(q1%xef zTx>p+mgAy;utkoG&4TzKE;b)Z%W+Xa*doWp=0j;YE(!=+ z4)*9GDCTk!vb zAZ#mwaPyKNc<&0rgYi2reSRMLt}NE(R=eN)_|=CG2;%+6ZhUg}kLaxv$A7zW_d_qd z_vW{Yr>}kR1aupHuA5(fd98Whs9|{Y%ZrZ)!mV4!1QUJ#=NIcQKb2_~&t0f}eD>0n FzW}tv{{H{~ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/turqoise.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/turqoise.png deleted file mode 100644 index bcdbbb5a2cfb10816fd4ae2b82db42228cb6fbc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*om)5S5QV$R#+2RRuGI2a7mU;SC9CicIq!HMbn4i2D#vgMnWUuOm~ b4%q8?+~Ho?qT12{J3h$qpL7cYAE!7wPxN z$8T@{B1wx6gzFp0M*TS#N6ixQBaf7N%{J{VN#)bMHp1H^DR^WvY*mWCefn9k5c-wk zMWYVt?Ip4mF7I{7g}w9ZcyAj!e(`j5q14FASLjh2MK-QqE16S7ygHN%#K#$5D zKXBJ-=LX@ZR4HyHN!wMFZnsmFwIH5K8ihayv^p!&~bA13PmtLI@2;<-)$3Rjl|JT z2a~f`=&78Vb@oXZKWPH>k zKMZy!ec0wsQ7K1$H-U5s}ebK+w+h&oM_RKq6PBucxrSyuAKv7V#( zxs6)p@s<5ogYMyCTi||f5p%+`2#54`@SbAuZ`j_k(v^m*2R5ZeBRxtbshrXK! z1vb)w?^!Z|Dxx_cw(O`Xlx^GbaNzhVG@Y`NUbfUlKCZ#67_`rJt(pNMrsvGTwFVr6 zde`US+E7hf*Ui+mlL7G{bmSoLJjcd?2^{~BKs3*T2GEQ-j9Ry`t@=otgKGn-zOEW@ z4z8U*2N=P5q!DSJ?W+LFCdO8lMr1%k#t_=7WkM6{)*;jAX{K)b);w5yK17D)1an}G zp$~0{aSDVCFLckB3B8gq_AKaV_>e$?z_cCT^U_fdE}4H`L+ENz@@Z-Eb*z_?zV4T_LCrjXXedQIq%j*0=DNK@u{sT{Z-MyIZ4mrDdaK%l0k6un`BrYdn3Xw2DE zpyxXw-C3f>SfBJ2%&1f+_QZV|2Gji?@NvT=jb$>?DqYq>DOaag#3ace1z2yiS_2?r(QB z-$f!~bmi{SplT{k??&VR__RhN9m^gJ0@*ip1DJF!8jx-~4xI+N2L!HR(OaA0Ht^p| zLpt-b=y(gYHi=(VhG#Zx_%CJd&g$XaWNv)-{y#`tb{S3<#NmQ5T|mp}U0YgwX(2%U zqNkRXskVH=Wc@eNBHGyL_je2j8n&VW`Wcvxt69@aeA96?YnofW*b0-XHi*VFk6ER+ zmf79U1^N_(R850!$;t}b%v!95J<`~yh4k(xPL}~wAK0*pnTD5gLr90%57svvQw$8V zRE<5a=&xZ}D}5S5AH*o5CoxmY+i3B*mk0S7-Ak{GFA;F03#Q@=pTwDwJyA4Q-zR;jc-(2v*_x2m~ ztp^3XyjGW_y(c8;)oYUU=RWQ_f3X@CEy Y^wulCuYHhQlhgKpF diff --git a/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/LowEyes/yellow.png deleted file mode 100644 index 85ff19dbbd0a5f26009918765c847862127c5cae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oNz1PwLbIIh+L^k;M!Q za)&^eG4DdD9Z*o))5S5QV$R#+2RRuGc$f{}+b3=>Jh5MPfx-8wvbs=(j)2MVMfU zH`^QO_X9GMnNeoIDM3bw##ob&#hJJo6_j{fj_+bbUQjq*;v}9GB~9ivS!Al8NU96{ zN|vmwHkRI74Tq%O$c*O|HI6Hn%h9qFbxPBmpsFgzi<~I3Xa?&p6g<7c7TliDNzG3h zx@O5PdbU$we80Nk%z3?$h##o_spge0)&mvXDmz4xtLQ~ei1J)JBg?GY6z590U}=`g z!5qxPg6ASTp{-qU#_=3?##tj|UA<;tRFh1m9=q*&^ZB-+U2kw6A*dp4Yw1ob6d^YT zU1zRj!ohizN>97&Jv-YdPKzgBv*y}i#a_eA*Mw%lRtPJUM7e4MC8&E&X~J=Gsc@H# z)(|oS1HrCh?mK7~ET`<=pX6|pM!g%}U|RQJ3hl=P%g0!OpAbY%Ry7HUvc~gGPQsa( zkBnp4*@cD=L16jB1dlefq)Bm>SL!~RX5v23`LT3QUzeBWxlMj7Q_DJ~yzZs!ygm)N zVqrSTH3pkz)_0XQ;N+YVS{6)6Nv_>+TdTBV&iUKAzhFWa6~k>R5-L@2aQEobt)n$X z&Q67G!*Wd9(i%Z^(MVVVFR?MxjI)9O6RfUC3TsMILWswtm?_7ToPT(ci^jTqzrkp0 z#O8EJ>-D!mCZi1(Tu(>o45w3QAZnwPNvah$BxtgV3N2Q!WSKQYL185kW{tS18;KYU z_C~9DV`Wv>wdlxo`^2Sq!Z2cJ+dxTB!^90qQrT?QFw}&Zjq$2g3)JLnRiJ$(8?|#i z*EGk^#X`C8S>7^YGSBjoVj`@v!KzXMWfkXn6IzNTCd68ZHf~mh8nXSmFJNWxYcmcX zZyjyaJ!rf|z2ri_t@K7}eWl*1(bW1U8MG%&H~p5KGW}Bz5rvk~#F2q@n(cdVwDFJt4`h8f)yC zaQ>vZ@B)IASPFBa7A0gLk&X-Einid7&a-YhGD6io)d!0 zSU8HFLeK*cSAPOpb%m>6e{SZFMn*T&E9Q#^!GMrOii^w#(^6a*5VA;dk@;X+iVFim z7AY<=A52SeVL-?t#YN_WX(=uY2w9}K$b2v@#f1SOixd}`52mHKFd$@+;v)0Gv=kQx zge+2AWImXd;=+KCMT(2e2h&nq7!a~Zagq68T8aw;LKZ15G9OG!abZBnBE?1KgJ~%) z3Vor!L$??281k9Tx33&mg2&IkVT4%%m>p_ zTo@3tNO6(*U|Na`140%lE;1iXOL1X9$RZI}SL2;xSU@ilm(d%;7su~-5xs59m_uV3 z02c27VCg9Uep^A`R{@yg0r+7G0PQ3ITb&b+UD%7}elVQwpQwEG`oJw)mcT}4$prh^d(&V`_oEa0 zzct^u{>i)DQ(t`Z{xvZ5>EV~b#g4t1XO=sk*G9lu@Y9*TPUgYst<1H-2fn)uuJ5=w zdid1*xnGaI)bX6RBChP);O&Z@I?$J2I&kUtGv~ht$L=@05YJHCAR^;2hlNo}7! xe`WVT&%yH-&Yn0nxO}y1`ISxpR#rBE+?TOGKELhwF_Z}y9vn%(xo7IhzW`3&DbD}^ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Magic/Green.png b/src/main/resources/assets/customnpcs/textures/overlays/Magic/Green.png deleted file mode 100644 index 25c42bd316ed1c76604c177e69a7dd893c85a48f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15807 zcmeI3U5Fc16o6;jZM$9CB2@4Pg)vo7bTa?R%#ftrZrbirvo706cR_R~GdIbw$xO`5 zHrWMhsQMs?wSp*!C>5kn(if#@rB?8%4=on7iijY6XtyGL5L?vNJ2Uyco4u^IAj%!c z&$;KGbMF1lz30w6%*&G#do~Z>J4{j3=JB!g6#U%*KlIRg_8i-iL9|WXQ*amduljQ*Pw$k@N~LfF4?YDPeua28vO4!vk^Mz z;>{%^BYr@7Ix|U+I#oc+(HLWJu{a%9qr4oCOYz5Of#YSC6IqdC1W}VXO%mwl6-f=l ze~GG@*QV0Do8h38j1)buqOokPR*Tles8cPlysD}!C$NIRz#fddV0(IBh##nZHRn~Xv;*00lO3eU*7XX@M>)2ik!iGTD)ZG+Ff`L( zK?#(B?YYp7?`u~nI-cVeofSg1)hh;uImu+&vHOm!VA2%1RyTDsYV3Sg&z z>&#aTu&9_pE#;IX#|y&5C0Ob!!DPUlW=IOCiiq0?t(%tpeS1s#(V=rNUJ< z*+NKKtMby_x66-dXnChv*1eQf)(e2G z*o6e!Y3%CRURBztQ*x?sSRf@P*nZ7@t!{7A)Qs`;z3=1{0mZx)d2txl| z<}1gj6@iVb8lkJ8*UC;@C-2qtDi|ri{j{2b7JBV9L*4h^C6H0DGfUPjB*N7X+*%q` ziI)XIR~eO8B}Nh@g;6EhWH?h%xjYbaO5A9r`Jbji7BpFC74Ls94L3~a0x(l- zYi6y6|5WByRS&}n|IN(xKQjLZnG1JfZ%u5~+2u7f;omK3u>QhYpa*r2Pq53{I%_8E zKke7i(tOZgl~qwzSe}Dd)3jTSn$F-&yVa;^$MQ+r@>1~h2nLEYcUk$jbm9HRKKS$j zQZX4G?gy0f=os0WCY>+UL*h{L`7y?evQHB0&%!c#+`3^Fg!(7Xkz?5?pvbh?d|&fZ#=f z3(p795?lxnyhw22`5;q8%pezorIR}#aAs5{O)Fi2AaLp!K7cQmL$x}i5pSGQ2l=IHjWdm(J{f3io0?x!+%Wx7eZ$+7{^Q{B;n{;569eh;;=mU(51xN|{cDReBa4~) zublr)UiyKS{>Vy0a`_RPMr8hsnOucl^(ckYoxB0!@*OtCL{QmKGUro+l t1I3G*ihn$M>B8WiLgV5EIPjY{*HTMY>sys2=4&WYG6ndC)RDbGIG3yR+_0 zyW1v^jS>VgsJy^~Xrji%Xc~P(B>@sOy!i7#M2*H5W5j^Gm>AQTdS_;TZ?`v%kQmLK zWPi>*_ndR@ckVrR=3$Nv4L-8I^R7++!1{syp98># zi{59&*;gj70}wxGjf}dZsmC?L&V_Z;PQ!3HS3tdyZb!MG8;vhoZ?f3UN~X(&lchC*})NGcG6JI(2hiBysRMyIq2$4IhV~lTDdFa`_<5YubB%m zeiwJLE7ao!WJXg%Os`#pj2w=#1|N+vF*Pj6u~;PbFeCDU%<&Q@@vJCm5nhXkO!W#S zI?=y)(adPW$z9cONa_krxNbq?xKgPUE=gg#IL-;Gs&c%@i6V=7u+B{0)yr(&*%~;h z`AI^@C|U*Avh$4RS5MnhZdWMe1*%`wdF2ZAKzXOi4pHRFdVv$dJlD?1H0m~msbbb2 znrUz_3v)2=6FYgd@CUE7(kmk3!`FBur+B$cYiZadywu5DfIwLa$ z$PGiso+=u!ZyHTyYrEOIR;H1h7EhjL$+5$-wS<|c3C#SZ5M(Hh=Bo7;q3+tn5!=ot zf>kzDL&)^@`m2h0V6T-o?UM6goWo5T`EGcFN!^7Bv>p|fkFo+kB8XZ<)g&ZFG@fsA z67z3ZoGLy{CB7L}q#Bo^nq&5K+##^w3- zTU#SGPlq&KZyBUg+CbiMbu^uUWCAsWEi^I(s)7j7iZEkoo=x+S7^_Az1}mmT!4O47 z6f=guHd@UaBdfZuMMtjNPn?(2rlDkFER+N_n0Q)}R5p`Ir&YzsM0wS$1!{7(D9{r{ z3zc&{+tkOKi;3pKXLvImjiA*i$p*q2Nwcb?n5+=vc>|iViKbHv(Z4sOb6Nb0zA)?UI+87pYW-U(V z@(=|6o6MJvQJR2xQq>4t`Ms8Q;@BCtq!(e&INDFkDQJP$Rx{jv`(1(<`8zXf-9#cB zefs9ophg5)6m^wV1vSD(q=>?*5!qyUQ&IU0l+sEJ?W&tggDh&YSS#NDUK%{$L3Cq6 z&yPbh!PRC~Yxpl^Zh7_aA7!rnk@-K!T(A>cYhta=F0P?*?`}y$^%vCw-LHE>oLkh^ zSTjNYQLm0>r~Lk^tV*)N2|T*0rp;>HbRXHYS&f@EEcfIsH-SzMf1p@%la+T%7u;{` zMo%9w5tY&59_R38++xTo!|Z6%LiZbvcM?P+RU2H<)^K0LP(nlWgZYL{imG9ds;1`z z{}>Be(NhR|0OIOTK#NYe`uTG!|1@TFE4^aAXb=ntS){ngd@wD=g#jUp6c?Efrlq(r zAY_r^BJ;tt6c+}BEK*!#KA4u`!hn!Pii^w#(^6a*5VA;dk@;X+iVFim7AY<=A52Se zVL-?t#YN_WX(=uY2w9}K$b2v@#f1SOixd}`52mHKFd$@+;v)0Gv=kQxge+2AWImXd z;=+KCMT(2e2h&nq7!a~Zagq68T8aw;LKZ15G9OG!abZBnBE?1KgJ~%)3Vor!L$??281jUadkG{DTaCUB5?`5F+6u|oA-7yWAqQF z0GPcGfXZ_K{JDUBuL3Z|1Mus90JPHpY_?C1eYy+vJvWf-87Y5v?aE^tD$KgoUp;+v z{`KRVUfgo*(V>@L+Q0qYrz#gOy~(TrAKbkYtlU@us~NCjO*dG1XUC;GZh-Djw%_*c zeEIpIu@Buk+~{@RTlgWz58^QjA)x-Y-InR&HOybi%Tr*41i z%H@lRgJaT#Grx^}y)apM;d6MPoVx#ym9?)}ca=Ozz1I<))VRgn!5ilSBx4rGVn?{@g1moJ0gFTeEIQ}E}O%D{e` zqE^4>etJ$F8^1zP=||0xQD-!FpQ2f%n5tWO5UZCeus76gt5;NQ95{3y6wGpO^w-nV zQQFjdqx+;Bm#g%HF>_$53ieLz9?_=8HCc~t%S6(31v)4JN2TkfV%b*ey;0Av0{^?s zY?Su8IODz1J~tpenj50~ttz0USc1{GM3PR*FR+n&F_-8y$0;io&wBS}j%+Vpg@l^0F+mT%3)^8Q6odC(DjnXUg_w z-$~0)7T8+VtT?7srd_{k-kNZFqfs|d`)basRA~n)+f8(mL)*^I!w^9eX;({o zWU>O-VPIPmRSoPs45zZW+w2|F2$Iv`$<@p|c2GCxF>^J(nYR@D45i^*mHsMF9jiKG zS;dUM%7$79>HdCiRnc4anPuIo*;~^rY7*o-@CLG~12S+urWh{4@Z1O=S43G6peQOF z7jokFM115d-83cxA3V=+sS(ay(26KAoYeLa>WTV*`$tzDbwOUjeM5e9O);!$Np&)2 zNi6`jQZA&~pfS|5y{eRct7ui>us}vgv)!7zT4gP5!d=#VWewOc8Fna1Fjd~h-Jupb zTU&~vneoepZfT~j1VPn!KBe=Vz$7#+$?!Z#F{&g;j3x*vKA8{_nwU(p?&gIqf^oTi zz1Gf%;pyPU>n?*_P8lrQjtZwUn9ab3m6KDl;-Ki;O6UDMl70o#FJ9%o#w)r;=JL&HpqFQe2VZt>XRfrNIU6N7u&G zaslWWwl%X>!+$Ar3#*6zg#Tvdx*wVUgUtCmv9l(&>g?Pans)D&6j*;@El|C>$EVpj zZNZxH`;WSHv^e4QmnB({QY_EGt7#fmqo(`ureQT|8d%<6Hk}MSJ-mS;%^@rImd?N5 z*bARNKqeuy0f=os0nIt#+UL*B{1eRRW_m?@kst^Vyhw22`5;ecP4z>nAQe{ za}+goCq*@$q^N7N@b^cGn&2qv@*#>+o~Nkw*6{~F*aiE(JDBYosbBi};-`@Yy>jXK z>$9gfU0(n7?Pu4#e(-?#)w*Tpwp%+$%3q7kZ2mzx?2$SC6bcb9dv9t(B!izrV0_;NfEjrX%0} zV4S$RLH^>6?|)jB`t15ge@?GD|Msb8-)vl3arTqso+DrOyt6JpwQ1(I?a$0yw5C^H znYimhHC1jED)i9++TYZ~x!jZmvg54{QxboA#7q2(q_3cir^v_PpKp zt~Fv+VuVPHniw7=5?_2F`hX&l2O!ZW|0KRZ)CAFJj7Fj_kQg57?C$-YUME#ZjAk~u zKi_=wec#OQoB3wGbPEb{q<3&ysS=57dW{R#}WsA4$cB2+z$hoFR3moB@fHdlLp$!yX@sDLw4Ez(Ns2dn!Rgfo5^YO?h+CUlVu3b*sc0LiT zvXMGMW?;ZyRm_&XR?)O8&LeRSH)-a(=?x}z7behpjIn%#75KCuYO< zk+%{-*)VOxGPPzan9Sk$VGEpo?pMU zJ!0#0NaOXEK`NyU6&+Vc(-}%8P(#>4Ba6XUMvyaEHXD&-R*1-1Ru@#0g@zQ#WTO$@ zgo?j5+Rd9ItGTX6N3J_hTvUWeOqL@olms=Hct(;`Hk-|4)R>Wt@Tyr4)Z%PGpy9HG z%DJ9z>Eq4CM04S@yqSr}Jj+Xpfw0OMR+VBVD@1wTfTm)KF|i(^gPR4R1}!h|GgunD z+>F7e+gqD?_X}@HFFVjHE4`t5U1?Nm)U|QN{qm&ghF7u^hPUe>qR`gb92Rb7EllUq z5Cr~P%omSQnSe!7)d*bqy%u-k*jcxtmtlVn?Wd&_w7_e-8ScLGEKmCr&c6N?)4H2>2yD59o__2T{SrNILpL^me% zVh)-Ku0FGR!+$ArORI;$g#TvdIv<(;gUkgxvArhN>+HfB8u#v&G*o|4EzteCC&al0 zZOt_k^dI-?XnxA?uPUmf#5jRRSIx9ljhpTxo3^TP)28L)MaxZ~)59Mq*4$#{-O>g3 z8)N9{112I0I^5$N-i%v}SXG!GPg>}H!|_gnh+MP56&(%tH4P;+L_e5s*rKQz2B~U! zPVkShpcOrZpa&qX@dUKsgln8XxARYPMz_-|=8FcwfRIIsi_8bpQd}4ivPf}}`CwX# z3j;zHDK0V}OiOWLK*%D+MdpKPDJ~2MS){ngd@wD=g#jUp6c?Efrlq(rAY_r^BJ;tt z6c+}BEK*!#KA4u`!hn!Pii^w#(^6a*5VA;dk@;X+iVFim7AY<=A52SeVL-?t#YN_W zX(=uY2w9}K$b2v@#f1SOixd}`52mHKFd$@+;v)0Gv=kQxge+2AWImXd;=+KCMT(2e z2h&nq7!a~Zagq68T8aw;LKZ15G9OG!abZBnA`w?l^POT?L@yFo&>O=$?@j!K-Zo~8 z!O;`|vkwC>_aXp)&ZFO70GQ$d`1K$F+HnBZ*{?tK=`Pgw;!v_bUH#^_%l)elGi$mp z%$W1@pRYW7O<^{f)=ffLa`v!M?s$iL26rkk%|vB&hFmd$z_PPAj&M< zpKreTzHjFD&3v=_u&<2_KeMTCTOR;mQ+6mbihldihgrW4eV;#b;uQMXP#&6a0oeSd z|LOVk^z>~2lE>|_ac?~LtY$dHsBSuW7_Ak{s5jE>sg-qO8hT6~PTHkZSvl zMGh)CK35)uQ})nY1s<3i9y8{q4b_b7N%tjd8gfvCp3c;Yg_5h)Qjx%~hW`7_T!aa_ zc+;uKfFF<<&y6sHP6aYbG{zcyEY8H$sG!8-a(p)<@`A$g5-0JjC}}dU$s$v~BI!Q# zFIh1yZ8WpL9u7&V$du=mHIA!RtI?_ybt;pbpsFgzi<~I3s0ZuLmOQ=2mfT&TlZKxR zbd8E#_H3ub_D zg9TWGCC^26LRY);l;b(>l(Ry}rh3J|C?~mGGj`YU7K>d&yWYNI2tgfbS4($nwhXyZ z=sGhM1MWM9rn0Ns>^<9RC8xuauUT>Iux77d=4(Q;U@3$dN}{=HgB7TIPG!t-3h8i_ zjWiH4gM-1UVxBx`mrSSXK9%HflUBZ4-e5-eU>dE*1k1-*fgck@O;$AtiL%D?ZBD|T zn2(%e+SY8#haj+gVvI)%TGD)%O4CPMPuvIEKc?>KtMby`x6O}fXqHnc>R#F|>XVQw zmnM^3tFf(Tb5&`BPQj_5VZpSN~vT*OvkWItrb)k^9fVnB{pUlaaIsug4GpCVGT)22=SN{Gvs)Z^EWSY(HfWUH)!pQ z*ghT7c>QIN%W2t?>*;7Z*-RQWL~S%OE6ArjBnXljOF$)9 z8=dB@k=0!{q9fPcCobkKOI4u3LP=1=iRUFrWi2b8R}+R6<5jZ}sLk23K+jcdRL=E6 zTOWTeCYlRx@n$|I^DHkZ2Er=mSyf7ytPtmU1Dc8{Cd5XFE^d~E8nXSo&thrtb8`S5 z?QCu3Jt(|oz2ZW@tfV51y3(xFsB7~|2IWc94Zmck4S&}|M4_X#H7wlBUY^d?Aqf4q znXeq9It5Flsu8*hdadllbu6!{SKz=T+E1$~Xrb3mGu(amU4j?|JF{TlLn2)L*uAAe zl?6oY5u2aP()1;8^!zIOM?$QjBZTnrAcU} zxyH;I4gaOgt*#!16aJf->waYZ4>A|-#Lk-7sI$v!Xwtu1(op?HwLlN*o{;30wYAnv z*nixwqlKBEzpAK`lHdd$U3JrTHEudVHf>kqrY+0oOSYFrr$;bQthvp~zoiTBHx8hu z515WA=x|SRcr$J>V%K0{JY%E#4c9*jVshOES9CR;XcVDLBF`F3}t9^g#yMfK8m@R7;XU!{b zetq=z<=u}DZhdg(>bq$#vhDS)z2{GVd`;+C-w)PonFnhb(6gT5!Myd5m_4*N2JWOR z``h=w0dH@=_``$X#KiQ*#ith+vezEiFrr20KL9^o=-+rQ{qw`;Ztc5sz1p*oTDb7} z*;|F1cZYimH@<*>?p*ii#No3G^Ot)Ly}0x2nvZ&ad*Ria#}^^k_0`gjyV~X7FOBz> vmL7ZW(wgfh-a5Sd2)1Fcc0rqz1uAAQ7p10fH zwMMK;j1Y;@2g3`|_~HxE2NjJx0EzlyH1P%elOP%sqmgJ#&=4N#?C$-YUMG!^7|m>Q zf4=$V`@WgqH}lQz!yX^q_weeT`+EQYtA~e@W9YXZeVA2uqVG3PA3cVC?kWu(Z~*AN z=zY3Ad}Zny0P&}-^n^Q++N&9MA*`Er28OGJ66%d~JF6w#n1U{ofjO(#7y9ko`4D57 zeWCqIicggW;iNS*SBB$r`_jhTl%blTor#`!RYML6(AAl0AzyT~YG26rtD*m1GZ$j~ zF78xcXuu1|Or%DcLAwkYB^+T5J`!c3YFJRBQ8~JU5qUx3c!`sER+KcE*JP2YU7oS>>I$BUdOvZx2^%obg}$`+k1fs?wQ zBy^0jRdOx6$asGBj6Lo4g+gAS##NhFq0|UebZYDnMXsusI3dh)os3MQVN;qe=l!9X z1_$%70E@1J?1YYXrAgbhok@F%kPY>cfl*FUsYdLM<1G|AhIZWDGYCNqX-7*ZJzIj@ z7G<(;|Hj~rl$W-sWg1F^u&Fj{bTB`zAP`TeOvsPhL*L<1>H?p1w9A3 zQZX0jnvE?z8>>niwDWcu4GSiuIM=DUqgB#2roCl7P&A-}lHs%@38l*4xV!XRduv^h zw-Q0wFm1y!wPsLV%*0HAm)MA5L|H+AF;-V3g*7B8CPX7r#E_$L&fC1mMRQ!9U%$0I zV(WBBM>E(qej&5 z*G9W}b7VEw_2|fT=ZP!49)pS`vQQG#VB#4`QrT=alTl+vHo~iBJy46YMS(`j7Aog@ zzNL>h7Zc5e&+=v_BJ(USDF(tSXINE=nXC}yc>|h?DaOQlhz@QRg&MNFyw753@NzQ_ zpKNb!=G`y6CB5uGudMWi>UE`2sZrO)75B@NrW;<#P8i;y<)y-5DW-eq`1g@FfGM}0U?VN7nu*HrMNI4WRc<` z^TD(f7Y2kZQe0#{n3m$gfRIIsi_8bpQd}4ivPf}}`CwX#3j;zHDK0V}OiOWLK*%D+ zMdpKPDJ~2MS){ngd@wD=g#jUp6c?Efrlq(rAY_r^BJ;tt6c+}BEK*!#KA4u`!hn!P zii^w#(^6a*5VA;dk@;X+iVFim7AY<=A52SeVL-?t#YN_WX(=uY2w9}K$b2v@#f1SO zixd}`52mHKFd$@+;v)0Gv=kQxge($q^)%lphDG!uaRt3GJpZYV-bez5VLpPxhd`7l)Gr>FPJXULNQ@#;onWFnjRujfF>J ze;s=5&SC|10^6Q`2YX_ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Magic/Teal.png b/src/main/resources/assets/customnpcs/textures/overlays/Magic/Teal.png deleted file mode 100644 index 821157f54b718414ae91c39f5cc8686676263005..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15809 zcmeI3U1%It6o4nTlp1U)77>!0d{7i@y)&~vvp1Vdv;|S_ zK(cf0x#ygFzjN=oGY@loVr=h*{w@6!MQs=zNl(JxLHI|nUkCr6e)Xy6;Ln|vk%JCJ zZT!gl>wD+q%yo)N9I>)f?o{Rx&9F;R-L!KcS}#>#Z>SrnS9D_rxO5H_ta38)^Sd8L zXv<7S4#*iUQyB)+*2qE?>{}Si8VfUqYDNZ9{fW8;9h88p)AdrZ>}d65#P_Sgd#{;| z(0&(pCK(y>0@72N33}MB0$PqLjKL`}I;KW>ITn**577e0%Pc3dBF6}#CUKf1(9J87 z>W6oUs+rd&(|elXpp=YEyKY5e*;=g@t%*^)T3~rqRas781%ZJ*7-zoh>UE~KWQ`ch5ltO{6_7o$P!C zu#>>CXR8L-JqM?aM;jFX6r+Kc=DO?P^JPQ&veY z0Jc&tB-l=4sAqdsX~TBWuEJq~l$c<9HTSei+s3T7tcS`5a9}c=P?BJ({EfRyFLbxI z6h$i)lnv81EK}9V_60Em*p^MJAJimTx zcf{~?aO3rsK_;V(mK|4z(-}>tU_;b`BU6=}B${!P;Y40%_?)COIS|V+f~xazL)7zm zS@qXOw|Qq|P1mjH&~@*LO9GdRD@vRJBCiG$&xxYS$t)`#_Uc1du_q}%sWaRJ6qIC<2aP+xb zOM@!$vLNUxqw=c6NTL*HR7r-L%#5pC9*DVk%xIjJ%l&1`O~KQ{A1Klsvhp73g6EBW z@a+Sn6d4}w2^MWeEhelwC{Cp<_`KnGCxIe0ZBRu|!-E||5f0H0<{O3-O~W8nq4xy; z7z0sK&Dt^*d~9T&1X4j-q}#Oi|iP6m_qC>d>cqVBZf$(?i+%(zS0M-q@h;TKmPe zx9|U9qPX~CdPo1UfntF_J}v#S^Vl7OiM{IwsXI0`sI@fJ2X7atGmnlPqv$QC-#YX8 z;>h)r&en@>emwte-^Ek!D}86zyzug-E1T)rSE$GPz8gP!_u$;6=-|?c?4=8R*OF&n ze=l{tc=gZdn)|Na05@J+_v6%KsdJ4b>fHI?#*cp4x8=c4eob9g8r!a1*gG)({SoEs y#^Te@?>XN%acIZZ6PLfb=d!vP4*llMHPjnV?mzd(_9X?1)adT9^!Z(fpZN=+A1eg_ diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Magic/Yellow.png b/src/main/resources/assets/customnpcs/textures/overlays/Magic/Yellow.png deleted file mode 100644 index 763a4769682f30ae58890e2ba99c5af0b577c957..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15807 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 Sdhrz`f~kE6iy!Pg_T1lcj~)sD diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Magic/white.png b/src/main/resources/assets/customnpcs/textures/overlays/Magic/white.png deleted file mode 100644 index cd3743f4693db682dc3caa409971d558344a6f3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15846 zcmeI3O>Epm6o4J5Xh=!L2@pcUY=s08UjMDvKiX`QW?K@(mMB@&9t-J&xY&@NMYxgX7P=guZUCPb~xtv-3jq z9y#hUM3?!1hg;ZPn^%Hqz~G)q%APL)L_gt~ZwX)K

ya*C*kUJGIt;b8Gu6*4nbA+nL?PkwVKr4r(w2Y^zrF0;4sSiTxVrcQnjr*mz2~ zJeHY=0c2wI#M>`I(;{FGo| zHQajW`W_qk1*X3ej%6}Ypzf=^uUfqu$P3!+5JkQP>b#g0_(4Xt)wQXwG^+8^Y>S6g zSc6^|AUkoOU46+9{b0%8BxF~;X<(F-a=9CO;CgGdfuVzN?_q?XjdY-8P+6@*eijD) zO2dMC52LN@8npY+b$ZF^^Au?|T{~>Ko0vtK#4Ij_Btr$XS7WjPLFhLszF#dSRW{Q> z$WBhiRmDDZ!1Zju89ZFzag$!Yd){CPgs_O}QR76B6O@Xm8G>d=D*9~*Ldr=p6Z28_ zZP!`t_n}n;(U5gR($YRsGjSj2`msR>w&W!}H|58+499QOKv;BZU=i|lZ?VAl22(S; zRb@>2Rlk9j1&eZlA2dABs^nWMQCUxT77S1_f>e@Fs^SZG4_NFU?I@~lF=-pNZ@IS7 z3koDtvqeGX@|LBdOhAnTimY&!ENh~gm-ALmE%4FBi(K^9)vk^9_+Zy&PBTqWaw69- zajlD{%|Ts3Bc>|rk~P?MGTOhHG$|5_sKUx+W7-QsfJjZ3ifAC~qD?!Fpa{0AagGUP zPB3#02h6<9<#b7La+U%>UW&`E-@Lc!w(CxGsQ*l%QK+eip5(m_r&S{Qfb7EcaKcg@K`U;&WRP$mB3G@za?7>Zy> z=!#9wg?}#%5%46swFJCHXczg;&N>7CrOa)uAKpmju+#W|kh$ba?C*)4KD)7p7NQ$5 z1NC3j3qaiW!~(xztXDJ1{Q0PlR#)Qrx}wX9#)|@awN2A%+;o9#npWecJlTd+D`a?!0!5S;}1T-yd$3^ZKm8Omsh zaj@7hrDz)_sY*S9#K%}NiXL##vlZWcxY}^Sb=7VV| zE({1+q`1g@FfGM}0U?VN7nu*HrMNI4WRc<`^TD(f7Y2kZQe0#{n3m$gfRIIsi_8bp zQd}4ivPf}}`CwX#3j;zHDK0V}OiOWLK*%D+MdpKPDJ~2MS){ngd@wD=g#jUp6c?Ef zrlq(rAY_r^BJ;tt6c+}BEK*!#KA4u`!hn!Pii^w#(^6a*5VA;dk@;X+iVFim7AY<= zA52SeVL-?t#YN_WX(=uY2w9}K$b2v@#f1SOixd}`52mHKFd$@+h-;+xcV+0I|0p-n zpOM+4-Zk_`X4aaTEi=s8gA8-zMTWV)j=rxj%!%+kg9+FZZFjuS}OF zDy{E-y)2HLXYUxl_~ZJeb7v=)9ys~zXKzkyKl#mv9}Ru+)9}!?JI9&M2fO3x*Pj|4 zztr3@%%0~jRG4k|?7Z`q;hDKt?PH%@|7v!1^u75j7ZE5d z>H5|0?mG7Mk-y$Qd0akm^|dpEk^I GU-%oD5-&pl diff --git a/src/main/resources/assets/customnpcs/textures/overlays/blue.png b/src/main/resources/assets/customnpcs/textures/overlays/blue.png deleted file mode 100644 index 512dd4c0ce9e2509de6ba2aa6156633bf34a94c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15055 zcmeI3Pi)&%9LJ3&At>7b?SRC|$^-(2^ZY-tm1HYTM=O!8YKzt#Cg#{Lt<}Ufw%epV z0NOZ=BRg>c1P8>4BSHcRc3|8%Oq_Os0|%HkI3P_zLK@F@;<&%0Pn9;rQTU8i0; zueHQhFo!qYg}o53?k%m^dt0{QlukEhY6Fu5=;7Gn2feNrnS**Mjcbzoq#2d?v`f5I zFU=+i`SsQ^Kj(*-*UGwJi+Y8x7-dPTRMg7Lyevu@5*4I~f~=UTXsR+lyh@E3a#stT zj=9o2J4{EcdTBF`0~4WszhCYvWk1|Nl3^G~l#wh8q=yjgda*SSyy#>WWE7`~BRh11 z*!4X=iEFj}?YLelC5iHDIImuiC-R~pJ3KR1`| zD*lD@uIKpu=*1d>F5~qcN5f4k#tpI`tAeNtlDHGWDs#^7`XLz> zZYVW0t-0Wp?lg1Ji(<>O@nW+<8p^Kgm~Bh4I*Q>4s${5w+ELqrCF+vUma3Mh>9(V{ zD=EZQtLQ!vy6M~7NwtvB*}>xYHVHo-mZ3|sZMTu=0{q7VkJIl9h;V&oNWy| zDG%(_(7x93uyW6#n>)FjheMFXFSs9^qrZtgT6txm(q0D#iTqC7w?aI-L3YStDnE<5 z-wlSZq2#}y>;4A|5m`GAwhV`>ss~$!eJ9law+!Q5Y;RiL26h@~w1Gzrhg-R9J@;4E z=s=jP#9H#_lvFX~wjDm<2@HJG)Mhd%PWiSh@|iSo=(v4?pxp3%dM3SzM&00`Y=xafR< z%5VW7bd%wt^8qTu1%S{^hKtSzs0pfX$l2;F43=zM_6Z~-86li{NC0V=}N@GHyJKEAD}W^ z00`Y=xafR<%5VW7bd%wt^8qTu1%S{^hKtSzs09QV!@j{EyQ`Td>awndJ+eTn1D4>;}_|JobhpCx@SE;eV^2Dk3q z{N(BH#HWs2N57tmf4K44&sUCKUOn^t6UVRq@%go%K0ZZy=GQl0-dj9(^RGJ}Id@My lnYR{heu*v;>;C;C+|{GM-FW*)`$Qrx&M!5;c;(XNe*w*SK;QrX diff --git a/src/main/resources/assets/customnpcs/textures/overlays/gone.png b/src/main/resources/assets/customnpcs/textures/overlays/gone.png deleted file mode 100644 index 35bf35702d7f2921fd46f2774f5998b2bc4fa1c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15044 zcmeI3Pl)4G9LL|XAiJZpCsFYfx`+y<`O`LSLfdt0XPp5%4zrb=Ik{=_+JK0=r7hM#j^y?^*C zLh1vny&vqiUegR`nAc6GgY%Q2OL`+zy)toi;}8d22lp(ymiztdZ*!bw)^gWNEwSY` zaNpWG@$j{iowjjuXsBlHN`0+5(MW(H4s>oZ9N4}#spX=$8o3Xfg&Y@k2@Y$yjW8j% z-`eFGj)%EYUf~T@{ZRNBvn-fQ5IyGCp~!o*bejwZ~K?yAhS44>>Hlt29{%U zVO+iAjDlJ&7bZ%s>AZ$+lF0U_>h_OXkFJ?uLp&%m2UWGa`J z%|5WY>Eg^q3YC>(#}jLXTd2ft(N>68s7mIlH9V{bj@NdaK|S7OyEBAbqY>>Y?uF}? zZ8~HB#i{^Z()CWG;iewoI@ymEUQ~EVY)i6MRJ8&zi<&5Ag2X*RjFw|s-Qy)ON|Gke z#mMx8F-ZNGdZ3>vO15t%j%jFJ#~bQF-5TmWEVy>BDx{5>p2@D#8qUD+$gps|P!*On zXS|}Frfu7PpxXxCZq`Xd-m*-stICQZ7Ylqx(G6agiwdt+q%JQh<*rn&sAXO0L=ao8 ztouUfrelo4Y9XQHgT-_V5qzaEjKH`w<36@&qif_3}>sVhg*iZ6YBq4hIAJjeckS1vo6dw@T}o%D;KZld}Yn5b+Hnw;h&R6 zs+jC3J*pm3+6!%I=D7cUSdD{G)L$*Bg;GV3L~>1Cvodr&pu1*e=$d-IVOv36o@N8h z8L#jkG(O(1k%v88S4yQqsVcx`=&@@}@L<1bk#pD&&l9CM^?|}t$Ai?dK!zA4iySk; z)G=PF%wt(pgK;Z)=p)aYLh``5P@c&t_9$=C89mCVAQnpkfY42bi_QnA3>N@GHyJKE zAD}W^00`Y=xafR<%5VW7bd%wt^8qTu1%S{^hKtSzs0pfX$l2;F43=zM_6Z~-86li{NC0V=}N@GHyJKEAD}W^00`Y=xafR<%5VW7bd!o}Eq#R(+vL5?F?m7r{2!MlrWa3;75+mH+?% diff --git a/src/main/resources/assets/customnpcs/textures/overlays/green.png b/src/main/resources/assets/customnpcs/textures/overlays/green.png deleted file mode 100644 index 6725e50c1cb54fbc2d067ff9f2e9917b7688fda4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15047 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 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/taken.png b/src/main/resources/assets/customnpcs/textures/overlays/taken.png deleted file mode 100644 index 508a51534b0268ef80eb3dc63dbf617030f4bc44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15045 zcmeI3!EfV46o+SbCA3s591(lLc!dNKj_o*(Ym;OtNtagIl&URidSV@W+*(a+V>?aS z15^taB!qwy9N@qoz=^{OgwP(ifw*wu4$`7UTo(zcjO`?LU(!*fUBqQ9CC;1Qy!Y&H z=Dqmh_t)26yRvX~0U>l{b)~gI&aaRUclj~${pIIxzei4w2P-=fLQmdJJ{RtMy#FUc z`h9n+6L;D-4a@JBOxy3`(x@Mh*$CCHj{?)$$1&H%yRKK~|N8cOo^$Owzpb{VcF@Fo z?#fY!H;>k~tfPHPxB2Uhh1$p<0s1&LxlzC8MaHPkr*RGPI~f*vE}atZ*ZHL+A=hcI zb4@?QoLZ_1mQ>X^O)tr+rd70;xUwXxqNIq5B$O4SA{mu3H$M2r0{K-7ZO7PX-594M zR-NCAKb;c!?QDkVSM6=hx5MX4;7%L17pM2B8%js!2dmIax_Y2nBU-5_>-k4xg3 zU4IbQc|J)rJ;wLd52lH{Xv~gK6h~$t$|Xsh=VV(`pI{L7(o3@~5%+K(dvQekw?ei;HFB>;GsI@>hg-hiYh=4@eS(l{Hq%|jy|C?i zwm*zstclPiU++8`ZkaJ|ko~wQNL4|Ww&b!=(G7)|6+@B=L9&@3M%%Yt=WtF8RW{^G zF-Bn~j6v$hHe>T#QHpa5acs+Q{IGAv4YzOZVlnV`YhpfFm^s~5M$_;4A-OEvP-^15 z;euDX(~MOwicQbLtE~nZD7mg}ENT{Z7L~4mwW=!EPDK&Al57f!wx}pl)v~m%okDE4 zi|#X_TfQ|&s)dBk8jI~)Bz%5ZnqGA(reg^tCKhBFFABQcwFRuJWTdMpdfA#JDg>KJ z^m^!$zGwCdbCP?pNwTskVO6)gf~_c)AUTyXNnvY(u2meza>|;llqV_XgqcaT;zne* z9u{^n*~@8X+r)339-Rn1H|nR zvZkJ6H+Ob9&xat3UvNJ=$8ZmOwDQVArL)cs68TO%G()_!OLoY4DnE;Q+6{)UiOGLK z&;1V;A~FviZW+#3RS&ler#jUCw+#6%w)RYK7uyYSvVkW9=UcgKJx^EGq*`Yyv6lQf z8KjEIjxy8gk!#}2Se`kX-$|;mH%RB}s;;PuqAZbP>{^te>ki$uC_~rW^9|398>9!N z7Yc?8Udcab*4{VC!yax_RaH@IA{>Su>+T5mIxUy<;V9`R)ymih3UeKIa>t}irpZ#r zf-rW>ma6brmeyc4N*?;i^QJg`;G8MXX%~BxKk_?zludBoexkME&zmXGF)^%KxMc95W2~5 z(fI(C;Q~PDCc{PN15}0!0HK=<7o87K87=^XZZceSK0sx-01&##aMAeymEi(F=qAHO z=L1xR3jm>;3>TdbP#G=≷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 BG;06= diff --git a/src/main/resources/assets/customnpcs/textures/overlays/yellowcontrol.png b/src/main/resources/assets/customnpcs/textures/overlays/yellowcontrol.png deleted file mode 100644 index e5be40cdee1be7d906d2d4c8d7a2030b46db0d44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15052 zcmeI3PiW*+9LL|H_@}VSUKBiqSp-Eh`8UZlVP&4ByylF#cl9;5O zX%DjMUIZ`xIf$?x^yEeHWI<2_7d(3K4E&Gb>&6)!I^llQ!ic7 zTXHLyCtL2~en>9wFR$VKZEQNFbB&qWz@hoXCrY>?lQPU_=PvF)7FLv5D!Nv|8ibQ^(uuO-&ue3%eA-5b0FUXl*Yb(khAkoe-0S zU3x2Lr`>(*cJj$N5-CxR9XlDg$G9a*=9VsnY=&y|Uak3%*s&k3`F^*Nt+JI7LScSB zT~)#pS6t8W`_Yp%3A*I-okt^0J0=af9%n__5EXe%QLTz;Y1FJ(vRnv~^#n0mzT<&A}&<5gwN`&~bz z!y*l>CQWNDc%>`NTJoaU_Aps$HfTfHbsY29cj&nHTE33xs%g*G6Y%tg8T6~`dh?fl~)!j?R9*R$nV5`J0x?PbcLLx^0TN% z-C+2dlspT%?td^5k-d9o({Qq?y0d9GvP1oU(~z%Xyk&cv#A!&Q1w3jv+0140d9<=d z)jC;;wdCPs(JH1Z%1*0CsYw%UdFHJDdQy$uowUEHo0>i=DKb5Vu0z*OZVX@*-wnh&<6@r9XE1E zjSewQmO2)Mp<^~xh1asQ2D4WB(nsGnrSS{rM0t*PvAcPZ-_hNS3S#jj00`UUxY&Gv z%5ec8Y?I?+^8qTy1%R+kj*HC)s2mpn!ZtZBHXopJTmT5$|e1OVv0U&IX<6`pxD#rzYuuYDO%?GF) z7XZRGIW9IIpmJOQ2;1bi*nEJ>aRDG~ljCCZ0V>A@fUr%Di_Hh992Wq>HaRXfAE0tv z00`UUxY&Gv%5ec8Y?I?+^8qTy1%R+kj*HC)s2mpn!Zw+>X7W!siATTN?9&f4KmYRE z`{~D>0$yBgA+-NELf2kL=&wV1{uQAe8KK{&RFl>zVy>aH~$$4 h`T5$%J!%{t-h;I5pC1wbIAtf=(!z4{lV`5J_Ah+ELGu6r diff --git a/src/main/resources/assets/customnpcs/textures/parts/claws/0.png b/src/main/resources/assets/customnpcs/textures/parts/claws/0.png deleted file mode 100644 index 6a033f0c687c5a2070579df5df62591cd1f9c044..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs%RL{`B;7id$psL%R zE{-7;aZk?~3N;0YusFV}&z$10nD0c`%(bsly4Jt9IR9Dw%(7&$w9AIvn_tdoy;*YR zP>xkvqM7VwgV}wNGklNh;FEs)_xW|Z_L$#tU(e^g|NC+4`NP@w<$tDcUw+)bpt|Z0 j3y`7OLklST{3DaP(UF?xew@ZYZ!&ng`njxgN@xNAYh#5s diff --git a/src/main/resources/assets/customnpcs/textures/parts/fin/fin1.png b/src/main/resources/assets/customnpcs/textures/parts/fin/fin1.png deleted file mode 100644 index 580504f45f07119592e728e65088fe1c55a58497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14707 zcmeI3U5Fc16vywjRo2jL*W$-gv5Z*?T{M}Qd~Gr$X}8I?yJFVuHf6U(XlG|`c84T0 zZP5oo{Csgy3RM)rr+R0SO-{1eUMqdP zfg~sQ{?9pge&^hqd6{P>C-(OFw)zl4edA-$qqj-Mo7cbH=bZG<*m zaNj+rAKY{wLh)@{e#V)}Jt8SaIVh{fEDl!7CQ&1l+*vhcrHCDF7SCyV%75*nPyC#w zru@^*; zQ%w0s+=SdrZj#Fw7UrVCSU?eC!`yHpC`N~eBf}4IAwi7tLYNN=flyeA2vQ`(HD3O- zk61}dEl5+@J&knaSIR%{IHtt&l}aU82?q^pju#V&1TTd6P$)nY0eew*4L5hD?&h^Zy+TQHty0FqvSV0z!ziWe zT{gLbkjrGeuHtq~Yr1Mw?4cyz>C&oqD;mzq4o;JPj0Z$9AVl+GToOn>#)(Y~5Tvf` zh>iWb>%9Bhy1bAqb)>Qo*pwvXj=z@*L((eJ;tj27$8K zPg2Gx85UU+PKT3xw_)Jr^_VoS+m5U&cs!dX13^twB|!;A6RHvpL}IEKh{%ypU^W_$ z2UI~3B2h71h=fEBUoHpTSB1_R%7VL38llyj3=P~@g?`l1$QdV>fW}?@&8FxQW>u;& z%_g0>2s)PZt#^v;$B(yq_r2KKH6TNm5yCq&!l^tNu(FZx@4~gq`g;-wKCWBGj2^w3!Xj^6Ud7f-Oq+A zobGfzcw<*M-Rau$JfLe%I@HM4F$}!iGq-*$>?gMeI30^d!_g$)Io#61`-eBbaD7)=LHc$h}I|N6BphxkKTbw;i4jf0)`9HpxO)<6%iCLT#yFUX1J(`pn&0mG^jSi zMMVS!3>Tz9wHYodA}C8Ps5ZkzMFa&57o zQ4v7_!v$$jZH9}A2nrZ3NP}uKTvS9*z;HntRGZj3(}z43>Os<6fj(n2GzbH zE??`RKdh4{{VL>|uLkWF~upM0N|XN0#)$4~$L>d-IiHWyy` z7(I6Q(kNQjUqc%>)YH4Gw)656Kfd?XvAx&sKUADQJ5u|)=d*zU<;dBm&fW9y(2lpx z53E-<_B?;v?>~HcY;!U2&bcoVgUcI-w!e95dHSahk+|o=z`o+>*}L75D~B@0zDtSt z^6RHgOg)P}M<@IHch~yY?d~l--S_?rKN|;nP2c%#aeLy+#2-fo?yOzzCo5OBe1m_HpJ;q^BKz*{BPad^O4#kL diff --git a/src/main/resources/assets/customnpcs/textures/parts/fin/fin2.png b/src/main/resources/assets/customnpcs/textures/parts/fin/fin2.png deleted file mode 100644 index 2173a08866ed509225b96c82e13146ac0c3b2f3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15948 zcmeI3U5Fc16o6-2D(l*=wO9+vmLa96)ye!%W`-o~cGGqj%)0DGyA?}&Gjp>$G|9xw zY?Ivwt^EOgs#Jvf;DbIW75u4>7PLqee9#9$L6JU66+uBt^`X=|Kl!`KUY1%A<%Zp4 z&OP^>bLTr}&YgLfmuIFAY#MoRgkhLXQ`daIniul53ApG?uGHb&%5=e6Ic6DlVs~~V-87Md3iJWntdy&s*~}zDza}~khWP{= zPVtXr65~NYc0NDDPPlc*s!5Hr1TDp;jHIZhQcCJ^RuV*&7i3-*I7v1Y!BiwR{v@&^ z=qO#cOXh5De;f`;nZ%;+*G!&oG#bf0~1skH-Dy_g-M$TvZa7n1@%$jG+ZHnpXCIb51; z@vsaluny1x15ct zY^H^fotOx#ihbmuQ?=cO_h_2OO*;ARc!N3M!z`*tofAb)Pz$1N3aB1+bc_zVoJ2D* zA9>eyO3S@IQUyUYrIaZt-9EZz;y%#zV*?+o$xHX#EsO$(*9uBBuaF;)<%SbGBd!iYm$_MG^K0w%~a@k-#4q8vjl59{k40K+K&6Nza9-wI!r)x&hD5eZs)nQn}z2+T)vFlcJ z9fu5{8Xxjnht~o8X0NA<+6@}An zMdrk!qH@KeBy*}}%a#Pt3F)O)hyiZ;LQOhBeJ=NwOIV+C@VVa6PJMwYbbH}cwRhPxkpmE4g;c;NUyOM@V$WLpqKPL`m?6-x?4l~^=5 zK~rVR4jM`kUFEl(2CX0(rlOkY?kC=4{=GB=z@zBaBB(AvJIlAutTpgo%G}!e;caKG ze{26AWG=cAdwXK5&-VAwbZ}Q^qW+6|0SNmZx)l1xIyDo`pAY(Ic`2N4Xaf51V(=ZC zcB^sILuAu#HE!Cme5&gBSt*W&4R=`ux1P~`(Hwe8f>}*fWi`#?!??wa(}d;uoP+L* zykIBLl-LGW3^Y8{F_h5~!(gFdmm)TdQq}c56K-SCD0*5#4{Ch-Nv&^(YwtgI@}P4@ zchW27iw41fkVT4%%m>p_To@3tNO6(*U|Na`140%lE;1iXOL1X9$Rfo>=7VV|E({1+ zq`1g@FfGM}0U?VN7nu*HrMNI4WRc<`^TD(f7Y2kZQe0#{n3m$gfRIIsi_8bpQd}4i zvPf}}`CwX#3j;zHDK0V}OiOWLK*%D+MdpKPDJ~2MS){ngd@wD=g#jUp6c?Efrlq(r zAY_r^BJ;tt6c+}BEK*!#KA4u`!hn!Pii^w#(^6a*5VA;dk@;X+iVFim7AY<=A52Se zVL-?t5!XoP-Dg-uFFZHUo6Uzu`K#!yXx5sX%`?o(PKG&giedh`g?@i#m?eQ>emTl8 z=6QzM=AJw9`F=F_&8ggYq4~qF=P%xOSr}gb{R^YpuAY2RIX!0_0QCzucPS^fj}Be@ zZseoSn2nd?zgNy((ax^_Fz_gTxUMMb}74I`rEgM7U!6Y!()uTVb}1pBfdBE>bfJRHdnSU-*fb9@XqD4 t_p_f|*}LV&!`D9eef(aux?8u_Gj(t4(?342`6VPWQ~RcK@9#Z&@^AlRL%{$5 diff --git a/src/main/resources/assets/customnpcs/textures/parts/fin/fin3.png b/src/main/resources/assets/customnpcs/textures/parts/fin/fin3.png deleted file mode 100644 index 0452424954ca66802b716ae233a27fc4757b9bb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15158 zcmeI3U5MON6o7A0O5L`LRH}Ao4 zFE=ogoO|v$=jOZToa80X3~k=Dyzh=a0KoFWTy_|p??*po$zt^X@{v9J(dnjYZqx#x zf5!POI($$6DgY9fwZe!!l7CQAj7m^ejUo&-DpfQafaLl{RaPdT%@pC7rl$f|PM--d znwko16Z3q&nt|h5ZpwsPr#2UqsR<>a2G*zhk_`zts6bn08kMqcNsUy%^(&!kXP65x z?i70>71-beWJdBsOvW%FBL<_a!bf9FED;pMSS%8|mkIHL$njw=%(J1e6yc>vh-n^y zbRW7(nrcZJ&TedmLsBX*ZrfFfw0X=Njc4Yjg119SbgxpzgtBdz1;Z$( zy(}AQA!ITcH>;Stw`sa+)U9<%4mauScgGvd$~H`+e2lY#!17{2h)X=m$2hu17d|K6 zOw32#P_@$JTp!VbkZ^O_@z?g@n~D2C^`pwRydW?BxjsLtB9#oYBHL-LB9B3?s*feP z&Y*8*JFBFOQ8rApESL@_xn9FQD>u`mLEW-tU4etyG#UtMnkuO<9E+>*2rHM0Ay$n< z1U4atMOFxl#i&~3<4QtsA?EXb^Dfs}L#a8{f?RuzMKu)UzOyVvh`4| zvk5gCW{dH7xFpB;5Fe3Sfqc%o0&Ouh)c54FZ;o>>Dheh?VYC<)OKeF<@T@GNBuK!b z%8G&zj))y_VA@KbB%;%3$ABQ@rygXO#tofZ- zM#-+rCfqQFGGrl@?|GeThPzL4&a^<7DHMCmPfK0 z>cf`PPoj~g4X)^EINC7`qb0h*TtlCtY3Oa0@3qXWL2nej^r81nuKmKVor!L$??281k9Tx33&mg2&I zkVT4%%m>p_To@3tNO6(*U|Na`140%lE;1iXOL1X9$Rfo>=7VV|E({1+q`1g@FfGM} z0U?VN7nu*HrMNI4WRc<`^TD(f7Y2kZQe0#{n3m$gfRIIsi_8bpQd}4ivPf}}`CwX# z3j;zHDK0V}OiOWLK*%D+MdpKPDJ~2MS){ngd@wD=g#jUp6c?Efrlq(rAY_r^BJ;tt z6c+}BED~|`bw1&QI{I$2jy}-*b*Xj~ecZ_?x#2tjQ+ENd_bC8=pGD`30MvK@F6{(B zng-xD4OR}e)IQ!AbCs)0AD0iWJBKyYS?Dh|DU3==t zxpQFP#{9}f$e?|^&j{8lkF2Www&vA~?>sy`I{o!BaBNro%!SWR9zS^e(H|#fK5zW8 zA_qQR9WW=}dwj8a;&pAub3dJC_a6KC%WKA8OOpe$`_F&z=k}`;Yi?ik{j*bltN`E; zc;47|;>-tER`Yvqeks-W9h(`u_U?|S-|F9zI&kOSw^!a0e&N9RZy)<)aM`9$*Iz{o dnw`A?{O}cX{L;GN*POKt4s6c8`M}P7e*+$ld2#>% diff --git a/src/main/resources/assets/customnpcs/textures/parts/fin/fin4.png b/src/main/resources/assets/customnpcs/textures/parts/fin/fin4.png deleted file mode 100644 index 41ed97bb5e2b209c60e101dda83237753813fcc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15409 zcmeI3U5pb|6o5xTgykn-q8oweSVDm4bpE^T*mnQA>n>7Uml76V-095i?m#TLMo3UZeKIP6_=1WUcrd6$$$Dq{H@)rNY=p#@JK1gL z+;h)4_kQP|(|MT}hBiO8v~6V@MNvx!2NJ{Zy9@r)3m3r8H(q^qKm1yhAJ}eF)Us3V z{~a$sylfRkDeoJp5oaX1NztraP}Qw82$phrIGduPou$00?F0^;24jX93tao?WPmpG zSYVr+z)|T^E^FFKDHibjD)8PNW&^Z0 z#n~APbh`oRk>n8FYZU-32Sbd;g*xbtNRXF1I;4(AXo2HpmJ?Z#V+2u=I7JfZ$`y#W z!MkWd&nUx*{z^C~#RB7wlUG=_SS$vMV$dp#v3w*FVL5>n1P0Dv>`Bv6ON?o+DLbk9 zNdQ|b7EvwV~U+BkTvzJfniRP$y)4|>&@j_hPIu)-4Hz1owR^|N)RWWT$<@rdc2F{AF>^I#Gw&#rGZck;ReB3Rb*w_lva<2= zDI2OHq9ZYf8o{XE&$-KU@itB20 z=(^k?bxVWp>wH6Ugx6(VV}Kxp;GqLyCZdN#CLIoo8MT8GI7zJr@;Pe?^hCjc4P4Fo z=2Y3LsvhQnBr#!K5*a=%$#5@%$jBjG)C4t>j)XJS5G~v^g&Hv2Oiv}njX zXWDDEd9`2zw~@pG)lO3D&2Vb%ih2!6Q8l+o$2GUkfgWWWM(fK$&5Y)B&J97?zt4R3 z7{zg5;`&6{l{ag4C$^PwifRFLkHHF>OA9M|Z8SsOx2_V%$g9PyaSMsC)!nz2hPhSM ze@;VltNs7d-~um4*Tz+I4CryTdVs3~bIV*gpN*AOt=8sBjJm(F3anyyqExSXV4G?h zt4A)+A91TOJK@cbggAJyy!%-(^{Y|S?RZna8a1t3ZZ!=jE>xl+!#*qbQK0-gwFN%4 zf_O-lMLEi%!>GlOQ3BbKgaLo2Y`33;q>2ryXlb~;ZYaVfdcizHpQ2(|PL=QZ(rbq0 zQTX% zaC~%n@22#XL zzii)gNGyD{@F9Btk;Ok=Jt~R^ZyY~%-;tN5hrd|U)wzSx^MRhD_ul+D|G~Pq+B#o( zvhVHh=imM5gXg=?MMmE{zP9Vp_A^Rq>pttex{|v8_&dE@<-d+TaOw4d+|m;lR(Jk+ tK{|W*`9n*rlc$z^LanBXaLY3@^Qd(jKR$2|_qhQ@YOrr};#kk<^uJh^!Fd1x diff --git a/src/main/resources/assets/customnpcs/textures/parts/fin/fin5.png b/src/main/resources/assets/customnpcs/textures/parts/fin/fin5.png deleted file mode 100644 index 8947cad1765dc30fa2c8c0f685bf45ce158f5748..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15857 zcmeI3U1%It6o4m$)HcuviWX{Zhi&~SIy?Wfv%_ZFB%7LmTSK}w>65uTb2mF?cV@dY z>29J(QK9IQh(bj~?4yX*`ev0@Q4uLV6dzQOzWGz6zWVbJ@67Da?A^^J)Pg8?Np|Pl zbI&>Ve&@`YnTL5{?&u>sM|Y1h46}1~CO40M52Jr}`!@7_?u}=jM?X7iGbcQT8T%~w zAA0qnv3nRM^Oap#^cVAw8m3!K0?RGJWV2dBvytvlvj)r+=(9z*Y&+wL-!5KCu(max zSWxpqzBUER_RM-69$P^)M?5qRI<0FAJO`8;W2k65IMDvZLrI zQ@2XSeC|jq9FoQpW#6wEJl|+Ek_|cO)|YuPolf(D#7h!~W^mq`5zKZ9h5a znRUD7+pfa~enHV)^~V#5AW-Mi+E=yK3FLS!c8DV11T|hv3j81=%k0?HR_m2;X_m>u z3amoM_mG`9(5_Z?eb+0yn}qDBHw}z(lFxTy4_t4xIxw{7PoF{vT1W?4dWE$b8!AE^Rzpr#B-jr)kr#C@Ri#{xdsl9%}0m>&!w0HS&Hl)o5HI>gBvySHj#AY^^4c23$^=JTS zP|!-8qzQm4DT>PJnyPT7qLlPfQ8I;+85UZvd3T#F*X`)Y^H8Sh@%mh0`rX=ENe}OR*@)oT^!}DS>n` zt(V#%2Ds@9HDd=wwAP!`u!xSqlf9$eA_}{B4b(jt^r-PfyGeE0epDB&>Ii$C0nDKP zXU(96Kr6%djCPmRvCKph?EZ9a4MCsz<}n&&=#W}aZpDJ>gZG0^Zt*HA`F z41%KkBfN}7qv(+aJx%eQ$Em(6T<7|8D-XImx|LorUo;2?ge+2AWImXd z;=+KCMT(2e2h&nq7!a~Zagq68T8aw;LKZ15G9OG!abZBnBE?1KgJ~%)3Vor!L$??281k9Tx33&mg2&IkVT4%%m>p_To@3tNO6(* zU|Na`140%lE;1iXOL1X9$Rfo>=7VV|E({1+q`1g@FfGM}0U?VN7nu*HrMNI4WRc<` z^TD(f7Y2kZQe0#{n3m$gfRIIsi_8bpQd}4ivPf}}`CwX#3j;zHiMU3)FDOF?y_MWR zuODw$?`F}f%d9ywpJ$l$`xxf*a}4vx2KxPlVO9l(xxU0O##x5h<-YvH=SR@ow`Ow_ zh35Cao_&8OBW@r5cw_O(r`z_Pe(&l>*#p;h@48Wbdh~&j!d>^@wrz=t|9O)aqz@94 zmwsM2zIKqgc<%MX*GKlecq1{w9GJM{%+;0SDgd6w1^xB^bZ+<;=fpPYn|M81`)BDisHa3Qt Y?|$EZ^2|@yhLFh2P9M#^JGu1i-&ScTMF0Q* diff --git a/src/main/resources/assets/customnpcs/textures/parts/fin/fin6.png b/src/main/resources/assets/customnpcs/textures/parts/fin/fin6.png deleted file mode 100644 index 288b22a1a886b2be8821ef7bb30163f34d980e28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16050 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 diff --git a/src/main/resources/assets/customnpcs/textures/parts/horns/antennas.png b/src/main/resources/assets/customnpcs/textures/parts/horns/antennas.png deleted file mode 100644 index fefff18cab2019ae901d9d224ca5e531a3e3d3d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uLSEsD@VqP_W(8#W5tq`Rx^7zGel1w!{Th|Enim;cbmj z@M-lEmpgFd#qXSbl84d`_5WnoR9(5XYn$7YZP%|wNgtjT9IFAOY8DKH1Rj~?Z5ls-tUQjKP=rE7$3F&nIcQ%wC85;zgw0l?ooMO(_as? e911LE8OmQ+9KFn8>p74+89ZJ6T-G@yGywqI%ULe~ diff --git a/src/main/resources/assets/customnpcs/textures/parts/horns/antlers.png b/src/main/resources/assets/customnpcs/textures/parts/horns/antlers.png deleted file mode 100644 index a0f7f52a2349f2053b33d8c8cf0d05da29f9d773..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uLSEsD@VqP_W+9#W5tq`R(P`T&{uwZ4Wc8Rle6R^a}He zaJwbGagTrIjCwmapgItEusX+is$4qdlRN!vFaqpy)A)mwV@*OTBjbyy3Act6pzme2}K3 X@2qHOW&H7656FB^S3j3^P6Nn{1`ISV`@iy0XB4uLSEsD@VqP;iH*i(^QJ^V>^%xta|mS|2vAn7m-~_j=8H zjhh!Y>vh$4@MX?Qdl8Y{CU%eg&~tHT19gxC7#JP|zuq;gyv}OIV+)_q&}FZ!%>R@W zOk6+xCc~BQd*2_bewXhYFzNn{1`%>sNvT-U8z2V_2f{`|p%2iLD(KXc~Hkt0VIFJ3%n&YYb)cV4=5>BWl| zzkdBXdi3a_Lx-L|eR}KGEueaN_Kn3rN~k2rFZe$?V0g5DzYtKCv%n(~sEY3p2s4Um zcr^eW#Omqd7~JH?ps=?s6~JJZ{PjaR_7dR;nY*k{aZRsr=|ODm?{~r zz}mr?`T66|tylA|m&)E^(PA`Ito*zE5MwUW)P@-ovT7|B_;&1KOLAKE^&)eW^KbdL zSHJJIJ+J6FVbT9zF4;Vn7A%~SbiUX_Xvgkvjn{UpZT|7~tM>xayw?i*>i_Crkb1gZ zKW4Vmq=47Et#~tfoi*9l`6_xwY^l}%&$iy^L*^-$G%aP_%4Fu*vA5-KFBIFc%f;@= zzO1^UoXy$4ldZ2XX{8;R@O#zIlOLl?63X%_xmL^&+`dlM*w}iz4Qt4m4!&!BGZVfh tus>N}w2}E!c;!Ckd;FiTvpue0x!a$8y1}aOEijZAJYD@<);T3K0RTmJ){y`J diff --git a/src/main/resources/assets/customnpcs/textures/parts/legs/naga1.png b/src/main/resources/assets/customnpcs/textures/parts/legs/naga1.png deleted file mode 100644 index 21f4c0f2444f81f92e1145630e6440b2cae3ea49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 709 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`&jWeH$$5EsSy@@DR;~K{`Sahuf0L4ua&mIAv$HcZGZPXLQd3h?Qc~jM<1;cc zYHDgqOG_goBkSwyV`5@fuU`G-%a@{}qNb*%+}zyI(9rPk@VL0R8#iv`=jT^cRIFIB zA|xba-n@AqKYm=keEHR@SFc>TvS7i2s;a7jf`U17=Dd6N?*IS)pFVwBxpHMmNr}I| zzq`Bpnl)>@yu1Pe0(R}%1@z0ZWNvjJ$YKTtzC$3) zD5~Mr01R9`PZ!4!5AU~qH-nlD7+fz4beU#}ahgnsIHD9VJ*qtV_O1{A@2hy%upKjR z|6K9z%uMbsdn1-Mhob^N>>CBQOt9T{eCtb3*#bVbZ;76{RYB|@E`H=xn{suT`dQ|> zS6t`kUt6Z`a7tkflZRrXj)l=a<|waFHV#3j&zon;|L}4BwlmUNKwEYilR7{z(SghG(&AK~khZbgPBp-jXHbAK5 z<0PRAF*~CL1v8FV8dYoicnG@rG(0=?x68BpL%Vz4x3EPzZdsD43wD0`;xpw#+@vMN z55zCTRMrMx^1Sxi_rF8&)4Qb?4&BfDdFIEthP!p!&pbHpp?&)12mhR!bcR2(o*eo; lFMDnkr~K_>+T1nxx0etp^NF22WQ%mvv4FO#p9kT*?3d diff --git a/src/main/resources/assets/customnpcs/textures/parts/legs/naga2.png b/src/main/resources/assets/customnpcs/textures/parts/legs/naga2.png deleted file mode 100644 index bff895fbb8acd8ccf59d425051b8821537fdf022..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 735 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`125AX?b1=8i^iZ<3Rf^YZetva(jKTJ`z!=f8jdCM6~15-0DEewIs+d7^s+Hz_97vMhl>UoCO|{#S9F5`$3q| zf;CtL7`PsuE{-7)?r*0=`!^d%wCxUR+nkjdo7j3ykuUMH!SkDE&tCrbKYxm+8g1sfax3%_t=-&wmoer8_?V}AaFchf_bDTgx1%g7}@x_qi+ zN!)?Hb{h`&sV_MMl)6e8JdaFdu0FQifm87`gW??RG9$jl6HXnmHN7sjBh~Y0nOm) L>gTe~DWM4fL}6>Q diff --git a/src/main/resources/assets/customnpcs/textures/parts/legs/spider1.png b/src/main/resources/assets/customnpcs/textures/parts/legs/spider1.png deleted file mode 100644 index 8d4d88a678e81dc7d740b236c9cbb5e9dba65f49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1963 zcmc(f`#%$m7sofYmix8HeBI|^F2fLpjA7F@w}~<#w-mWFqA~YNX4G7gP{VQ;8I=%y z5yDf^<5m-umW1bvR=Vuj^H+S&>-9PB*SWl2=e*7j=ZXi>RZ3h%8~^}F;jkDlAsvL$ zI4COgWllvsLI5v%xjF*cr&T`*15gB-fCd0MizR*rgN3yV9(aiHcJcrso_WCgZIr$VM%dO`Y>%D4?=e<+ZKhGnHcJ9Vo@nEM4U^I zzmKd8Bs|F90Ir@*OVUU{{shYpShe z78=6U738ELAQ5p0SW!;q=l(Z=;P>C#n}TnfnbZW~se2PiF+yCXcoDsY)BisP;2q=X z3bzo8#h$zf07yUiSHMGhZs`C3*a3$@ld#7VN`D0|x~M*t!wzv6E9tVu^l#X7RosNr zYOd$(WDie=-SaFcK`ieZ;N`*vgP(kqfqnlv_wk3#z2s&7CiUUqdlYiWqawJ*xprk? zVLUrkE$R0v?CJF1rn2rjIi*%I!Ie&4WhBwE8FS787u$`F+y3&o2TS&S=)2Xx5r3$!Y zZfO`NeHD5qp`? z<@slUTzYl&n`mx9%!lQ9hg1VX-X9q*A^LsOn>h=xa0K~WYg^kF^{8^?M4L2-UgrK? zW|bj)DUsGd3j{K}(e<4ij-WEQB2{AXtBLL+#m5jWMNH@6O4?4_Ms;Z-4C9Pz?Qa z?*~biVK`%H_CmJnNMXDC$1RU9%>fp-fu-6|Wp(Dv%915F=yL9bwG``|UeIN`Kb2Sr zu|cfL#0qY?r{ygtCBCtIC)vleXlJias-PHj4}uAu==dwsONLt0^b89yC3s9kG^Z|( z^X2p&A2lcFXYof$dgCRViw$_y=jUI(fM>k1%*B|ehL)Pzi@vRmnR6dxQC>g_3QP~g zb@LkilRjT_Ftk!ZtkaD2Wyn+bQ@!&gA7`L(L%dsRfxC$P6anY*>&O#i|3$b>nJ$f- zkuOQ-J6Fl4SY_|SxU#MeKdPceN<b>2d-I`+&iOu1rBR!w;K^z>P%XzrPxJ3f&C zzgj5kfn3@WZAXgM5$!Xz1(L0GWq8a%N5r-?>Ca{Cq*+@x@4&*n88CFton?ivkje3x zGBsH}Qf2mYl<1@EVa=X==Q87H()4cF@^yk-W4?lBp5)l~nORYhD~yUYZJN2(a6+8( z=E;Eu)Knsp$aLb@p;X0_xrHmHI{!`ChX$(FokrMGR3W~2oB}JkJyKcweTbAV z`CWiN{e?TXYcg^j2rL?9d(tJrAFJsSS}azlqf3@?c2+q_GxKebjSK(XcXzQtc3d)T zlX(pyA^pTc#G=Z3w6>y+{g)ZTMcb+PK;=P38%r>&IVu*}`$at4x&*}!js_V?0_`gN z3R_<7MwM$DjolpUqRgdjS1rq9*)Km0r|g&Lt@nz1w&jKD9BKK4(duE%Nn{1`c>;VwT!C~)N5|#Mmw}AEv6oyx>PmwAg8%>j&)}f7@(Ym9S>O>_%)r36 z7lawze@|Eo6pZ$CaSZYBemlWYj6spZ$$iiNxy*6u6I{D5dWHR)u>Nq=0j3b{ALa|z zospdpaFR>qgPPNn{1`c>;VwT!Hle|Nnb?dw~p_4Ou5Z>PmwAf`Nhz4q7X}0QsB+9+AZi419Y* zn9=?Bgtb7yU{4pv5D)LS7Y+G9Ryt(<|DT@wnES;6r(UZ<#R7@6M%F2;VgYQ8TKCNY z?28YGPg2}vcdO}@`gIQ{e|ZKS7FiF5TMei0%a<%a&Y$(*3(YnYYsn{oC!3Z N!PC{xWt~$(69CGUNp=7L diff --git a/src/main/resources/assets/customnpcs/textures/parts/particle/type3.png b/src/main/resources/assets/customnpcs/textures/parts/particle/type3.png deleted file mode 100644 index 17b7ed53e68d750a875dd21a1facc8c74b5b3694..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`c>;VwT!C~)N5|#Mmw}AEv6oyx>PmwAg8%>j&)}f7@(Ym9S>O>_%)r36 z7lawze@|Eo6b$!taSZYBetXeTj6s0M*)jKBeY%kOhv`xCV%@F^tzl#<;Qe47@N_am zx}d_(D)x7OwHTgMuOJX;GE+r&1WKh UMm=QTX`mGhp00i_>zopr0EU!EO#lD@ diff --git a/src/main/resources/assets/customnpcs/textures/parts/particle/type4.png b/src/main/resources/assets/customnpcs/textures/parts/particle/type4.png deleted file mode 100644 index fa8feedd636de78933f46535e72f9cfac8b2fdba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`c>;VwT!C~)N5|#Mmw}AEv6oyx>PmwAg8%>j&)}f7@(Ym9S>O>_%)r36 z7lawze@|Eo6b$inaSZYBetXeTj6s0IHSp{A{ptJrL@St?Ths0y5$a)NTOskFTHz2U zV;swhUknc4!vz*hY*(J6$Z_F+M*|nj5`IP_U4{cs?|paJT3%Jb{EtmcC70v6_))Q< S_(eeT89ZJ6T-G@yGywqaQb?Qt diff --git a/src/main/resources/assets/customnpcs/textures/parts/particle/type5.png b/src/main/resources/assets/customnpcs/textures/parts/particle/type5.png deleted file mode 100644 index 43cc1f96328fe2ed56fe05e8ff8181c5452071a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`c>;VwT!C~)N5|#Mmw}AEv6oyx>PmwAg8%>j&)}f7@(Ym9S>O>_%)r36 z7lawze@|Eo6b$!taSZYBetU7FAka$Zz{bDjW(Rryw6?mOKUeM;evrqY!T7*;hZa7D zA67DoTh=kge&b+l5PR47Zv6st14o8mz3TdnSNvEsa#~6_S#~f<9aQyTUYfNn{1`c>;VwT!C~)N5|#Mmw}AEv6oyx>PmwAg8%>j&)}f7@(Ym9S>O>_%)r36 z7lawze@|Eo6b$loaSZYBemh|!FM|TlVTHf{(=Qb?v9o2Z%-QG^=ICb7l*Y23dz)gD z-|vP8b}7y8J_I%FZ*VW!C7aUR!1773(Mzf6NuvX!X#wjN$4?n9!KDlz%fK1sg~ PG@ZfI)z4*}Q$iB}1ZqoR diff --git a/src/main/resources/assets/customnpcs/textures/parts/particle/type7.png b/src/main/resources/assets/customnpcs/textures/parts/particle/type7.png deleted file mode 100644 index a794ed6e654db79061f64d6baca5fd13dd1830dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`c>;VwT!C~)N5|#Mmw}AEv6oyx>PmwAg8%>j&)}f7@(Ym9S>O>_%)r36 z7lawze@|Eo6m;@*aSZYBPEJ@R&?9A##lQg}C*(6ID@*V%;db~I{D`TGx1njFOh;am_;OXk;vd$@?2>@$@Id1>} diff --git a/src/main/resources/assets/customnpcs/textures/parts/skirt/skirt1.png b/src/main/resources/assets/customnpcs/textures/parts/skirt/skirt1.png deleted file mode 100644 index 021c6653dda7ee51395fee5aff276cba0ef60140..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3755 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 K`c>ClWBw0De+U}@ diff --git a/src/main/resources/assets/customnpcs/textures/parts/snout/beak1.png b/src/main/resources/assets/customnpcs/textures/parts/snout/beak1.png deleted file mode 100644 index c150af24e9fb0338d0b7d2b2f9b2269c222a1a1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`g#vs+T!HkPH*XFdIusrrzH{eJAUE&m^hzMbRubeF{2v4uHt%1uA1K0E z;1OBOz`%D1gc(IOyc&Rl37#&FAs*guCwlTVDDW_B-1h(fCJ{9?FOFWhFBf)}H2QgI zq-}HbjlP=f-jZ^RpM~de9oso&=`Gf)_U;oF&1mI2A-YT1CQ-!2(cx>urW*yF^^diK kCNQb9Y8C{2*n8j&!_R89u6#N9K%iX=p00i_>zopr08I{5g#Z8m diff --git a/src/main/resources/assets/customnpcs/textures/parts/snout/bunny1.png b/src/main/resources/assets/customnpcs/textures/parts/snout/bunny1.png deleted file mode 100644 index 98a1af74599877faa2a8ea6d6f7d1fc29cb976d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`MFV_7T!Hk8-m;A|Th47bxNcJA|9}60BLDavtOru;B|(0{|G|Jk%A45@ zD8yOd5n0T@z;_6Q8AUa`8i0b%o-U3d9^P-yIdTE5ceyy{)NlEnJelb%Lb=c0A3J(@ zk>jS%&H)?@TbVc=Zs~k>jQ?rzg>OeM17kNBy*6K9#c--$zxdgT^VUG)7(8A5T-G@y GGywpKol1NF diff --git a/src/main/resources/assets/customnpcs/textures/parts/snout/large1.png b/src/main/resources/assets/customnpcs/textures/parts/snout/large1.png deleted file mode 100644 index 953555e53b962451eb596016030befbd17a3893f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`Ljrt4T!C~|Nq%8=dSOm_ac<`8=a1h!fBf~so6>^p>e7Omvch*SpT2l} z|MR<-&mZ6a_~ymucduG&E86R;UO#*E;>m-TPal4I`!c}6EYia!&c`9z(-vqTv*N`z zASF{0b>+k!)p1YPDIgu9(=^!Ze%zX-n*O{R54Udp_<8-oz*7vDW^F2qViB4uu6S42(Nn{1`ISV`@iy0XB4uLSEsD@VqP;iZ>i(^QJ^V`d3Ia>?_+8*j_b5!}s%h^Nn{1`ISV`@iy0XB4uLSEsD@VqP;jHCi(^QJ^V>_he1{waSRZWPtvTC_(b2<; zqp|pkkO|-MQVYiI513lG6RH_lm>Ly2!X`{h-91H%Wn1f#_r}I~b*xewV)f^I3z@2| zDzMh<#HT%HL|X(n+$X#J`myZWq3NGb?oIx_qkX;g4!?8`Ci%T}KQ=G4zk2V8?arMl zz6-auP1&?-hap?@!yU5R5$BYr+w$!BbeH@2hb>~)#BRtw+8@CnhzzzeeqgHGs=@l7 SOJpt3@eH1>elF{r5}E*3fMi_& diff --git a/src/main/resources/assets/customnpcs/textures/parts/tail/dragon1.png b/src/main/resources/assets/customnpcs/textures/parts/tail/dragon1.png deleted file mode 100644 index df11b0b09a58cbedf582a0443a957787e96a4bbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uLSEsD@VqP%zlj#W5tq`RxToz5@y(E(hmp`87QI=ia2e zz*9iw$^xxdx6jP*op%SQlHtd$Yq#F*eINDO?&a0eZ|2vc43Blp`KNn{1`EdzW)T!HlefB!zddHetO@Bjb*fBpFJ>-!JaFI|4~?D^jxKmPpq`Tph0 zS5Kb)|NH0fkMED~-~aOd{nrm4fx6fpie~{S;gTS~V4y}cz_6+I4hK-0v%n*=n1O-s z5C}7hYIrpO1%o_Y978<3-=6mrYETex4wQ6do4D_PqOP)fhxN;xfA2z5C-(Nn{1`bpw1tT!HkVLx(P1y0mWHx~ET{-nw<`=+UFUe*Jp>{P}|i53XOoe&)=X zBS((x+_@8|^4~iFMIgmr666>B9|bU6xie!SP>Qp_BeIx*f$tCqGm2_>H2?)SdAc}; zczC~^berq2f`H52JRj-&|NnR1ymrv;#Uk$)&Wi05d-QmmuZTMEFYDc4c!A00{X82p zwkU@9+ztO%G|C*-JR^0&aE=pqKwjeB#v<;|Z1YZh=f3Q3Xu;}!d-ATYxk^VLh@|l@ zdmz83Phr(PHl{uS*Q>W396CHh_VThEnF8jV(gDdBZC>%~*oP*AY>RgXT;wjk=uEig t(5#rv`$4vF=Ru+J1F|2Uy=V5aWVAb#TDAPRmnYEm44$rjF6*2UngC~vpy>br diff --git a/src/main/resources/assets/customnpcs/textures/parts/tail/rodent1.png b/src/main/resources/assets/customnpcs/textures/parts/tail/rodent1.png deleted file mode 100644 index 3f84ab18547864a2304dcc7a6be3b6b08b02ed5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uLSEsD@VqP_WF?#W5tq`R$cNt_B63w#1E1yZ$?J3z3pipAxnA|G#_XddDi}cD_+v^YF~gKN&#FAVA{r9mXYFUCpf6wfsRM Mp00i_>zopr0ByNbod5s; diff --git a/src/main/resources/assets/customnpcs/textures/parts/tail/squirrel1.png b/src/main/resources/assets/customnpcs/textures/parts/tail/squirrel1.png deleted file mode 100644 index 0fa819c8e1f06ee9f3e58b01f2957385b150423d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2794 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 diff --git a/src/main/resources/assets/customnpcs/textures/parts/tail/tail1.png b/src/main/resources/assets/customnpcs/textures/parts/tail/tail1.png deleted file mode 100644 index 0457575bb72751d11e6f878033f98dc0826120f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uLSEsD@VqP;jNEi(^QJ^V@5VT&)Tstq&Iq2}V3*y7hlg zEQ_w2MpxIK_nPN!HO}LA*?4hky+8*XWG(s>wNn{1`O9OmDT!FNwlVxLB?#Y9PjvP36^2pJ1Cr=(dcyQ6|X_wBNzI)^5yy=s! zoIii{!iAGZkDfew?9|a?Cl4RFeD>Vcix=MKXiD>yqR}y-aN8z-_5Jn=FOON{K!$Djq2^2_kgI9Aiv=ML;;58 zu<18}S~v?lB8wRq_zrc4m6-I4!%j;BG?Kb?JtMDDHH6x;t#!DVpB1b_nrBjOXp<{^z}Zwu;YmigwVpC?sz}>?j&!n?IH5{{=0i$C134@?(HT*i%!|^ zIS1D-dJ>_~Dm^)94JNk8nvrv>X(NT*FEf+ z&7Tkxg%}>uyC;fx>qKu-n;6x?X?|n0Ln+H7K@M9gSI%Ygrd*EjPF|VBcC)~9j>H;` z@LhI6ZZOfu#f&26{O*8D69Yjm7cl3Ns7nbKO#Qy42|ouQ>Q z0cUXz=Pi@?q?W$Ih+!G#h%rmaTKBAl$($q-wc0Jmo6EHQNdD5DkF^W0Wit0Ia7z>5`up-nO zfwH!$Q#hR&A{cXG`S~lT54XyJ@F`MaO-+nR@0$yDCG;g0um0oJV6qL zrBuo#V#%jwd_n9@1ssTp1hmgc9XGTwd$&|mr|&a0u+K>STu~<{otgz2d-V5PqD7h+ zrMh*Ktj}?dBX zhQMh>XlShutLCiQ^#417mHfaydyUcv&fjfARZ=;s*^`(?#ww{r+%-(r#J%kGO4deO zb9zOvPyejmI1!cB#`&3Eu`}mWu@5zwtOYVI)tLiH5oWa2D_8V`_MB$N9DO(-l9wRa zpH(aDZnkc}yA^gfTkFn&ylzE3)oM-6z-6Djm1AKmxkaGxfxmNSCM&JvW`W$N2(=rP#!0Siga;hd zujm0MhUr)lNP`+PTvS9*z;Hnt)R^I-B7y>j3(}y*3>Os<6fj(n1~q25sED9|;es@% zF~dbg1O*Hiq(O}tE-E4@V7MR+YRqs^5kUdN1!+)YhKq^_3K%X(gBmkjR76m~a6uZ> znBk%#f&zvM(xAo+7Zni{FkFxZHDIYL5&$MDk3OgxF8K` z%y3Z=K>@=BX;5Q^i;4&e7%oVI8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr6%iCLT#yDe zzALVd`lEk1PoDQHkq7(Er;Z*b4+U~scYgw*iPZ>AzJk!LJLLN}gvLaKt_&e0zlG3J zgDdBzHs1d1^~m*A zu}2QHb$zpA{mtxm_{fcO!hGbqcxKnBGs_mw@0|D5zJVLv`#H3(bBS^~^yeJ@%!anf zv$s9ww<{mxW9Wxpemrt)bcOct3bgC5t7k79>P zY&7SUMiZ-VtRy(k9ZeiaX2ooI0?m7qOBJ+lX>ZP1I_#KkVpn=7RkN@_5rvSe6$_=n zs*NVc?-Cv!P3(>ma;!e^<9o3~~%cQ?{uYcw$*hGk0-s@3X9RT=RsbAn`=rXb3KEc3Vr zA1szaSmR5BEfwX62kXtMxVFm^MLd8LQj^InVz1P);UcOzNE~Ut`;n-2l+aN6R#9{TR5LYOL zuhp8UAQ<|UobMOX@hqEeBIG6}>a&Ww^MF@!{c7;_lt6~G>)lpE85p88o{t7ENxYcM zNrolrmT2H}OB6dq;+}*?)_1-9Vz-8tlO#))Em`l>=;%pm;PvCe5N=APvu}rv>sWce zQiNgJE5bP>luL6dq21Wgvo))%3BTZ1@UT!?NeR80dq!n^XCa!_yGsrVa4~|8BH>ci z7w$Nm>uzm23SK(iHeBEFT&tZ_*OYu7X(o@Pq=+kl4Bj^KGH)u5q9#>I(`7u!Xz^l+ z_P82zqtV`5+HedB?>j25IS!1a4O30>4l-@W)?@`L`hS$hQ)$G-BUV(|kddVG&_z10 zxGLgJS#q!#grco$vX1Oci$T{g4O=yNO~PWbj?YZVws{drD$J`oQf#faSlrr;xwD3} zB1LmQo3*A&K?rdTr!wj2;yiqDqLGxKnRIwOCWDu4Rp$-aMZBH2Op*{wl2|q6%XITV4Byqwe!u6mrJhs?TElU_907rWO3mZw#rzl-fLr# zz|V(OSV6nz@FudET|8Fp4kP7zuaaw0hyWh>-^#GLRrOz&Vg23a|5t_xc%0pthow2> zriJDNZZ>SLa&bMoS5|Yiu3w3%=t0B6s~FEHSYJI-N?6y{&K&ojjaFk}q2AxrMEnt? z=(iEt=_W%D(nCAlWN16`{*o7_Kz za1lW0Cc{PNLwFf30tnq?xafQcFT+Iup_>dBoe$wSMWVq;j z2rt7$0HK=<7o88`Ww;0+bd%wt^C7$p7XgHBGF)^%gqPtWfY42bi_VAeGF$`@y2)_S z`4C=)ivU75sknyPuj8T;eh0UTU$&ji4$tBjbvb8pCJVsQR{>c5E&!ih#mA2TSP%iY z@*n`#j{x|JfBb>p-wi;YF_qb!tG)ZTOVaCaa$njq{ocx7W~}r3|1`bo9~*GazVAJ= zU43@ywfnfE<1@yocTW7_pI07%TZW%~(ZB5!7=n*p8W@{#^I&-S;^2O8{JOE14h$aI z_9~csdFSQp-u~v_&8x?MHGY2Zdg+O`?tNwJogd{MI{ur9U#x)-F7@w)53gSN?a33) zkGCJaW$d=|e_a_~T1~w8&IvI2^UJ&5+j91oYfpo_PQTm#;o8&h_f>}@2j z$4|epvj34UE`N6J(3^+)Pi3F_;QD2E_K8={UHqdy{Cyk}teM}+KM!_1^}Btaesbv8 zpSN=0j0XJE{cFz+q#nQZ*746laA7C-_{j@{59b!Qtvvtji?N`4c;f0fLeV+WZ|3+cu>ghLDmuvlNI=F}5`n_{E{a{D* PX7tpay_uKCAAI!RJ}NGV diff --git a/src/main/resources/assets/customnpcs/textures/parts/wings/wing11.png b/src/main/resources/assets/customnpcs/textures/parts/wings/wing11.png deleted file mode 100644 index eb19442a6b54e0575d16c0a5de7f0b1c27c173fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19415 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 diff --git a/src/main/resources/assets/customnpcs/textures/parts/wings/wing12.png b/src/main/resources/assets/customnpcs/textures/parts/wings/wing12.png deleted file mode 100644 index 1278af655bce1e8fb9d2d0f0c0b9252e3e4bde3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20147 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 diff --git a/src/main/resources/assets/customnpcs/textures/parts/wings/wing13.png b/src/main/resources/assets/customnpcs/textures/parts/wings/wing13.png deleted file mode 100644 index f958569117bd9008b97dad734d56d9348a8d7bf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19545 zcmeI44~!I78NlZ#((7RhYPDLGZkLc0?cDtT>)z7i7J7#);IWrGilNNBd2=`6c4yg{ zWA~^zDQJzx*jWFhMB8cssk9*>8m%^wR;hmzp{Y$wje(dN#5RI4D2LVh&HjD2x5pgZ zHHKt1x!v#HeBbxp`+e_y@6RUt`Ar+{y}9G|4vL~~?(0qU!{1b=N``{*qnq^Na+PG-m-O0UtvZ$ zMi#2uvgwmZ#LVqYR_M@ z3lLP1wzTvz<9W>VW6vEcAiQQ5bY*#~-g|yOZbWAmu0Xw|Bj2%S@Dn_l5dtnbGnfTW zDrV&|RS9(hpy@pYZ1`>=+UCXh@r}|JboTBr*&hexVLbKTiOhn7@jahji zbqPNf(rvepHTR(U|Auifhf11@Ny5wxO^*D;n488fzAdWEENsO`q3R zL%!u~)-1PLoZnU}vS8a-)}YlAJHM?~dCjymY`zU)RFTTTIwaCELe&wXYNA9VteMD^ zdBG5rYYZdeL~OG%3_hN(hVkl02qc?M3&u2ycuBL6K#Q`)(V`*pv?-}74FiQ0B~GwK zo(pYf&6#1Tnrey~Epu3*c?BemGfkSsoM_mhf(27-k0-y z17>+&DjBrLfzAmSu~>qpU<)E4!PKM;9zzc;O*Ax9vUv_VH_f~;VXLldwS(){lUCzx zj4%=*B$innqdY`N(^!kMITLyg(XLcPIGa|{#)1ReC1aG(3HlNQ$^f_=7DZaMM1kf^ z=!g;DP_QLRqF^z^R)U#Q+GtkYGEq@*riXKO2&S3OTt{&P=dQGvR$P^} zW_IGawqG;~xO*6unc1xK6|Ymxn%%daCG!#p&)7A$FtD5=SS-uY0*__dv_%Xf(bQ;2 zNdkh2rf??As%s8|oZ&QGlyum&SNAmkzc2*AE48B$BR7n#Bvb2It>Ai!oQxF9lx3b) zWftBfNcJk`Ra(>}SW{SRTAW$yA2I)$yV#&Ibpk0FmeVDU*o{V!t0q4;w+k1pCjCK@ zHQ>mLVZ&+{+-$7APmcL+%*f|Q9b^P~mD!cEst3sW_Oup4!bfum-^To6;evBD8HQ*j zs$q&S5E9wy zy3DE9PoL*JGiP`Di)Lm$n+E&3@}~J04e7{I$V8B}m9HM?wyWu&IXo zS)EwPYDf0jrqd?#DRZ&v-Kt*w&3tMP&eIayonp8HshrwX8w<37;nDzZG7wyX1oJ+q zi*VMeE_bd6_ew1-+%#&d#Ua(eO`Ovc!S%HcCx1AFmUo6pID}0rBfOQL4FxCo(XsLg zU6WaOF>VlqE@!5=?V( zv&AN-ghz)`4qO0x!5xGwR&AOev^3n(FchGP<;u#2#Dl6~W!ezm0F?t%DTVKs;HxdB z{@oT4Gjit5v)t&>JUb@cMU{{=LgffoC?ZlJ!bQ>ul_OlCh)9J97fB;jj&Ow{A{8QB zB#lrx!WD{$REThqG(zPFS12ML@2p35sRE}_kA|e$cTqKQ9Il>i+ zh*XGhku*Z(2v;Z~QX#@c(g>9!T%m|ag$Nf(BUFxXg(4yqB3vYmP&vXCiilK*aFH}Z zul_OlCh)9J97fB;jj&Ow{A{8QBB#lt{inux&zZQja@Dou*_$??Qb1DYEBNaov z{b`EYy@I0l?4zj3x8U;}MUAl(_1Enbr9Vnhx4Dnp|KeJTYWq}QsykD9^|hg6M}Nw` zGjTx4wBNa8VE7WX=sOb=s~-Gz&!?9k_+0P!;-l-o+JEN{e)jSEia-9xK-Tj-@ z=i1)A6`j0w$-y(qFSh-0(eLO}9m3WpPM#G87mw22+ja{3_ID4w=w%kZaq+pq()ht?=RbDg{E>}4_bhz#rqcV~^X5nXdn5JTul&nCy!3@H QK+LGVH5*b#S8w0@KLDM4UjP6A diff --git a/src/main/resources/assets/customnpcs/textures/parts/wings/wing2.png b/src/main/resources/assets/customnpcs/textures/parts/wings/wing2.png deleted file mode 100644 index 3b745b8b7dbb3b8824e612351e6d1acf74e14a86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15562 zcmeI3Yitx%6o4=CXl+386;Toyhe#Biotb^lxVwT~pp9&;rGyrvb{==z3A;P%&XirM z!A3FSAB{#)Q6&1KCTJ8QCK94xg0FyRqT(w760m|H7T=&zytA{<+wGM^693#yc6ZJ_ z_ndR@cg{UCf9B!NjwLf%u51AS%xG_mccK3U=*u)uL%%O>TDuPYou6&%wE(zakMo`M zna3WTNcY&Rr~H=uvh> zAR#2Ot#H6-8_L0DLml1P&?-&R*_&c5k%EjIq@k@ag>))o$%QCe^edxlXP9T1;uL#T zlwIfqWO@>vOskoLOu!T5G$9ybLXt-eghKw%4UAV11H9nleFEq8$$mlhdzsRQjkTbw zNKQ}6UGc@Ga7c=>1Gb%&c|M=dd-6Vynd|38Ns@TM%X_^Xn!#CXGPY9SGS*zzN!d>v zT3XJ?+J>279KVWc4%$(cbplmBrG2Hdl|UJ*#12v93rdz3Jp$jzNY^Sh*}+_@xHMhk zVG5>U#2$-;mc3{-LQq25(9-H&lZAX2 zw9LVr1{bYHTbbKv_qLI&Ca2DmqnU8+uwYDJ=4f2AVkx*8ilDv9tvRUJX0F>bQ!%&7 zI?D)|*4AQGG1smzGP;?!u8Z)vNj2Y9Z!oUdFox;Q&0|Im&?a`52MGs41 z)h}^D5r#N#2wh2{s&WDp{Yugwf<86a*qJ+8zx-M@q|H0klt{?!8Ov4>oA!9jS&xC% zBMA^~L-2AzzlgRJ_G_G?pr+^3rBFbWl3wVSiX~QWUfpKNbvZh6-I${4^@|}@QaLDw zpi5B=C%v5H(|rDbUkrx4DAn#dYn+V>bZgE)cLgO?GpE8*2L->%g}r)^ z3ne9}>Y@aF3M_|c;AUK?Hp3~RHT5|y7SS?zcl~I!h>HC?tK=-`bf+j=Zcmkl@76`B zI*MIRRy3#c$26yTKt00OjaHXcv5dGAjPdDI&I-Xe^NC~R2VjQOd|X$>Sra?4%%q)H za&TckI-F;(1(^-3|2I(QIrhbRMkAO7CWIkik^qjqc~rA79ZCnD=q9?UQ~B< zF1=#DXb=ntS){ngd@wD=g#jUp6c?Efrlq(rAY_r^BJ;tt6c+}BEK*!#KA4u`!hn!P zii^w#(^6a*5VA;dk@;X+iVFim7AY<=A52SeVL-?t#YN_WX(=uY2w9}K$b2v@#f1SO zixd}`52mHKFd$@+;v)0Gv=kQxge+2AWImXd;=+KCMT(2e2h&nq7!a~Zagq68T8aw; zLKZ15G9OG!abZBnBE?1KgJ~%)3Vor!L$?? z281jUakW(6ZiN~2N^2gyyL#S%CuH>AE2Fh_B>)(@27uuQ062XH{T~NlPypcjJ^CNI=Bb@O9QwBFx!sq1(sldmi7&5SFW)}8^O^Q- zAFez(W$E;1u6XP8zV`?3*wC@%k+DL2_~6c8555E*{qb6G_knxHMz)M>X`MIy$YbE% z(deml*=fT~AMJZ@-=k|8b{_ljwhzFLs}F*C>|pDHN$cPFZfWP|&B{z5zB&KYXVZ6` zS^oL&laKBn1Ite??_B`8_dee=_QjTw=BBOB{&i~hNYkF7N5IRelZO>=-&23=h(rnl z!@bvSKk&*Mqcf*W-M#O?%5V0s?TMZQtB-Hq@bS+ezAk<=4CaGlvxcAk>F<^IPG9iq zY2~5jD-OTC)&9uj>2rvRS_#Irhs%`AIWhyKfrMHXqvh+a}Lz&fCWA Mi#p=3-rRTpKed?$(EtDd diff --git a/src/main/resources/assets/customnpcs/textures/parts/wings/wing3.png b/src/main/resources/assets/customnpcs/textures/parts/wings/wing3.png deleted file mode 100644 index 4328fc4b96718abe56bc4d7a062b2185b3318342..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15599 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 diff --git a/src/main/resources/assets/customnpcs/textures/parts/wings/wing6.png b/src/main/resources/assets/customnpcs/textures/parts/wings/wing6.png deleted file mode 100644 index 9bbdb6bc7dfcd90e38e24526396ea6cc4d811885..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15713 zcmeI3Z)hAv6u>98ks3^`McZ0GbiJz8>fY|&?%v*RFW08I)I_~Dq>(0wP4>@Rvi9!w zyxk<1d}vb@M87CPK~S*@R%k^ievuYw{Zp(UMJz>>mP%U@MU4vnMXa;8_jhs`gBJWU z2Y0(~-n{o_e(%l9-iLj%Z|gnnZL8Y=0PVd!$$oU*gucv@tI_W(FYbOEU9QRZ47mU- zec%7K?7M5}%>Zn8%N`i?22=NIrjrfpmSezhF`Gxd0f=ub=5=!y^cVw<+PRLph4vY3YX1*pcE0sc!p*WhW)>VMI=M)AU zCzA-OtgnKQ>FO#~6?4Z9J7+nQ?wxTCH>u^j<_#uw4<=AO##ljMd3ivHX}qHGF?6r- ze4Ue^C*~vNSay1<(MNPZ5Hw!ZB2vANx}LZXw0Zfccu%yGZ0J98#Ts+prwdwzOJMB`T)VFsiapka?5|7-NlCI>M@=DN3>=M3o2{q`!EPi`ux#wNY+w z?mA}11hnr+Y}7RMz;#TOWY&bLVH(khsEf)!x<;iGw$O-0DH4l7L1A?ZDy(QpkX0js ziJa*=Zz$1-0*wVb)2)~qGbELb3dmVRL3gTP7%UG3Nl!}(6pd(eXF+Qt=K36xlH}KZ zDy8-2Tu(`f;8$=PUf5Mh=qo@Zm0!LzE0#$#Bb$V#$~rYFQCp4UqYqS3sTjNYzO14b2cZ?wt|h$Fg;V(r;;c+ElH+f3al)t5-Xx2LKEV3 zRyGC0;6ZeAOwWx%E5TI? zxYDq&%mw*uTv?UXI(H?;{Ra&VtzuMBdTI3tac)jqEppI*&|i(2@lt;^%A*e__`hY- zdNpo3L^iEgVor!L$??281k9Tx33&mg2&I zkVT4%%m>p_To@3tNO6(*U|Na`140%lE;1iXOL1X9$Rfo>=7VV|E({1+q`1g@FfGM} z0U?VN7nu*HrMNI4WRc<`^TD(f7Y2kZQe0#{n3m$gfRIIsi_8bpQd}4ivPf}}`CwX# z3j;zHiMZNouj9fTdIxtBy=)swt_hGq=fj_UhYMY2&=DmE+32x%iLoG|><7b{)2L$ou`}Q8X@oDwg ztzc#a|K+;FJNIq;<-69C5B}9Ua`nj%&K`EM{d-o--uN~I4?BA%PH{iZ=3oEmO|S;B cynJ~P*#D{V(lg+paU_D??ybo;Hjg~|H=9`&=Kufz diff --git a/src/main/resources/assets/customnpcs/textures/parts/wings/wing7.png b/src/main/resources/assets/customnpcs/textures/parts/wings/wing7.png deleted file mode 100644 index ad147a0cf7dd908a9f1b26a58bca2facc279b66d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19647 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�JpL=@YreEv^gTK0B>gElvVh_6h zsfDwrzQ6d&`H`M4o%-V+zP{}nqrHC5;2Wd0p6{Nyg&Y4FyzIv`$Sj1ep;XQlv&)z<9{682B BB0vBD diff --git a/src/main/resources/assets/customnpcs/textures/parts/wings/wing9.png b/src/main/resources/assets/customnpcs/textures/parts/wings/wing9.png deleted file mode 100644 index 64c3193a864a1686a43b810febaee8fa3353e565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19604 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 diff --git a/src/main/resources/assets/customnpcs/textures/parts/beard/beard1.png b/src/main/resources/assets/moreplayermodels/textures/beard/beard1.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/beard/beard1.png rename to src/main/resources/assets/moreplayermodels/textures/beard/beard1.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/beard/beard2.png b/src/main/resources/assets/moreplayermodels/textures/beard/beard2.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/beard/beard2.png rename to src/main/resources/assets/moreplayermodels/textures/beard/beard2.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/beard/beard3.png b/src/main/resources/assets/moreplayermodels/textures/beard/beard3.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/beard/beard3.png rename to src/main/resources/assets/moreplayermodels/textures/beard/beard3.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/beard/beard4.png b/src/main/resources/assets/moreplayermodels/textures/beard/beard4.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/beard/beard4.png rename to src/main/resources/assets/moreplayermodels/textures/beard/beard4.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/ears/bunny1.png b/src/main/resources/assets/moreplayermodels/textures/ears/bunny1.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/ears/bunny1.png rename to src/main/resources/assets/moreplayermodels/textures/ears/bunny1.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/ears/type1.png b/src/main/resources/assets/moreplayermodels/textures/ears/type1.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/ears/type1.png rename to src/main/resources/assets/moreplayermodels/textures/ears/type1.png diff --git a/src/main/resources/assets/moreplayermodels/textures/fin/fin1.png b/src/main/resources/assets/moreplayermodels/textures/fin/fin1.png new file mode 100644 index 0000000000000000000000000000000000000000..cc5c92c54067f3792ddd65f8487209b8cbde5cff GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5hd`K7RKu$QC@59p8c`CQpH@o*M5|Yd(ELZ17Usb%qcqRQqY;{iE;$IJAuYa}vvfq8d#)(JVgrqH6AYfNelF{r5}E+RTz9+x literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/parts/hair/hair1.png b/src/main/resources/assets/moreplayermodels/textures/hair/hair1.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/hair/hair1.png rename to src/main/resources/assets/moreplayermodels/textures/hair/hair1.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/hair/hair2.png b/src/main/resources/assets/moreplayermodels/textures/hair/hair2.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/hair/hair2.png rename to src/main/resources/assets/moreplayermodels/textures/hair/hair2.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/hair/hair3.png b/src/main/resources/assets/moreplayermodels/textures/hair/hair3.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/hair/hair3.png rename to src/main/resources/assets/moreplayermodels/textures/hair/hair3.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/hair/hair4.png b/src/main/resources/assets/moreplayermodels/textures/hair/hair4.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/hair/hair4.png rename to src/main/resources/assets/moreplayermodels/textures/hair/hair4.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/hair/mohawk1.png b/src/main/resources/assets/moreplayermodels/textures/hair/mohawk1.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/hair/mohawk1.png rename to src/main/resources/assets/moreplayermodels/textures/hair/mohawk1.png diff --git a/src/main/resources/assets/customnpcs/textures/parts/legs/horse1.png b/src/main/resources/assets/moreplayermodels/textures/legs/horse1.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/legs/horse1.png rename to src/main/resources/assets/moreplayermodels/textures/legs/horse1.png diff --git a/src/main/resources/assets/moreplayermodels/textures/legs/mermaid1.png b/src/main/resources/assets/moreplayermodels/textures/legs/mermaid1.png new file mode 100644 index 0000000000000000000000000000000000000000..c6ce1b4d0106dc413c08bbd2689c779413d93f4d GIT binary patch literal 674 zcmV;T0$u%yP)<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^4L^m3s900JIKL_t(&L+zKbj>0euhM9T)k&T_56~V^Dg2cpv;2BtYIFc*N z`I;s@)1{pBiPZS~|8{amSnYPZu7%IfYKZlE-3)2eK((fj3_PFD?tZ^_*Xy-ApU>U# zcuXSO?KZL5YvnnE(*o8RyEy^tS*Z`wivW2jCmRBH;!z)v>)~+dvGLkm(yAd1fOcBebTWL?783ACjoMvp$tA5Ck|9N#m%nv+rvDAT zX$uK>T6VQ1m$Yi=2Vk4m0nn#|Z`wiv9x?rRJksvTy0oh;xujJ?8h~$J2SE1&-*hXt z+pXU{S&PoluD0Y-b2XsJ5>#XgR67FFDuKZ{AoCHBRtXHw0hy10v`S!bNnmhEU~oxf z0r^Pz55As-@=H*SXtDqqX~EaCP<{!j5lt2#BQ5xP7RoO{HKNG^WTXXOPi|{^os}!A zez6hsxhBWgjUv07TTyR9)~)&WI;-!?^;NI1wK-%yg6wW?MZF1Gx8_UU?*x4EG*|G0 zs>vbq5zKl5?BHy?CWp*Nkez_&XFD)OVt$bJeT~^TnU5el0nyL$sskwvYAlD$NAUF% z;J>X!K#ff0>nFgQkANDP%I^eFa89T}f_^sw3@!-_E{FB%4^Z#MVQMHHZ2$lO07*qo IM6N<$f=P}uj{pDw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/legs/naga1.png b/src/main/resources/assets/moreplayermodels/textures/legs/naga1.png new file mode 100644 index 0000000000000000000000000000000000000000..f393a85293e15c846ad93545fb75799eb47bb3a2 GIT binary patch literal 787 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 TAZ!Kc00000NkvXXu0mjfZ-s?2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/particle/type1.png b/src/main/resources/assets/moreplayermodels/textures/particle/type1.png new file mode 100644 index 0000000000000000000000000000000000000000..4cef51fe9b6a61d60b57683724b68937cde82e1e GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5`$3q|f;CtLC@59p8c`CQpH@o$c84oV>*}us%{Up$%44$rjF6*2UngF-ei+un9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/particle/type2.png b/src/main/resources/assets/moreplayermodels/textures/particle/type2.png new file mode 100644 index 0000000000000000000000000000000000000000..a749a63fadefd722edf9521a422ab27f0c0135e0 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zagsfPd>I(3R2di=ni&{={s+=8 z85l|p7#Ln9FfdrnU|pA>)84XBp0z$3Dlfq`#72s2u+2CD!CrAk~QN`mv#O3D+9 zQW*jgGxJLH{9Hp6%8d0)^$ZORz7#D4s@m)6;uwsBvWa{=-EekqK+31-*KU1Q5}7H}b2R(saX}5E$UFTT(z|>vJ$hW} xJn`hBY4tLVN|T$Te*Cjucp{}RvZ`1{-b-q6ROzKz-awBqc)I$ztaD0e0svc}fA#hJyShH1A{L`3xTQ@ zdb&7*)V93>CAmDIuPSlNi*N)}oZxm+{C(!=Bo{=nfHPIV_@)f^>bP0l+XkKIM8eG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/snout/large1.png b/src/main/resources/assets/moreplayermodels/textures/snout/large1.png new file mode 100644 index 0000000000000000000000000000000000000000..34198e7cb002d4a5b5d7a1980d721fc9bdc38cf4 GIT binary patch literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5`#_lSmD9!pKtZVz*NBqf{Irtt#G+J&fW*wa5hJyShH1A{L`3mF&~ z`8{16Lo%G7UiQsCMUs8ru(e3w<~i%@nZWjU?}`54U}P#kijzsWPr>NoZWVq~lviiHx>>voiOITu^kyHCtGbJ_Cd?)BEP z`<1O3b~9~0sS(S3`Ne0~#fJXvZ!guxT6f$Q<+%R2gjcSN;bL0j{N$EZ-=AEGn|EvMu^j5A*rbsRgTe~DWM4fwPl}Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/snout/medium1.png b/src/main/resources/assets/moreplayermodels/textures/snout/medium1.png new file mode 100644 index 0000000000000000000000000000000000000000..637a33b0656597204ff0652fb719d229760c7f93 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5dqJ4d{r7~mKtZVz*NBqf{Irtt#G+J&fW*wa5hJyShH1A{L`3xTSR zdb&7*)V93?%Am9+#zwCt~tMx^<4;)Q%r?#rkO7YPVs?#*9e|YfSb=|b?j*25D zzJ@%`J&z@FZy(#1YyaoCy^f+e(#&l93Cp_d)X!Sdf>FDH$UAjuiNvRrAJM|*I-tH$-#`K li!6&d-Gqr0sB-zpbRquwf!WIUVt^iE@O1TaS?83{1OSDleiQ%z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/snout/small1.png b/src/main/resources/assets/moreplayermodels/textures/snout/small1.png new file mode 100644 index 0000000000000000000000000000000000000000..b698b69e9f8ba35306b5f217f76732ebeaa15108 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5`#_lSmD9!pKtZVz*NBqf{Irtt#G+J&fW*wa5hJyShH1A{L`3xTTc zc)B=-WH>*)aGr}XQ0C~zN>#x?mzx?#rnqkk{1zs6z%TN4C2#$)Gc#7tJn2zpb!LOj zX~ojKTC@A_@{4sC;-~IAx}*PT%8W?gT$f|b&vOJT*d^{));`|8-ywOP-*MTX?O%EN z&&o9JK5lCEKGm-O?q9Cn%3bP#W)3yq3OSioCOS&&uww4H75YU=^~PE*wzEdNzA9O5 zZ92#Bzt2t8L~CInXRlXAh|^*rsi_xMw2&gizDB*|)LCKMMSP!t{$%iU^>bP0l+XkK DL0N-Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/overlays/Eyes/ender_eyes.png b/src/main/resources/assets/moreplayermodels/textures/tail/dragon1.png similarity index 73% rename from src/main/resources/assets/customnpcs/textures/overlays/Eyes/ender_eyes.png rename to src/main/resources/assets/moreplayermodels/textures/tail/dragon1.png index 0804402874909b47f3f16f4a3826e6c444d10710..fd2db401b0b0c5223167a6dbb85c1c25065cbd0e 100644 GIT binary patch delta 177 zcmV;i08an43DyaaJQ&y4*V@|J+uPgV;Na-!=_)j4iHDJ^L5EwOJN(k#HXbb+!)XvpoYB0b#%Z01m(bYSxJf0000# zNkl>-dA}^5UaD?hnFAS=bI2w)Q ihQMevfph4Ol41y9ca000088her diff --git a/src/main/resources/assets/customnpcs/textures/parts/tail/horse1.png b/src/main/resources/assets/moreplayermodels/textures/tail/horse1.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/parts/tail/horse1.png rename to src/main/resources/assets/moreplayermodels/textures/tail/horse1.png diff --git a/src/main/resources/assets/moreplayermodels/textures/tail/squirrel1.png b/src/main/resources/assets/moreplayermodels/textures/tail/squirrel1.png new file mode 100644 index 0000000000000000000000000000000000000000..af008fbd12054893abf3499174e987a6d04d264e GIT binary patch literal 2713 zcmV;K3TE|*P)N2bPDNB8 zb~7$DE-^4L^m3s9016dJL_t(&Lsi&|Qr$=l1W^C~7gFS1fdmrB1M(mN?A7UYyKc5> zGBc8<)oP7>y)5_l_sh3$-kv|6AV6agSFh=-X_L*F~5HOTHe2ZzfC^a+xWJL z*)A_Hx8J{iZ*w-e*~H+2TXT2a!S?y{=d9&^dU{G8oD5tCJKUV*ySTUr4}0A5kHIj9 zLg3Y_SKEMYf}3D$0r>Ib$1=nMj({TP%uy&DG1dPHn`h}yNxf! zDtd~D4UdV9AoE|&RdiewC5PseUwMe*|NHlE{01AokB^TLfXyDS{3BpGW4#S zRItMAE0$Rjq$C%IOo^Cbmz-fu;31LX6s-I5O_w4DVJ0>=kX;VAI67}Vw`Hu~w`z8pw{Tbp&YFC3X#~`~b#QKM)5c@o4A@Fo}s#rJLNo$rS@<;!-?Z0{c%+ z_S2Xlmz>rW1t(p{0j5q?Y->F5;=@OAc;IBs?q=ZM=7_Th83`0W2|~tf%r(v|k>Rj} z>$)C~fFu><_3PImi7cDM#MEI0PRu&z*A~SlpRUXA9U*4&uI&8mgd(U%%A=)N1>ho& zoVsdOTyHB*YzF>r3k-JWVyHq@i<-a$0&-BWnH{imK*bt-o^vFdoCq*mED`3+I{p-8 z5J$(ye%!plTE)$rn_#fRlcO)OcG6lwW>+0oLwxPHb`Z^@kmX7QYF!`iikPkT)bk4zRVtbjJ{9X16xWS-UfegVPsV zal|yAeT&4q*Ii-!!~2L+FiiW-713F_j)OqQndh#v-{~QlmkAE#=b3acdMZ&p#tYce8yu9#y8WUi0tb@Bw zY;qD{V%@}a4Mrasg(<`u2RYgBl27p!!`cudzgrB)HOyOfHpds3G08#<0mS$SGDPws zQ#eA1Sp!850fI`_H!ecrkm*)o2xQn?TQ)*aPf~ygm4G3UVkI}15E0Bf$rNs$7g*ME z;(?QO`4FiXM37@*f-M)HA)gNS9cAqo!OZW5Is-?n8DNr1IKWA2jTq(K3%JY8XEoE=0m- zdGX>!ik-kD@=Owh%}}%}kL>&`h7g-VTtfmV2w1P8?o3P`iTyD+3R0-Oe9h|ywrIKe z?fK>dEw^CLncLyq?$0BqV4XgF8S_nCc=3Bj;AP*NBaSLbjD!wIt_x;l=H-~g{I%Ot zU4edoeJe-|yugwW#!Ju{!a83;6+sNM8%E$c6MTCG@=akGJRA3u4{wOJbfvA`ah-h(=JeA{9XJ zy_2~e3L}t0+1bPppIGg_HNgmuZ~3|E^5dlAd}=e)K`_NP32gofDux|Vq!Dz6knG|RXS0UWeb?gTkRPVAe8u52JFfw9 zsLeSs2AkW1UkD2SY}JUAO?7y=(v@U?9|6ftVQYj*5nexu47B z<7{!*obx|y^2kX*abobWcAmfM;tc=H@`&dn9*hG}P+v9^kggMAKvFni4A-!U6hVE8 zN`Rp22HXorjD0&ThH%b_>7$1fKP+7M2tzQj1UJMe0=D;#0@?sLeAaMbI;*bkVVLpg zuYyDA@POw9WA=Mb2rnOl0F&sSmzS60E>MyJ2aLQVW(D#0<-;aU0mv(e-JTCA&ndxR z^21U<_e5cXYY^1A;v2;9F$Tx_lvlq@i388|NAl^*t>Nw+4zi#gIja zp8m=6J%>`{bmRCa84~||r+Wvu3F5^JSRMhOp2K#F&D`~A2Rxew63!{KaV^STcNB*x zTz<1o6NS&(8CY!AEvz}6G2jxWd91~790i)^aEjDzGn*JvD=yKu}z=`~iISm(?z<$~e7Jv)4{&e@j>k;U@0G4R(8yi6fB%?MW;@EwhShr9%j{%zm ziiOJuS3xjfDHNIB3>d!E5p~wyV**Q;*x`$<2;y)T14oQp20MOY`Ha&VVd24k5L9%D zvr&g#5b|uuuvKkq!1m%#3G!RPn8&i#W%*fIBtgXK8)nl zX?wWN;w}!R`q=CZIgZYqot+)UQjgsbI13AR_ESN{;v%+1ijfyy?f<`*u9yD+2lPKf T3kWLg00000NkvXXu0mjfYN-25 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/tail/tail1.png b/src/main/resources/assets/moreplayermodels/textures/tail/tail1.png new file mode 100644 index 0000000000000000000000000000000000000000..8869897d56eeb5d24bb131ea3441cc5c396e6984 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5hd`K7RKu$QC@59p8c`CQpH@=Wf68zu) z4wsCU=k0B;e#iMCw=<`I0E2XioEJB2=e!jWgkk7o2_rbzR7fz;&Nf+EN|8=*& zzV6ZAUF&wO^S-@psW#u#Cl-BQ9zCyImia{Tku3N8nR6O;CjVIgl^cu#D z&r(fn3G!N9omTosuKS7IlU}FsV3xEg+}u%8yWxeybTO*22WQ%mvv4FO#s7M Bur>ey literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/wings/wing1.png b/src/main/resources/assets/moreplayermodels/textures/wings/wing1.png new file mode 100644 index 0000000000000000000000000000000000000000..e9bce91ac630c363231a92c682eef15dc1eb4d3c GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5hd`K7RKu$QC@59p8c`CQpH@y)0)8)+dFFE={(#oKi6;U))HTx7ctxi!SR@n@ z($wV@5Xh;e<>;!qVg(Bp!5I_p?QZMOF;DG0~a7u^5e-Oli0q0f<{uk}|+W$JI$&JC_?bYw4ucR0cm}JRc zcVzq$p!RPsBlDRr_Zl1YdVhZy! ockXSs-1!uxH#1(@GjpoE`>KDO?*b;A1^Sr5)78&qol`;+0G=9+IsgCw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/wings/wing2.png b/src/main/resources/assets/moreplayermodels/textures/wings/wing2.png new file mode 100644 index 0000000000000000000000000000000000000000..14f93cb996cbfbbec076b6f7d40a2c2c17faaa49 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F52SJ!|$HeTnKtZVz*NBqf{Irtt#G+J&fW*wa5hJyShH1A{L`3mF&~ zZ9H8ZLo%G7PV-#V8o=XnU+?a%!)zt)N)}rWvaxJDm^SObR>4F5EY_0`95hxqzEZo` z-?5{uYuMLGwYE?B6U`8o*DLoDMUcnqWt#Goc)8_qAk1VFyoPYZJua;|I!DQ77 zHd5}J6?}s;Z->46{Y{Wz)|*{^-)g5nwqQxV|9$VZ)0=>5K0G>XaN@Jgrgf{?4Eh$w zTz{(EpyFA=^x;v4mCu3S`>aH-q;TG8ShecQ)$^aPJT~{8e63-YP9wvqO; M)78&qol`;+05Ooa4*&oF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreplayermodels/textures/wings/wing3.png b/src/main/resources/assets/moreplayermodels/textures/wings/wing3.png new file mode 100644 index 0000000000000000000000000000000000000000..acfc37ffa7dbf044552a3f3e44d70f7f12977e9c GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5hd`K7RKu$QC@59p8c`CQpH@wrY5X?UpJ!~*2KNDcHO=6SU}yQ+4fK0()6r(KF8%f zG>&iv-T#sHaNWL~-#W_~-+fRH{qo_W*JF1}-WOjFAFo@r@7J;acA8vy$4$8k7p)GT z-miD*JzLAZ32a-wJt;Q|pC7hi)`^UU>K_(I7w-GDX4*YozQRMXwSE_Wz1tLjX5CeB Y?)m>Ej>N^K1H+ub)78&qol`;+04oN>j{pDw literal 0 HcmV?d00001

>t0e1gwoC&>Q9L8T z-T|7W0%{=S%&UPAW~tzB5$qYCK`08QVIUL*Aq19bI^&u3?yOs;fe^yo4XU@p+jq!j zH!ml~4vSDMA=lh`*Ci{w^(kE)Q7+CFTy?;!cKEMSC#7`A@WTrKWCLFmkk6#)e`Ww_ znUw^qt}y~eC-U|7uP8tWfwWA7qGB0EPi(MUxMJFDB5J*FE1-Jpbx}O|%Wtka;9Ct4 zLU7>N4AFQ80E^jKXIv~4Di08>%e>19Hd!9E!rDUUYa5JRa~+A!ZZuWFv?QTbd1BFs zb5SOfaeWJjCa(4EfhvVl-gx(e&fMI>B3&I(<`w{tTcLK(mJc|(rP0d=`DvoDD|??D z@|+w$TA`*YE%^>{S=cXM)i#)0SoGz;6jmT6-rFyJ{qbv8=FL*U-<{w}RY87XwzX}r zl`8mS`V7CHJB?A)T|X}&uI5W>LkrjT%4NXS#Ij-)uwr(CZ36!1@T~^470@Q2O+cG~ dHUa+u{0&~Cj^(*wja>i$002ovPDHLkV1luT{-6K= diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Royal Guard Cape.png b/src/main/resources/assets/customnpcs/textures/cloak/Royal Guard Cape.png deleted file mode 100644 index d54c9d0ef72648583b89c95bea6cdb19eff2a409..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 834 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/Skin_Template.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/Skin_Template.png deleted file mode 100644 index 0d6751f525f011b13453f37360d47023108be341..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7685 zcmbW32Ut_fm%wj2z4wmvE=m`Ph=7O)(m@cB8mZEIp3)RV1Ox<>ND%}Dl-?svRGNT* zfOL^6289q>vX}REeQ)>sw*4pHocqg}Gk4CJGk0bvpDD8d(*->PJpclM0O!FUK$!zv zbwe<&0AOSUNCN;s1;8OZ00JZkShXO$zgZ6=3Bdl;L%~Kx0F(d|STBJURB#&r0Brd` zp1zJ4?*MskmjEFp`IGV|0m?j`wSkU~gNdoJp20<3&;bCTJAV=5?E?kh;pH9RXR3cz z$lAtM2-Oe1nHoR>iU8o~ok5!;pM9OZoR7E@ET4)Sr3>HN%1bwJhx(?jR>55E2n4sZzp{R99VAKy?vjGKFakff88kfOS}n$UTd zU{9BT067y!Cl5zIXCWOQFJDLRPyqNV=A&K!%hB8lfs?GFsIH+)Z2WEY zKf_UO|FZaX`Olm|IC}rq{oVI(oliahsBMFD^WbmY^(+9Wiv<9#iNAHCPXT~21^{XY z{t*wy(Ry(Y2=LWVPzVkVmdCg_$sbMV@AAJI{I>k>;UDA4AC32W?u5>{xH<-U1_&KZ zs*{hWPoSTWzptZ{i;&!ZUBv%#$A7r>4?kp0U0hxKT)e@dEWuTV@pc2#?d^;S!1#Cz zVZ8sl4F8MW{^7$B{XRfY8_K^A*VpUpd$vqi6emkXaGil4d4a@01-eEkONKt zs=z7W44?~K0E_{1zy`PqI05c}7vKj30};S2APz_b9sub;Hh=>PffAq`s08YOW}ppt z3-kaVfe~O5m<1MrHGlvRfqihpL_z2wtPpO9AVdrz133XvgJ?l?Ar~R05F5xfh#SNk z5(tTaL_-oGsgP_)9;5{F8qxr1gS>|fLdGF;kQK;J$Q~31rGv6T`Jv)a1*jTS8)^tO zhuTBkpf{mm&=}}_=p$%8^d+t(58{`dSIPxCy z39NLt2<%kME#i6oLFHv~Z5NZ)cqN1e|q&h*RM`cUpO?8_p zgQ}FOm1>A;iE5vkiCTtjU4Vqgtk7&wi zx@f-8{Gz3$Jw~fedzltP`v>hK+E=viXy<5m=~(Eb>2&Dq=mP2P(-qUbp&O_BMNdyJ zPJf2pmOg;~K79#&2mLfXiGh_tp22{@nE}g?!%)jG#IV6g%_zpG&3KhDj4^|;igAE( zor#)BoJohtktvEPhpB;SjA@&hm06M5nAwZ@9&;)4d*)>p6pJ{EE{iiu3`+q^2g?F0 zj8%kHht-KSnzfL%i*=C=$tJ;Oz;=Tzk*$oapN+uI!mh+_$sWRiU-ak z&2yP2m?xK~i)WpejrSC<6K?`|2#tuEh^xp$k#-S+sGz8kXoTns(FrkXF*PxFu}raUu^n*_gCDD>MCG#aeNg<`wq&%daNPU!sN-ImdOXo-r$UtROWH2&MWCmpsvg)$l zviY)Oa&&UqazS!0(MkA=v1*0^hFPFqFd0(nC28<1i(~PG~Bus9aG+jnsHo2U0`J1Vt zX@qIF8LOFtS*aP({H%Gh`J{!UMW98yC8MRCWr^jE)j6wFt66IW>qzS!8y*{sO}#D3 z*3!1fcKeF%mGmo%cFJ~fcBA$Z_96D~uku{=yxQWx=-}v3bq#UN>RRcw14m=We8=tU z2G<{7CphUiWjd`npK*TZyy9}&CDmog^|WiM>$2Nvw=}mEceHzk`#MGkla1NDasCGG z#*T-vN3jRR)5^2Li^}VoSA#c;w}*G9kAP2z&!Df2Z=CP!O^uuBHwk`*entKee|!J> z05#bD}s%|F8-na$Mah>w>)n3-9COh_4Zb@Rdizvf6N~-3$gmKFX9;D{Nl#q zPsQWz!0%x0^xr*sH|s7r!8zeW;_<|c#DjZI_dX;kCOt}`+;_d-pRAIc`vCdC`@v`m zI^}sPb81-XLYh%p?L(o52@ki@9n#-tC}rR>X)*&dXCGaBRG%f9^&smY+dX?E=WI^J zW4_0CAMZSIelnDMCbt~Nk4wbuJ;glzoTr~xn=hW9QGhH6D)?4tS=jwd?O90?Pf=pg zVX=4d>~quSoh7OzC8d0&$uFQU0$;4Ww0rrn>|9xWxm8ERh3tZRX?s_tx2eb)P~j)>fGyQ>uu@>8!j}oH=b&&X_9X$ZWeCNX<=_kZl!6B zX{F%9@Y`>E->kQ}wJo$ev`=SGl*QPr0wAU!}ixKy{%0qx#3jLCwL|A@oq&@VVi)pA0_rj9eNS9JLtzJZ3jG z``P*P^0?>t=0woM{^TED5ML6en5HtO`KI${q-H8+Rc2e}&dv4Co6S!yI4!Jw_5XUX z81s$(TgH;$Qpxg(<>nQ=m5-}eRu|WN*Y?-rzB7M+ydk+!{o~A!UV=4Yano;;^7Gy= z?q9`QN?YyQCfn0QFXH}A0*RaSd{=F^d(UcbX+QV?b@1p=>adY)Nd7|cqEIN4fDQl! z&u0kaNJ5Va9CjoTa5xN(M1Y6cQAJTxffa>Bf=3iJ%~1h~j+Tb*=+Dth{^|-vz+ea( z6cY8P$^T1G-T=&0;HBdX3?d9bnISM{2&EGc1n)G6Ki&I%wShoka0C(sxt#pOv72lsZl&Z=iJX1i#%?-D5IuR_?>03J2PYRd zkC?cGq?ELhvWlvjx`xgsSE=7xVjU{G*KXjpViY+U@E zy9udj57RR;A7y3d7Zg4#Dt=y4T3J6oxIcZ8@zwS3k!y&3PC$@PM+MkjA-vYb+FGcn{u)pJ) z0O(*4FnKU$01X@-RLpHy&(@>e9?qR7Gwxtc0wZqM9sxLjBbxH@Uh}?F&n!Yb`K2rc$^*U0^+K)Z=u*YXM zbAODYvm=@!w7%CK25zvE+^%BTusyi_a0=jszDkfFyP|hc6u>Vw>f7aZ3h;BEJVgN} zqq}`}GqGQM4m+{jSQ-l8;&3-t)kw#5Olfj}!Ft@LIx)1whW%I3zZF;E4{AI z9X1%|SnJF--=TJ!Q!^UP)#}TmUbn9y{3K{tYA@xEfiq33Pq;z)|8$h^icpp3?p3Y z=?exK46<6U9Hc{lq@{^!DLAvjA~YG^kYjJ%IRmtN&8)zB3sUJJ)N;sbt;nydrJc zQuED!Vr*h!<||fhXh&_YUtjGYEr$h=+``F>pSd-|h%Fx*%_jyj1aKZYhKz%ewE%umWR*LWCaAD=6nD&cx1 z_Nw)}@RXFX1Z*2)j0P@Y*xZZQmLD=6+u6_9>mV2)@Ii(sxV;wleD2jRzlUE!8}jov zDrzXXOs^6q{dRiMRTG3Fv^kz7% z1EUqRRJZI#Swy-F*~4s)ak-*>mjcjtXx?|z9`d#hk*VI8Ep4zJa4zP^-f>V)^E#!_ zwpLhG_etzm;m_c6?-!rG=XH(5s}jBgbW!Pt%vMVW3I`fEg~NJs+=9Y9xZvvWlDIT% zO~qSGcC-TX|m?$n1ZUI8lE+W-wZ+br~vQ`?MK2=p$KU{u{=T?$L=*7++gC9Ezaa{ zI;@AgC0eeXVNbW?KwC6ow`*9RUl60p|i*eqO1ds>CpriQkl`2FHUw;$|Eb5b2u zWt?g39R@0y$75UH^kX}mL!FPySEfZ{T0~wx3n&YA`_Uy9-qhWQ4*x*d@@uB^Ezi%C zxv?kbypdkMe)zR4(z~hP3*LDkS&$j;)FjBcnvGlEEn6L}!(As2*4JZR77RCMZIpFC zdOP)INR5lnFW;C5w00p_?UKny3*YNXnMWT|nfrgTkkT%)jY zw1>L2``c9C;)E{I-Em)IBc&4G!Yy+P_a?$MR$A@RNS?CUnp{xY&_Y!(pv{^iH{E(TV=s9wbl7_jtYy+|Zsv{g#15G)Gg`?9*+babH$5%*HgR65KG||#rbl|( zefW+|hPV^Ql(ep5mD0r>rryCU**WF@1MS27Z9Gqe;9wNw^D_E6VIVG0YUyK!{SBhW zE!Hpgy(JpdrXOtdC;5%qZM&st3Zxr!e%K99gx6}tkWOx1X^TRTycUe9Nh!+bJ}K9m zEZ5n3J@&ivl|v)xg-n*%WuE$$&wZ6(5Pi~ zw(ZpNgz?njBzyY2B3ITYBhiW4otk`{A;xudCrl-62NPj`n129S@PXWzK*ruIRe4>4 z3F6oZYZ;6E{!}ATzT~;XvCoZRkZ%mx_ zu>?<*Kgj(&OYKSM_MZ`oBQFnhpB{*fG^^*Yt`${p_LNSOtU5H{nf?;Q$4)tss+P4@ z7C-0jUy+qEmImbp-nP&-q)u`l=lUCa4h ze-lQgv8Mo3ZU@2+5DM@bJtw%yvwWNabX{g2nAoOw@ELbJ{Av;!N*>5rQrAAXh?8F+ z(jAr@xb0INC~l(P!U)kuo8Hm$Q-&8`Val3=-F$8q+nrN}@fh7mRNCClb8|VN&vlIN zcH6D;3NMA1;ZY9h2QQR@DjS?@nR6I*_>%$Yw97s}H z;C%yerixHrP#D#3mCIg7^1zhX-$dk{=Pq&zJpe!5 z+n(4qgY6$AG1sO|-u7v!!^ahxx+SE9pY3C&!-4dn)uCH=w}{OK$5K^mvJyAyr9ZUM zaNQ9~>z)i}Bx0Sgt2^r0QJ%y*_*#BWpT$-jEWWGf>+}@Qia)sT`pit4&7%(3c614G z_&LV$)-|2zw#Lmtc#xJ5PvO{J+^f7YxrJD-`3Ft(Cn7wp;IsUN&%^Mqu;1tA9Y|so zcOydQ1UVy+;0}|z--#P{8H_N=c-_HAeN)s-SJu}~Kag&7sxYOGH`GU`PHOww$y1^FFsH5x$7!2Zc-ManKWM`J8T7CSA0h=419Jn+>C1| zj~cLTt#Em$U+r$ksnE=*A?UGp(A8J#7L23!6yBWTN3CDwCiFkk++*n}yV~b_EIhFxT|!&h z#!zzKsifY}dQsTi#Y!^L*yBb-NobTRn)|-nIzc){q(U}-YP!_abWkS9&~kLg_C-V$ z;pDu+EltkZ9|>Blo1gZo(S+=XQ{;Dp8%j?!WS(ShdhobDW6E;Qm3x5y%p;y+SRHlE zk?)bT@x&z9PwO~&n2aXj2}6-KTgDuu+Wjk)_Q97DMpp%EddC=PyV-t8Y)tFjJO1E@ zIm1~FNqnAU&xFI?3Rz!ilg;IiB(W&xFlCp?)QDssE=qmE$WH06o5%& zEIabl{8+T6gNs0NQJaQcM`2Ht{L`S+c@frXtEL5EyOUk7YmvV=lMV}8VwiA3yo+5&BCPM8{;3 z(sNorj=T_Swyy~b94Xk&vP|sI%bwmjpa8vl@v}bNMhdfsjpcc>JxP`xSYCGl(buW` zHeTss!_M{M5@vLWFltSRLKfa!_=Ejb4v%pKSLO13|n%nhJ6C*&%T-H zX8%|~7(x_m;fB^zlXq%QQ zDz7%}M@`cZqb&tA2BN71NKH-TT@(e12=lz})BN_nYi2}qFE~sGh&#DC_nf=W-h2Jm z+H0@Z4XHx==s5*+DN4%arASzcN2S)RR47VEQx7Q|mRd7;g+n3Lq!P;K3knpdSd?be zy%ef6M|b{Sad809l#yx@QcKno58;WZlrKsLlK>D_K3`NOmsd0rRw@}+Q%gpXNLY8z z-%xRmD;j`f>l8qAHt#=3Kvi6hySbwDpPGkN;6_p=n^#pLrq)bOk#Jb?SVWWOtiQSe zIQ&}$a2qkFA^NeX6b(xatI0r!@!yCk=ow?ZFqXZUBxyrvQ@Ag02 z008oZqH0oc*RP>Dqgjt`zPcsAP66XRTcIiKw*f$W5T929C2%JIdI0fHC1Ofv^ZLOf zo33sEK3=bYeNQvZkN5*ZO;UP4TBm3X8w*nM8 zx=sN^uxJ)!3kC=XNN1%a#Fh2{M;|LTB?vHlkOszq@My&UZmlKbp8+bi1bqRG_lEtv zn*m^t8|QKbuk37ba0^j~7(Nh!LgYKdm{O#_0l+i+&7PYLK_A;XjD>`CI{=Hc?)3bvQjwB9!7-W z9^839I?q{icl`8ss-2e9wx2!h9G#heeo>9vGkW6>k2*;h)VSWg<7|b3-{+=0FI0fc zWm^KpdDA1^3;;R+qD|!Y6y~T$Dxv1qtP=64JJ%8Ws$|SNJK?Z$g`$%2s55%lGF)S^ zh%%YHMuj#yU4aw?C5ZwI0Q%#ZB^oebfbJ>QJAeRU)g3>TDfv%*>ijQhPohBQkF;tU?3UAAaJhonqO~FyrdM< zd9Nnyh(!-=KU7{K?jGZP6LeKLB#pm!x$^nEqS2_b*{oKrT6IZw#TPn{AFKeaZteEj zPipk&(MqLKdi(9SwR-jHvJ?FM#fJhcKx+g>&?5kmjK{QM_493~Ol!_NSvFm3UfO-E zJOH!4uK?xDwmp4L8ard5MvWS!zJ2>@*REX^8T2{LEPv{KuHE%buN0vHNtp2C6>fqP zCr;?-(W6?kW=%y2AP{0P0l1DHNmcnE$+~r$+Uy4;f#Vlqm=sfcX9WqEbgP0J`bbF6 zxhCoMyBBNX#EI(FtCzNJ-KuAvd8Ts`FlD#`OkLCBvljeHXV0EhB;x)36)RSho#4$a z3xbxk4~U>d8=BKjiK1sh3TfppUs55Es$-sTXJBD%Vq8U}zkN_%0sz2H78o^Z+G5AR zTrQ_rEOzMtOdRS>VfG&_Q;-r7e@4Tdnz+=EZ5LA~9hkleFD2^HZsf2h%^q-^ElCmY za71!C&;Zv?27HIwl+@57ZGOP}8*{g`hu-)dNo0M-6dS|EDUwo6mGsenz0PuBJIwBg zKV`PUfN{?vzBSn&le=E2cRq*(VF3VtV$HS(P5PZr`+i6bK=tk?^{Vks6B9Bqi!`4BDd=bh zGpUqbDOyb zq+Zoh9MD_*7)S$S3?1(!;GMtJyLXubpdknX(fV+kzFa>(D^(}`cO)p2^Zo~b@GeYw z^`9330HW+XzS8*&0OsVdK=ba{0&vs%qc-v>Pdr{8dzl5pO|E8Ao0SPict&F!J1xyw z`qNw=YnZde6V}m9hZw*G7=8mtK%o!wvt~|_j*b2m0hm70AA4}jlos0oB28Ooi(Uz` z_BayZYY{Re?nWBxZ8X)*vUr$x~aMbmLB)_d?lI zEA+2%4G_Mg zlZwaV%49N{Jov2R4h~T+pVzj7wa(7Q5W?1mD;OMHdG@`2C)|Wckq5(zHjQz(2auAC zyY~PYE+c6;L`WF~8gNLS-(rFGoVm#n+0@kJ*2pKFPPffZKklomt6e|*0{SEp3H9mI zM|E{|<+s3+B};;tGiU0^kt5FBJ%9eZ8yp9SE8t9@K3yMv_@Ul?_gy#m?Af!mXU`sI z8qXMU-V0wKCpmB)4kHQ&_U>_BVgHfecAW82QE=i3=P{Xi2SNc4PIJ$1NDTY?ol`fs zlL2S!;K74xXlQWX$w#s#uET~6Q)_FhPM$pJn04E2x9QliV{Tpb_4VZeShQ$SFm&ip z4IVt$y}V<`4h9=g&`3-oX z+)tfb-k#y95wsx7q@N9pmm>>N2;d zPMvarib~nr>7#vVE_e{vA3ftK7lyMMfTy2+`m(P1vJM6ZNwt~ilSsMa{v{eWZk$?L zTC{iXUOoHlvt{Qb``fRVk0_CB`OdVZnlNF4&YU@;{rmT8?b@}Mbh;F>`Mn}N1Wy{LWIc1ara*c$~NPUgFXR&6@n&rY?Z@u+aMG3kXz0GSxT`( zskXoZn=Fc>o#?Nn)-3T_)7R(qZn|D-YL!~k?X?3&3}9M<)v8v>rDO}z&i$RMGV8Pi zSWOYBbi&vWMk`lyV6_F*3S^V*`Fuj<)C8~vtO%R5c%L3V(`(O2j#@oHrSx|tiRd%{ z)D)3fgEN*FpqPSzNwL$c_JDpUMv5_z2A*F(usy4M`n;E(o;75Zd?wgckWfF6@H&BZ zDf#~{2Y?C_Cb5{mmCqmvaM*GL^dWU|p7QxIYKeXg7eaG&%# zoVWS_0NcLr3fTf3tH-UR-u;IF!q~5r$Crwu&=+>!>v|6aeL40lOJp?wRD+-cAli~B zR$~CDukYz*0MPm!YX?YgS#5!p(sZmAcTP@er7X4*180x`2O;vHEm2r(z*cA`x}&EDnwpEa2Ni3}!9_xccIV zPlH=Y7KBJM|Bj~ZVV0DKh3*AU>+V#`{w1BYCM%hi+3C67;XlfEQlF>rVnqDi)r;BhgJADLkirPMO;yt9T;rvaeA zV(i$lE=9d<+crle#NqgGC8LZPObY(B*IskaFpbBI8Kak9e%WQAA*!mXN{0_0cG+FV z;)(-RTU)CUBSyII!1CqG19I^+xOwQ%Aq^TdsO|gIsZ*U~ zP_RG|25tQK@vh>7G&|RkBS*Tz3<@5Q1OQ?z2nGPa1caSCce;9jTW-0tjH6A#ZMWD?Tk2rC>%L59|5QP+OuK&yA|gbU@a&aginU|`fQlThiioW2nkTjl`a(}Wxr7M73(G*m~Wv7A)6XQNV?oI;_X0u!P}Ktw=F zj%U^W{R3CG0^V%*5rEah0bdauk)VVd;2!yVHX8I%LN-@Wq3B;!|H{+4{RPw6=k_SM zxWn!8az!ay@P$PQD1^@-Vl*r1&o>&}fqgDlP%IkOg=9ue|8YQHyxJ822Vl>jeCuO* z4u0i5seset7HjTPWqC}QY+i|2MEQSy!g%AVSHNp)jMt3xG6g>pgo08M|Mz?(xTE-I z5Bkda*C*{dxZ>-tT;(p{6aeYvC!&DkfFcT*a0&jNElRix*KwePl`nnH74Vz8cCh=##?pJa_$67EFYtXwY}375_H73JPFh76hYn zOtrLA27;pq!W`#-J%UX_U%v28*s1PXb*8=yCoa z{Du9KVUT-41f=Mq1V|uqOntuFQ}FE114#z{bFI9o@O5P9d>oC{VN@Own3v~ z8MSX3RXY1Ky?Ia62+&#A;iBAaOH4BhamVT3nalQ zFN+%d^M#^idRRZ3FDMcYDe?1tW_1+heBKe|)V;%0#ey;v!h7zRXha76|;_jkF)%iEt|bWBB5;7 zr}Tz~Mx8y|tIEns<#IV~-TKJ1`-g4Y9`OQ!fL+TynM_9cd|u&jMEQJ9Wo2aw27?+M z9aT6SRxB1%GC4l63{Q_gzI)o|@7%e=o+S<7$(8$P;9)5W1v@iJ4kM?+FWfh9Yo?z0Ni{DxX}_73Xn_y6Oi zxxlVnJ3aiVxw+Zk%4eW!iAtfUrAwEnv$J#3ZPMus@xm63PqT<vD$2ER;X(}#4ywDm+uQ)bQS!Hs?66QtQp9gEQkR;ONBnlx4!e$b@UDi2 z2Aw^7*47FtIhRZ(wP3*lbEo0qVRO00#zyt__LekQ0H25GxZ&KnLG}0d>y}$qD3wa- z#EIi3#Pa1gskgUBBO}9tAaA~Tg((G2z!LN4FEF7#_~3+*U0d6i%*r)2H5wQgRH2YJ z1sy;BzRJtX)X>mm3OIfGlud1ewNS5qnP}QDJNO@WYd) zoEvUfq(C63bULY#krCZ=(=B%Wv11+DzWuRj5fQ+r7B2jPT3Y7o(4pViVsF2_%@+LD zTSpWMh1Jy5Y^XSWx>IxK)~TiCI^B5Vje7OfUkdAHvw2$>3K<$2)>ppr#~L0UQ6`f% zWSu&7%B=G4yB(^jsa8!*ouLN-LZOgWAKqpA2L$Ga6_Y7C>%&R7Q6`hp(9n=>z4bOj z=h?G876GcO=NKYJM@O`D=~A6LH*D+e>gp_wfFJ&Fmp5--gKBH*bnMtsTTo3+t>(>} zr;d)Js;sQA7jV8<%xhp^Ky&BTn}*Mv=~7!;n}WfJYHR1{@ZsMZ1Q#r5H8>IpR;*ZI zM9Tfgj=gJwFIu$3EC-1}fLy=m`Sp{<6|&H`+n-iXPq#t8xw*yoqNk_JEL~n+Y0ri< zLDIs7H(1C;A-DzWB}q%i=uVsuP#>e;CMV{utg|*kTBWQ z)TARv4x3=OL_AI|kugia*tNB_N~Mze=%bGevJfo-f(#anpj?L_xF7E(45MgA%3RC) zur})gr7q{-z1+jWIX?5e-MjZpuK=IXCbnlHCq_7kZt6MbrZhk-!zY5<$*o%-Hi1z_ zPtO^1iKeFc#tra5dAT3&Q3fu80_*DLnFWC?3R=1H4kN4!7cQ6rSUC6h_n+0@|9Ynt zB?GtyDSBQCQl5`X9sz{q@OSzaqZd=0aE(+dY1Umdtm*14^n8EsK>EBt}T@r z242~>-b+LymPV3JB4j3)7w1p}8y_mYWr>I~*@7vBhsPpes}20cvrj2hHDMhxS}YZo zVztr(%eI-t_Z{AI(Nb)iN2FkU!g6t`I4*hg9soIqr?R-e77USyhpiRo zI!`1&P5~%^^-_{&jeIZFmi7N4CImj}6JgO97|+2% zyMOVJ!H-23v%X+K3aBH#Kn7n|02!MQassIcZqSbU_u{PfEMSgeveI+k-C%u2lphWS zt@%RcS6vZTDoZ9=GzFy6C?aZqAPT_h2n^|v2mwXHUj!>>v#PIeR8>`# z1_%2My33c}Y_KOa{<~Lq8Ui@Hw7+Qg-F!BEQ5e1##(f{gy7sp+9|?RmzeSNgz1Z>m zy&KKd*ouSDe6eUf$n#?uDKPoNIhwMWY))ae>9L5Rq*P`Y_{mTH)+4N7S%gDK;{5XE z%XRSJuP2in6hmT!1zKCLH#G2l@4?5-iVm`THW&lxGG7=+VrE$cMp?jo0v#ZR&xV`{ zBI7fP`PpCIZ+SkbLwL9G!NP$FKc^Lk!1O5j9FO{(hU=`p_sQv_z<~o#dtF`KW@#XO zaf_PN;>C+~{P=Nm4;UIHAvlWx9S|1bXKXB~mX;RF@<>z&PY@sq<++3<@(OYU7ZwR= zKGH(wUeRbwgM$Nhz1uSL?6!GbMs$!M7KfWS90EWEpAnWWHAD!SAxOCEt_Pnk83r%n z?f>AXOWHYIi~9M01zd|(y%d>d9Ra`G_kc(8LPF!hoFhGmtW+4g6k$K@+F4h?OMCD4 zV0b?^%GjF>lXIb9pkx@k>J{+vlj}UPIfg6PXGEwK=KXdOh`7>2RDNFz=NL40<-zNRes}8IX&6?|13q$Sw{fPR_gv#WjZ@)iIrKW2_*~-4eFtX zHczVn1~lmO+;-b-dhx{y463U9MrT)7m-Pt|9<*=|E&IN{K0D`%s}ybNLoy@4TtKOjno^uF zV+HKk@tDW-2rYEF$sCIpFR=>q+i(BDh9>Ij=Guap5vs1PGEP8Q^cA=+9!Kz^b#p-u z%~PJ4O8EmDnM}?q({M^O8qu<4%kBHoqi>fS+PdNjU})*O>srm)3{fy&K>wa{_nU9N zVGWj*D_5zz`;1PV`at#d4f^Iczoqxydr#fnr!7)cRn?fq&z~Q*Y>=5GP{e!!UFBFT zVI_1p1u~_b&im@>=BT~>J2NukjBZA|2M#>r1%qMh1t7qM3u87>!W;qJV9qaFc9S(r z2L}2Kwse!RAWaw_>dh7=nffApGC_i?B$F2m8O_ZLCfn&K0)%iK?_0NS{fuOo(ak6T z1n`@1$D&+ojoJ5E+hN;=uaFElpsi9}*dU|fRhp*GfqzKBKByBI7_bZE9;=^~^;jSg-Qst?$ z0=#3UiP4M|@T>hBJofM7DPI^Wx(H6|nq3{rakB@UW1sJKeJFtzyzBD1fk)T-&ld_x zrSqm(o=NWy1-RZnh15Imo4)yZ#a)2R4We^11YfG}u?{UsOl4VIzw2)?BJ?Lh;EHl% zex?Cn`a7C>|3_~hi_-w5B1GnAUExA;vPeSD-}U}^Ua9{76;}Y0o6HxG@-ou{$>nm) z1u`J*4_UD{Kp}3vfYcbm>*#n#x7T%9{h!u1h;Tm)K)6`|5X5kVE0lmL+=@|}_V536 zMkt=q&1jcFOA;Rhg}E7>TfO>g>gedOIFE7&d8EaJH3lcS9#k+Ux2macvbT>rfB^m* zE|zv1APOU(g}OmSS=3wsPDy8Tx_i^i{%`VSP{3xJ-F2h!OO`Cri4!Lb>TXmX$b*ap z3tDWHmKYC85bBHbdMA7PSRHGF0zPxV8*Vtt5v1$=gQ~SNRKR}&Ew32JPyqAY00000 LNkvXXu0mjfMT1R~ diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarffemale/GingerDwarf2.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarffemale/GingerDwarf2.png deleted file mode 100644 index 56e5d27faf20c40e0685e23f195322e6b8ef09e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4003 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 JPDHLkV1nCsu0sF- diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarffemale/Simone.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarffemale/Simone.png deleted file mode 100644 index 78d1ef78f6f5886159ebba36748af3fff06ed210..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1561 zcmV+!2Il#RP)}VF?kfYtSERLABe@HHqA91(DjNrSOl4lmeAy3nVLu{wOxw zOoFzxA6Q#aZVF`)LFh_EqLoCOQE5Wz8brMK-sMbZ&bu?`&YSm|+4jvp@6Fs_=X~z@ zacAxgjB<6|dtWK3N^i^Mi9O6+^=P1tk!QIo903>~ACJh{(9mG-rvv~f4}}Q={m1W= z0pK#zDFI-3XrT1!TO-y2_yucNbytgN`un$<#sG|u0oppcBJLXZJZ(HtV*mj_#{_{~ zVM+kdg5VXSI}@R=-~YP`Iqj@fv%V^vmIfz10GEO*Zdqb>e(+f;(3P~o00Y}zs)}z{ z8WRE+fDMoIm?xg@PX(ZoHZA~1zW%}nz4=#Ot6C=)u+nxx>(b`3m0o}U3#O;%fw2E0 zM~^#U%%3wWd@kGg(%bdvzF@(n^CB|r8s1@A+uF_H?|-lmWI6TC%c%_?*QdP`fUoe? zs0RS9NkHEy!!IvC6HGJbl}_8CUFBRRpYmYKqM3-_vRPLZ8=^{<1}12ItuS^owWI|C|G7Qu%sj;-Z7#ou(NjE*vR=XZY`PL20TF zAW)Qm(ti$_16e-$NB#gvSgtIDYEL^%v3*~a8BSyKRp#dIjV3OmPy>qGahB&w+dm#2wbjwL)?W5o zW_|#`h2*J@N8UIA0RUwj0+h#9O#of1JIuf_n$8VfCnxJ1YqF7_6fKnhs>S(CsHk~ z88`&Mcze;m>kJwQ%1iK4Zj1#86#<~Yr$uZG8V5i^`26VE)|#L^1;y?s-!uqj#~xl8 zt{W(A(yz1tALR)KAZS6c%mSc1nGg9^l2u3mi*H?SW==mV(xmU%cg>pa`_1;PFPcpc z-4T|}Tf91q;LprB5kep_jW+XA)?nf7i3_c=7ZE6rS;2)gqxqUkAV8q&!b`56 zF!#RAW^LDP5jYY6xdO!j-<4?61gQY{t0td)?r%x1AT59k!)NcJT|}u$jYv} z{>CsKV5PY9xov5~k+Xg(0O%pB3!o2aw%qTzlmPI_$Ghz#004}&r@pm;k9^&gInt0x z9Rmmge$xg)m#}flqkq0yL`LA&05?R?luPk6%3C)UpWMn~gmeMd07)R^QkmLQs-uXn z2`=4%FK)E9N#&{q@P!Z$fT1EDfiO<#J;NW_q8r+7Qgv{-1Hi*I_~nzCsJ_p;LHJP= z9mknlQW@VH^qp-N4b2^_Ig82g`Bte~0J(rG1NdeFb$U})z^wD&D4Y9O0qLX0fRwWR z@2cneIjRUW>i~){3wg>=w}3q97h&wW1r%Wx@|2-&0eR9d!q{~SD8ek{DMQ@?@}ysc zvFjF4gjvW_hN@dY*7F5&{~sSl=)0rOR##e>RR^GbWYs=V0YKc||D*(vc6(g{m~<8( zU7!*GuCKtp-}wG>7my13o-5D<)iy+E&r)+KZJf+8Anq8eHZYaP?Jd&&zN;U;MXv4r zX>!yAK$i0bTwoUjc|M?U0IIRMDk1QDxgDQ709W46dcHt2TV9?!fLfj}@BvXM01!B> z3&ia%`zVh(h0FqJf}q^}^;MkeX?uTKe^t!_akE*;`2tOFD$m^lvYs!{;K&7$+!@wR zu4*7NTL8ViReHXFw!yie+>(+`tyOY5Tms1qpjPJ#e9tRnwSa#B2Pe30G*+(=00000 LNkvXXu0mjf2#fS` diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/BeardedDwarf.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/BeardedDwarf.png deleted file mode 100644 index e3e07cde61453467504274dae927e817c3def516..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4421 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%0A6|dWzlA{V(j?JGZTPKuf8fe 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 diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/DwarfStatue.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/DwarfStatue.png deleted file mode 100644 index 69fbd05987b507d2d95ee635e8be7287307fbeeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1729 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 D-=dk% diff --git a/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Dwarf_Keeper.png b/src/main/resources/assets/customnpcs/textures/entity/64-Textures/dwarfmale/Dwarf_Keeper.png deleted file mode 100644 index 0e29e1f78d6807161a134720d0050746ad0c63a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3347 zcmV+u4eauXP)_7=6(8lH2#5+5CZLEApa>{g3uCd>jFxJh(ON-m2U}?! z6_qB6k6Ir!J}?z3MFtfG0#Olz5`$S2AYt>^Wb@{9zI*nDdpDas!NjSV=FDVv_nz1P zfB*k~|9^9i21VPq9AfWLAWQ?srU1u%z*jXuvJG&?0AJSvXE=byHo(^goRbJdMF5^A zpt2EI_7*hN9;*Ib%OEB`3+=h9AVv=c#yumyFYSZ1mBQ^>3URm=NQef8*np;X;6OES zelk$v0WKHF!mYs-bw(7bczkoG@$Jy@U0h!j{=(8<=^mlAju}5r`iF6 zMImDc0c{g3vC2bUW~Al>}tQOKKrh02o$1QV&Fj z1B1eWd9QU{_lcPhW0HW$r{Q%<0JbfHAmUVvA#lh8j7bJQuLiuWz?5_u66A#X7U)vZ zTWVW?vlD>J{@ynLFbrsb!7-9=%<;cr2E!eC=94*034C>kK{-WxU!EtfL^fsdWg@eftbMrc;uoYCq+G$`A6y@h4pEL}R|7kQoYcmC0ZVR67o08MSck8U~D_whQHo(4&ZHO-QxFGvPz zTIBTT2)Q0VnK@1h=|v>aRa@0U8bVM(f`7Wi`r5S+*S-erqh%1S9TGr#6ZuIiS`Kl% z5vXqk21iTFk?E)2c}hV;fZ~T;I72%r91YDCT@!JM~DV1@| zaTyNa>Q|xdTmsRPdVy9Y_sk8F0Rk=k@-+|({3N(J8-jdAy<#JQ3a<>;?AM{`n{!dN zvl3EkH)5#rTZYFFGo{gtY^`?aLZq#lN7vI#)70 z`GPrrd=FeVm`q$}egQOQ1rqSASEP5ncb()8g20S5Zm0~;E9e2Q%!Oe2$^jIZZkZGV zd~pJ}=H5Jf^SDcAe}=}iyQJl}-tW?tV6~O9G7t0&Dnun%GbG0VpH#{6*%>VXW!M~T z1cusy$_B|LES2dA42R`@W`8>yf&elkC-^HnTAuP5uK(tI2<~C9{JV=F7@7<(dK6`R zaSjBFC3+silHf8;(lZyo3GL%$5aczTI9TC*T_;0e-0f1y57)VH$!ht1=p{K=b@_PQ z^We?;@B4oHC?4Cs2S-25*MEPy-i7mW<=B!(TsoMn3s^G{%&I1U1IOG zITK>#I}%)yAHyvn3J4FAVaU|YYEq-ivBYG0VTE;uUAig>>?bKw$T7Kjx@8T;nDfuQ zH4p9$(%Mvph0ocEa$%OLhihalAcTB7q{}itr`cte;9h4XNPrl2Bt()VfvWZalhS3X zt!o7?eI8oj0*I`ar9#HrA=4j2lVDSR#`wpTa(|{|hBO;_D7yd}-w#;NkQ|u>D2K*3 zClVGHpg^<`351}qwjYro*^`1NE_eW~ZSC+C+@lvly0T$XK^>eZIiB9c^$wnpR%hc_ zD$BK5Qga^?(ULb$g}|1D5RCIpvmvfGRd(+zgqZn~1c97#@w3o9*IW@Ahg+ZnVf3iXVc7a!>#`&=B&w0C0PJp`HQg=JW)H2V?K~ zb_sxaeSSBT=XVtVD_ky7QCSHCgdZdTze_GeOS`l>If7*}(_(?vPXOpm2)r?0zC1Cr zkn~su(i<4}%wfMjJmH5G0<))2*K@16Rl41%sB-I%e9di^K3lY8wY21Pq^73>k&%{u zS5%=+cvRSUdnC)Vkry`jvMl4%Qd4pB$vhpTZ|WsUk{p?Zo{n;X?#?l6{LW_PfQGs{ zq-JEuuqrQyJwCp3eMejzHWwC#