diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java index 7512253089..1cfbbd681a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java @@ -131,8 +131,8 @@ public void onEntityBreeds(EntityBreedEvent event) { // Prevent entities from continuing to breed with each other if (cancelled && !wasCancelled) { - NMSHandler.getInstance().getEntityHelper().setBreeding((Animals) father.getLivingEntity(), false); - NMSHandler.getInstance().getEntityHelper().setBreeding((Animals) mother.getLivingEntity(), false); + NMSHandler.getEntityHelper().setBreeding((Animals) father.getLivingEntity(), false); + NMSHandler.getEntityHelper().setBreeding((Animals) mother.getLivingEntity(), false); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java index 5317bc127b..5a42f591b0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java @@ -138,7 +138,7 @@ public void onPlayerFishes(PlayerFishEvent event) { if (EntityTag.isNPC(event.getPlayer())) { return; } - Entity hookEntity = NMSHandler.getInstance().getEntityHelper().getFishHook(event); + Entity hookEntity = NMSHandler.getEntityHelper().getFishHook(event); EntityTag.rememberEntity(hookEntity); hook = new EntityTag(hookEntity); state = new ElementTag(event.getState().toString()); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java index bc0cf12d19..e7e028d5cf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java @@ -50,7 +50,7 @@ public PlayerKickedScriptEvent() { public PlayerKickEvent event; public boolean isFlying() { - return NMSHandler.getInstance().getPlayerHelper().getFlyKickCooldown(player.getPlayerEntity()) == 0; + return NMSHandler.getPlayerHelper().getFlyKickCooldown(player.getPlayerEntity()) == 0; } @Override @@ -86,7 +86,7 @@ else if (lower.startsWith("reason:")) { else if (lower.startsWith("fly_cooldown:")) { DurationTag duration = DurationTag.valueOf(lower.substring("fly_cooldown:".length())); if (duration != null) { - NMSHandler.getInstance().getPlayerHelper().setFlyKickCooldown(player.getPlayerEntity(), (int) duration.getTicks()); + NMSHandler.getPlayerHelper().setFlyKickCooldown(player.getPlayerEntity(), (int) duration.getTicks()); cancelled = true; return true; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/PortalCreateScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/PortalCreateScriptEvent.java index cd6ba3d578..645829d5ca 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/PortalCreateScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/PortalCreateScriptEvent.java @@ -74,7 +74,7 @@ else if (name.equals("reason")) { } else if (name.equals("blocks")) { ListTag blocks = new ListTag(); - for (Location location : NMSHandler.getInstance().getBlockHelper().getBlocksList(event)) { + for (Location location : NMSHandler.getBlockHelper().getBlocksList(event)) { blocks.addObject(new LocationTag(location)); } return blocks; diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java index af7bad121e..6eaaa3393c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java @@ -74,55 +74,95 @@ public static JavaPlugin getJavaPlugin() { return javaPlugin; } - public boolean isCorrectMappingsCode() { - return true; + public AdvancementHelper advancementHelper; + public AnimationHelper animationHelper; + public BlockHelper blockHelper; + public ChunkHelper chunkHelper; + public CustomEntityHelper customEntityHelper; + public EntityHelper entityHelper; + public FishingHelper fishingHelper; + public ItemHelper itemHelper; + public SoundHelper soundHelper; + public PacketHelper packetHelper; + public ParticleHelper particleHelper; + public PlayerHelper playerHelper; + public WorldHelper worldHelper; + + public static AdvancementHelper getAdvancementHelper() { + return getInstance().advancementHelper; } - public abstract void disableAsyncCatcher(); + public static AnimationHelper getAnimationHelper() { + return getInstance().animationHelper; + } - public abstract void undisableAsyncCatcher(); + public static BlockHelper getBlockHelper() { + return getInstance().blockHelper; + } - public abstract Sidebar createSidebar(Player player); + public static ChunkHelper getChunkHelper() { + return getInstance().chunkHelper; + } - public abstract BlockLight createBlockLight(Location location, int lightLevel, long ticks); + public static CustomEntityHelper getCustomEntityHelper() { + return getInstance().customEntityHelper; + } - public abstract PlayerProfile fillPlayerProfile(PlayerProfile playerProfile); + public static EntityHelper getEntityHelper() { + return getInstance().entityHelper; + } - public abstract PlayerProfile getPlayerProfile(Player player); + public static FishingHelper getFishingHelper() { + return getInstance().fishingHelper; + } - public abstract ProfileEditor getProfileEditor(); + public static ItemHelper getItemHelper() { + return getInstance().itemHelper; + } - public abstract BiomeNMS getBiomeNMS(Biome biome); + public static SoundHelper getSoundHelper() { + return getInstance().soundHelper; + } - public abstract Thread getMainThread(); + public static PacketHelper getPacketHelper() { + return getInstance().packetHelper; + } - public abstract double[] getRecentTps(); + public static ParticleHelper getParticleHelper() { + return getInstance().particleHelper; + } - public abstract AdvancementHelper getAdvancementHelper(); + public static PlayerHelper getPlayerHelper() { + return getInstance().playerHelper; + } - public abstract AnimationHelper getAnimationHelper(); + public static WorldHelper getWorldHelper() { + return getInstance().worldHelper; + } - public abstract BlockHelper getBlockHelper(); + public boolean isCorrectMappingsCode() { + return true; + } - public abstract ChunkHelper getChunkHelper(); + public abstract void disableAsyncCatcher(); - public abstract CustomEntityHelper getCustomEntityHelper(); + public abstract void undisableAsyncCatcher(); - public abstract EntityHelper getEntityHelper(); + public abstract Sidebar createSidebar(Player player); - public abstract FishingHelper getFishingHelper(); + public abstract BlockLight createBlockLight(Location location, int lightLevel, long ticks); - public abstract ItemHelper getItemHelper(); + public abstract PlayerProfile fillPlayerProfile(PlayerProfile playerProfile); - public abstract SoundHelper getSoundHelper(); + public abstract PlayerProfile getPlayerProfile(Player player); - public abstract PacketHelper getPacketHelper(); + public abstract ProfileEditor getProfileEditor(); - public abstract ParticleHelper getParticleHelper(); + public abstract BiomeNMS getBiomeNMS(Biome biome); - public abstract PlayerHelper getPlayerHelper(); + public abstract Thread getMainThread(); - public abstract WorldHelper getWorldHelper(); + public abstract double[] getRecentTps(); public abstract void enablePacketInterception(PacketHandler packetHandler); diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/abstracts/ModernBlockData.java b/plugin/src/main/java/com/denizenscript/denizen/nms/abstracts/ModernBlockData.java index 9a0d34c283..5e6c58de92 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/nms/abstracts/ModernBlockData.java +++ b/plugin/src/main/java/com/denizenscript/denizen/nms/abstracts/ModernBlockData.java @@ -23,9 +23,9 @@ public ModernBlockData(Material material) { } public ModernBlockData(Block block) { - NMSHandler.getInstance().getChunkHelper().changeChunkServerThread(block.getWorld()); + NMSHandler.getChunkHelper().changeChunkServerThread(block.getWorld()); this.data = block.getBlockData(); - NMSHandler.getInstance().getChunkHelper().restoreServerThread(block.getWorld()); + NMSHandler.getChunkHelper().restoreServerThread(block.getWorld()); } public ModernBlockData(BlockState block) { @@ -41,7 +41,7 @@ public Material getMaterial() { } public BlockState getBlockState() { - BlockState state = NMSHandler.getInstance().getBlockHelper().generateBlockState(getMaterial()); + BlockState state = NMSHandler.getBlockHelper().generateBlockState(getMaterial()); state.setBlockData(data); return state; } @@ -72,10 +72,10 @@ else if (data instanceof Dispenser) { else { return false; } - NMSHandler.getInstance().getChunkHelper().changeChunkServerThread(block.getWorld()); + NMSHandler.getChunkHelper().changeChunkServerThread(block.getWorld()); block.setBlockData(data, true); block.getState().update(true, true); - NMSHandler.getInstance().getChunkHelper().restoreServerThread(block.getWorld()); + NMSHandler.getChunkHelper().restoreServerThread(block.getWorld()); return true; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java index 7c207de37b..2c3a46b3be 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java @@ -497,6 +497,6 @@ else if (337.5 <= yaw && yaw < 360.0) { public abstract void setCarryingChest(Entity horse, boolean carrying); public BlockData getBlockDataFor(FallingBlock entity) { - return NMSHandler.getInstance().getBlockHelper().getBlockData(entity.getMaterial(), (byte) 0); + return NMSHandler.getBlockHelper().getBlockData(entity.getMaterial(), (byte) 0); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/util/Utilities.java b/plugin/src/main/java/com/denizenscript/denizen/nms/util/Utilities.java index 8d10eee7dc..a121252917 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/nms/util/Utilities.java +++ b/plugin/src/main/java/com/denizenscript/denizen/nms/util/Utilities.java @@ -46,7 +46,7 @@ public static Location getWalkableLocationNear(Location location, int range) { } public static boolean isWalkable(Location location) { - BlockHelper blockHelper = NMSHandler.getInstance().getBlockHelper(); + BlockHelper blockHelper = NMSHandler.getBlockHelper(); return !blockHelper.isSafeBlock(location.clone().subtract(0, 1, 0).getBlock().getType()) && blockHelper.isSafeBlock(location.getBlock().getType()) && blockHelper.isSafeBlock(location.clone().add(0, 1, 0).getBlock().getType()); diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/FishingTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/FishingTrait.java index fe96f78241..6c4b51e9d0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/FishingTrait.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/FishingTrait.java @@ -178,7 +178,7 @@ private void cast() { v = v + (CoreUtilities.getRandom().nextDouble() - .8) / 2; victor = victor.multiply(v / 20.0); - fishHook = NMSHandler.getInstance().getFishingHelper().spawnHook(from, (Player) npc.getEntity()); + fishHook = NMSHandler.getFishingHelper().spawnHook(from, (Player) npc.getEntity()); fishHook.setShooter((ProjectileSource) npc.getEntity()); fishHook.setVelocity(victor); @@ -213,7 +213,7 @@ private void reel() { catch (Exception e) { } Location location = fishHook.getLocation(); - ItemStack result = NMSHandler.getInstance().getFishingHelper().getResult(fishHook, catchType); + ItemStack result = NMSHandler.getFishingHelper().getResult(fishHook, catchType); if (result != null) { fish = location.getWorld().dropItem(location, result); Location npcLocation = npc.getEntity().getLocation(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java index 4a4381681f..6c16dbaa49 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java @@ -180,7 +180,7 @@ public ChunkSnapshot getSnapshot() { } public int[] getHeightMap() { - return NMSHandler.getInstance().getChunkHelper().getHeightMap(getChunk()); + return NMSHandler.getChunkHelper().getHeightMap(getChunk()); } String prefix = "Chunk"; @@ -671,7 +671,7 @@ public void run() { // None // --> if (mechanism.matches("refresh_chunk_sections")) { - NMSHandler.getInstance().getChunkHelper().refreshChunkSections(getChunk()); + NMSHandler.getChunkHelper().refreshChunkSections(getChunk()); } CoreUtilities.autoPropertyMechanism(this, mechanism); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java index 0c181ba532..0ef36c57b3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java @@ -674,7 +674,7 @@ public ListTag getSpawnableBlocks(List mats) { ListTag list = new ListTag(); int index = 0; - BlockHelper blockHelper = NMSHandler.getInstance().getBlockHelper(); + BlockHelper blockHelper = NMSHandler.getBlockHelper(); for (LocationPair pair : pairs) { LocationTag loc_1 = pair.low; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java index 10052a59d5..3758a51989 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java @@ -318,7 +318,7 @@ public static Entity getEntityForID(UUID id) { return rememberedEntities.get(id); } for (World world : Bukkit.getWorlds()) { - Entity entity = NMSHandler.getInstance().getEntityHelper().getEntity(world, id); + Entity entity = NMSHandler.getEntityHelper().getEntity(world, id); if (entity != null) { return entity; } @@ -885,7 +885,7 @@ public void spawnAt(Location location) { else if (entity != null && isUnique()) { entity.teleport(location); if (entity.getWorld().equals(location.getWorld())) { // Force the teleport through (for things like mounts) - NMSHandler.getInstance().getEntityHelper().teleport(entity, location.toVector()); + NMSHandler.getEntityHelper().teleport(entity, location.toVector()); } } else { @@ -1044,7 +1044,7 @@ public void target(LivingEntity target) { return; } - NMSHandler.getInstance().getEntityHelper().setTarget((Creature) entity, target); + NMSHandler.getEntityHelper().setTarget((Creature) entity, target); } public void setEntity(Entity entity) { @@ -1604,7 +1604,7 @@ else if (getLivingEntity().getType() == EntityType.PIG) { // --> if (attribute.startsWith("item_in_hand") || attribute.startsWith("iteminhand")) { - return new ItemTag(NMSHandler.getInstance().getEntityHelper().getItemInHand(getLivingEntity())) + return new ItemTag(NMSHandler.getEntityHelper().getItemInHand(getLivingEntity())) .getAttribute(attribute.fulfill(1)); } @@ -1617,7 +1617,7 @@ else if (getLivingEntity().getType() == EntityType.PIG) { // --> if (attribute.startsWith("item_in_offhand") || attribute.startsWith("iteminoffhand")) { - return new ItemTag(NMSHandler.getInstance().getEntityHelper().getItemInOffHand(getLivingEntity())) + return new ItemTag(NMSHandler.getEntityHelper().getItemInOffHand(getLivingEntity())) .getAttribute(attribute.fulfill(1)); } @@ -1660,7 +1660,7 @@ else if (getLivingEntity().getType() == EntityType.PIG) { // Each coordinate is in the range of 0 to 128. // --> if (attribute.startsWith("map_trace")) { - EntityHelper.MapTraceResult mtr = NMSHandler.getInstance().getEntityHelper().mapTrace(getLivingEntity(), 200); + EntityHelper.MapTraceResult mtr = NMSHandler.getEntityHelper().mapTrace(getLivingEntity(), 200); if (mtr != null) { double x = 0; double y = 0; @@ -1796,7 +1796,7 @@ else if (mtr.angle == BlockFace.EAST) { // Returns the entity's body yaw (separate from head yaw). // --> if (attribute.startsWith("body_yaw")) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().getBaseYaw(entity)) + return new ElementTag(NMSHandler.getEntityHelper().getBaseYaw(entity)) .getAttribute(attribute.fulfill(1)); } @@ -1852,7 +1852,7 @@ else if (mtr.angle == BlockFace.EAST) { // Returns the material of a fallingblock-type entity. // --> if (attribute.startsWith("fallingblock_material") && entity instanceof FallingBlock) { - return new MaterialTag(NMSHandler.getInstance().getEntityHelper().getBlockDataFor((FallingBlock) entity)) + return new MaterialTag(NMSHandler.getEntityHelper().getBlockDataFor((FallingBlock) entity)) .getAttribute(attribute.fulfill(1)); } @@ -2013,7 +2013,7 @@ else if (mtr.angle == BlockFace.EAST) { // Returns whether the animal entity is trying to with another of its kind. // --> if (attribute.startsWith("breeding") || attribute.startsWith("is_breeding")) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().isBreeding((Animals) getLivingEntity())) + return new ElementTag(NMSHandler.getEntityHelper().isBreeding((Animals) getLivingEntity())) .getAttribute(attribute.fulfill(1)); } @@ -2558,7 +2558,7 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("item_in_hand")) { - NMSHandler.getInstance().getEntityHelper().setItemInHand(getLivingEntity(), mechanism.valueAsType(ItemTag.class).getItemStack()); + NMSHandler.getEntityHelper().setItemInHand(getLivingEntity(), mechanism.valueAsType(ItemTag.class).getItemStack()); } // <--[mechanism] @@ -2572,7 +2572,7 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("item_in_offhand")) { - NMSHandler.getInstance().getEntityHelper().setItemInOffHand(getLivingEntity(), mechanism.valueAsType(ItemTag.class).getItemStack()); + NMSHandler.getEntityHelper().setItemInOffHand(getLivingEntity(), mechanism.valueAsType(ItemTag.class).getItemStack()); } // <--[mechanism] @@ -2723,7 +2723,7 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("breed") && mechanism.requireBoolean()) { - NMSHandler.getInstance().getEntityHelper().setBreeding((Animals) getLivingEntity(), mechanism.getValue().asBoolean()); + NMSHandler.getEntityHelper().setBreeding((Animals) getLivingEntity(), mechanism.getValue().asBoolean()); } // <--[mechanism] @@ -2987,7 +2987,7 @@ && getBukkitEntity() instanceof Sheep) { // Forces an entity to move in the direction of the velocity specified. // --> if (mechanism.matches("move") && mechanism.requireObject(LocationTag.class)) { - NMSHandler.getInstance().getEntityHelper().move(getBukkitEntity(), mechanism.valueAsType(LocationTag.class).toVector()); + NMSHandler.getEntityHelper().move(getBukkitEntity(), mechanism.valueAsType(LocationTag.class).toVector()); } // <--[mechanism] @@ -3001,7 +3001,7 @@ && getBukkitEntity() instanceof Sheep) { // --> if (mechanism.matches("interact_with") && mechanism.requireObject(LocationTag.class)) { LocationTag interactLocation = mechanism.valueAsType(LocationTag.class); - NMSHandler.getInstance().getEntityHelper().forceInteraction(getPlayer(), interactLocation); + NMSHandler.getEntityHelper().forceInteraction(getPlayer(), interactLocation); } // <--[mechanism] @@ -3108,7 +3108,7 @@ && getBukkitEntity() instanceof Sheep) { // Marks the entity as visible to players by default (if it was hidden). // --> if (mechanism.matches("show_to_players")) { - NMSHandler.getInstance().getEntityHelper().unhideEntity(null, getBukkitEntity()); + NMSHandler.getEntityHelper().unhideEntity(null, getBukkitEntity()); } // <--[mechanism] @@ -3119,7 +3119,7 @@ && getBukkitEntity() instanceof Sheep) { // Hides the entity from players by default. // --> if (mechanism.matches("hide_from_players")) { - NMSHandler.getInstance().getEntityHelper().hideEntity(null, getBukkitEntity(), false); + NMSHandler.getEntityHelper().hideEntity(null, getBukkitEntity(), false); } // <--[mechanism] diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java index d874eaa78b..61379571eb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java @@ -80,13 +80,13 @@ public static InventoryTag mirrorBukkitInventory(Inventory inventory) { // Iterate through offline player inventories for (Map.Entry inv : ImprovedOfflinePlayer.offlineInventories.entrySet()) { if (inv.getValue().equals(inventory)) { - return new InventoryTag(NMSHandler.getInstance().getPlayerHelper().getOfflineData(inv.getKey())); + return new InventoryTag(NMSHandler.getPlayerHelper().getOfflineData(inv.getKey())); } } // Iterate through offline player enderchests for (Map.Entry inv : ImprovedOfflinePlayer.offlineEnderChests.entrySet()) { if (inv.getValue().equals(inventory)) { - return new InventoryTag(NMSHandler.getInstance().getPlayerHelper().getOfflineData(inv.getKey()), true); + return new InventoryTag(NMSHandler.getPlayerHelper().getOfflineData(inv.getKey()), true); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java index abf8a4d15c..0c8bdbb627 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java @@ -522,7 +522,7 @@ public void setItemScript(ItemScriptContainer script) { return; } if (Settings.packetInterception()) { - setItemStack(NMSHandler.getInstance().getItemHelper().addNbtData(getItemStack(), "Denizen Item Script", new StringTag(script.getHashID()))); + setItemStack(NMSHandler.getItemHelper().addNbtData(getItemStack(), "Denizen Item Script", new StringTag(script.getHashID()))); } else { ItemMeta meta = item.getItemMeta(); @@ -898,7 +898,7 @@ public String run(Attribute attribute, ObjectTag object) { registerTag("json", new TagRunnable() { @Override public String run(Attribute attribute, ObjectTag object) { - return new ElementTag(NMSHandler.getInstance().getItemHelper().getJsonString(((ItemTag) object).item)) + return new ElementTag(NMSHandler.getItemHelper().getJsonString(((ItemTag) object).item)) .getAttribute(attribute.fulfill(1)); } }); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java index c28194b461..9d69d285f6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java @@ -382,9 +382,9 @@ public Block getBlock() { } public static BlockState getBlockStateFor(Block block) { - NMSHandler.getInstance().getChunkHelper().changeChunkServerThread(block.getWorld()); + NMSHandler.getChunkHelper().changeChunkServerThread(block.getWorld()); BlockState state = block.getState(); - NMSHandler.getInstance().getChunkHelper().restoreServerThread(block.getWorld()); + NMSHandler.getChunkHelper().restoreServerThread(block.getWorld()); return state; } @@ -999,7 +999,7 @@ public String getAttribute(Attribute attribute) { Debug.echoError("As of Minecraft version 1.13 potted flowers each have their own material, such as POTTED_CACTUS."); } else if (getBlock().getType() == Material.FLOWER_POT) { - MaterialData contents = NMSHandler.getInstance().getBlockHelper().getFlowerpotContents(getBlock()); + MaterialData contents = NMSHandler.getBlockHelper().getFlowerpotContents(getBlock()); return OldMaterialsHelper.getMaterialFrom(contents.getItemType(), contents.getData()) .getAttribute(attribute.fulfill(1)); } @@ -1031,7 +1031,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) { if (attribute.startsWith("skull_name")) { BlockState blockState = getBlockState(); if (blockState instanceof Skull) { - PlayerProfile profile = NMSHandler.getInstance().getBlockHelper().getPlayerProfile((Skull) blockState); + PlayerProfile profile = NMSHandler.getBlockHelper().getPlayerProfile((Skull) blockState); if (profile == null) { return null; } @@ -1053,7 +1053,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) { if (attribute.startsWith("skull_skin")) { BlockState blockState = getBlockState(); if (blockState instanceof Skull) { - PlayerProfile profile = NMSHandler.getInstance().getBlockHelper().getPlayerProfile((Skull) blockState); + PlayerProfile profile = NMSHandler.getBlockHelper().getPlayerProfile((Skull) blockState); if (profile == null) { return null; } @@ -1136,7 +1136,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) { double nx = xzLen * Math.sin(-getYaw() * (Math.PI / 180)); double ny = Math.sin(getPitch() * (Math.PI / 180)); double nz = xzLen * Math.cos(getYaw() * (Math.PI / 180)); - Location location = NMSHandler.getInstance().getEntityHelper().getImpactNormal(this, new Vector(nx, -ny, nz), range); + Location location = NMSHandler.getEntityHelper().getImpactNormal(this, new Vector(nx, -ny, nz), range); if (location != null) { return new LocationTag(location).getAttribute(attribute.fulfill(1)); } @@ -1161,7 +1161,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) { double nx = xzLen * Math.sin(-getYaw() * (Math.PI / 180)); double ny = Math.sin(getPitch() * (Math.PI / 180)); double nz = xzLen * Math.cos(getYaw() * (Math.PI / 180)); - Location location = NMSHandler.getInstance().getEntityHelper().rayTraceBlock(this, new Vector(nx, -ny, nz), range); + Location location = NMSHandler.getEntityHelper().rayTraceBlock(this, new Vector(nx, -ny, nz), range); if (location != null) { return new LocationTag(location.getBlock().getLocation()).getAttribute(attribute.fulfill(1)); } @@ -1186,7 +1186,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) { double nx = xzLen * Math.sin(-getYaw() * (Math.PI / 180)); double ny = Math.sin(getPitch() * (Math.PI / 180)); double nz = xzLen * Math.cos(getYaw() * (Math.PI / 180)); - Location location = NMSHandler.getInstance().getEntityHelper().rayTrace(this, new Vector(nx, -ny, nz), range); + Location location = NMSHandler.getEntityHelper().rayTrace(this, new Vector(nx, -ny, nz), range); if (location != null) { return new LocationTag(location).getAttribute(attribute.fulfill(1)); } @@ -1260,7 +1260,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) { if (attribute.startsWith("line_of_sight") && attribute.hasContext(1)) { LocationTag location = LocationTag.valueOf(attribute.getContext(1)); if (location != null) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().canTrace(getWorld(), toVector(), location.toVector())) + return new ElementTag(NMSHandler.getEntityHelper().canTrace(getWorld(), toVector(), location.toVector())) .getAttribute(attribute.fulfill(1)); } } @@ -1294,7 +1294,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) { // not the other way around LocationTag target = LocationTag.valueOf(attribute.getContext(1)); attribute = attribute.fulfill(1); - EntityHelper entityHelper = NMSHandler.getInstance().getEntityHelper(); + EntityHelper entityHelper = NMSHandler.getEntityHelper(); // <--[tag] // @attribute ].yaw> // @returns ElementTag(Decimal) @@ -1316,7 +1316,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) { } // Get a cardinal direction from this location's yaw else { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().getCardinal(getYaw())) + return new ElementTag(NMSHandler.getEntityHelper().getCardinal(getYaw())) .getAttribute(attribute.fulfill(1)); } } @@ -1331,7 +1331,7 @@ else if (getBlock().getType() == Material.FLOWER_POT) { if (attribute.startsWith("face") && attribute.hasContext(1)) { Location two = LocationTag.valueOf(attribute.getContext(1)); - return new LocationTag(NMSHandler.getInstance().getEntityHelper().faceLocation(this, two)) + return new LocationTag(NMSHandler.getEntityHelper().faceLocation(this, two)) .getAttribute(attribute.fulfill(1)); } @@ -1368,12 +1368,12 @@ else if (getBlock().getType() == Material.FLOWER_POT) { degrees = ArgumentHelper.getIntegerFrom(yaw); int pitchDegrees = ArgumentHelper.getIntegerFrom(pitch); if (LocationTag.matches(attribute.getContext(1))) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().isFacingLocation + return new ElementTag(NMSHandler.getEntityHelper().isFacingLocation (this, LocationTag.valueOf(attribute.getContext(1)), degrees, pitchDegrees)) .getAttribute(attribute.fulfill(attributePos)); } else if (EntityTag.matches(attribute.getContext(1))) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().isFacingLocation + return new ElementTag(NMSHandler.getEntityHelper().isFacingLocation (this, EntityTag.valueOf(attribute.getContext(1)) .getBukkitEntity().getLocation(), degrees, pitchDegrees)) .getAttribute(attribute.fulfill(attributePos)); @@ -1386,12 +1386,12 @@ else if (EntityTag.matches(attribute.getContext(1))) { } if (LocationTag.matches(attribute.getContext(1))) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().isFacingLocation + return new ElementTag(NMSHandler.getEntityHelper().isFacingLocation (this, LocationTag.valueOf(attribute.getContext(1)), degrees)) .getAttribute(attribute.fulfill(attributePos)); } else if (EntityTag.matches(attribute.getContext(1))) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().isFacingLocation + return new ElementTag(NMSHandler.getEntityHelper().isFacingLocation (this, EntityTag.valueOf(attribute.getContext(1)) .getBukkitEntity().getLocation(), degrees)) .getAttribute(attribute.fulfill(attributePos)); @@ -1444,7 +1444,7 @@ else if (context.split(",").length == 2) { // Returns the yaw as 'North', 'South', 'East', or 'West'. // --> if (attribute.startsWith("yaw.simple")) { - float yaw = NMSHandler.getInstance().getEntityHelper().normalizeYaw(getYaw()); + float yaw = NMSHandler.getEntityHelper().normalizeYaw(getYaw()); if (yaw < 45) { return new ElementTag("South") .getAttribute(attribute.fulfill(2)); @@ -1485,7 +1485,7 @@ else if (yaw < 315) { // Returns the normalized yaw of the object at the location. // --> if (attribute.startsWith("yaw")) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().normalizeYaw(getYaw())) + return new ElementTag(NMSHandler.getEntityHelper().normalizeYaw(getYaw())) .getAttribute(attribute.fulfill(1)); } @@ -2585,7 +2585,7 @@ public void adjust(Mechanism mechanism) { if (mechanism.matches("data") && mechanism.hasValue()) { Debug.echoError("Material ID and data magic number support is deprecated and WILL be removed in a future release."); - BlockData blockData = NMSHandler.getInstance().getBlockHelper().getBlockData(getBlock().getType(), (byte) mechanism.getValue().asInt()); + BlockData blockData = NMSHandler.getBlockHelper().getBlockData(getBlock().getType(), (byte) mechanism.getValue().asInt()); blockData.setBlock(getBlock(), false); } @@ -2735,7 +2735,7 @@ else if (blockState instanceof Skull) { if (texture != null) { // Ensure we didn't get overwritten profile.setTexture(texture); } - NMSHandler.getInstance().getBlockHelper().setPlayerProfile((Skull) blockState, profile); + NMSHandler.getBlockHelper().setPlayerProfile((Skull) blockState, profile); } else { Debug.echoError("Unable to set skull_skin on block of type " + material.name() + " with state " + blockState.getClass().getCanonicalName()); @@ -2760,7 +2760,7 @@ else if (blockState instanceof Skull) { } else if (getBlock().getType() == Material.FLOWER_POT) { MaterialData data = mechanism.valueAsType(MaterialTag.class).getMaterialData(); - NMSHandler.getInstance().getBlockHelper().setFlowerpotContents(getBlock(), data); + NMSHandler.getBlockHelper().setFlowerpotContents(getBlock(), data); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java index a6ee63e3fd..3ce33e6267 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java @@ -311,9 +311,9 @@ public Material getMaterial() { public BlockData getNmsBlockData() { if (modernData != null) { - return NMSHandler.getInstance().getBlockHelper().getBlockData(modernData); + return NMSHandler.getBlockHelper().getBlockData(modernData); } - return NMSHandler.getInstance().getBlockHelper().getBlockData(getMaterial(), getData((byte) 0)); + return NMSHandler.getBlockHelper().getBlockData(getMaterial(), getData((byte) 0)); } public String name() { @@ -726,11 +726,11 @@ public String run(Attribute attribute, ObjectTag object) { @Override public String run(Attribute attribute, ObjectTag object) { MaterialTag material = (MaterialTag) object; - if (!NMSHandler.getInstance().getBlockHelper().hasBlock(material.getMaterial())) { + if (!NMSHandler.getBlockHelper().hasBlock(material.getMaterial())) { Debug.echoError("Provided material does not have a placeable block."); return null; } - return new ElementTag(NMSHandler.getInstance().getBlockHelper().getBlockResistance(material.getMaterial())) + return new ElementTag(NMSHandler.getBlockHelper().getBlockResistance(material.getMaterial())) .getAttribute(attribute.fulfill(1)); } }); @@ -877,7 +877,7 @@ public String run(Attribute attribute, ObjectTag object) { registerTag("piston_reaction", new TagRunnable() { @Override public String run(Attribute attribute, ObjectTag object) { - String res = NMSHandler.getInstance().getBlockHelper().getPushReaction(((MaterialTag) object).material); + String res = NMSHandler.getBlockHelper().getPushReaction(((MaterialTag) object).material); if (res == null) { return null; } @@ -895,7 +895,7 @@ public String run(Attribute attribute, ObjectTag object) { registerTag("block_strength", new TagRunnable() { @Override public String run(Attribute attribute, ObjectTag object) { - float res = NMSHandler.getInstance().getBlockHelper().getBlockStength(((MaterialTag) object).material); + float res = NMSHandler.getBlockHelper().getBlockStength(((MaterialTag) object).material); return new ElementTag(res).getAttribute(attribute.fulfill(1)); } }); @@ -968,7 +968,7 @@ public void adjust(Mechanism mechanism) { // // --> if (!mechanism.isProperty && mechanism.matches("block_resistance") && mechanism.requireFloat()) { - if (!NMSHandler.getInstance().getBlockHelper().setBlockResistance(material, mechanism.getValue().asFloat())) { + if (!NMSHandler.getBlockHelper().setBlockResistance(material, mechanism.getValue().asFloat())) { Debug.echoError("Provided material does not have a placeable block."); } } @@ -986,7 +986,7 @@ public void adjust(Mechanism mechanism) { if (!material.isBlock()) { Debug.echoError("'block_strength' mechanism is only valid for block types."); } - NMSHandler.getInstance().getBlockHelper().setBlockStrength(material, mechanism.getValue().asFloat()); + NMSHandler.getBlockHelper().setBlockStrength(material, mechanism.getValue().asFloat()); } // <--[mechanism] @@ -1003,7 +1003,7 @@ public void adjust(Mechanism mechanism) { if (!material.isBlock()) { Debug.echoError("'piston_reaction' mechanism is only valid for block types."); } - NMSHandler.getInstance().getBlockHelper().setPushReaction(material, mechanism.getValue().asString().toUpperCase()); + NMSHandler.getBlockHelper().setPushReaction(material, mechanism.getValue().asString().toUpperCase()); } CoreUtilities.autoPropertyMechanism(this, mechanism); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java index bfca56d403..96ec28d0c0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java @@ -252,7 +252,7 @@ public OfflinePlayer getOfflinePlayer() { } public ImprovedOfflinePlayer getNBTEditor() { - return NMSHandler.getInstance().getPlayerHelper().getOfflineData(getOfflinePlayer()); + return NMSHandler.getPlayerHelper().getOfflineData(getOfflinePlayer()); } @Override @@ -583,7 +583,7 @@ public void setGameMode(GameMode mode) { } public boolean hasChunkLoaded(Chunk chunk) { - return NMSHandler.getInstance().getPlayerHelper().hasChunkLoaded(getPlayerEntity(), chunk); + return NMSHandler.getPlayerHelper().hasChunkLoaded(getPlayerEntity(), chunk); } @@ -1134,7 +1134,7 @@ else if (attribute.startsWith("uuid") && !isOnline()) // @mechanism PlayerTag.absorption_health // --> if (attribute.startsWith("absorption_health")) { - return new ElementTag(NMSHandler.getInstance().getPlayerHelper().getAbsorption(getPlayerEntity())) + return new ElementTag(NMSHandler.getPlayerHelper().getAbsorption(getPlayerEntity())) .getAttribute(attribute.fulfill(1)); } @@ -1656,7 +1656,7 @@ else if (isOnline()) { // Returns the amount of time that passed since the start of the attack cooldown. // --> if (attribute.startsWith("duration")) { - return new DurationTag((long) NMSHandler.getInstance().getPlayerHelper() + return new DurationTag((long) NMSHandler.getPlayerHelper() .ticksPassedDuringCooldown(getPlayerEntity())).getAttribute(attribute.fulfill(1)); } @@ -1671,7 +1671,7 @@ else if (isOnline()) { // cooldown progress. // --> else if (attribute.startsWith("max_duration")) { - return new DurationTag((long) NMSHandler.getInstance().getPlayerHelper() + return new DurationTag((long) NMSHandler.getPlayerHelper() .getMaxAttackCooldownTicks(getPlayerEntity())).getAttribute(attribute.fulfill(1)); } @@ -1685,7 +1685,7 @@ else if (attribute.startsWith("max_duration")) { // NOTE: This may not match exactly with the clientside attack cooldown indicator. // --> else if (attribute.startsWith("percent")) { - return new ElementTag(NMSHandler.getInstance().getPlayerHelper() + return new ElementTag(NMSHandler.getPlayerHelper() .getAttackCooldownPercent(getPlayerEntity()) * 100).getAttribute(attribute.fulfill(1)); } @@ -1963,7 +1963,7 @@ else if (foodLevel / maxHunger < 1) { // Returns the player's current ping. // --> if (attribute.startsWith("ping")) { - return new ElementTag(NMSHandler.getInstance().getPlayerHelper().getPing(getPlayerEntity())) + return new ElementTag(NMSHandler.getPlayerHelper().getPing(getPlayerEntity())) .getAttribute(attribute.fulfill(1)); } @@ -2234,7 +2234,7 @@ public void adjust(Mechanism mechanism) { // Forces the player to respawn if they are on the death screen. // --> if (mechanism.matches("respawn")) { - NMSHandler.getInstance().getPacketHelper().respawn(getPlayerEntity()); + NMSHandler.getPacketHelper().respawn(getPlayerEntity()); } // <--[mechanism] @@ -2248,10 +2248,10 @@ public void adjust(Mechanism mechanism) { // --> if (mechanism.matches("vision")) { if (mechanism.hasValue() && mechanism.requireEnum(false, EntityType.values())) { - NMSHandler.getInstance().getPacketHelper().setVision(getPlayerEntity(), EntityType.valueOf(mechanism.getValue().asString().toUpperCase())); + NMSHandler.getPacketHelper().setVision(getPlayerEntity(), EntityType.valueOf(mechanism.getValue().asString().toUpperCase())); } else { - NMSHandler.getInstance().getPacketHelper().forceSpectate(getPlayerEntity(), getPlayerEntity()); + NMSHandler.getPacketHelper().forceSpectate(getPlayerEntity(), getPlayerEntity()); } } @@ -2360,7 +2360,7 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("absorption_health") && mechanism.requireFloat()) { - NMSHandler.getInstance().getPlayerHelper().setAbsorption(getPlayerEntity(), mechanism.getValue().asFloat()); + NMSHandler.getPlayerHelper().setAbsorption(getPlayerEntity(), mechanism.getValue().asFloat()); } // <--[mechanism] @@ -2371,7 +2371,7 @@ public void adjust(Mechanism mechanism) { // Shows the player fake absorption health that persists on damage. // --> if (mechanism.matches("fake_absorption_health") && mechanism.requireFloat()) { - NMSHandler.getInstance().getPacketHelper().setFakeAbsorption(getPlayerEntity(), mechanism.getValue().asFloat()); + NMSHandler.getPacketHelper().setFakeAbsorption(getPlayerEntity(), mechanism.getValue().asFloat()); } // <--[mechanism] @@ -2426,7 +2426,7 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("redo_attack_cooldown")) { - NMSHandler.getInstance().getPlayerHelper().setAttackCooldown(getPlayerEntity(), 0); + NMSHandler.getPlayerHelper().setAttackCooldown(getPlayerEntity(), 0); } // <--[mechanism] @@ -2443,7 +2443,7 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("reset_attack_cooldown")) { - PlayerHelper playerHelper = NMSHandler.getInstance().getPlayerHelper(); + PlayerHelper playerHelper = NMSHandler.getPlayerHelper(); playerHelper.setAttackCooldown(getPlayerEntity(), Math.round(playerHelper.getMaxAttackCooldownTicks(getPlayerEntity()))); } @@ -2464,7 +2464,7 @@ public void adjust(Mechanism mechanism) { float percent = mechanism.getValue().asFloat(); System.out.println(percent + " >> " + (percent >= 0 && percent <= 1)); if (percent >= 0 && percent <= 1) { - PlayerHelper playerHelper = NMSHandler.getInstance().getPlayerHelper(); + PlayerHelper playerHelper = NMSHandler.getPlayerHelper(); playerHelper.setAttackCooldown(getPlayerEntity(), Math.round(playerHelper.getMaxAttackCooldownTicks(getPlayerEntity()) * mechanism.getValue().asFloat())); } @@ -2487,7 +2487,7 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("attack_cooldown") && mechanism.requireObject(DurationTag.class)) { - NMSHandler.getInstance().getPlayerHelper().setAttackCooldown(getPlayerEntity(), + NMSHandler.getPlayerHelper().setAttackCooldown(getPlayerEntity(), mechanism.getValue().asType(DurationTag.class).getTicksAsInt()); } @@ -2813,7 +2813,7 @@ public void adjust(Mechanism mechanism) { // Shows the player a previously hidden entity. // --> if (mechanism.matches("show_entity") && mechanism.requireObject(EntityTag.class)) { - NMSHandler.getInstance().getEntityHelper().unhideEntity(getPlayerEntity(), mechanism.valueAsType(EntityTag.class).getBukkitEntity()); + NMSHandler.getEntityHelper().unhideEntity(getPlayerEntity(), mechanism.valueAsType(EntityTag.class).getBukkitEntity()); } // <--[mechanism] @@ -2833,11 +2833,11 @@ public void adjust(Mechanism mechanism) { Debug.echoError("Can't hide the unspawned entity '" + split[0] + "'!"); } else if (split.length > 1 && new ElementTag(split[1]).isBoolean()) { - NMSHandler.getInstance().getEntityHelper().hideEntity(getPlayerEntity(), entity.getBukkitEntity(), + NMSHandler.getEntityHelper().hideEntity(getPlayerEntity(), entity.getBukkitEntity(), new ElementTag(split[1]).asBoolean()); } else { - NMSHandler.getInstance().getEntityHelper().hideEntity(getPlayerEntity(), entity.getBukkitEntity(), false); + NMSHandler.getEntityHelper().hideEntity(getPlayerEntity(), entity.getBukkitEntity(), false); } } else { @@ -2897,11 +2897,11 @@ else if (split.length > 1 && new ElementTag(split[1]).isBoolean()) { String[] split = mechanism.getValue().asString().split("[\\|" + ListTag.internal_escape + "]", 2); if (split.length > 0 && new ElementTag(split[0]).isFloat()) { if (split.length > 1 && new ElementTag(split[1]).isInt()) { - NMSHandler.getInstance().getPacketHelper().showExperience(getPlayerEntity(), + NMSHandler.getPacketHelper().showExperience(getPlayerEntity(), new ElementTag(split[0]).asFloat(), new ElementTag(split[1]).asInt()); } else { - NMSHandler.getInstance().getPacketHelper().showExperience(getPlayerEntity(), + NMSHandler.getPacketHelper().showExperience(getPlayerEntity(), new ElementTag(split[0]).asFloat(), getPlayerEntity().getLevel()); } } @@ -2910,7 +2910,7 @@ else if (split.length > 1 && new ElementTag(split[1]).isBoolean()) { } } else { - NMSHandler.getInstance().getPacketHelper().resetExperience(getPlayerEntity()); + NMSHandler.getPacketHelper().resetExperience(getPlayerEntity()); } } @@ -2936,16 +2936,16 @@ else if (split.length > 1 && new ElementTag(split[1]).isBoolean()) { if (split.length > 0 && new ElementTag(split[0]).isFloat()) { if (split.length > 1 && new ElementTag(split[1]).isInt()) { if (split.length > 2 && new ElementTag(split[2]).isFloat()) { - NMSHandler.getInstance().getPacketHelper().showHealth(getPlayerEntity(), new ElementTag(split[0]).asFloat(), + NMSHandler.getPacketHelper().showHealth(getPlayerEntity(), new ElementTag(split[0]).asFloat(), new ElementTag(split[1]).asInt(), new ElementTag(split[2]).asFloat()); } else { - NMSHandler.getInstance().getPacketHelper().showHealth(getPlayerEntity(), new ElementTag(split[0]).asFloat(), + NMSHandler.getPacketHelper().showHealth(getPlayerEntity(), new ElementTag(split[0]).asFloat(), new ElementTag(split[1]).asInt(), getPlayerEntity().getSaturation()); } } else { - NMSHandler.getInstance().getPacketHelper().showHealth(getPlayerEntity(), new ElementTag(split[0]).asFloat(), + NMSHandler.getPacketHelper().showHealth(getPlayerEntity(), new ElementTag(split[0]).asFloat(), getPlayerEntity().getFoodLevel(), getPlayerEntity().getSaturation()); } } @@ -2954,7 +2954,7 @@ else if (split.length > 1 && new ElementTag(split[1]).isBoolean()) { } } else { - NMSHandler.getInstance().getPacketHelper().resetHealth(getPlayerEntity()); + NMSHandler.getPacketHelper().resetHealth(getPlayerEntity()); } } @@ -2985,7 +2985,7 @@ else if (split.length > 1 && new ElementTag(split[1]).isBoolean()) { else if (slot.equals("BOOTS")) { slot = "FEET"; } - NMSHandler.getInstance().getPacketHelper().showEquipment(getPlayerEntity(), + NMSHandler.getPacketHelper().showEquipment(getPlayerEntity(), new ElementTag(split[0]).asType(EntityTag.class, mechanism.context).getLivingEntity(), EquipmentSlot.valueOf(slot), new ElementTag(split[2]).asType(ItemTag.class, mechanism.context).getItemStack()); @@ -2998,7 +2998,7 @@ else if (split.length > 1) { Debug.echoError("'" + split[1] + "' is not a valid slot; must be HAND, OFF_HAND, BOOTS, LEGS, CHEST, or HEAD!"); } else { - NMSHandler.getInstance().getPacketHelper().resetEquipment(getPlayerEntity(), + NMSHandler.getPacketHelper().resetEquipment(getPlayerEntity(), new ElementTag(split[0]).asType(EntityTag.class, mechanism.context).getLivingEntity()); } } @@ -3019,10 +3019,10 @@ else if (split.length > 1) { // --> if (mechanism.matches("fov_multiplier")) { if (mechanism.hasValue() && mechanism.requireFloat()) { - NMSHandler.getInstance().getPacketHelper().setFieldOfView(getPlayerEntity(), mechanism.getValue().asFloat()); + NMSHandler.getPacketHelper().setFieldOfView(getPlayerEntity(), mechanism.getValue().asFloat()); } else { - NMSHandler.getInstance().getPacketHelper().setFieldOfView(getPlayerEntity(), Float.NaN); + NMSHandler.getPacketHelper().setFieldOfView(getPlayerEntity(), Float.NaN); } } @@ -3046,7 +3046,7 @@ else if (split.length > 1) { // Shows the player the end credits. // --> if (mechanism.matches("show_endcredits")) { - NMSHandler.getInstance().getPlayerHelper().showEndCredits(getPlayerEntity()); + NMSHandler.getPlayerHelper().showEndCredits(getPlayerEntity()); } // <--[mechanism] @@ -3057,7 +3057,7 @@ else if (split.length > 1) { // Shows the player the demo screen. // --> if (mechanism.matches("show_demo")) { - NMSHandler.getInstance().getPacketHelper().showDemoScreen(getPlayerEntity()); + NMSHandler.getPacketHelper().showDemoScreen(getPlayerEntity()); } // <--[mechanism] @@ -3071,7 +3071,7 @@ else if (split.length > 1) { // (i.e. - adjust "spectate:") // --> if (mechanism.matches("spectate") && mechanism.requireObject(EntityTag.class)) { - NMSHandler.getInstance().getPacketHelper().forceSpectate(getPlayerEntity(), mechanism.valueAsType(EntityTag.class).getBukkitEntity()); + NMSHandler.getPacketHelper().forceSpectate(getPlayerEntity(), mechanism.valueAsType(EntityTag.class).getBukkitEntity()); } // <--[mechanism] @@ -3084,7 +3084,7 @@ else if (split.length > 1) { // without the player closing the book. // --> if (mechanism.matches("open_book")) { - NMSHandler.getInstance().getPacketHelper().openBook(getPlayerEntity(), EquipmentSlot.HAND); + NMSHandler.getPacketHelper().openBook(getPlayerEntity(), EquipmentSlot.HAND); } // <--[mechanism] @@ -3097,7 +3097,7 @@ else if (split.length > 1) { // without the player closing the book. // --> if (mechanism.matches("open_offhand_book")) { - NMSHandler.getInstance().getPacketHelper().openBook(getPlayerEntity(), EquipmentSlot.OFF_HAND); + NMSHandler.getPacketHelper().openBook(getPlayerEntity(), EquipmentSlot.OFF_HAND); } // <--[mechanism] @@ -3114,10 +3114,10 @@ else if (split.length > 1) { Debug.echoError("show_book mechanism must have a book as input."); return; } - NMSHandler.getInstance().getPacketHelper().showEquipment(getPlayerEntity(), getPlayerEntity(), + NMSHandler.getPacketHelper().showEquipment(getPlayerEntity(), getPlayerEntity(), EquipmentSlot.OFF_HAND, book.getItemStack()); - NMSHandler.getInstance().getPacketHelper().openBook(getPlayerEntity(), EquipmentSlot.OFF_HAND); - NMSHandler.getInstance().getPacketHelper().showEquipment(getPlayerEntity(), getPlayerEntity(), + NMSHandler.getPacketHelper().openBook(getPlayerEntity(), EquipmentSlot.OFF_HAND); + NMSHandler.getPacketHelper().showEquipment(getPlayerEntity(), getPlayerEntity(), EquipmentSlot.OFF_HAND, getPlayerEntity().getEquipment().getItemInOffHand()); } @@ -3130,7 +3130,7 @@ else if (split.length > 1) { // sign, see <@link command Sign>. // --> if (mechanism.matches("edit_sign") && mechanism.requireObject(LocationTag.class)) { - if (!NMSHandler.getInstance().getPacketHelper().showSignEditor(getPlayerEntity(), mechanism.valueAsType(LocationTag.class))) { + if (!NMSHandler.getPacketHelper().showSignEditor(getPlayerEntity(), mechanism.valueAsType(LocationTag.class))) { Debug.echoError("Can't edit non-sign materials!"); } } @@ -3153,14 +3153,14 @@ else if (split.length > 1) { if (split.length > 1) { footer = split[1]; } - NMSHandler.getInstance().getPacketHelper().showTabListHeaderFooter(getPlayerEntity(), header, footer); + NMSHandler.getPacketHelper().showTabListHeaderFooter(getPlayerEntity(), header, footer); } else { Debug.echoError("Must specify a header and footer to show!"); } } else { - NMSHandler.getInstance().getPacketHelper().resetTabListHeaderFooter(getPlayerEntity()); + NMSHandler.getPacketHelper().resetTabListHeaderFooter(getPlayerEntity()); } } @@ -3225,7 +3225,7 @@ else if (split.length > 1) { Debug.echoError("Could not apply base color to banner: " + split[1]); return; } - NMSHandler.getInstance().getPacketHelper().showBannerUpdate(getPlayerEntity(), location, base, patterns); + NMSHandler.getPacketHelper().showBannerUpdate(getPlayerEntity(), location, base, patterns); } else { Debug.echoError("Must specify a valid location and a base color!"); @@ -3265,7 +3265,7 @@ else if (split.length > 1) { // Sends the player text in the action bar. // --> if (mechanism.matches("action_bar")) { - NMSHandler.getInstance().getPacketHelper().sendActionBarMessage(getPlayerEntity(), mechanism.getValue().asString()); + NMSHandler.getPacketHelper().sendActionBarMessage(getPlayerEntity(), mechanism.getValue().asString()); } // <--[mechanism] @@ -3276,7 +3276,7 @@ else if (split.length > 1) { // Updates the player's client-side advancements to match their server data. // --> if (mechanism.matches("update_advancements")) { - NMSHandler.getInstance().getAdvancementHelper().update(getPlayerEntity()); + NMSHandler.getAdvancementHelper().update(getPlayerEntity()); } // <--[mechanism] diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java index d3adc45580..faf32b2b0b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java @@ -49,7 +49,7 @@ private EntityAI(EntityTag ent) { @Override public String getPropertyString() { - return String.valueOf(!NMSHandler.getInstance().getEntityHelper().isAIDisabled(entity.getBukkitEntity())); + return String.valueOf(!NMSHandler.getEntityHelper().isAIDisabled(entity.getBukkitEntity())); } @Override @@ -78,7 +78,7 @@ public String getAttribute(Attribute attribute) { // AI to roam and look around. // --> if (attribute.startsWith("has_ai")) { - return new ElementTag(!NMSHandler.getInstance().getEntityHelper().isAIDisabled(entity.getBukkitEntity())) + return new ElementTag(!NMSHandler.getEntityHelper().isAIDisabled(entity.getBukkitEntity())) .getAttribute(attribute.fulfill(1)); } @@ -100,7 +100,7 @@ public void adjust(Mechanism mechanism) { // // --> if ((mechanism.matches("has_ai") || mechanism.matches("toggle_ai")) && mechanism.requireBoolean()) { - NMSHandler.getInstance().getEntityHelper().toggleAI(entity.getBukkitEntity(), mechanism.getValue().asBoolean()); + NMSHandler.getEntityHelper().toggleAI(entity.getBukkitEntity(), mechanism.getValue().asBoolean()); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArrowDamage.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArrowDamage.java index a2c043c3c9..7e1b38a957 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArrowDamage.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArrowDamage.java @@ -47,7 +47,7 @@ private EntityArrowDamage(EntityTag entity) { @Override public String getPropertyString() { - return String.valueOf(NMSHandler.getInstance().getEntityHelper().getArrowDamage(dentity.getBukkitEntity())); + return String.valueOf(NMSHandler.getEntityHelper().getArrowDamage(dentity.getBukkitEntity())); } @Override @@ -76,7 +76,7 @@ public String getAttribute(Attribute attribute) { // NOTE: The actual damage dealt by the arrow/trident may be different depending on the projectile's flight speed. // --> if (attribute.startsWith("damage")) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().getArrowDamage(dentity.getBukkitEntity())) + return new ElementTag(NMSHandler.getEntityHelper().getArrowDamage(dentity.getBukkitEntity())) .getAttribute(attribute.fulfill(1)); } @@ -97,7 +97,7 @@ public void adjust(Mechanism mechanism) { // --> if (mechanism.matches("damage") && mechanism.requireDouble()) { - NMSHandler.getInstance().getEntityHelper().setArrowDamage(dentity.getBukkitEntity(), mechanism.getValue().asDouble()); + NMSHandler.getEntityHelper().setArrowDamage(dentity.getBukkitEntity(), mechanism.getValue().asDouble()); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBodyArrows.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBodyArrows.java index fae5f9818f..3b30c8bc1d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBodyArrows.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBodyArrows.java @@ -46,11 +46,11 @@ private EntityBodyArrows(EntityTag entity) { /////// private int getBodyArrows() { - return NMSHandler.getInstance().getEntityHelper().getBodyArrows(entity.getBukkitEntity()); + return NMSHandler.getEntityHelper().getBodyArrows(entity.getBukkitEntity()); } private void setBodyArrows(int numArrows) { - NMSHandler.getInstance().getEntityHelper().setBodyArrows(entity.getBukkitEntity(), numArrows); + NMSHandler.getEntityHelper().setBodyArrows(entity.getBukkitEntity(), numArrows); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java index 267b9ba913..0134c81809 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java @@ -59,7 +59,7 @@ private EntityBoundingBox(EntityTag entity) { EntityTag entity; private ListTag getBoundingBox() { - BoundingBox boundingBox = NMSHandler.getInstance().getEntityHelper().getBoundingBox(entity.getBukkitEntity()); + BoundingBox boundingBox = NMSHandler.getEntityHelper().getBoundingBox(entity.getBukkitEntity()); ListTag list = new ListTag(); list.add(new LocationTag(boundingBox.getLow().toLocation(entity.getWorld())).identify()); list.add(new LocationTag(boundingBox.getHigh().toLocation(entity.getWorld())).identify()); @@ -128,7 +128,7 @@ public void adjust(Mechanism mechanism) { List locations = mechanism.valueAsType(ListTag.class).filter(LocationTag.class, mechanism.context); if (locations.size() == 2) { BoundingBox boundingBox = new BoundingBox(locations.get(0).toVector(), locations.get(1).toVector()); - NMSHandler.getInstance().getEntityHelper().setBoundingBox(entity.getBukkitEntity(), boundingBox); + NMSHandler.getEntityHelper().setBoundingBox(entity.getBukkitEntity(), boundingBox); modifiedBoxes.add(entity.getUUID()); } else { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityChestCarrier.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityChestCarrier.java index eedf7e218a..3b3c32ac24 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityChestCarrier.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityChestCarrier.java @@ -12,7 +12,7 @@ public class EntityChestCarrier implements Property { public static boolean describes(ObjectTag entity) { return entity instanceof EntityTag - && NMSHandler.getInstance().getEntityHelper().isChestedHorse(((EntityTag) entity).getBukkitEntity()); + && NMSHandler.getEntityHelper().isChestedHorse(((EntityTag) entity).getBukkitEntity()); } public static EntityChestCarrier getFrom(ObjectTag entity) { @@ -49,7 +49,7 @@ private EntityChestCarrier(EntityTag entity) { @Override public String getPropertyString() { - return NMSHandler.getInstance().getEntityHelper().isCarryingChest(entity.getBukkitEntity()) ? "true" : "false"; + return NMSHandler.getEntityHelper().isCarryingChest(entity.getBukkitEntity()) ? "true" : "false"; } @Override @@ -77,7 +77,7 @@ public String getAttribute(Attribute attribute) { // If the entity is a horse, returns whether it is carrying a chest. // --> if (attribute.startsWith("carries_chest")) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().isCarryingChest(entity.getBukkitEntity())) + return new ElementTag(NMSHandler.getEntityHelper().isCarryingChest(entity.getBukkitEntity())) .getAttribute(attribute.fulfill(1)); } @@ -98,7 +98,7 @@ public void adjust(Mechanism mechanism) { // --> if (mechanism.matches("carries_chest") && mechanism.requireBoolean()) { - NMSHandler.getInstance().getEntityHelper().setCarryingChest(entity.getBukkitEntity(), mechanism.getValue().asBoolean()); + NMSHandler.getEntityHelper().setCarryingChest(entity.getBukkitEntity(), mechanism.getValue().asBoolean()); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java index 4c4ceb2ee2..c4ed88e2ed 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java @@ -123,7 +123,7 @@ public void adjust(Mechanism mechanism) { .asType(ItemTag.class, mechanism.context).getItemStack()); } else { - NMSHandler.getInstance().getEntityHelper().setCarriedItem((Enderman) item.getBukkitEntity(), + NMSHandler.getEntityHelper().setCarriedItem((Enderman) item.getBukkitEntity(), mechanism.valueAsType(ItemTag.class).getItemStack()); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPickupStatus.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPickupStatus.java index 6dfacdc0c8..d7ee552a50 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPickupStatus.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityPickupStatus.java @@ -47,7 +47,7 @@ private EntityPickupStatus(EntityTag entity) { @Override public String getPropertyString() { - return NMSHandler.getInstance().getEntityHelper().getArrowPickupStatus(dentity.getBukkitEntity()); + return NMSHandler.getEntityHelper().getArrowPickupStatus(dentity.getBukkitEntity()); } @Override @@ -75,7 +75,7 @@ public String getAttribute(Attribute attribute) { // If the entity is an arrow or trident, returns the pickup status of the arrow/trident. // --> if (attribute.startsWith("pickup_status")) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().getArrowPickupStatus(dentity.getBukkitEntity())) + return new ElementTag(NMSHandler.getEntityHelper().getArrowPickupStatus(dentity.getBukkitEntity())) .getAttribute(attribute.fulfill(1)); } @@ -97,7 +97,7 @@ public void adjust(Mechanism mechanism) { // --> if (mechanism.matches("pickup_status")) { - NMSHandler.getInstance().getEntityHelper().setArrowPickupStatus(dentity.getBukkitEntity(), mechanism.getValue().asString().toUpperCase()); + NMSHandler.getEntityHelper().setArrowPickupStatus(dentity.getBukkitEntity(), mechanism.getValue().asString().toUpperCase()); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRiptide.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRiptide.java index a5f0504b8b..9f1ee323d0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRiptide.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRiptide.java @@ -93,7 +93,7 @@ public void adjust(Mechanism mechanism) { if (mechanism.matches("is_using_riptide") && mechanism.requireBoolean()) { boolean shouldRiptide = mechanism.getValue().asBoolean(); if (shouldRiptide != entity.getLivingEntity().isRiptiding()) { - NMSHandler.getInstance().getEntityHelper().setRiptide(entity.getBukkitEntity(), shouldRiptide); + NMSHandler.getEntityHelper().setRiptide(entity.getBukkitEntity(), shouldRiptide); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java index d19a96bb98..2b1a871249 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java @@ -48,7 +48,7 @@ private EntitySilent(EntityTag ent) { @Override public String getPropertyString() { - return NMSHandler.getInstance().getEntityHelper().isSilent(entity.getBukkitEntity()) ? "true" : null; + return NMSHandler.getEntityHelper().isSilent(entity.getBukkitEntity()) ? "true" : null; } @Override @@ -76,7 +76,7 @@ public String getAttribute(Attribute attribute) { // Returns whether the entity is silent. (Plays no sounds) // --> if (attribute.startsWith("silent")) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().isSilent(entity.getBukkitEntity())) + return new ElementTag(NMSHandler.getEntityHelper().isSilent(entity.getBukkitEntity())) .getAttribute(attribute.fulfill(1)); } @@ -97,7 +97,7 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("silent") && mechanism.requireBoolean()) { - NMSHandler.getInstance().getEntityHelper().setSilent(entity.getBukkitEntity(), mechanism.getValue().asBoolean()); + NMSHandler.getEntityHelper().setSilent(entity.getBukkitEntity(), mechanism.getValue().asBoolean()); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java index 2bbebd29c2..4d107135a4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java @@ -78,7 +78,7 @@ public String getPropertyId() { public ElementTag getSpeed() { if (entity.isLivingEntity()) { - return new ElementTag(NMSHandler.getInstance().getEntityHelper().getSpeed(entity.getBukkitEntity())); + return new ElementTag(NMSHandler.getEntityHelper().getSpeed(entity.getBukkitEntity())); } else { EntityType entityType = entity.getBukkitEntityType(); @@ -141,7 +141,7 @@ public void adjust(Mechanism mechanism) { if (mechanism.matches("speed") && mechanism.requireDouble()) { double value = mechanism.getValue().asDouble(); if (entity.isLivingEntity()) { - NMSHandler.getInstance().getEntityHelper().setSpeed(entity.getBukkitEntity(), value); + NMSHandler.getEntityHelper().setSpeed(entity.getBukkitEntity(), value); } else { EntityType entityType = entity.getBukkitEntityType(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java index 7e6d5516dc..248eee23c0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java @@ -337,7 +337,7 @@ public void adjust(Mechanism mechanism) { meta.setColor(ColorTag.valueOf(d1[3].replace("&comma", ",")).getColor()); } meta.clearCustomEffects(); - ItemHelper itemHelper = NMSHandler.getInstance().getItemHelper(); + ItemHelper itemHelper = NMSHandler.getItemHelper(); for (int i = 1; i < data.size(); i++) { String[] d2 = data.get(i).split(","); PotionEffectType type = PotionEffectType.getByName(d2[0].toUpperCase()); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java index fe800c9906..6b79c2482a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java @@ -113,7 +113,7 @@ public boolean isCorrectDurability() { @Override public String getPropertyString() { if (isCorrectDurability()) { - PlayerProfile playerProfile = NMSHandler.getInstance().getItemHelper().getSkullSkin(item.getItemStack()); + PlayerProfile playerProfile = NMSHandler.getItemHelper().getSkullSkin(item.getItemStack()); if (playerProfile != null) { String name = playerProfile.getName(); UUID uuid = playerProfile.getUniqueId(); @@ -173,7 +173,7 @@ public void adjust(Mechanism mechanism) { if (texture != null) { // Ensure we didn't get overwritten profile.setTexture(texture); } - item.setItemStack(NMSHandler.getInstance().getItemHelper().setSkullSkin(item.getItemStack(), profile)); + item.setItemStack(NMSHandler.getItemHelper().setSkullSkin(item.getItemStack(), profile)); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java index a40ece007c..9b13115cd5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java @@ -58,7 +58,7 @@ public class AnimateCommand extends AbstractCommand { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - AnimationHelper animationHelper = NMSHandler.getInstance().getAnimationHelper(); + AnimationHelper animationHelper = NMSHandler.getAnimationHelper(); for (Argument arg : scriptEntry.getProcessedArgs()) { @@ -132,7 +132,7 @@ else if (effect != null) { entity.getBukkitEntity().playEffect(effect); } else { - EntityAnimation entityAnimation = NMSHandler.getInstance().getAnimationHelper().getEntityAnimation(nmsAnimation); + EntityAnimation entityAnimation = NMSHandler.getAnimationHelper().getEntityAnimation(nmsAnimation); entityAnimation.play(entity.getBukkitEntity()); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java index d5079a5089..2bed1f88ac 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java @@ -235,7 +235,7 @@ else if (livingEntity.getType() == EntityType.PIG) { else { if (equipment.get("hand") != null) { - NMSHandler.getInstance().getEntityHelper().setItemInHand(livingEntity, equipment.get("hand").getItemStack()); + NMSHandler.getEntityHelper().setItemInHand(livingEntity, equipment.get("hand").getItemStack()); } if (equipment.get("head") != null) { livingEntity.getEquipment().setHelmet(equipment.get("head").getItemStack()); @@ -250,7 +250,7 @@ else if (livingEntity.getType() == EntityType.PIG) { livingEntity.getEquipment().setBoots(equipment.get("boots").getItemStack()); } if (equipment.get("offhand") != null) { - NMSHandler.getInstance().getEntityHelper().setItemInOffHand(livingEntity, equipment.get("offhand").getItemStack()); + NMSHandler.getEntityHelper().setItemInOffHand(livingEntity, equipment.get("offhand").getItemStack()); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java index 4424e87de2..b8c17cae79 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java @@ -257,9 +257,9 @@ public void run() { // To avoid excessive turbulence, only have the entity rotate // when it really needs to - if (!NMSHandler.getInstance().getEntityHelper().isFacingLocation(entity, location, rotationThreshold)) { + if (!NMSHandler.getEntityHelper().isFacingLocation(entity, location, rotationThreshold)) { - NMSHandler.getInstance().getEntityHelper().faceLocation(entity, location); + NMSHandler.getEntityHelper().faceLocation(entity, location); } Vector v1 = entity.getLocation().toVector(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java index 7be35d555d..505b484ab2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java @@ -140,10 +140,10 @@ public void execute(ScriptEntry scriptEntry) { } else { if (stop.asBoolean()) { - NMSHandler.getInstance().getEntityHelper().stopFollowing(entity.getBukkitEntity()); + NMSHandler.getEntityHelper().stopFollowing(entity.getBukkitEntity()); } else { - NMSHandler.getInstance().getEntityHelper().follow(target.getBukkitEntity(), entity.getBukkitEntity(), + NMSHandler.getEntityHelper().follow(target.getBukkitEntity(), entity.getBukkitEntity(), speed != null ? speed.asDouble() : 0.3, lead != null ? lead.asDouble() : 5, maxRange != null ? maxRange.asDouble() : 8, allowWander.asBoolean()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java index 708c9c6048..99f5b4d83c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java @@ -97,7 +97,7 @@ public void execute(ScriptEntry scriptEntry) { for (EntityTag entity : entities) { if (entity.isSpawned()) { - NMSHandler.getInstance().getEntityHelper().faceLocation(entity.getBukkitEntity(), loc); + NMSHandler.getEntityHelper().faceLocation(entity.getBukkitEntity(), loc); } } if (duration != null && duration.getTicks() > 2) { @@ -112,7 +112,7 @@ public void run() { } for (EntityTag entity : entities) { if (entity.isSpawned()) { - NMSHandler.getInstance().getEntityHelper().faceLocation(entity.getBukkitEntity(), loc); + NMSHandler.getEntityHelper().faceLocation(entity.getBukkitEntity(), loc); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java index ed2fcba871..79ac6f4f01 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java @@ -221,7 +221,7 @@ public void execute(final ScriptEntry scriptEntry) { entityList.add(entity.toString()); if (!no_rotate) { - NMSHandler.getInstance().getEntityHelper().faceLocation(entity.getBukkitEntity(), destination); + NMSHandler.getEntityHelper().faceLocation(entity.getBukkitEntity(), destination); } // If the current entity is a projectile, set its shooter @@ -279,7 +279,7 @@ public void run() { // Check if the entity has collided with something // using the most basic possible calculation - BlockHelper blockHelper = NMSHandler.getInstance().getBlockHelper(); + BlockHelper blockHelper = NMSHandler.getBlockHelper(); if (!blockHelper.isSafeBlock(lastEntity.getLocation().add(v3).getBlock().getType()) || !blockHelper.isSafeBlock(lastEntity.getLocation().add(newVel).getBlock().getType())) { runs = maxTicks; diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java index 829ab5b61f..184311d6b5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java @@ -179,8 +179,8 @@ public void run() { else if (infinite || ticks < maxTicks) { for (EntityTag entity : entities) { if (entity.isSpawned() && rotatingEntities.contains(entity.getUUID())) { - NMSHandler.getInstance().getEntityHelper().rotate(entity.getBukkitEntity(), - NMSHandler.getInstance().getEntityHelper().normalizeYaw(entity.getLocation().getYaw() + yaw.asFloat()), + NMSHandler.getEntityHelper().rotate(entity.getBukkitEntity(), + NMSHandler.getEntityHelper().normalizeYaw(entity.getLocation().getYaw() + yaw.asFloat()), entity.getLocation().getPitch() + pitch.asFloat()); } else { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java index 57b2661037..cc6d5bbf4c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java @@ -255,7 +255,7 @@ public void execute(final ScriptEntry scriptEntry) { entityList.addObject(entity); if (!no_rotate) { - NMSHandler.getInstance().getEntityHelper().faceLocation(entity.getBukkitEntity(), destination); + NMSHandler.getEntityHelper().faceLocation(entity.getBukkitEntity(), destination); } // If the current entity is a projectile, set its shooter diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java index dbcaaeee2b..d7998be910 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java @@ -189,11 +189,11 @@ public Location apply(Navigator nav) { } } else if (shouldStop) { - NMSHandler.getInstance().getEntityHelper().stopWalking(entity.getBukkitEntity()); + NMSHandler.getEntityHelper().stopWalking(entity.getBukkitEntity()); } else { waitForEntities.add(entity); - NMSHandler.getInstance().getEntityHelper().walkTo(entity.getBukkitEntity(), loc, speed != null ? speed.asDouble() : 0.2, + NMSHandler.getEntityHelper().walkTo(entity.getBukkitEntity(), loc, speed != null ? speed.asDouble() : 0.2, new Runnable() { @Override public void run() { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/FakeItemCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/FakeItemCommand.java index 3b196998e7..8c8bc092a9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/FakeItemCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/FakeItemCommand.java @@ -117,7 +117,7 @@ public void execute(ScriptEntry scriptEntry) { } final boolean playerOnly = player_only.asBoolean(); - final PacketHelper packetHelper = NMSHandler.getInstance().getPacketHelper(); + final PacketHelper packetHelper = NMSHandler.getPacketHelper(); for (ItemTag item : items) { if (item == null) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ActionBarCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ActionBarCommand.java index 141ef51e56..1cd1a1c59c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ActionBarCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ActionBarCommand.java @@ -110,7 +110,7 @@ public void execute(ScriptEntry scriptEntry) { for (PlayerTag player : targets) { if (player.isValid() && player.isOnline()) { - NMSHandler.getInstance().getPacketHelper().sendActionBarMessage(player.getPlayerEntity(), text.asString()); + NMSHandler.getPacketHelper().sendActionBarMessage(player.getPlayerEntity(), text.asString()); } else { Debug.echoError(scriptEntry.getResidingQueue(), "Tried to send action bar message to non-existent or offline player!"); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java index 01458e7585..028ed5a2e9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java @@ -199,7 +199,7 @@ public void execute(ScriptEntry scriptEntry) { + frame.debug() + toast.debug() + announce.debug() + hidden.debug() + x.debug() + y.debug()); } - final AdvancementHelper advancementHelper = NMSHandler.getInstance().getAdvancementHelper(); + final AdvancementHelper advancementHelper = NMSHandler.getAdvancementHelper(); NamespacedKey key = new NamespacedKey(DenizenAPI.getCurrentInstance(), id.asString()); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java index fe373839ad..96afe81cf8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java @@ -122,7 +122,7 @@ public void execute(ScriptEntry scriptEntry) { boolean stackVal = stack.asBoolean(); - PacketHelper packetHelper = NMSHandler.getInstance().getPacketHelper(); + PacketHelper packetHelper = NMSHandler.getPacketHelper(); for (PlayerTag player : players) { if (!player.isOnline()) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TitleCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TitleCommand.java index c93dac57f7..ed21081d6a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TitleCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TitleCommand.java @@ -106,7 +106,7 @@ public void execute(ScriptEntry scriptEntry) { for (PlayerTag player : targets) { if (player.isValid() && player.isOnline()) { - NMSHandler.getInstance().getPacketHelper().showTitle(player.getPlayerEntity(), + NMSHandler.getPacketHelper().showTitle(player.getPlayerEntity(), title != null ? title.asString() : "", subtitle != null ? subtitle.asString() : "", fade_in.getTicksAsInt(), diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java index 9c18d86f90..274816965c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java @@ -136,7 +136,7 @@ public void execute(ScriptEntry scriptEntry) { icon.getItemStack(), text.asString(), "", backgroundKey, Advancement.Frame.valueOf(frame.asString().toUpperCase()), true, false, true, 0, 0); - final AdvancementHelper advancementHelper = NMSHandler.getInstance().getAdvancementHelper(); + final AdvancementHelper advancementHelper = NMSHandler.getAdvancementHelper(); for (PlayerTag target : targets) { Player player = target.getPlayerEntity(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java index cd091bb6d3..b2b244eca4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java @@ -156,7 +156,7 @@ public void execute(ScriptEntry scriptEntry) { return; } Player player = Utilities.getEntryPlayer(scriptEntry).getPlayerEntity(); - PlayerHelper playerHelper = NMSHandler.getInstance().getPlayerHelper(); + PlayerHelper playerHelper = NMSHandler.getPlayerHelper(); boolean isOp = player.isOp(); if (!isOp) { playerHelper.setTemporaryOp(player, true); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java index f316fe947c..801f341826 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java @@ -130,14 +130,14 @@ public void execute(ScriptEntry scriptEntry) { + ArgumentHelper.debugObj("players", players.toString())); } - PacketHelper packetHelper = NMSHandler.getInstance().getPacketHelper(); + PacketHelper packetHelper = NMSHandler.getPacketHelper(); switch (ChestAction.valueOf(action.asString().toUpperCase())) { case OPEN: for (PlayerTag player : players) { Player ent = player.getPlayerEntity(); if (sound.asBoolean()) { - NMSHandler.getInstance().getSoundHelper().playSound(ent, location, + NMSHandler.getSoundHelper().playSound(ent, location, Sound.BLOCK_CHEST_OPEN, 1, 1, "BLOCKS"); } packetHelper.showBlockAction(ent, location, 1, 1); @@ -148,7 +148,7 @@ public void execute(ScriptEntry scriptEntry) { for (PlayerTag player : players) { Player ent = player.getPlayerEntity(); if (sound.asBoolean()) { - NMSHandler.getInstance().getSoundHelper().playSound(ent, location, + NMSHandler.getSoundHelper().playSound(ent, location, Sound.BLOCK_CHEST_CLOSE, 1, 1, "BLOCKS"); } packetHelper.showBlockAction(ent, location, 1, 0); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CopyBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CopyBlockCommand.java index 4910a4a8c1..594edfe0fa 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CopyBlockCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CopyBlockCommand.java @@ -119,7 +119,7 @@ else if (copy_cuboid != null) { Block update = destination.getBlock(); // TODO: 1.13 - confirm this works - BlockData blockData = NMSHandler.getInstance().getBlockHelper().getBlockData(source); + BlockData blockData = NMSHandler.getBlockHelper().getBlockData(source); blockData.setBlock(update, false); BlockState updateState = LocationTag.getBlockStateFor(update); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java index 9cb9fcaa9a..e4a2d9aaab 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java @@ -297,7 +297,7 @@ public void run() { boolean preSetup(LocationTag loc0) { // Freeze the first world in the list. - WorldHelper worldHelper = NMSHandler.getInstance().getWorldHelper(); + WorldHelper worldHelper = NMSHandler.getWorldHelper(); World world = loc0.getWorld(); boolean was_static = worldHelper.isStatic(world); if (no_physics) { @@ -309,7 +309,7 @@ boolean preSetup(LocationTag loc0) { void postComplete(Location loc, boolean was_static) { // Unfreeze the first world in the list. if (no_physics) { - NMSHandler.getInstance().getWorldHelper().setStatic(loc.getWorld(), was_static); + NMSHandler.getWorldHelper().setStatic(loc.getWorld(), was_static); } no_physics = false; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java index 9159eda5bd..955b3e02b2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java @@ -81,7 +81,7 @@ public class PlayEffectCommand extends AbstractCommand { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - ParticleHelper particleHelper = NMSHandler.getInstance().getParticleHelper(); + ParticleHelper particleHelper = NMSHandler.getParticleHelper(); // Iterate through arguments for (Argument arg : scriptEntry.getProcessedArgs()) { @@ -149,8 +149,8 @@ else if (arg.matchesEnum(Effect.values())) { scriptEntry.addObject("effect", Effect.valueOf(arg.getValue().toUpperCase())); continue; } - else if (NMSHandler.getInstance().getParticleHelper().effectRemap.containsKey(arg.getValue().toUpperCase())) { - scriptEntry.addObject("effect", NMSHandler.getInstance().getParticleHelper().effectRemap.get(arg.getValue().toUpperCase())); + else if (NMSHandler.getParticleHelper().effectRemap.containsKey(arg.getValue().toUpperCase())) { + scriptEntry.addObject("effect", NMSHandler.getParticleHelper().effectRemap.get(arg.getValue().toUpperCase())); } } if (!scriptEntry.hasObject("radius") @@ -352,21 +352,21 @@ else if (clazz == org.bukkit.Particle.DustOptions.class) { if (iconcrack != null) { ItemStack itemStack = iconcrack.getItemStack(); - Particle particle = NMSHandler.getInstance().getParticleHelper().getParticle("ITEM_CRACK"); + Particle particle = NMSHandler.getParticleHelper().getParticle("ITEM_CRACK"); for (Player player : players) { particle.playFor(player, location, qty.asInt(), offset.toVector(), data.asFloat(), itemStack); } } else if (blockcrack != null) { MaterialData materialData = blockcrack.getMaterialData(); - Particle particle = NMSHandler.getInstance().getParticleHelper().getParticle("BLOCK_CRACK"); + Particle particle = NMSHandler.getParticleHelper().getParticle("BLOCK_CRACK"); for (Player player : players) { particle.playFor(player, location, qty.asInt(), offset.toVector(), data.asFloat(), materialData); } } else { // blockdust MaterialData materialData = blockdust.getMaterialData(); - Particle particle = NMSHandler.getInstance().getParticleHelper().getParticle("BLOCK_DUST"); + Particle particle = NMSHandler.getParticleHelper().getParticle("BLOCK_DUST"); for (Player player : players) { particle.playFor(player, location, qty.asInt(), offset.toVector(), data.asFloat(), materialData); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java index 6242032b8e..9af7443e04 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java @@ -144,13 +144,13 @@ public void execute(ScriptEntry scriptEntry) { if (locations != null) { if (custom.asBoolean()) { for (LocationTag location : locations) { - NMSHandler.getInstance().getSoundHelper().playSound(null, location, sound.asString(), volume.asFloat(), + NMSHandler.getSoundHelper().playSound(null, location, sound.asString(), volume.asFloat(), pitch.asFloat(), sound_category.asString()); } } else { for (LocationTag location : locations) { - NMSHandler.getInstance().getSoundHelper().playSound(null, location, Sound.valueOf(sound.asString().toUpperCase()), + NMSHandler.getSoundHelper().playSound(null, location, Sound.valueOf(sound.asString().toUpperCase()), volume.asFloat(), pitch.asFloat(), sound_category.asString()); } } @@ -158,11 +158,11 @@ public void execute(ScriptEntry scriptEntry) { else { for (PlayerTag player : players) { if (custom.asBoolean()) { - NMSHandler.getInstance().getSoundHelper().playSound(player.getPlayerEntity(), player.getLocation(), sound.asString(), + NMSHandler.getSoundHelper().playSound(player.getPlayerEntity(), player.getLocation(), sound.asString(), volume.asFloat(), pitch.asFloat(), sound_category.asString()); } else { - NMSHandler.getInstance().getSoundHelper().playSound(player.getPlayerEntity(), player.getLocation(), + NMSHandler.getSoundHelper().playSound(player.getPlayerEntity(), player.getLocation(), Sound.valueOf(sound.asString().toUpperCase()), volume.asFloat(), pitch.asFloat(), sound_category.asString()); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SignCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SignCommand.java index 0dfa490614..f8f1fe0cb7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SignCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SignCommand.java @@ -102,7 +102,7 @@ public void setWallSign(Block sign, BlockFace bf) { // TODO: 1.14 - allow new sign types? org.bukkit.material.Sign sgntmp = new org.bukkit.material.Sign(MaterialCompat.WALL_SIGN); sgntmp.setFacingDirection(bf); - BlockData blockData = NMSHandler.getInstance().getBlockHelper().getBlockData(MaterialCompat.WALL_SIGN, sgntmp.getData()); + BlockData blockData = NMSHandler.getBlockHelper().getBlockData(MaterialCompat.WALL_SIGN, sgntmp.getData()); blockData.setBlock(sign, false); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SwitchCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SwitchCommand.java index 5b824cbe0f..1d7cb7bca0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SwitchCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SwitchCommand.java @@ -194,7 +194,7 @@ public void switchBlock(ScriptEntry scriptEntry, Location interactLocation, Swit else { block = interactLocation; } - BlockData blockData = NMSHandler.getInstance().getBlockHelper().getBlockData(MaterialCompat.IRON_DOOR, (byte) (block.getBlock().getData() ^ 4)); + BlockData blockData = NMSHandler.getBlockHelper().getBlockData(MaterialCompat.IRON_DOOR, (byte) (block.getBlock().getData() ^ 4)); blockData.setBlock(block.getBlock(), false); } else { @@ -215,7 +215,7 @@ else if (Depends.citizens != null) { // TODO: backup if no human NPC available? (Fake EntityPlayer instance?) } } - NMSHandler.getInstance().getEntityHelper().forceInteraction(player, interactLocation); + NMSHandler.getEntityHelper().forceInteraction(player, interactLocation); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java index a341ca4c69..cba6e68447 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java @@ -176,7 +176,7 @@ public void execute(ScriptEntry scriptEntry) { if (players != null) { if (reset.asBoolean()) { for (PlayerTag player : players) { - NMSHandler.getInstance().getPacketHelper().resetWorldBorder(player.getPlayerEntity()); + NMSHandler.getPacketHelper().resetWorldBorder(player.getPlayerEntity()); } return; } @@ -184,7 +184,7 @@ public void execute(ScriptEntry scriptEntry) { WorldBorder wb; for (PlayerTag player : players) { wb = player.getWorld().getWorldBorder(); - NMSHandler.getInstance().getPacketHelper().setWorldBorder( + NMSHandler.getPacketHelper().setWorldBorder( player.getPlayerEntity(), (center != null ? center : wb.getCenter()), (size != null ? size.asDouble() : wb.getSize()), diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/EntityScriptHelper.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/EntityScriptHelper.java index e31ade2cb6..5ac829b429 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/EntityScriptHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/EntityScriptHelper.java @@ -56,14 +56,14 @@ public static void linkWorld(World world) { if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_14)) { return; } - NMSHandler.getInstance().getWorldHelper().setWorldAccess(world, new DenizenWorldAccess()); + NMSHandler.getWorldHelper().setWorldAccess(world, new DenizenWorldAccess()); } public static void unlinkWorld(World world) { if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_14)) { return; } - NMSHandler.getInstance().getWorldHelper().removeWorldAccess(world); + NMSHandler.getWorldHelper().removeWorldAccess(world); } @EventHandler(priority = EventPriority.MONITOR) diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InventoryScriptHelper.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InventoryScriptHelper.java index 46e04dd3cb..c41a404166 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InventoryScriptHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InventoryScriptHelper.java @@ -29,7 +29,7 @@ public InventoryScriptHelper() { } public static void _savePlayerInventories() { - PlayerHelper playerHelper = NMSHandler.getInstance().getPlayerHelper(); + PlayerHelper playerHelper = NMSHandler.getPlayerHelper(); for (Map.Entry offlineInv : ImprovedOfflinePlayer.offlineInventories.entrySet()) { playerHelper.getOfflineData(offlineInv.getKey()).setInventory(offlineInv.getValue()); } @@ -41,7 +41,7 @@ public static void _savePlayerInventories() { @EventHandler public void onPlayerLogin(PlayerLoginEvent event) { UUID uuid = event.getPlayer().getUniqueId(); - PlayerHelper playerHelper = NMSHandler.getInstance().getPlayerHelper(); + PlayerHelper playerHelper = NMSHandler.getPlayerHelper(); if (ImprovedOfflinePlayer.offlineInventories.containsKey(uuid)) { playerHelper.getOfflineData(uuid).setInventory(ImprovedOfflinePlayer.offlineInventories.get(uuid)); ImprovedOfflinePlayer.offlineInventories.remove(uuid); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java index ba1a13caa0..ed224e30e1 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java @@ -177,7 +177,7 @@ public static ItemScriptContainer getItemScriptContainer(ItemStack item) { if (item == null) { return null; } - String nbt = NMSHandler.getInstance().getItemHelper().getNbtData(item).getString("Denizen Item Script"); + String nbt = NMSHandler.getItemHelper().getNbtData(item).getString("Denizen Item Script"); if (nbt != null && !nbt.equals("")) { return item_scripts_by_hash_id.get(nbt); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java index 97f16fc3f7..8a31595bc3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java @@ -161,7 +161,7 @@ public ChatContext process(Player player, String message) { } if (Settings.chatMustLookAtNPC()) { - if (!NMSHandler.getInstance().getEntityHelper().isFacingEntity(player, npc.getEntity(), 45)) { + if (!NMSHandler.getEntityHelper().isFacingEntity(player, npc.getEntity(), 45)) { if (HyperDebug) { Debug.log("Not facing"); } @@ -230,7 +230,7 @@ public ChatContext process(Player player, String message) { + "(" + npc.getTriggerTrait().getRadius(name) + ")") + ArgumentHelper.debugObj("Trigger text", message) + ArgumentHelper.debugObj("LOS", String.valueOf(player.hasLineOfSight(npc.getEntity()))) - + ArgumentHelper.debugObj("Facing", String.valueOf(NMSHandler.getInstance().getEntityHelper().isFacingEntity(player, npc.getEntity(), 45)))); + + ArgumentHelper.debugObj("Facing", String.valueOf(NMSHandler.getEntityHelper().isFacingEntity(player, npc.getEntity(), 45)))); // Check if the NPC has Chat Triggers for this step. String step = InteractScriptHelper.getCurrentStep(denizenPlayer, script.getName()); diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java index a545268308..ca5fbd5cd3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java @@ -147,7 +147,7 @@ public static Location getWalkableLocationNear(Location location, int range) { // TODO: Javadocs, comments // public static boolean isWalkable(Location location) { - BlockHelper blockHelper = NMSHandler.getInstance().getBlockHelper(); + BlockHelper blockHelper = NMSHandler.getBlockHelper(); return !blockHelper.isSafeBlock(location.clone().subtract(0, 1, 0).getBlock().getType()) && blockHelper.isSafeBlock(location.getBlock().getType()) && blockHelper.isSafeBlock(location.clone().add(0, 1, 0).getBlock().getType()); diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/CuboidBlockSet.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/CuboidBlockSet.java index 66e3ccef9f..3e376142d9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/CuboidBlockSet.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/CuboidBlockSet.java @@ -40,7 +40,7 @@ public CuboidBlockSet(CuboidTag cuboid, Location center) { for (int x = 0; x < x_width; x++) { for (int y = 0; y < y_length; y++) { for (int z = 0; z < z_height; z++) { - blocks.add(NMSHandler.getInstance().getBlockHelper().getBlockData(low.clone().add(x, y, z).getBlock())); + blocks.add(NMSHandler.getBlockHelper().getBlockData(low.clone().add(x, y, z).getBlock())); } } } @@ -352,7 +352,7 @@ public void saveMCEditFormatToStream(OutputStream os) { int index = (int) (y * (x_width) * (z_height) + z * (x_width) + x); BlockData bd = this.blocks.get(indexer);//blockAt(x, y, z); indexer++; - int matId = NMSHandler.getInstance().getBlockHelper().idFor(bd.getMaterial()); + int matId = NMSHandler.getBlockHelper().idFor(bd.getMaterial()); if (matId > 255) { if (addBlocks == null) { addBlocks = new byte[(blocks.length >> 1) + 1]; diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/OldMaterialsHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/OldMaterialsHelper.java index 9a6f98caef..f6d7f7263f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/OldMaterialsHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/OldMaterialsHelper.java @@ -581,7 +581,7 @@ public static MaterialTag getMaterialFrom(Material material, int data) { if (data != 0) { // upvert old data valued materials if (material.isBlock()) { - material = NMSHandler.getInstance().getBlockHelper().getBlockData(material, (byte) data).getMaterial(); + material = NMSHandler.getBlockHelper().getBlockData(material, (byte) data).getMaterial(); } } // Forcible upvert from legacy diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/entity/DenizenEntityType.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/entity/DenizenEntityType.java index faacf5b46f..962201f9a6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/entity/DenizenEntityType.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/entity/DenizenEntityType.java @@ -94,7 +94,7 @@ else if (!isCustom()) { return SpawnEntityHelper.spawn(location, bukkitEntityType, mechanisms, scriptName); } else { - CustomEntityHelper customEntityHelper = NMSHandler.getInstance().getCustomEntityHelper(); + CustomEntityHelper customEntityHelper = NMSHandler.getCustomEntityHelper(); switch (customEntityType) { case FAKE_ARROW: return customEntityHelper.spawnFakeArrow(location); diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java index fdd74418ed..bd7349cf72 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java @@ -110,7 +110,7 @@ public void playNote(ShortMessage message) { float pitch = (float) ToneUtil.midiToPitch(message); float volume = VOLUME_RANGE * (message.getData2() / 127.0f); - SoundHelper soundHelper = NMSHandler.getInstance().getSoundHelper(); + SoundHelper soundHelper = NMSHandler.getSoundHelper(); Sound instrument = soundHelper.getDefaultMidiInstrument(); if (patch != null) { instrument = soundHelper.getMidiInstrumentFromPatch(patch); @@ -124,10 +124,10 @@ else if (entities != null && !entities.isEmpty()) { EntityTag entity = entities.get(i); if (entity.isSpawned()) { if (entity.isPlayer()) { - NMSHandler.getInstance().getSoundHelper().playSound(entity.getPlayer(), entity.getLocation(), instrument, volume, pitch, "RECORDS"); + NMSHandler.getSoundHelper().playSound(entity.getPlayer(), entity.getLocation(), instrument, volume, pitch, "RECORDS"); } else { - NMSHandler.getInstance().getSoundHelper().playSound(null, entity.getLocation(), instrument, volume, pitch, "RECORDS"); + NMSHandler.getSoundHelper().playSound(null, entity.getLocation(), instrument, volume, pitch, "RECORDS"); } } else { diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/nbt/CustomNBT.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/nbt/CustomNBT.java index a588286a49..b986e0659f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/nbt/CustomNBT.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/nbt/CustomNBT.java @@ -53,7 +53,7 @@ public static List getAttributes(ItemStack itemStack) { if (itemStack == null || itemStack.getType() == Material.AIR) { return null; } - CompoundTag compoundTag = NMSHandler.getInstance().getItemHelper().getNbtData(itemStack); + CompoundTag compoundTag = NMSHandler.getItemHelper().getNbtData(itemStack); List attribs = new ArrayList<>(); if (compoundTag.getValue().containsKey(KEY_ATTRIBUTES)) { @@ -128,7 +128,7 @@ public static ItemStack addAttribute(ItemStack itemStack, String attr, String sl if (itemStack == null || itemStack.getType() == Material.AIR) { return null; } - CompoundTag compoundTag = NMSHandler.getInstance().getItemHelper().getNbtData(itemStack); + CompoundTag compoundTag = NMSHandler.getItemHelper().getNbtData(itemStack); List attribs = new ArrayList<>(); if (compoundTag.getValue().containsKey(KEY_ATTRIBUTES)) { @@ -156,7 +156,7 @@ public static ItemStack addAttribute(ItemStack itemStack, String attr, String sl ListTag lt = new ListTag(CompoundTag.class, attribs); compoundTag = compoundTag.createBuilder().put(KEY_ATTRIBUTES, lt).build(); - return NMSHandler.getInstance().getItemHelper().setNbtData(itemStack, compoundTag); + return NMSHandler.getItemHelper().setNbtData(itemStack, compoundTag); } public static List getNBTMaterials(ItemStack itemStack, String key) { @@ -164,13 +164,13 @@ public static List getNBTMaterials(ItemStack itemStack, String key) { return null; } - CompoundTag compoundTag = NMSHandler.getInstance().getItemHelper().getNbtData(itemStack); + CompoundTag compoundTag = NMSHandler.getItemHelper().getNbtData(itemStack); List materials = new ArrayList<>(); if (compoundTag.getValue().containsKey(key)) { List temp = (List) compoundTag.getValue().get(key).getValue(); for (StringTag tag : temp) { - materials.add(NMSHandler.getInstance().getItemHelper().getMaterialFromInternalName(tag.getValue())); + materials.add(NMSHandler.getItemHelper().getMaterialFromInternalName(tag.getValue())); } } @@ -182,29 +182,29 @@ public static ItemStack setNBTMaterials(ItemStack itemStack, String key, List internalMaterials = new ArrayList<>(); for (Material material : materials) { - internalMaterials.add(new StringTag(NMSHandler.getInstance().getItemHelper().getInternalNameFromMaterial(material))); + internalMaterials.add(new StringTag(NMSHandler.getItemHelper().getInternalNameFromMaterial(material))); } ListTag lt = new ListTag(StringTag.class, internalMaterials); compoundTag = compoundTag.createBuilder().put(key, lt).build(); - return NMSHandler.getInstance().getItemHelper().setNbtData(itemStack, compoundTag); + return NMSHandler.getItemHelper().setNbtData(itemStack, compoundTag); } public static ItemStack addCustomNBT(ItemStack itemStack, String key, String value, String basekey) { if (itemStack == null || itemStack.getType() == Material.AIR) { return null; } - CompoundTag compoundTag = NMSHandler.getInstance().getItemHelper().getNbtData(itemStack); + CompoundTag compoundTag = NMSHandler.getItemHelper().getNbtData(itemStack); CompoundTag denizenTag; if (compoundTag.getValue().containsKey(basekey)) { @@ -220,26 +220,26 @@ public static ItemStack addCustomNBT(ItemStack itemStack, String key, String val compoundTag = compoundTag.createBuilder().put(basekey, denizenTag).build(); // Write tag back - return NMSHandler.getInstance().getItemHelper().setNbtData(itemStack, compoundTag); + return NMSHandler.getItemHelper().setNbtData(itemStack, compoundTag); } public static ItemStack clearNBT(ItemStack itemStack, String key) { if (itemStack == null || itemStack.getType() == Material.AIR) { return null; } - CompoundTag compoundTag = NMSHandler.getInstance().getItemHelper().getNbtData(itemStack); + CompoundTag compoundTag = NMSHandler.getItemHelper().getNbtData(itemStack); compoundTag = compoundTag.createBuilder().remove(key).build(); // Write tag back - return NMSHandler.getInstance().getItemHelper().setNbtData(itemStack, compoundTag); + return NMSHandler.getItemHelper().setNbtData(itemStack, compoundTag); } public static ItemStack removeCustomNBT(ItemStack itemStack, String key, String basekey) { if (itemStack == null || itemStack.getType() == Material.AIR) { return null; } - CompoundTag compoundTag = NMSHandler.getInstance().getItemHelper().getNbtData(itemStack); + CompoundTag compoundTag = NMSHandler.getItemHelper().getNbtData(itemStack); CompoundTag denizenTag; if (compoundTag.getValue().containsKey(basekey)) { @@ -255,14 +255,14 @@ public static ItemStack removeCustomNBT(ItemStack itemStack, String key, String compoundTag = compoundTag.createBuilder().put(basekey, denizenTag).build(); // Write tag back - return NMSHandler.getInstance().getItemHelper().setNbtData(itemStack, compoundTag); + return NMSHandler.getItemHelper().setNbtData(itemStack, compoundTag); } public static boolean hasCustomNBT(ItemStack itemStack, String key, String basekey) { if (itemStack == null || itemStack.getType() == Material.AIR) { return false; } - CompoundTag compoundTag = NMSHandler.getInstance().getItemHelper().getNbtData(itemStack); + CompoundTag compoundTag = NMSHandler.getItemHelper().getNbtData(itemStack); CompoundTag denizenTag; if (compoundTag.getValue().containsKey(basekey)) { @@ -279,7 +279,7 @@ public static String getCustomNBT(ItemStack itemStack, String key, String baseke if (itemStack == null || itemStack.getType() == Material.AIR || key == null) { return null; } - CompoundTag compoundTag = NMSHandler.getInstance().getItemHelper().getNbtData(itemStack); + CompoundTag compoundTag = NMSHandler.getItemHelper().getNbtData(itemStack); if (compoundTag.getValue().containsKey(basekey)) { CompoundTag denizenTag = (CompoundTag) compoundTag.getValue().get(basekey); @@ -297,7 +297,7 @@ public static List listNBT(ItemStack itemStack, String basekey) { if (itemStack == null || itemStack.getType() == Material.AIR) { return nbt; } - CompoundTag compoundTag = NMSHandler.getInstance().getItemHelper().getNbtData(itemStack); + CompoundTag compoundTag = NMSHandler.getItemHelper().getNbtData(itemStack); if (compoundTag.getValue().containsKey(basekey)) { CompoundTag denizenTag = (CompoundTag) compoundTag.getValue().get(basekey); @@ -311,46 +311,46 @@ public static void addCustomNBT(Entity entity, String key, String value) { if (entity == null) { return; } - CompoundTag compoundTag = NMSHandler.getInstance().getEntityHelper().getNbtData(entity); + CompoundTag compoundTag = NMSHandler.getEntityHelper().getNbtData(entity); // Add custom NBT compoundTag = compoundTag.createBuilder().putString(key, value).build(); // Write tag back - NMSHandler.getInstance().getEntityHelper().setNbtData(entity, compoundTag); + NMSHandler.getEntityHelper().setNbtData(entity, compoundTag); } public static void addCustomNBT(Entity entity, String key, int value) { if (entity == null) { return; } - CompoundTag compoundTag = NMSHandler.getInstance().getEntityHelper().getNbtData(entity); + CompoundTag compoundTag = NMSHandler.getEntityHelper().getNbtData(entity); // Add custom NBT compoundTag = compoundTag.createBuilder().putInt(key, value).build(); // Write tag back - NMSHandler.getInstance().getEntityHelper().setNbtData(entity, compoundTag); + NMSHandler.getEntityHelper().setNbtData(entity, compoundTag); } public static void removeCustomNBT(Entity entity, String key) { if (entity == null) { return; } - CompoundTag compoundTag = NMSHandler.getInstance().getEntityHelper().getNbtData(entity); + CompoundTag compoundTag = NMSHandler.getEntityHelper().getNbtData(entity); // Remove custom NBT compoundTag = compoundTag.createBuilder().remove(key).build(); // Write tag back - NMSHandler.getInstance().getEntityHelper().setNbtData(entity, compoundTag); + NMSHandler.getEntityHelper().setNbtData(entity, compoundTag); } public static boolean hasCustomNBT(Entity entity, String key) { if (entity == null) { return false; } - CompoundTag compoundTag = NMSHandler.getInstance().getEntityHelper().getNbtData(entity); + CompoundTag compoundTag = NMSHandler.getEntityHelper().getNbtData(entity); // Check for key return compoundTag.getValue().containsKey(key); @@ -360,7 +360,7 @@ public static String getCustomNBT(Entity entity, String key) { if (entity == null) { return null; } - CompoundTag compoundTag = NMSHandler.getInstance().getEntityHelper().getNbtData(entity); + CompoundTag compoundTag = NMSHandler.getEntityHelper().getNbtData(entity); // Return contents of the tag return compoundTag.getString(key); @@ -370,7 +370,7 @@ public static int getCustomIntNBT(Entity entity, String key) { if (entity == null) { return 0; } - CompoundTag compoundTag = NMSHandler.getInstance().getEntityHelper().getNbtData(entity); + CompoundTag compoundTag = NMSHandler.getEntityHelper().getNbtData(entity); // Return contents of the tag return compoundTag.getInt(key); @@ -395,7 +395,7 @@ public static Map> getDisabledSlots(Entity entity) { } Map> map = new HashMap<>(); - CompoundTag compoundTag = NMSHandler.getInstance().getEntityHelper().getNbtData(entity); + CompoundTag compoundTag = NMSHandler.getEntityHelper().getNbtData(entity); int disabledSlots = compoundTag.getInt(KEY_DISABLED_SLOTS); if (disabledSlots == 0) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java index 6f57d9a118..892a64a43e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java @@ -173,7 +173,7 @@ private static ItemStack removeItemScriptLore(ItemStack itemStack) { if (hash != null) { meta.setLore(lore); itemStack.setItemMeta(meta); - return NMSHandler.getInstance().getItemHelper().addNbtData(itemStack, "Denizen Item Script", new StringTag(hash)); + return NMSHandler.getItemHelper().addNbtData(itemStack, "Denizen Item Script", new StringTag(hash)); } } return itemStack; diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/ItemChangeMessage.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/ItemChangeMessage.java index 54dbebd3ae..593c334c96 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/ItemChangeMessage.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/ItemChangeMessage.java @@ -27,7 +27,7 @@ public class ItemChangeMessage implements Listener { private static final Map slotChanged = new HashMap<>(); public static void sendMessage(Player player, String message) { - ItemStack item = NMSHandler.getInstance().getEntityHelper().getItemInHand(player); + ItemStack item = NMSHandler.getEntityHelper().getItemInHand(player); // If the player is holding air, force a light gray stained glass pane, // which is probably the least intrusive if (item == null || item.getType() == Material.AIR) { @@ -40,7 +40,7 @@ public static void sendMessage(Player player, String message) { meta.setDisplayName(message); item.setItemMeta(meta); int slot = player.getInventory().getHeldItemSlot() + 36; - NMSHandler.getInstance().getPacketHelper().setSlot(player, slot, item, true); + NMSHandler.getPacketHelper().setSlot(player, slot, item, true); slotChanged.put(player.getUniqueId(), slot); } @@ -51,8 +51,8 @@ public static void resetItem(Player player) { UUID uuid = player.getUniqueId(); if (slotChanged.containsKey(uuid)) { int slot = slotChanged.get(uuid); - ItemStack itemStack = NMSHandler.getInstance().getEntityHelper().getItemInHand(player); - NMSHandler.getInstance().getPacketHelper().setSlot(player, slot, itemStack, true); + ItemStack itemStack = NMSHandler.getEntityHelper().getItemInHand(player); + NMSHandler.getPacketHelper().setSlot(player, slot, itemStack, true); slotChanged.remove(uuid); } } diff --git a/v1_12/src/main/java/com/denizenscript/denizen/v1_12/Handler.java b/v1_12/src/main/java/com/denizenscript/denizen/v1_12/Handler.java index 91b3b3f9b7..1ba4100dd0 100644 --- a/v1_12/src/main/java/com/denizenscript/denizen/v1_12/Handler.java +++ b/v1_12/src/main/java/com/denizenscript/denizen/v1_12/Handler.java @@ -7,15 +7,12 @@ import com.denizenscript.denizen.v1_12.impl.blocks.BlockLightImpl; import com.denizenscript.denizen.v1_12.impl.jnbt.CompoundTagImpl; import com.denizenscript.denizen.v1_12.impl.packets.handlers.DenizenPacketListenerImpl; -import com.denizenscript.denizen.nms.interfaces.*; import com.denizenscript.denizen.v1_12.helpers.*; import com.google.common.collect.Iterables; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; -import com.denizenscript.denizen.nms.abstracts.AnimationHelper; import com.denizenscript.denizen.nms.abstracts.BiomeNMS; import com.denizenscript.denizen.nms.abstracts.BlockLight; -import com.denizenscript.denizen.nms.abstracts.ParticleHelper; import com.denizenscript.denizen.nms.abstracts.ProfileEditor; import com.denizenscript.denizen.nms.abstracts.Sidebar; import com.denizenscript.denizen.nms.interfaces.packets.PacketHandler; @@ -37,19 +34,21 @@ public class Handler extends NMSHandler { - private final AdvancementHelper advancementHelper = new AdvancementHelperImpl(); - private final AnimationHelper animationHelper = new AnimationHelperImpl(); - private final BlockHelper blockHelper = new BlockHelperImpl(); - private final ChunkHelper chunkHelper = new ChunkHelperImpl(); - private final CustomEntityHelper customEntityHelper = new CustomEntityHelperImpl(); - private final EntityHelper entityHelper = new EntityHelperImpl(); - private final FishingHelper fishingHelper = new FishingHelperImpl(); - private final ItemHelper itemHelper = new ItemHelperImpl(); - private final SoundHelper soundHelper = new SoundHelperImpl(); - private final PacketHelper packetHelper = new PacketHelperImpl(); - private final ParticleHelper particleHelper = new ParticleHelperImpl(); - private final PlayerHelper playerHelper = new PlayerHelperImpl(); - private final WorldHelper worldHelper = new WorldHelperImpl(); + public Handler() { + advancementHelper = new AdvancementHelperImpl(); + animationHelper = new AnimationHelperImpl(); + blockHelper = new BlockHelperImpl(); + chunkHelper = new ChunkHelperImpl(); + customEntityHelper = new CustomEntityHelperImpl(); + entityHelper = new EntityHelperImpl(); + fishingHelper = new FishingHelperImpl(); + itemHelper = new ItemHelperImpl(); + soundHelper = new SoundHelperImpl(); + packetHelper = new PacketHelperImpl(); + particleHelper = new ParticleHelperImpl(); + playerHelper = new PlayerHelperImpl(); + worldHelper = new WorldHelperImpl(); + } private final ProfileEditor profileEditor = new ProfileEditorImpl(); @@ -76,71 +75,6 @@ public double[] getRecentTps() { return ((CraftServer) Bukkit.getServer()).getServer().recentTps; } - @Override - public AdvancementHelper getAdvancementHelper() { - return advancementHelper; - } - - @Override - public AnimationHelper getAnimationHelper() { - return animationHelper; - } - - @Override - public BlockHelper getBlockHelper() { - return blockHelper; - } - - @Override - public ChunkHelper getChunkHelper() { - return chunkHelper; - } - - @Override - public CustomEntityHelper getCustomEntityHelper() { - return customEntityHelper; - } - - @Override - public EntityHelper getEntityHelper() { - return entityHelper; - } - - @Override - public FishingHelper getFishingHelper() { - return fishingHelper; - } - - @Override - public ItemHelper getItemHelper() { - return itemHelper; - } - - @Override - public SoundHelper getSoundHelper() { - return soundHelper; - } - - @Override - public PacketHelper getPacketHelper() { - return packetHelper; - } - - @Override - public ParticleHelper getParticleHelper() { - return particleHelper; - } - - @Override - public PlayerHelper getPlayerHelper() { - return playerHelper; - } - - @Override - public WorldHelper getWorldHelper() { - return worldHelper; - } - @Override public void enablePacketInterception(PacketHandler packetHandler) { DenizenPacketListenerImpl.enable(packetHandler); diff --git a/v1_12/src/main/java/com/denizenscript/denizen/v1_12/helpers/PacketHelperImpl.java b/v1_12/src/main/java/com/denizenscript/denizen/v1_12/helpers/PacketHelperImpl.java index a7fbe404a7..8aa9ea4fe4 100644 --- a/v1_12/src/main/java/com/denizenscript/denizen/v1_12/helpers/PacketHelperImpl.java +++ b/v1_12/src/main/java/com/denizenscript/denizen/v1_12/helpers/PacketHelperImpl.java @@ -144,7 +144,7 @@ public void showBannerUpdate(Player player, Location location, DyeColor base, Li .putString("Pattern", pattern.getPattern().getIdentifier()) .build()); } - CompoundTag compoundTag = NMSHandler.getInstance().getBlockHelper().getNbtData(location.getBlock()) + CompoundTag compoundTag = NMSHandler.getBlockHelper().getNbtData(location.getBlock()) .createBuilder() .putInt("Base", base.getDyeData()) .put("Patterns", new ListTag(CompoundTag.class, nbtPatterns)) diff --git a/v1_12/src/main/java/com/denizenscript/denizen/v1_12/impl/packets/handlers/DenizenNetworkManagerImpl.java b/v1_12/src/main/java/com/denizenscript/denizen/v1_12/impl/packets/handlers/DenizenNetworkManagerImpl.java index 0e4d0371c1..db624c8498 100644 --- a/v1_12/src/main/java/com/denizenscript/denizen/v1_12/impl/packets/handlers/DenizenNetworkManagerImpl.java +++ b/v1_12/src/main/java/com/denizenscript/denizen/v1_12/impl/packets/handlers/DenizenNetworkManagerImpl.java @@ -268,7 +268,7 @@ else if (packet instanceof PacketPlayOutNamedEntitySpawn if (entity == null) { oldManager.sendPacket(packet); } - else if (!NMSHandler.getInstance().getEntityHelper().isHidden(player.getBukkitEntity(), entity.getBukkitEntity())) { + else if (!NMSHandler.getEntityHelper().isHidden(player.getBukkitEntity(), entity.getBukkitEntity())) { if (entity instanceof EntityFakePlayerImpl) { final EntityFakePlayerImpl fakePlayer = (EntityFakePlayerImpl) entity; sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, fakePlayer)); diff --git a/v1_13/src/main/java/com/denizenscript/denizen/v1_13/Handler.java b/v1_13/src/main/java/com/denizenscript/denizen/v1_13/Handler.java index 5e9abcacd7..62c448f8ee 100644 --- a/v1_13/src/main/java/com/denizenscript/denizen/v1_13/Handler.java +++ b/v1_13/src/main/java/com/denizenscript/denizen/v1_13/Handler.java @@ -7,7 +7,6 @@ import com.denizenscript.denizen.v1_13.impl.blocks.BlockLightImpl; import com.denizenscript.denizen.v1_13.impl.jnbt.CompoundTagImpl; import com.denizenscript.denizen.v1_13.impl.packets.handlers.DenizenPacketListenerImpl; -import com.denizenscript.denizen.nms.interfaces.*; import com.denizenscript.denizen.nms.interfaces.packets.PacketHandler; import com.denizenscript.denizen.nms.util.PlayerProfile; import com.denizenscript.denizen.nms.util.jnbt.CompoundTag; @@ -16,10 +15,8 @@ import com.google.common.collect.Iterables; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; -import com.denizenscript.denizen.nms.abstracts.AnimationHelper; import com.denizenscript.denizen.nms.abstracts.BiomeNMS; import com.denizenscript.denizen.nms.abstracts.BlockLight; -import com.denizenscript.denizen.nms.abstracts.ParticleHelper; import com.denizenscript.denizen.nms.abstracts.ProfileEditor; import com.denizenscript.denizen.nms.abstracts.Sidebar; import com.denizenscript.denizencore.utilities.debugging.Debug; @@ -38,19 +35,21 @@ public class Handler extends NMSHandler { - private final AdvancementHelper advancementHelper = new AdvancementHelperImpl(); - private final AnimationHelper animationHelper = new AnimationHelperImpl(); - private final BlockHelper blockHelper = new BlockHelperImpl(); - private final ChunkHelper chunkHelper = new ChunkHelperImpl(); - private final CustomEntityHelper customEntityHelper = new CustomEntityHelperImpl(); - private final EntityHelper entityHelper = new EntityHelperImpl(); - private final FishingHelper fishingHelper = new FishingHelperImpl(); - private final ItemHelper itemHelper = new ItemHelperImpl(); - private final SoundHelper soundHelper = new SoundHelperImpl(); - private final PacketHelper packetHelper = new PacketHelperImpl(); - private final ParticleHelper particleHelper = new ParticleHelperImpl(); - private final PlayerHelper playerHelper = new PlayerHelperImpl(); - private final WorldHelper worldHelper = new WorldHelperImpl(); + public Handler() { + advancementHelper = new AdvancementHelperImpl(); + animationHelper = new AnimationHelperImpl(); + blockHelper = new BlockHelperImpl(); + chunkHelper = new ChunkHelperImpl(); + customEntityHelper = new CustomEntityHelperImpl(); + entityHelper = new EntityHelperImpl(); + fishingHelper = new FishingHelperImpl(); + itemHelper = new ItemHelperImpl(); + soundHelper = new SoundHelperImpl(); + packetHelper = new PacketHelperImpl(); + particleHelper = new ParticleHelperImpl(); + playerHelper = new PlayerHelperImpl(); + worldHelper = new WorldHelperImpl(); + } private final ProfileEditor profileEditor = new ProfileEditorImpl(); @@ -82,71 +81,6 @@ public double[] getRecentTps() { return ((CraftServer) Bukkit.getServer()).getServer().recentTps; } - @Override - public AdvancementHelper getAdvancementHelper() { - return advancementHelper; - } - - @Override - public AnimationHelper getAnimationHelper() { - return animationHelper; - } - - @Override - public BlockHelper getBlockHelper() { - return blockHelper; - } - - @Override - public ChunkHelper getChunkHelper() { - return chunkHelper; - } - - @Override - public CustomEntityHelper getCustomEntityHelper() { - return customEntityHelper; - } - - @Override - public EntityHelper getEntityHelper() { - return entityHelper; - } - - @Override - public FishingHelper getFishingHelper() { - return fishingHelper; - } - - @Override - public ItemHelper getItemHelper() { - return itemHelper; - } - - @Override - public SoundHelper getSoundHelper() { - return soundHelper; - } - - @Override - public PacketHelper getPacketHelper() { - return packetHelper; - } - - @Override - public ParticleHelper getParticleHelper() { - return particleHelper; - } - - @Override - public PlayerHelper getPlayerHelper() { - return playerHelper; - } - - @Override - public WorldHelper getWorldHelper() { - return worldHelper; - } - @Override public void enablePacketInterception(PacketHandler packetHandler) { DenizenPacketListenerImpl.enable(packetHandler); diff --git a/v1_13/src/main/java/com/denizenscript/denizen/v1_13/helpers/PacketHelperImpl.java b/v1_13/src/main/java/com/denizenscript/denizen/v1_13/helpers/PacketHelperImpl.java index aef9c96f53..81bb4b0d9c 100644 --- a/v1_13/src/main/java/com/denizenscript/denizen/v1_13/helpers/PacketHelperImpl.java +++ b/v1_13/src/main/java/com/denizenscript/denizen/v1_13/helpers/PacketHelperImpl.java @@ -145,7 +145,7 @@ public void showBannerUpdate(Player player, Location location, DyeColor base, Li .putString("Pattern", pattern.getPattern().getIdentifier()) .build()); } - CompoundTag compoundTag = NMSHandler.getInstance().getBlockHelper().getNbtData(location.getBlock()) + CompoundTag compoundTag = NMSHandler.getBlockHelper().getNbtData(location.getBlock()) .createBuilder() .putInt("Base", base.getDyeData()) .put("Patterns", new ListTag(CompoundTag.class, nbtPatterns)) diff --git a/v1_13/src/main/java/com/denizenscript/denizen/v1_13/impl/packets/handlers/DenizenNetworkManagerImpl.java b/v1_13/src/main/java/com/denizenscript/denizen/v1_13/impl/packets/handlers/DenizenNetworkManagerImpl.java index 7cf483f5ff..382870587d 100644 --- a/v1_13/src/main/java/com/denizenscript/denizen/v1_13/impl/packets/handlers/DenizenNetworkManagerImpl.java +++ b/v1_13/src/main/java/com/denizenscript/denizen/v1_13/impl/packets/handlers/DenizenNetworkManagerImpl.java @@ -280,7 +280,7 @@ else if (packet instanceof PacketPlayOutNamedEntitySpawn if (entity == null) { oldManager.sendPacket(packet, genericfuturelistener); } - else if (!NMSHandler.getInstance().getEntityHelper().isHidden(player.getBukkitEntity(), entity.getBukkitEntity())) { + else if (!NMSHandler.getEntityHelper().isHidden(player.getBukkitEntity(), entity.getBukkitEntity())) { if (entity instanceof EntityFakePlayerImpl) { final EntityFakePlayerImpl fakePlayer = (EntityFakePlayerImpl) entity; sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, fakePlayer)); diff --git a/v1_14/src/main/java/com/denizenscript/denizen/v1_14/Handler.java b/v1_14/src/main/java/com/denizenscript/denizen/v1_14/Handler.java index ace13ce571..2e75ab152b 100644 --- a/v1_14/src/main/java/com/denizenscript/denizen/v1_14/Handler.java +++ b/v1_14/src/main/java/com/denizenscript/denizen/v1_14/Handler.java @@ -8,7 +8,6 @@ import com.denizenscript.denizen.v1_14.impl.blocks.BlockLightImpl; import com.denizenscript.denizen.v1_14.impl.jnbt.CompoundTagImpl; import com.denizenscript.denizen.v1_14.impl.packets.handlers.DenizenPacketListenerImpl; -import com.denizenscript.denizen.nms.interfaces.*; import com.denizenscript.denizen.nms.interfaces.packets.PacketHandler; import com.denizenscript.denizen.nms.util.jnbt.Tag; import com.denizenscript.denizen.v1_14.helpers.*; @@ -42,19 +41,21 @@ public class Handler extends NMSHandler { - private final AdvancementHelper advancementHelper = new AdvancementHelperImpl(); - private final AnimationHelper animationHelper = new AnimationHelperImpl(); - private final BlockHelper blockHelper = new BlockHelperImpl(); - private final ChunkHelper chunkHelper = new ChunkHelperImpl(); - private final CustomEntityHelper customEntityHelper = new CustomEntityHelperImpl(); - private final EntityHelper entityHelper = new EntityHelperImpl(); - private final FishingHelper fishingHelper = new FishingHelperImpl(); - private final ItemHelper itemHelper = new ItemHelperImpl(); - private final SoundHelper soundHelper = new SoundHelperImpl(); - private final PacketHelper packetHelper = new PacketHelperImpl(); - private final ParticleHelper particleHelper = new ParticleHelperImpl(); - private final PlayerHelper playerHelper = new PlayerHelperImpl(); - private final WorldHelper worldHelper = new WorldHelperImpl(); + public Handler() { + advancementHelper = new AdvancementHelperImpl(); + animationHelper = new AnimationHelperImpl(); + blockHelper = new BlockHelperImpl(); + chunkHelper = new ChunkHelperImpl(); + customEntityHelper = new CustomEntityHelperImpl(); + entityHelper = new EntityHelperImpl(); + fishingHelper = new FishingHelperImpl(); + itemHelper = new ItemHelperImpl(); + soundHelper = new SoundHelperImpl(); + packetHelper = new PacketHelperImpl(); + particleHelper = new ParticleHelperImpl(); + playerHelper = new PlayerHelperImpl(); + worldHelper = new WorldHelperImpl(); + } private final ProfileEditor profileEditor = new ProfileEditorImpl(); @@ -86,71 +87,6 @@ public double[] getRecentTps() { return ((CraftServer) Bukkit.getServer()).getServer().recentTps; } - @Override - public AdvancementHelper getAdvancementHelper() { - return advancementHelper; - } - - @Override - public AnimationHelper getAnimationHelper() { - return animationHelper; - } - - @Override - public BlockHelper getBlockHelper() { - return blockHelper; - } - - @Override - public ChunkHelper getChunkHelper() { - return chunkHelper; - } - - @Override - public CustomEntityHelper getCustomEntityHelper() { - return customEntityHelper; - } - - @Override - public EntityHelper getEntityHelper() { - return entityHelper; - } - - @Override - public FishingHelper getFishingHelper() { - return fishingHelper; - } - - @Override - public ItemHelper getItemHelper() { - return itemHelper; - } - - @Override - public SoundHelper getSoundHelper() { - return soundHelper; - } - - @Override - public PacketHelper getPacketHelper() { - return packetHelper; - } - - @Override - public ParticleHelper getParticleHelper() { - return particleHelper; - } - - @Override - public PlayerHelper getPlayerHelper() { - return playerHelper; - } - - @Override - public WorldHelper getWorldHelper() { - return worldHelper; - } - @Override public void enablePacketInterception(PacketHandler packetHandler) { DenizenPacketListenerImpl.enable(packetHandler); diff --git a/v1_14/src/main/java/com/denizenscript/denizen/v1_14/helpers/BlockHelperImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/v1_14/helpers/BlockHelperImpl.java index 885d00c62a..3b6342b018 100644 --- a/v1_14/src/main/java/com/denizenscript/denizen/v1_14/helpers/BlockHelperImpl.java +++ b/v1_14/src/main/java/com/denizenscript/denizen/v1_14/helpers/BlockHelperImpl.java @@ -103,9 +103,9 @@ public void setPlayerProfile(Skull skull, PlayerProfile playerProfile) { @Override public CompoundTag getNbtData(Block block) { - NMSHandler.getInstance().getChunkHelper().changeChunkServerThread(block.getWorld()); + NMSHandler.getChunkHelper().changeChunkServerThread(block.getWorld()); org.bukkit.block.BlockState state = block.getState(); - NMSHandler.getInstance().getChunkHelper().restoreServerThread(block.getWorld()); + NMSHandler.getChunkHelper().restoreServerThread(block.getWorld()); TileEntity tileEntity = getTE((CraftBlockEntityState) state); if (tileEntity == null) { return null; @@ -115,9 +115,9 @@ public CompoundTag getNbtData(Block block) { @Override public void setNbtData(Block block, CompoundTag compoundTag) { - NMSHandler.getInstance().getChunkHelper().changeChunkServerThread(block.getWorld()); + NMSHandler.getChunkHelper().changeChunkServerThread(block.getWorld()); org.bukkit.block.BlockState state = block.getState(); - NMSHandler.getInstance().getChunkHelper().restoreServerThread(block.getWorld()); + NMSHandler.getChunkHelper().restoreServerThread(block.getWorld()); TileEntity tileEntity = getTE((CraftBlockEntityState) state); if (tileEntity == null) { return; diff --git a/v1_14/src/main/java/com/denizenscript/denizen/v1_14/helpers/PacketHelperImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/v1_14/helpers/PacketHelperImpl.java index a520113827..d635804db3 100644 --- a/v1_14/src/main/java/com/denizenscript/denizen/v1_14/helpers/PacketHelperImpl.java +++ b/v1_14/src/main/java/com/denizenscript/denizen/v1_14/helpers/PacketHelperImpl.java @@ -147,7 +147,7 @@ public void showBannerUpdate(Player player, Location location, DyeColor base, Li .putString("Pattern", pattern.getPattern().getIdentifier()) .build()); } - CompoundTag compoundTag = NMSHandler.getInstance().getBlockHelper().getNbtData(location.getBlock()) + CompoundTag compoundTag = NMSHandler.getBlockHelper().getNbtData(location.getBlock()) .createBuilder() .putInt("Base", base.getDyeData()) .put("Patterns", new ListTag(CompoundTag.class, nbtPatterns)) diff --git a/v1_14/src/main/java/com/denizenscript/denizen/v1_14/impl/packets/handlers/DenizenNetworkManagerImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/v1_14/impl/packets/handlers/DenizenNetworkManagerImpl.java index 5106093afb..72f297a066 100644 --- a/v1_14/src/main/java/com/denizenscript/denizen/v1_14/impl/packets/handlers/DenizenNetworkManagerImpl.java +++ b/v1_14/src/main/java/com/denizenscript/denizen/v1_14/impl/packets/handlers/DenizenNetworkManagerImpl.java @@ -277,7 +277,7 @@ else if (packet instanceof PacketPlayOutNamedEntitySpawn if (entity == null) { oldManager.sendPacket(packet, genericfuturelistener); } - else if (!NMSHandler.getInstance().getEntityHelper().isHidden(player.getBukkitEntity(), entity.getBukkitEntity())) { + else if (!NMSHandler.getEntityHelper().isHidden(player.getBukkitEntity(), entity.getBukkitEntity())) { if (entity instanceof EntityFakePlayerImpl) { final EntityFakePlayerImpl fakePlayer = (EntityFakePlayerImpl) entity; sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, fakePlayer));