diff --git a/docs/changelog_v3.3.x.md b/docs/changelog_v3.3.x.md index da604139e..a37f25201 100644 --- a/docs/changelog_v3.3.x.md +++ b/docs/changelog_v3.3.x.md @@ -14,7 +14,13 @@ These change logs represent the work that has been going on within prison. -# 3.3.0-alpha.19j 2026-03-07 +# 3.3.0-alpha.19j 2026-03-15 + + +* **Prison Cleanup: prison-spigot: Removed obsolete and unneeded comments and fix indentation where needed.** Second part. + + +* **Prison Cleanup: prison-spigot: Removed obsolete and unneeded comments and fix indentation where needed.** First part. * **Bug fix in the ChatTest Junit test. When I was cleaning up that source I accidentally introduced a stray '.'.** diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotCommandSender.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotCommandSender.java index d417b81da..faca09541 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotCommandSender.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotCommandSender.java @@ -67,10 +67,10 @@ public UUID getUniqueId() { } public UUID getUUID() { - UUID uuid = null; - if ( isPlayer() ) { - uuid = ((org.bukkit.entity.Player) bukkitSender).getUniqueId(); - } + UUID uuid = null; + if ( isPlayer() ) { + uuid = ((org.bukkit.entity.Player) bukkitSender).getUniqueId(); + } return uuid; } @@ -89,10 +89,10 @@ public String getName() { @Override public void dispatchCommand(String command) { - command = CommandHandler.remapRootCmdIdentifiers( command ); - - String registeredCmd = Prison.get().getCommandHandler() - .findRegisteredCommand( command ); + command = CommandHandler.remapRootCmdIdentifiers( command ); + + String registeredCmd = Prison.get().getCommandHandler() + .findRegisteredCommand( command ); Bukkit.getServer().dispatchCommand(bukkitSender, registeredCmd); } @@ -104,11 +104,11 @@ public boolean doesSupportColors() { @Override public void sendMessage(String message) { - - String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" ); - - for ( String msg : msgs ) { - bukkitSender.sendMessage(msg); + + String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" ); + + for ( String msg : msgs ) { + bukkitSender.sendMessage(msg); } } @@ -116,24 +116,24 @@ public void sendMessage(String message) { public void sendMessage(String[] messages) { for (String message : messages) { - String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" ); - for ( String msg : msgs ) { - - sendMessage(msg); - } + String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" ); + for ( String msg : msgs ) { + + sendMessage(msg); + } } } @Override public void sendMessage(List messages) { - for (String message : messages) { - - String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" ); - for ( String msg : msgs ) { - - sendMessage(msg); - } - } + for (String message : messages) { + + String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" ); + for ( String msg : msgs ) { + + sendMessage(msg); + } + } } @Override @@ -146,7 +146,7 @@ public void sendRaw(String json) { @Override public boolean isOp() { - return bukkitSender.isOp(); + return bukkitSender.isOp(); } @Override @@ -163,10 +163,10 @@ public boolean hasPermission(String perm) { @Override public List getPermissions() { - List results = new ArrayList<>(); - - Set perms = bukkitSender.getEffectivePermissions(); - for ( PermissionAttachmentInfo perm : perms ) + List results = new ArrayList<>(); + + Set perms = bukkitSender.getEffectivePermissions(); + for ( PermissionAttachmentInfo perm : perms ) { results.add( perm.getPermission() ); } @@ -178,128 +178,108 @@ public List getPermissions() { @Override public List getPermissions( String prefix ) { - return getPermissions( prefix, getPermissions() ); + return getPermissions( prefix, getPermissions() ); } @Override public List getPermissions( String prefix, List perms ) { - List results = new ArrayList<>(); - - for ( String perm : perms ) { - if ( perm.startsWith( prefix ) ) { - results.add( perm ); - } - } - - return results; + List results = new ArrayList<>(); + + for ( String perm : perms ) { + if ( perm.startsWith( prefix ) ) { + results.add( perm ); + } + } + + return results; } -// @Override -// public List getPermissions( String prefix ) { -// List results = new ArrayList<>(); -// -// for ( String perm : getPermissions() ) { -// if ( perm.startsWith( prefix ) ) { -// results.add( perm ); -// } -// } -// -// return results; -// } @Override public double getSellAllMultiplier() { - double results = 1.0; - - if ( isPlayer() ) { - - SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); - - if ( sellall != null && getWrapper() != null ) { - results = sellall.getPlayerMultiplier((org.bukkit.entity.Player) getWrapper()); - } - } - - return results; - -// Optional oPlayer = Prison.get().getPlatform().getPlayer( getName() ); -// -// if ( oPlayer.isPresent() ) { -// results = oPlayer.get().getSellAllMultiplier(); -// } -// -// return results; + double results = 1.0; + + if ( isPlayer() ) { + + SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); + + if ( sellall != null && getWrapper() != null ) { + results = sellall.getPlayerMultiplier((org.bukkit.entity.Player) getWrapper()); + } + } + + return results; } @Override public double getSellAllMultiplierDebug() { - double results = 1.0; - - if ( isPlayer() ) { - - SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); - - if ( sellall != null && getWrapper() != null ) { - - Player player = getPlatformPlayer(); - - results = sellall.getPlayerMultiplierDebug( player ); - } - } - - return results; + double results = 1.0; + + if ( isPlayer() ) { + + SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); + + if ( sellall != null && getWrapper() != null ) { + + Player player = getPlatformPlayer(); + + results = sellall.getPlayerMultiplierDebug( player ); + } + } + + return results; } @Override public List getSellAllMultiplierListings() { - List results = new ArrayList<>(); - - if ( isPlayer() ) { - - SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); - - if ( sellall != null && getWrapper() != null ) { - results.addAll( sellall.getPlayerMultiplierList((org.bukkit.entity.Player) getWrapper()) ); - } - } - - - return results; + List results = new ArrayList<>(); + + if ( isPlayer() ) { + + SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); + + if ( sellall != null && getWrapper() != null ) { + results.addAll( sellall.getPlayerMultiplierList((org.bukkit.entity.Player) getWrapper()) ); + } + } + + + return results; } public List getPermissionsIntegrations( boolean detailed ) { - List results = new ArrayList<>(); - - Optional oPlayer = Prison.get().getPlatform().getPlayer( getName() ); - - if ( oPlayer.isPresent() ) { - - PermissionIntegration perms = PrisonAPI.getIntegrationManager() .getPermission(); - if ( perms != null ) { - results = perms.getPermissions( oPlayer.get(), detailed ); - } - } - - return results; + List results = new ArrayList<>(); + + Optional oPlayer = Prison.get().getPlatform().getPlayer( getName() ); + + if ( oPlayer.isPresent() ) { + + PermissionIntegration perms = PrisonAPI.getIntegrationManager() .getPermission(); + if ( perms != null ) { + results = perms.getPermissions( oPlayer.get(), detailed ); + } + } + + return results; } @Override public boolean isPlayer() { - return bukkitSender != null && bukkitSender instanceof org.bukkit.entity.Player; + return bukkitSender != null && bukkitSender instanceof org.bukkit.entity.Player; } @Override public String toString() { - StringBuilder sb = new StringBuilder(); - - sb.append( "SpigotCommandSender: " ).append( getName() ) - .append( " isOp=" ).append( isOp() ) - .append( " isPlayer=" ).append( isPlayer() ); - - return sb.toString(); + StringBuilder sb = new StringBuilder(); + + sb.append( "SpigotCommandSender: " ).append( getName() ) + .append( " isOp=" ).append( isOp() ) + .append( " isPlayer=" ).append( isPlayer() ); + + return sb.toString(); } public org.bukkit.command.CommandSender getWrapper() { diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotLocation.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotLocation.java index 91b95dbd8..dce7ea10e 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotLocation.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotLocation.java @@ -29,7 +29,6 @@ public org.bukkit.Location getBukkitLocation() { if ( bukkitLocation == null ) { bukkitLocation = getBukkitLocation( this ); -// bukkitLocation = createBukkitLocation(); } return bukkitLocation; @@ -46,27 +45,9 @@ public static org.bukkit.Location getBukkitLocation( Location location ) { bLocation.setPitch( location.getPitch() ); -// bLocation.; - return bLocation; } -// private org.bukkit.Location createBukkitLocation() { -// -// org.bukkit.World world = Bukkit.getWorld( getWorld().getName() ); -// -// org.bukkit.Location bLocation = new org.bukkit.Location(world, getBlockX(), getBlockY(), getBlockZ() ); -// -// bLocation.setYaw(getYaw()); -// -// bLocation.setPitch(getPitch()); -// -// return bLocation; -// } - -// public void setBukkitLocation(org.bukkit.Location bukkitLocation) { -// this.bukkitLocation = bukkitLocation; -// } public org.bukkit.World getBukkitWorld() { return getBukkitLocation().getWorld(); diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotOfflinePlayer.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotOfflinePlayer.java index dd4b2007b..b5fbb9121 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotOfflinePlayer.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotOfflinePlayer.java @@ -116,23 +116,17 @@ public void setFileCache(File fileCache) { public String filenamePlayer() { return getFilePlayer().getName(); -// return JsonFileIO.filenamePlayer( this ); } public String filenameCache() { return getFileCache().getName(); -// return JsonFileIO.filenameCache( this ); } -// public String getPlayerFileName() { -// -// return JsonFileIO.filenamePlayer( this ); -// } @Override public String toString() { - return getName(); + return getName(); } @@ -154,7 +148,6 @@ public String getDisplayName() { @Override public boolean isOnline() { return offlinePlayer.isOnline(); -// return false; } @@ -171,17 +164,10 @@ public long getLastSeenDate() { */ @Override public boolean isPlayer() { - return ( offlinePlayer != null && offlinePlayer.getPlayer() != null && - offlinePlayer.getPlayer() instanceof Player ); -// return false; + return ( offlinePlayer != null && offlinePlayer.getPlayer() != null && + offlinePlayer.getPlayer() instanceof Player ); } -// @Override -// public boolean hasPermission( String perm ) { -// Output.get().logError( "SpigotOfflinePlayer.hasPermission: Cannot access permissions for offline players." ); -// return false; -// } - @Override public void setDisplayName( String newDisplayName ) { Output.get().logError( "SpigotOfflinePlayer.setDisplayName: Cannot set display names." ); @@ -254,7 +240,7 @@ public tech.mcprison.prison.internal.block.Block getLineOfSightBlock() { public List getLineOfSightBlocks() { List results = new ArrayList<>(); - return results; + return results; } @@ -272,10 +258,6 @@ public Inventory getInventory() { return null; } -// @Override -// public void printDebugInventoryInformationToConsole() { -// -// } public OfflinePlayer getWrapper() { return offlinePlayer; @@ -294,43 +276,43 @@ public void recalculatePermissions() { @Override public List getPermissions() { - List results = new ArrayList<>(); - - if ( offlinePlayer.getPlayer() != null ) { - - Set perms = offlinePlayer.getPlayer().getEffectivePermissions(); - for ( PermissionAttachmentInfo perm : perms ) - { - results.add( perm.getPermission() ); - } - } - else { - // try to use vault: - - // TODO add permission integrations here!! - } - - - return results; + List results = new ArrayList<>(); + + if ( offlinePlayer.getPlayer() != null ) { + + Set perms = offlinePlayer.getPlayer().getEffectivePermissions(); + for ( PermissionAttachmentInfo perm : perms ) + { + results.add( perm.getPermission() ); + } + } + else { + // try to use vault: + + // TODO add permission integrations here!! + } + + + return results; } @Override public List getPermissions( String prefix ) { - return getPermissions( prefix, getPermissions() ); + return getPermissions( prefix, getPermissions() ); } @Override public List getPermissions( String prefix, List perms ) { - List results = new ArrayList<>(); - - for ( String perm : perms ) { - if ( perm.startsWith( prefix ) ) { - results.add( perm ); - } - } - - return results; + List results = new ArrayList<>(); + + for ( String perm : perms ) { + if ( perm.startsWith( prefix ) ) { + results.add( perm ); + } + } + + return results; } @Override @@ -347,30 +329,8 @@ public boolean hasPermission( String perm ) { } return hasPerm; - -// List perms = getPermissions( perm ); -// return perms.contains( perm ); } -// @Override -// public List getPermissions() { -// List results = new ArrayList<>(); -// -// return results; -// } -// -// @Override -// public List getPermissions( String prefix ) { -// List results = new ArrayList<>(); -// -// for ( String perm : getPermissions() ) { -// if ( perm.startsWith( prefix ) ) { -// results.add( perm ); -// } -// } -// -// return results; -// } @Override public List getPermissionsIntegrations( boolean detailed ) { @@ -391,63 +351,48 @@ public List getPermissionsIntegrations( boolean detailed ) { */ @Override public double getSellAllMultiplier() { - double results = 1.0; + double results = 1.0; SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); if ( sellall != null && getWrapper() != null ) { -// SpigotPlayer sPlayer = new SpigotPlayer( getWrapper() ); - results = sellall.getPlayerMultiplier( this ); } -// SpigotPlayer sPlayer = null; -// -// if ( getWrapper() != null ) { -// sPlayer = new SpigotPlayer( getWrapper() ); -// -// results = sPlayer.getSellAllMultiplier(); -// } - - return results; + return results; } @Override public double getSellAllMultiplierDebug() { - double results = 1.0; + double results = 1.0; // NOTE: isPlayer() is a check to see if it's tied to the bukkit Player object, of // which offline player is not. But the sellall multiplier can still be called. -// if ( isPlayer() ) { SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); if ( sellall != null && getWrapper() != null ) { -// SpigotPlayer sPlayer = new SpigotPlayer( getWrapper() ); - results = sellall.getPlayerMultiplierDebug( this ); } -// } return results; } public List getSellAllMultiplierListings() { - List results = new ArrayList<>(); - - if ( isPlayer() ) { - - SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); - - if ( sellall != null && getWrapper() != null ) { - results.addAll( sellall.getPlayerMultiplierList((org.bukkit.entity.Player) getWrapper()) ); - } - } - - - return results; + List results = new ArrayList<>(); + + if ( isPlayer() ) { + + SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil(); + + if ( sellall != null && getWrapper() != null ) { + results.addAll( sellall.getPlayerMultiplierList((org.bukkit.entity.Player) getWrapper()) ); + } + } + + return results; } @Override @@ -517,16 +462,6 @@ public tech.mcprison.prison.internal.Player getPlatformPlayer() { SpigotPlayer sPlayer = SpigotPlayer.getSpigotPlayer( getRankPlayer() ); return sPlayer; - -// tech.mcprison.prison.internal.Player player = null; -// -// Optional oPlayer = Prison.get().getPlatform().getPlayer( getName() ); -// -// if ( oPlayer.isPresent() ) { -// player = oPlayer.get(); -// } -// -// return player; } diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotPlayer.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotPlayer.java index c7c99176a..b2e5ecab5 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotPlayer.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotPlayer.java @@ -26,11 +26,9 @@ import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Material; -import org.bukkit.OfflinePlayer; import org.bukkit.Statistic; import org.bukkit.block.Block; import org.bukkit.entity.ExperienceOrb; -import org.bukkit.inventory.meta.ItemMeta; import com.cryptomorin.xseries.XMaterial; @@ -38,7 +36,6 @@ import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures; import tech.mcprison.prison.autofeatures.AutoFeaturesWrapper; import tech.mcprison.prison.autofeatures.PlayerMessaging.MessageType; -import tech.mcprison.prison.bombs.MineBombData; import tech.mcprison.prison.cache.PlayerCache; import tech.mcprison.prison.cache.PlayerCachePlayerData; import tech.mcprison.prison.file.JsonFileIO; @@ -63,7 +60,6 @@ import tech.mcprison.prison.spigot.utils.tasks.PlayerMessagingTask; import tech.mcprison.prison.util.Gamemode; import tech.mcprison.prison.util.Location; -import tech.mcprison.prison.util.Text; import tech.mcprison.prison.util.Vector; /** @@ -120,25 +116,25 @@ public SpigotPlayer(org.bukkit.entity.Player bukkitPlayer) { */ public static SpigotPlayer getSpigotPlayer( RankPlayer rankPlayer ) { - SpigotPlayer result = null; - - // We have a RankPlayer object, but we need to connect this SpigotPlayer object - // to the bukkit player object. - - // NOTE: We're directly accessing bukkit here because it's more direct instead of - // trying to do that through a few different function within the - // SpigotPlatform. - - // First try to load a bukkit online player: - org.bukkit.entity.Player bPlayer = Bukkit.getPlayer( rankPlayer.getUUID() ); - - if ( bPlayer != null ) { - result = new SpigotPlayer( bPlayer ); - - result.setRankPlayer( rankPlayer ); - } - - return result; + SpigotPlayer result = null; + + // We have a RankPlayer object, but we need to connect this SpigotPlayer object + // to the bukkit player object. + + // NOTE: We're directly accessing bukkit here because it's more direct instead of + // trying to do that through a few different function within the + // SpigotPlatform. + + // First try to load a bukkit online player: + org.bukkit.entity.Player bPlayer = Bukkit.getPlayer( rankPlayer.getUUID() ); + + if ( bPlayer != null ) { + result = new SpigotPlayer( bPlayer ); + + result.setRankPlayer( rankPlayer ); + } + + return result; } @@ -159,7 +155,7 @@ public static SpigotPlayer getSpigotPlayer( RankPlayer rankPlayer ) { */ public String getPlayerFileName() { - return filenamePlayer(); + return filenamePlayer(); } @@ -199,20 +195,6 @@ public String filenameCache() { return getFileCache().getName(); } -// public String getPlayerFileName() { -// -// return JsonFileIO.filenamePlayer( this ); -// } - -// @Override -// public UUID getUUID() { -// return bukkitPlayer.getUniqueId(); -// } - -// @Override -// public String getName() { -// return bukkitPlayer.getName(); -// } @Override public String getDisplayName() { @@ -239,17 +221,6 @@ public void give(ItemStack itemStack) { bukkitPlayer.getInventory().addItem(SpigotUtil.prisonItemStackToBukkit(itemStack)); } -// @Override -// public Location getLocation() { -// return SpigotUtil.bukkitLocationToPrison(bukkitPlayer.getLocation()); -// } - -// @Override public boolean teleport(Location location) { -// -// -// return bukkitPlayer.teleport(SpigotUtil.prisonLocationToBukkit(location), -// PlayerTeleportEvent.TeleportCause.PLUGIN); -// } @Override public boolean isOnline() { @@ -273,66 +244,29 @@ public void setGamemode(Gamemode gamemode) { @Override public Optional getLocale() { - Optional results = Optional.empty(); + Optional results = Optional.empty(); -// if ( SpigotNMSPlayer.getInstance().hasSupport() ) { -// try { -// results = Optional.ofNullable( -// SpigotNMSPlayer.getInstance().getLocale( getWrapper() ) -// ); -// } -// catch ( Exception ex ) { -// Output.get().logInfo( -// "Failed to initialize NMS components -- " + -// "NMS is not functional - " + ex.getMessage() ); -// } -// } return results; } @Override public SpigotBlock getLineOfSightBlock() { - SpigotBlock results = null; - -// org.bukkit.Location eyeLocation = getWrapper().getEyeLocation(); -// org.bukkit.util.Vector lineOfSight = eyeLocation.getDirection().normalize(); -// -// double maxDistance = 256; -// -// for(double i = 0; i < maxDistance; ++i){ -// Block block = eyeLocation.add( lineOfSight.clone().multiply(i) ).getBlock(); -// if( block.getType() != Material.AIR ) { -//// if( block.getType().isSolid() ) { -// -// results = new SpigotBlock( block ); -// break; -// } -// -// } -// -// return results; -// - - - -// List results = new ArrayList<>(); - - - - List blocks = bukkitPlayer.getLineOfSight( null, 256 ); - for ( Block block : blocks ) { - if ( block != null && block.getType() != Material.AIR && - !SpigotCompatibility.getInstance().isPassable(block) ) { - - - // return the first non-null and non-AIR block, which will - // be the one the player is looking at: - results = SpigotBlock.getSpigotBlock( block ); - } - } - - return results; + SpigotBlock results = null; + + List blocks = bukkitPlayer.getLineOfSight( null, 256 ); + for ( Block block : blocks ) { + if ( block != null && block.getType() != Material.AIR && + !SpigotCompatibility.getInstance().isPassable(block) ) { + + + // return the first non-null and non-AIR block, which will + // be the one the player is looking at: + results = SpigotBlock.getSpigotBlock( block ); + } + } + + return results; } @@ -356,27 +290,27 @@ public SpigotBlock getLineOfSightBlock() { * @return */ public Location getLineOfSightExactLocation() { - - SpigotLocation eyeLoc = new SpigotLocation( getWrapper().getEyeLocation() ); - Vector eyeVec = eyeLoc.getDirection(); - - Location loc = eyeLoc.add(eyeVec); - - int i = 0; - - // Is isPassible also true when isEmpty? If so, then this could be simplified... - // while ( i++ <= 75 && (loc.getBlockAt().isEmpty() || loc.getBlockAt().isPassible()) ) { - - while ( i++ <= 75 && loc.getBlockAt().isEmpty() ) { - - loc = loc.add(eyeVec); - } - - if ( loc.getBlockAt().isEmpty() ) { - loc = null; - } - - return loc; + + SpigotLocation eyeLoc = new SpigotLocation( getWrapper().getEyeLocation() ); + Vector eyeVec = eyeLoc.getDirection(); + + Location loc = eyeLoc.add(eyeVec); + + int i = 0; + + // Is isPassible also true when isEmpty? If so, then this could be simplified... + // while ( i++ <= 75 && (loc.getBlockAt().isEmpty() || loc.getBlockAt().isPassible()) ) { + + while ( i++ <= 75 && loc.getBlockAt().isEmpty() ) { + + loc = loc.add(eyeVec); + } + + if ( loc.getBlockAt().isEmpty() ) { + loc = null; + } + + return loc; } /** @@ -389,21 +323,21 @@ public Location getLineOfSightExactLocation() { @Override public List getLineOfSightBlocks() { - List results = new ArrayList<>(); - - List blocks = bukkitPlayer.getLineOfSight( null, 256 ); - for ( Block block : blocks ) { - if ( block != null && - (results.size() == 0 && block.getType() != Material.AIR || - results.size() > 0 && results.size() < 20 )) { - - // return the first non-null and non-AIR block, which will - // be the one the player is looking at: - results.add( SpigotBlock.getSpigotBlock( block ) ); - } + List results = new ArrayList<>(); + + List blocks = bukkitPlayer.getLineOfSight( null, 256 ); + for ( Block block : blocks ) { + if ( block != null && + (results.size() == 0 && block.getType() != Material.AIR || + results.size() > 0 && results.size() < 20 )) { + + // return the first non-null and non-AIR block, which will + // be the one the player is looking at: + results.add( SpigotBlock.getSpigotBlock( block ) ); + } } - return results; + return results; } @@ -417,7 +351,7 @@ public Inventory getInventory() { } public SpigotPlayerInventory getSpigotPlayerInventory() { - return new SpigotPlayerInventory(getWrapper().getInventory()); + return new SpigotPlayerInventory(getWrapper().getInventory()); } @Override @@ -438,284 +372,33 @@ public boolean isPlayer() { @Override public long getLastSeenDate() { - return bukkitPlayer.getLastPlayed(); + return bukkitPlayer.getLastPlayed(); } -// @Override -// public boolean isOp() { -// return bukkitPlayer.isOp(); -// } - -// @Override -// public boolean hasPermission( String perm ) { -// List perms = getPermissions( perm ); -// return perms.contains( perm ); -// } - - -// @Override -// public List getPermissions() { -// List results = new ArrayList<>(); -// -// Set perms = bukkitPlayer.getEffectivePermissions(); -// for ( PermissionAttachmentInfo perm : perms ) -// { -// results.add( perm.getPermission() ); -// } -// -// return results; -// } - - -// @Override -// public List getPermissions( String prefix ) { -// List results = new ArrayList<>(); -// -// for ( String perm : getPermissions() ) { -// if ( perm.startsWith( prefix ) ) { -// results.add( perm ); -// } -// } -// -// return results; -// } - - -// /** -// *

This uses the sellall configs for the permission name to use to get the list of -// * multipliers. It then adds all of the multipliers together to ... -// * -// *

-// * -// */ -// @Override -// public double getSellAllMultiplier() { -// double results = 1.0; -// -// SellAllPrisonCommands sellall = SellAllPrisonCommands.get(); -// -// if ( sellall != null ) { -// results = sellall.getMultiplier( this ); -// } -// -// return results; -// } @Override public int compareTo( SpigotPlayer sPlayer) { return getUUID().compareTo( sPlayer.getUUID() ); -// return getName().compareTo( sPlayer.getName() ); } @Override public String toString() { - StringBuilder sb = new StringBuilder(); - - sb.append( "SpigotPlayer: " ).append( getName() ) - .append( " isOp=" ).append( isOp() ) - .append( " isOnline=" ).append( isOnline() ) - .append( " isPlayer=" ).append( isPlayer() ) - - .append( " hasBukkitPlayer=" ).append( bukkitPlayer != null ) - .append( " hasRankPlayer=" ).append( rankPlayer != null ) - ; - - return sb.toString(); + StringBuilder sb = new StringBuilder(); + + sb.append( "SpigotPlayer: " ).append( getName() ) + .append( " isOp=" ).append( isOp() ) + .append( " isOnline=" ).append( isOnline() ) + .append( " isPlayer=" ).append( isPlayer() ) + + .append( " hasBukkitPlayer=" ).append( bukkitPlayer != null ) + .append( " hasRankPlayer=" ).append( rankPlayer != null ) + ; + + return sb.toString(); } -// /** -// * This class is an adaptation of the NmsHelper class in the Rosetta library by Max Roncace. The -// * library is licensed under the New BSD License. See the {@link tech.mcprison.prison.localization} -// * package for the full license. -// * -// * @author Max Roncacé -// */ -// private static class NmsHelper { -// -// private static final boolean SUPPORT; -// -// private static final String PACKAGE_VERSION; -// -// private static final Method PLAYER_SPIGOT; -// private static final Method PLAYER$SPIGOT_GETLOCALE; -// private static final Method CRAFTPLAYER_GETHANDLE; -// -// private static final Field ENTITY_PLAYER_LOCALE; -// private static final Field LOCALE_LANGUAGE_WRAPPED_STRING; -// -// static { -// String[] array = Bukkit.getServer().getClass().getPackage().getName().split("\\."); -// PACKAGE_VERSION = array.length == 4 ? array[3] + "." : ""; -// -// Method player_spigot = null; -// Method player$spigot_getLocale = null; -// Method craftPlayer_getHandle = null; -// Field entityPlayer_locale = null; -// Field localeLanguage_wrappedString = null; -// try { -// -// Class craftPlayer = getCraftClass("entity.CraftPlayer"); -// -// // for reasons not known to me Paper decided to make EntityPlayer#locale null by default and have the -// // fallback defined in CraftPlayer$Spigot#getLocale. Rosetta will use that method if possible and fall -// // back to accessing the field directly. -// try { -// player_spigot = org.bukkit.entity.Player.class.getMethod("spigot"); -// Class player$spigot = Class.forName("org.bukkit.entity.Player$Spigot"); -// player$spigot_getLocale = player$spigot.getMethod("getLocale"); -// } catch (NoSuchMethodException ignored) { // we're non-Spigot or old -// } -// -// if (player$spigot_getLocale == null) { // fallback for non-Spigot software -// craftPlayer_getHandle = craftPlayer.getMethod("getHandle"); -// -// entityPlayer_locale = getNmsClass("EntityPlayer").getDeclaredField("locale"); -// entityPlayer_locale.setAccessible(true); -// if (entityPlayer_locale.getType().getSimpleName().equals("LocaleLanguage")) { -// // On versions prior to 1.6, the locale is stored as a LocaleLanguage object. -// // The actual locale string is wrapped within it. -// // On 1.5, it's stored in field "e". -// // On 1.3 and 1.4, it's stored in field "d". -// try { // try for 1.5 -// localeLanguage_wrappedString = -// entityPlayer_locale.getType().getDeclaredField("e"); -// } catch (NoSuchFieldException ex) { // we're pre-1.5 -// localeLanguage_wrappedString = -// entityPlayer_locale.getType().getDeclaredField("d"); -// } -// } -// } -// } -// catch ( ClassNotFoundException ex ) { -// Output.get().logInfo( -// "Cannot initialize NMS components - ClassNotFoundException - " + -// "NMS is not functional - " + ex.getMessage() ); -// -// } -// catch (NoSuchFieldException | NoSuchMethodException ex) { -// Output.get().logInfo( -// "Cannot initialize NMS components - per-player localization disabled. - " + ex.getMessage()); -// } -// PLAYER_SPIGOT = player_spigot; -// PLAYER$SPIGOT_GETLOCALE = player$spigot_getLocale; -// CRAFTPLAYER_GETHANDLE = craftPlayer_getHandle; -// ENTITY_PLAYER_LOCALE = entityPlayer_locale; -// LOCALE_LANGUAGE_WRAPPED_STRING = localeLanguage_wrappedString; -// SUPPORT = CRAFTPLAYER_GETHANDLE != null; -// } -// -// private static boolean hasSupport() { -// return SUPPORT; -// } -// -// private static String getLocale(org.bukkit.entity.Player player) -// throws IllegalAccessException, InvocationTargetException, ClassNotFoundException { -// if (PLAYER$SPIGOT_GETLOCALE != null) { -// return (String) PLAYER$SPIGOT_GETLOCALE.invoke(PLAYER_SPIGOT.invoke(player)); -// } -// -// Object entityPlayer = CRAFTPLAYER_GETHANDLE.invoke(player); -// Object locale = ENTITY_PLAYER_LOCALE.get(entityPlayer); -// if (LOCALE_LANGUAGE_WRAPPED_STRING != null) { -// return (String) LOCALE_LANGUAGE_WRAPPED_STRING.get(locale); -// } else { -// return (String) locale; -// } -// } -// -// private static Class getCraftClass(String className) throws ClassNotFoundException { -// return Class.forName("org.bukkit.craftbukkit." + PACKAGE_VERSION + className); -// } -// -// private static Class getNmsClass(String className) throws ClassNotFoundException { -// return Class.forName("net.minecraft.server." + PACKAGE_VERSION + className); -// } -// -// } - -// @SuppressWarnings( "deprecation" ) -// public void printDebugInventoryInformationToConsole() { -// -// try { -// printDebugInfo( bukkitPlayer.getInventory().getContents(), "Inventory Contents"); -// } -// catch ( java.lang.NoSuchMethodError | Exception e ) { -// // Ignore: Not supported with that version of spigot: -// } -// -// try { -// printDebugInfo( bukkitPlayer.getInventory().getExtraContents(), "Inventory Extra Contents"); -// } -// catch ( java.lang.NoSuchMethodError | Exception e ) { -// // Ignore: Not supported with that version of spigot: -// } -// -// try { -// printDebugInfo( bukkitPlayer.getInventory().getArmorContents(), "Inventory Armor Contents"); -// } -// catch ( java.lang.NoSuchMethodError | Exception e ) { -// // Ignore: Not supported with that version of spigot: -// } -// try { -// printDebugInfo( bukkitPlayer.getInventory().getStorageContents(), "Inventory Storage Contents"); -// } -// catch ( java.lang.NoSuchMethodError | Exception e ) { -// // Ignore: Not supported with that version of spigot: -// } -// -// try { -// printDebugInfo( bukkitPlayer.getInventory().getItemInHand(), "Inventory Item In Hand (pre 1.13)"); -// } -// catch ( java.lang.NoSuchMethodError | Exception e ) { -// // Ignore: Not supported with that version of spigot: -// } -// -// try { -// printDebugInfo( bukkitPlayer.getInventory().getItemInMainHand(), "Inventory Item in Main Hand"); -// } -// catch ( java.lang.NoSuchMethodError | Exception e ) { -// // Ignore: Not supported with that version of spigot: -// } -// -// try { -// printDebugInfo( bukkitPlayer.getInventory().getItemInOffHand(), "Inventory Item in Off Hand"); -// } -// catch ( java.lang.NoSuchMethodError | Exception e ) { -// // Ignore: Not supported with that version of spigot: -// } -// } - -// private void printDebugInfo( org.bukkit.inventory.ItemStack[] iStacks, String title ) { -// -// Output.get().logInfo( "&7%s:", title ); -// for ( int i = 0; i < iStacks.length; i++ ) { -// org.bukkit.inventory.ItemStack iStack = iStacks[i]; -// -// if ( iStack != null ) { -// -// ItemStack pItemStack = SpigotUtil.bukkitItemStackToPrison(iStack); -// -// Output.get().logInfo( " i=%d &3%s &3%d &a[&3%s&a]", -// i, iStack.getType().name(), iStack.getAmount(), -// (pItemStack == null ? "" : -// (pItemStack.getDisplayName() == null ? "" : -// pItemStack.getDisplayName())) ); -// } -// } -// } - -// private void printDebugInfo( org.bukkit.inventory.ItemStack iStack, String title ) { -// -// Output.get().logInfo( "&7%s:", title ); -// if ( iStack != null ) { -// -// Output.get().logInfo( " &3%s &3%d", -// iStack.getType().name(), iStack.getAmount() ); -// } -// } - public void giveExp( int xp ) { if ( getWrapper() != null ) { @@ -860,8 +543,6 @@ public void setActionBar( String actionBar ) { if ( getWrapper() != null) { PlayerMessagingTask.submitTask( getWrapper(), MessageType.actionBar, actionBar ); -// SpigotCompatibility.getInstance() -// .sendActionBar( getWrapper(), actionBar ); } } @@ -920,7 +601,6 @@ public boolean addBalance( String currency, double amount ) { if ( currencyEcon != null ) { results = currencyEcon.addBalance( this, amount, currency ); -// addCachedRankPlayerBalance( currency, amount ); } } return results; @@ -947,20 +627,6 @@ public boolean enableFlying( Mine mine, float flightSpeed ) { return enabled; } -// public Mine getEffectsMine() { -// Mine effectsMine = null; -// -// if ( lastEffectsMine != null ) { -// -// if ( !lastEffectsMine.isInMineExact( getLocation() ) ) { -// lastEffectsMine = null; -// -// // cancel all effects for player -// } -// effectsMine = lastEffectsMine; -// } -// return effectsMine; -// } public boolean isFlying() { boolean flying = false; @@ -994,13 +660,7 @@ public boolean isMinecraftStatisticsEnabled() { @Override public void incrementMinecraftStatsMineBlock( Player player, String blockName, int quantity) { -// Statistic.BREAK_ITEM; -// Statistic.DROP_COUNT; -// Statistic.MINE_BLOCK; -// Statistic.PICKUP; - XMaterial xMat = XMaterial.matchXMaterial( blockName ).orElse( null ); -// XMaterial xMat = SpigotCompatibility.getInstance().getXMaterial( block ); if ( xMat != null ) { Material mat = xMat.parseMaterial(); @@ -1012,12 +672,6 @@ public void incrementMinecraftStatsMineBlock( Player player, String blockName, i } } -// Statistic.MINE_BLOCK; -// player.setStatistic(null, count); -// player.incrementStatistic(null, null); -// player.incrementStatistic(null, null, count); -// player.statistic - } @Override @@ -1076,9 +730,6 @@ public boolean isInventoryFull() { * * @return */ -// public boolean isAutoSellEnabled() { -// return isAutoSellEnabled( null ); -// } public boolean isAutoSellEnabled( StringBuilder debugInfo ) { boolean results = false; @@ -1089,8 +740,6 @@ public boolean isAutoSellEnabled( StringBuilder debugInfo ) { if ( SellAllUtil.get().isAutoSellPerUserToggleable ) { debugInfo.append( "(&7sellallEnabled:userToggleable&3)" ); -// boolean isAutoSellPerUserToggleable = SellAllUtil.get().isAutoSellPerUserToggleable; - boolean isPlayerAutoSellTurnedOn = SellAllUtil.get().isSellallPlayerUserToggleEnabled( getWrapper() ); @@ -1136,22 +785,6 @@ public boolean isAutoSellEnabled( StringBuilder debugInfo ) { return results; } - -// /** -// *

This will check to see if the player has the perms enabled -// * for autosell. -// *

If the function 'isAutoSellEnabled()' has already -// * been called, you can also pass that in as a parameter so it does -// * not have to be recalculated. -// *

-// * -// * @return -// */ -// public boolean isAutoSellByPermEnabled( StringBuilder debugInfo ) { -// return isAutoSellByPermEnabled( isAutoSellEnabled( debugInfo ), debugInfo ); -// } /** *

This will check to see if the player has the perms enabled @@ -1181,8 +814,8 @@ private boolean isAutoSellByPermEnabledAutoFeatures( StringBuilder debugInfo ) { !"false".equalsIgnoreCase( perm ) ) { debugInfo.append( "(&7autosellAutoFeaturesByPerm&3: " ) - .append( Output.get().getColorCodeWarning() ) - ; + .append( Output.get().getColorCodeWarning() ) + ; if ( isOp() ) { debugInfo.append( diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotPlayerUtil.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotPlayerUtil.java index 5fb7637ad..1fb291529 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotPlayerUtil.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotPlayerUtil.java @@ -365,12 +365,6 @@ private int getEnchantment( String enchant ) { } } -// for ( Enchantment e : Enchantment.values() ) { -// if (e.getKey().getKey().equalsIgnoreCase( enchant ) ) { -// enchantment = e; -// break; -// } -// } if ( enchantment != null ) { @@ -425,36 +419,6 @@ public int getItemInHandEnchantmentLuck() { } -// public String getEnchantments() { -// StringBuilder sb = new StringBuilder(); -// -// SpigotItemStack itemStack = getItemInHand(); -// -// if ( itemStack != null && itemStack.getBukkitStack() != null) { -// try { -// -// Set keys = itemStack.getBukkitStack().getEnchantments().keySet(); -// -// for ( Enchantment key : keys ) { -// Integer value = itemStack.getBukkitStack().getEnchantments().get( key ); -// -// if ( value != null ) { -// if ( sb.length() > 0 ) { -// sb.append( ", " ); -// } -// sb.append( key.getName() ).append( ": " ).append( value ); -// key.getItemTarget().toString() -// } -// } -// -// } -// catch ( NullPointerException e ) { -// // Ignore. This happens when a TokeEnchanted tool is used when TE is not installed anymore. -// // It throws this exception: Caused by: java.lang.NullPointerException: null key in entry: null=5 -// } -// } -// } - public String getItemInHandLore() { StringBuilder sb = new StringBuilder(); @@ -482,6 +446,4 @@ public void setSpigotPlayer( SpigotPlayer spigotPlayer ) { this.spigotPlayer = spigotPlayer; } - - } diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotWorld.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotWorld.java index db23cf30f..2da03d031 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotWorld.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotWorld.java @@ -82,14 +82,14 @@ public SpigotWorld(org.bukkit.World bukkitWorld) { @Override public List getEntities() { - List results = new ArrayList<>(); - - for (org.bukkit.entity.Entity bukkitEnitity : getWrapper().getEntities() ) { - - results.add( new SpigotEntity( bukkitEnitity) ); + List results = new ArrayList<>(); + + for (org.bukkit.entity.Entity bukkitEnitity : getWrapper().getEntities() ) { + + results.add( new SpigotEntity( bukkitEnitity) ); } - return results; + return results; } /** @@ -99,20 +99,20 @@ public List getEntities() { * @return */ public List getEntities( EntityType eType ) { - List results = new ArrayList<>(); - - SpigotEntityType seType = eType == null ? null : (SpigotEntityType) eType; - - for (org.bukkit.entity.Entity bukkitEnitity : getWrapper().getEntities() ) { - - if ( seType == null || - seType.getxEType() == XEntityType.of(bukkitEnitity) ) { - - results.add( new SpigotEntity( bukkitEnitity )); - } - } - - return results; + List results = new ArrayList<>(); + + SpigotEntityType seType = eType == null ? null : (SpigotEntityType) eType; + + for (org.bukkit.entity.Entity bukkitEnitity : getWrapper().getEntities() ) { + + if ( seType == null || + seType.getxEType() == XEntityType.of(bukkitEnitity) ) { + + results.add( new SpigotEntity( bukkitEnitity )); + } + } + + return results; } /** @@ -128,42 +128,37 @@ public List getEntities( EntityType eType ) { @Override public Block getBlockAt( Location location, boolean containsCustomBlocks ) { - if ( getBlockAtLocation == null ) { - getBlockAtLocation = new SpigotBlockGetAtLocation(); - } - - return getBlockAtLocation.getBlockAt(location, containsCustomBlocks, this); + if ( getBlockAtLocation == null ) { + getBlockAtLocation = new SpigotBlockGetAtLocation(); + } + + return getBlockAtLocation.getBlockAt(location, containsCustomBlocks, this); } public Block getBlockAt( Location location ) { - return getBlockAt( location, false ); + return getBlockAt( location, false ); } -// public SpigotBlock getSpigotBlockAt(Location location) { -// return new SpigotBlock( -// bukkitWorld.getBlockAt(SpigotUtil.prisonLocationToBukkit(location))); -// } - public org.bukkit.Location getBukkitLocation(Location location) { - return SpigotUtil.prisonLocationToBukkit(location); + return SpigotUtil.prisonLocationToBukkit(location); } public org.bukkit.inventory.ItemStack getBukkitItemStack( ItemStack itemStack ) { - SpigotItemStack sItemStack = (SpigotItemStack) itemStack; - - return sItemStack.getBukkitStack(); + SpigotItemStack sItemStack = (SpigotItemStack) itemStack; + + return sItemStack.getBukkitStack(); } @Override public void setBlock( PrisonBlock block, int x, int y, int z ) { - Location loc = new Location( this, x, y, z ); - org.bukkit.block.Block bukkitBlock = - bukkitWorld.getBlockAt(SpigotUtil.prisonLocationToBukkit(loc)); - - SpigotCompatibility.getInstance().updateSpigotBlock( block, bukkitBlock ); + Location loc = new Location( this, x, y, z ); + org.bukkit.block.Block bukkitBlock = + bukkitWorld.getBlockAt(SpigotUtil.prisonLocationToBukkit(loc)); + + SpigotCompatibility.getInstance().updateSpigotBlock( block, bukkitBlock ); } @@ -209,59 +204,6 @@ public void setBlocksSynchronously( List tBlocks, MineRes } -// public String getBlockSignature( Location location ) { -// String results = null; -// -// if ( getWrapper() != null ) { -// -// SpigotBlock block = (SpigotBlock) getBlockAt( location ); -// -// StringBuilder sb = new StringBuilder(); -// sb.append( block.getWrapper().getType().name() ) -// .append( ":" ) -//// .append( location.toWorldCoordinates() ) -//// .append( "::" ) -// .append( block.getWrapper().getBlockData() ); -// -// results = sb.toString(); -// } -// -// return results; -// } - -// public void getTestBlock() { -// -// PrisonNBTUtil nbtUtil = new PrisonNBTUtil(); -// -// NBTItem nbtItemStack = nbtUtil.getNBT( bstack ); -// -// nbtItemStack. -// } - -// public void setBlockFromString( String blockString, Location location ) { -// -// String[] parts = blockString.split("::"); -// String blockNameFormal = parts[0]; -// String worldCoordinates = parts[1]; -// String blockData = parts[2]; -// -// Location targetLocation = location; -// if ( targetLocation == null ) { -// targetLocation = Location.decodeWorldCoordinates(worldCoordinates); -// } -// -// SpigotBlock block = (SpigotBlock) getBlockAt( targetLocation ); -// -// Prison.get().getPlatform().getPrisonBlock(blockNameFormal); -//// block.setType(Material.getMaterial(parts[0])); -// -// BlockData targetBlockData = -// SpigotPrison.getInstance().getServer().createBlockData( blockData ); -// -// block.getWrapper().setBlockData( targetBlockData ); -// -// } - public org.bukkit.World getWrapper() { return bukkitWorld; @@ -306,9 +248,6 @@ public org.bukkit.entity.ArmorStand spawnBukkitArmorStand( Location location ) { Location spawnPoint = new Location( location ); spawnPoint.setY(maxHight); -// Entity e = spawnEntity( spawnPoint, SpigotEntityType.ENTITY_TYPE_ARMOR_STAND ); -// SpigotEntity sEntity = (SpigotEntity) e; - org.bukkit.entity.Entity bEntity = spawnBukkitEntity( spawnPoint, SpigotEntityType.ENTITY_TYPE_ARMOR_STAND ); org.bukkit.entity.ArmorStand armorStand = (org.bukkit.entity.ArmorStand) bEntity; @@ -316,12 +255,6 @@ public org.bukkit.entity.ArmorStand spawnBukkitArmorStand( Location location ) { armorStand.teleport( new SpigotLocation( location ).getBukkitLocation() ); -// SpigotArmorStand sArmorStand = new SpigotArmorStand( armorStand ); - -// sArmorStand.teleport(location); - -// testArmorStandPlacement( spawnPoint ); - return armorStand; } @@ -401,22 +334,9 @@ public ArmorStand spawnArmorStand( Location location, String itemType, as.getHelmet(); as.setHelmet(bItemStack); -// String msg = "SpigotWorld.spawnArmorStand: itemInHand: " + -// ( as.getItemInHand() == null ? "null" : as.getItemInHand().toString()) + -// " hasArmms: " + as.hasArms() + -// " itemStack( " + -// (bItemStack == null ? "null" : -// bItemStack.toString() + " " + bItemStack.getAmount()) + ") " + -// " name: " + (customName == null ? "noCustomName" : customName); -// -// Output.get().logInfo( msg ); - -// as.teleport( SpigotLocation.getBukkitLocation(location) ); - // wrap in a SpigotArmorStand: SpigotArmorStand sas = new SpigotArmorStand( as ); - //sas.teleport( location ); return sas; } diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/entity/SpigotArmorStand.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/entity/SpigotArmorStand.java index 2fe6cd813..a07e090a4 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/entity/SpigotArmorStand.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/entity/SpigotArmorStand.java @@ -23,16 +23,6 @@ public SpigotArmorStand( org.bukkit.entity.ArmorStand bArmorStand ) { this.bArmorStand = bArmorStand; } -// public static ArmorStand spawn( tech.mcprison.prison.util.Location location ) { -// tech.mcprison.prison.internal.Entity e = location.spawnEntity( SpigotEntityType.ENTITY_TYPE_ARMOR_STAND ); -// SpigotEntity sEntity = (SpigotEntity) e; -// -// org.bukkit.entity.ArmorStand armorStand = (org.bukkit.entity.ArmorStand) sEntity.getBukkitEntity(); -// SpigotArmorStand sArmorStand = new SpigotArmorStand( armorStand ); -// -// return sArmorStand; -// } - public SpigotArmorStand(Entity entity) { this( (org.bukkit.entity.ArmorStand) ((SpigotEntity) entity).getBukkitEntity() ); @@ -43,58 +33,6 @@ public SpigotArmorStand(Entity entity) { } } -// /** -// * Sets visibility:false, arms:true, basePlate:false, canPickupItems:false, -// * removeWhenFar:false, gravity:false, and itemInHand. -// */ -// @Override -// public void setupArmorStand( ItemStack item ) { -// -// if ( item != null ) { -// -// setVisible( false ); -// -// setArms( true ); -// setBasePlate( false ); -// setCanPickupItems( false ); -// -// setItemInHand( item ); -// -// setRemoveWhenFarAway(false); -// -// if ( new BluesSemanticVersionComparator().compareMCVersionTo( "1.9.0" ) >= 0 ) { -// -// // setGravity is invalid for spigot 1.8.8: -// setGravity( false ); -// } -// } -// } - -// @Override -// public void setupArmorStand( String itemType ) { -// SpigotItemStack item = null; -// -// XMaterial xBomb = XMaterial.matchXMaterial( itemType ).orElse( null ); -// -// if ( xBomb != null ) { -// try { -// -// // Create the spigot/bukkit ItemStack: -// org.bukkit.inventory.ItemStack bItemStack = xBomb.parseItem(); -// -// if ( sItemStack != null ) { -// -// item = new SpigotItemStack( bItemStack ); -// } -// } -// catch (PrisonItemStackNotSupportedRuntimeException e) { -// // Ignore -// } -// } -// -// setupArmorStand( item ); -// } - @Override public boolean isVisible() { return bArmorStand.isVisible(); diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/entity/SpigotEntity.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/entity/SpigotEntity.java index 95f9b052c..3f3b931f8 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/entity/SpigotEntity.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/entity/SpigotEntity.java @@ -104,7 +104,6 @@ public int getMaxFireTicks() { * @return */ public List getNearbyEntities( int r, EntityType eType ) { -// Location loc = getLocation(); List bEntities = getBukkitEntity() .getNearbyEntities( r * 2, r * 2, r * 2 ); @@ -280,15 +279,6 @@ public org.bukkit.entity.Entity getBukkitEntity() { return bukkitEntity; } - -// @Override -// public String getName() { -// -// return bukkitEntity != null ? -// bukkitEntity.getName() : -// rankplayer; -// } - @Override public boolean isPlayer() { @@ -296,14 +286,4 @@ public boolean isPlayer() { } - -// @Override -// public boolean doesSupportColors() { -// return false; -// } - - - - - } diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/ListenersPrisonManager.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/ListenersPrisonManager.java index 2d6586434..cc8440ef9 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/ListenersPrisonManager.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/ListenersPrisonManager.java @@ -92,7 +92,6 @@ public class ListenersPrisonManager private final MessagesConfig messages = SpigotPrison.getInstance().getMessagesConfig(); boolean guiNotEnabled = !getBoolean(config.getString("prison-gui-enabled")); -// private Optional ladder; // makes no sense... not thread safe. public ChatMode mode; @@ -238,7 +237,6 @@ public void onPlayerInteractEvent(PlayerInteractEvent e){ // signs, so check if the material name contains "sign": String matName = clickedBlock.name().toLowerCase(); if ( matName.contains("sign")) { -// if (clickedBlock == Material.SIGN || clickedBlock == Material.WALL_SIGN) { // Get the player Player p = e.getPlayer(); @@ -265,7 +263,6 @@ public void onPlayerInteractEvent(PlayerInteractEvent e){ if (sellAllUtil.isSellAllSignPermissionToUseEnabled && !p.hasPermission(permissionUseSign)) { Output.get().sendWarn(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_missing_permission) -// + " [&3" + permissionUseSign + "&7]" ); return; } @@ -426,7 +423,7 @@ public void onClick(InventoryClickEvent e){ // If a GUI Tools Page action, then process the request and just exit: else if ( SpigotGUIMenuTools.getInstance().processGUIPage( p, title, e ) ) { - return; + return; } @@ -570,41 +567,7 @@ else if ( SpigotGUIMenuTools.getInstance().processGUIPage( p, title, e ) ) { break; } -// // Check the inventory title and do the actions. -// case "PrisonManager -> AutoFeatures": { -// -// // Call the method -// autoFeaturesGUI(e, p, parts); -// -// break; -// } - -// // Check the title and do the actions. -// case "AutoFeatures -> AutoPickup": { -// -// // Call the method -// autoPickupGUI(e, p, parts); -// -// break; -// } - -// // Check the title and do the actions. -// case "AutoFeatures -> AutoSmelt": { -// -// // Call the method -// autoSmeltGUI(e, p, parts); -// -// break; -// } - -// // Check the title and do the actions. -// case "AutoFeatures -> AutoBlock": { -// -// // Call the method -// autoBlockGUI(e, p, parts); -// -// break; -// } + // Check the title and do the actions. case "SellAll -> Blocks": { @@ -744,60 +707,8 @@ else if ( SpigotGUIMenuTools.getInstance().processGUIPage( p, title, e ) ) { } - - -// private boolean processGUIPage( Player p, String title, InventoryClickEvent e ) { -// boolean isPageAction = false; -// -// ItemStack currentItem = e.getCurrentItem(); -// if ( currentItem != null && currentItem.hasItemMeta() ) { -// -// ItemMeta meta = currentItem.getItemMeta(); -// -// if ( meta.hasLore() ) { -// -// String command = null; -// -// List lores = meta.getLore(); -// -// for ( String lore : lores ) { -// -// if ( lore.contains( SpigotGUIMenuTools.GUI_MENU_TOOLS_PAGE ) ) { -// isPageAction = true; -// } -// if ( lore.contains( SpigotGUIMenuTools.GUI_MENU_TOOLS_COMMAND ) ) { -// command = Text.stripColor( lore ).replace( SpigotGUIMenuTools.GUI_MENU_TOOLS_COMMAND, "" ).trim(); -// } -// } -// -// if ( isPageAction && command != null ) { -// Bukkit.dispatchCommand(p, -// Prison.get().getCommandHandler().findRegisteredCommand( command )); -// -// } -// } -// -// } -// -// return isPageAction; -// } private void sellAllPlayerGUI(InventoryClickEvent e, Player p, String[] parts) { -// if (parts[0].equalsIgnoreCase("Prior")){ -// -// SellAllPlayerGUI gui = new SellAllPlayerGUI(p, Integer.parseInt(parts[1])); -// gui.open(); -// -// e.setCancelled(true); -// return; -// } else if (parts[0].equalsIgnoreCase("Next")){ -// -// SellAllPlayerGUI gui = new SellAllPlayerGUI(p, Integer.parseInt(parts[1])); -// gui.open(); -// -// e.setCancelled(true); -// return; -// } p.closeInventory(); e.setCancelled(true); @@ -1401,7 +1312,7 @@ private void mineBlockPercentage(InventoryClickEvent e, Player p, String[] parts String positionStr = ( parts.length > 5 ? parts[5] : "0" ); int position = 0; try { - position = Integer.parseInt( positionStr ); + position = Integer.parseInt( positionStr ); } catch(NumberFormatException ignored) {} @@ -1620,22 +1531,6 @@ private void sellAllItemValue(InventoryClickEvent e, Player p, String[] parts) { private void sellAllAdminBlocksGUI(InventoryClickEvent e, Player p, String[] parts) { -// if (parts[0].equalsIgnoreCase("Prior")){ -// -// SellAllAdminBlocksGUI gui = new SellAllAdminBlocksGUI(p, Integer.parseInt(parts[1])); -// gui.open(); -// -// e.setCancelled(true); -// return; -// } else if (parts[0].equalsIgnoreCase("Next")){ -// -// SellAllAdminBlocksGUI gui = new SellAllAdminBlocksGUI(p, Integer.parseInt(parts[1])); -// gui.open(); -// -// e.setCancelled(true); -// return; -// } - if (e.isRightClick()){ String registeredCmd = Prison.get().getCommandHandler().findRegisteredCommand( "sellall delete" ); @@ -1666,19 +1561,6 @@ private void prisonManagerGUI(InventoryClickEvent e, Player p, String buttonName break; } -// // Check the Item display name and do open the right GUI. -// case "AutoManager": { -// -// // Check if the autofeatures config isn't null. -// if(SpigotGUIComponents.afConfig() != null) { -// SpigotAutoFeaturesGUI gui = new SpigotAutoFeaturesGUI(p); -// gui.open(); -// } else { -// Output.get().sendWarn(new SpigotPlayer(p), "Can't find an autofeatures config, maybe they're disabled."); -// } -// break; -// } - // Check the Item display name and do open the right GUI. case "Mines": { SpigotMinesGUI gui = new SpigotMinesGUI(p, 1, "gui admin mines", "gui"); @@ -1713,21 +1595,12 @@ private void laddersGUI(InventoryClickEvent e, Player p, String buttonNameMain, return; } -// if (parts[0].equalsIgnoreCase("Next") || parts[0].equalsIgnoreCase("Prior")){ -// -// // Open a new SpigotLadders GUI page. -// SpigotLaddersGUI gui = new SpigotLaddersGUI(p, Integer.parseInt(parts[1]), 1); -// p.closeInventory(); -// gui.open(); -// return; -// } - // Get the ladder by the name of the button got before. RankLadder rLadder = PrisonRanks.getInstance().getLadderManager().getLadder(buttonNameMain); if ( rLadder == null ) { - // Do nothing since it's not a valid ladder name: - return; + // Do nothing since it's not a valid ladder name: + return; } // ladder = rLadder; @@ -1735,22 +1608,22 @@ private void laddersGUI(InventoryClickEvent e, Player p, String buttonNameMain, // to be sure's a right click. if (e.isShiftClick() && e.isRightClick()) { - if ( rLadder.getRanks().size() > 0 ) { - - SpigotPlayer sPlayer = new SpigotPlayer( p ); - sPlayer.setActionBar( "Cannot delete a non-empty ladder" ); - } - else { - - // Execute the command - Bukkit.dispatchCommand(p, - Prison.get().getCommandHandler().findRegisteredCommand( "ranks ladder delete " + buttonNameMain )); - e.setCancelled(true); - p.closeInventory(); - SpigotLaddersGUI gui = new SpigotLaddersGUI(p, 1, "gui ladders", "gui" ); - gui.open(); - return; - } + if ( rLadder.getRanks().size() > 0 ) { + + SpigotPlayer sPlayer = new SpigotPlayer( p ); + sPlayer.setActionBar( "Cannot delete a non-empty ladder" ); + } + else { + + // Execute the command + Bukkit.dispatchCommand(p, + Prison.get().getCommandHandler().findRegisteredCommand( "ranks ladder delete " + buttonNameMain )); + e.setCancelled(true); + p.closeInventory(); + SpigotLaddersGUI gui = new SpigotLaddersGUI(p, 1, "gui ladders", "gui" ); + gui.open(); + return; + } } @@ -1765,15 +1638,6 @@ private void laddersGUI(InventoryClickEvent e, Player p, String buttonNameMain, private void ranksGUI(InventoryClickEvent e, Player p, String buttonNameMain, String[] parts) { -// if (parts[0].equalsIgnoreCase("Next") || parts[0].equalsIgnoreCase("Prior")){ -// -// // Open a new SpigotLadders GUI page. -// SpigotRanksGUI gui = new SpigotRanksGUI(p, ladder, Integer.parseInt(parts[1])); -// p.closeInventory(); -// gui.open(); -// return; -// } - if ( !PrisonRanks.getInstance().isEnabled() ) { Output.get().sendWarn(new SpigotPlayer(p), "&cPrison ranks are not enabled."); @@ -1833,53 +1697,32 @@ private void playerPrestigesGUI(InventoryClickEvent e, Player p, String buttonNa private void prestigeConfirmationGUI(InventoryClickEvent e, Player p, String buttonNameMain) { - String playerName = p.getName(); + String playerName = p.getName(); // Check the button name and do the actions. if (buttonNameMain.equalsIgnoreCase("Confirm: Prestige")){ - Output.get().logDebug( DebugTarget.rankup, "rankup: /gui prestigeConfirm: Prestige has been Confirmed. " - + " calling: '/prestige " + playerName + " confirm'" ); - - // Execute the command. - String registeredCmd = Prison.get().getCommandHandler().findRegisteredCommand( "prestige" ); - - String command = registeredCmd + " " + playerName + " confirm"; - + Output.get().logDebug( DebugTarget.rankup, "rankup: /gui prestigeConfirm: Prestige has been Confirmed. " + + " calling: '/prestige " + playerName + " confirm'" ); + + // Execute the command. + String registeredCmd = Prison.get().getCommandHandler().findRegisteredCommand( "prestige" ); + + String command = registeredCmd + " " + playerName + " confirm"; + Bukkit.dispatchCommand(p, command ); } else if (buttonNameMain.equalsIgnoreCase("Cancel: Don't Prestige")){ - Output.get().logDebug( DebugTarget.rankup, "rankup: /gui prestigeConfirm: Prestige has been canceled " + - "for " + playerName + "." ); + Output.get().logDebug( DebugTarget.rankup, "rankup: /gui prestigeConfirm: Prestige has been canceled " + + "for " + playerName + "." ); - // Send a message to the player. -// Output.get().sendInfo(new SpigotPlayer(p), "&cCancelled"); } // Close the inventory. p.closeInventory(); -// // Check the button name and do the actions. -// if (buttonNameMain.equalsIgnoreCase("Confirm: Prestige")){ -// Output.get().logDebug( DebugTarget.rankup, "rankup: GUI: 'Confirm: Prestige' calling: '/rankup prestiges'" ); -// -// // Execute the command. -// String registeredCmd = Prison.get().getCommandHandler().findRegisteredCommand( "rankup" ); -// -// Bukkit.dispatchCommand(p, registeredCmd + " prestiges"); -// // Close the inventory. -// p.closeInventory(); -// } else if (buttonNameMain.equalsIgnoreCase("Cancel: Don't Prestige")){ -// Output.get().logDebug( DebugTarget.rankup, "rankup: GUI/: 'Cancel: Don't Prestige' sendInfo: 'cancelled'" ); -// -// // Send a message to the player. -// Output.get().sendInfo(new SpigotPlayer(p), "&cCancelled"); -// // Close the inventory. -// p.closeInventory(); -// } -// // Cancel the event. e.setCancelled(true); } @@ -1957,7 +1800,7 @@ private void rankManagerGUI(InventoryClickEvent e, Player p, String[] parts) { private void playerRanksGUI(InventoryClickEvent e, Player p, String buttonNameMain) { // Check the buttonName and do the actions. - String message = Text.stripColor( messages.getString(MessagesConfig.StringID.spigot_gui_lore_rankup) ); + String message = Text.stripColor( messages.getString(MessagesConfig.StringID.spigot_gui_lore_rankup) ); if (buttonNameMain.equals(SpigotPrison.format( message ))){ Bukkit.dispatchCommand(p, Prison.get().getCommandHandler().findRegisteredCommand( @@ -2096,15 +1939,6 @@ private void rankPriceGUI(InventoryClickEvent e, Player p, String[] parts) { private void minesGUI(InventoryClickEvent e, Player p, String buttonNameMain, String[] parts) { -// if (parts[0].equalsIgnoreCase("Next") || parts[0].equalsIgnoreCase("Prior")){ -// -// // Open a new SpigotLadders GUI page. -// SpigotMinesGUI gui = new SpigotMinesGUI(p, Integer.parseInt(parts[1])); -// p.closeInventory(); -// gui.open(); -// return; -// } - // Variables. PrisonMines pMines = PrisonMines.getInstance(); Mine m = pMines.getMine(buttonNameMain); @@ -2655,277 +2489,7 @@ private void radiusGUI(InventoryClickEvent e, Player p, String[] parts) { } } -// private void autoFeaturesGUI(InventoryClickEvent e, Player p, String[] parts) { -// -// // Get the config -// AutoFeaturesFileConfig afConfig = AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig(); -// -// // Output finally the buttonname and the mode explicit out of the array -// String buttonName = parts[0]; -// String mode = parts[1]; -// -// boolean enabled = mode.equalsIgnoreCase("Enabled"); -// -// // Check the clickType and do the actions -// if ( enabled && e.isRightClick() && e.isShiftClick() || -// !enabled && e.isRightClick()){ -// -// if (buttonName.equalsIgnoreCase("Full-Inventory-Sound")){ -// afConfig.setFeature( AutoFeatures.playSoundIfInventoryIsFull, !enabled ); -// saveConfigAutoFeatures(e, p); -// } -// -// if (buttonName.equalsIgnoreCase("Full-Inventory-ActionBar")){ -// afConfig.setFeature(AutoFeatures.actionBarMessageIfInventoryIsFull, !enabled); -// saveConfigAutoFeatures(e,p); -// } -// -// if (buttonName.equalsIgnoreCase("All")){ -// afConfig.setFeature(AutoFeatures.isAutoManagerEnabled, !enabled); -// saveConfigAutoFeatures(e,p); -// } -// -// } -// -// // Check the clickType and do the actions -// if (enabled && e.isRightClick() && e.isShiftClick() || !enabled && e.isRightClick() || enabled && e.isLeftClick()){ -// if (buttonName.equalsIgnoreCase("AutoPickup")){ -// if (e.isLeftClick()){ -// SpigotAutoPickupGUI gui = new SpigotAutoPickupGUI(p); -// gui.open(); -// return; -// } -// afConfig.setFeature(AutoFeatures.autoPickupEnabled, !enabled); -// saveConfigAutoFeatures(e,p); -// } -// -// if (buttonName.equalsIgnoreCase("AutoSmelt")){ -// if (e.isLeftClick()){ -// SpigotAutoSmeltGUI gui = new SpigotAutoSmeltGUI(p); -// gui.open(); -// return; -// } -// afConfig.setFeature(AutoFeatures.autoSmeltEnabled, !enabled); -// saveConfigAutoFeatures(e,p); -// } -// -// if (buttonName.equalsIgnoreCase("AutoBlock")){ -// if (e.isLeftClick()){ -// SpigotAutoBlockGUI gui = new SpigotAutoBlockGUI(p); -// gui.open(); -// return; -// } -// afConfig.setFeature(AutoFeatures.autoBlockEnabled, !enabled); -// saveConfigAutoFeatures(e,p); -// } -// } -// } - -// private void autoPickupGUI(InventoryClickEvent e, Player p, String[] parts) { -// -// // Get the config -// AutoFeaturesFileConfig afConfig = AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig(); -// -// // Output finally the buttonname and the mode explicit out of the array -// String buttonname = parts[0]; -// String mode = parts[1]; -// -// boolean enabled = mode.equalsIgnoreCase("Enabled"); -// -// // Check the click and do the actions, also the buttonName -// if ( enabled && e.isRightClick() && e.isShiftClick() || -// !enabled && e.isRightClick() ){ -// -// switch (buttonname){ -// case "All_Blocks":{ -// afConfig.setFeature( AutoFeatures.pickupAllBlocks, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Cobblestone":{ -// afConfig.setFeature(AutoFeatures.pickupCobbleStone, !enabled); -// saveConfigPickup(e,p); -// break; -// } -// case "Gold_Ore":{ -// afConfig.setFeature( AutoFeatures.pickupGoldOre, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Iron_Ore":{ -// afConfig.setFeature( AutoFeatures.pickupIronOre, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Coal_Ore":{ -// afConfig.setFeature( AutoFeatures.pickupCoalOre, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Diamond_Ore":{ -// afConfig.setFeature( AutoFeatures.pickupDiamondOre, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Redstone_Ore":{ -// afConfig.setFeature( AutoFeatures.pickupRedStoneOre, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Emerald_Ore":{ -// afConfig.setFeature( AutoFeatures.pickupEmeraldOre, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Quartz_Ore":{ -// afConfig.setFeature( AutoFeatures.pickupQuartzOre, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Lapis_Ore":{ -// afConfig.setFeature( AutoFeatures.pickupLapisOre, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Snow_Ball":{ -// afConfig.setFeature( AutoFeatures.pickupSnowBall, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// case "Glowstone_Dust":{ -// afConfig.setFeature( AutoFeatures.pickupGlowstoneDust, !enabled ); -// saveConfigPickup(e, p); -// break; -// } -// default:{ -// break; -// } -// -// } -// } -// } -// -// private void autoSmeltGUI(InventoryClickEvent e, Player p, String[] parts) { -// -// // Get the config -// AutoFeaturesFileConfig afConfig = AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig(); -// -// // Output finally the buttonname and the mode explicit out of the array -// String buttonname = parts[0]; -// String mode = parts[1]; -// -// boolean enabled = mode.equalsIgnoreCase("Enabled"); -// -// // Check the clickType and do the actions -// if ( enabled && e.isRightClick() && e.isShiftClick() || -// !enabled && e.isRightClick()){ -// -// switch (buttonname){ -// case "Gold_Ore":{ -// afConfig.setFeature( AutoFeatures.smeltGoldOre, !enabled ); -// saveConfigSmelt(e, p); -// break; -// } -// case "Iron_Ore":{ -// afConfig.setFeature( AutoFeatures.smeltIronOre, !enabled ); -// saveConfigSmelt(e, p); -// break; -// } -// case "All_Ores":{ -// afConfig.setFeature( AutoFeatures.smeltAllBlocks, !enabled ); -// saveConfigSmelt(e, p); -// break; -// } -// default:{ -// break; -// } -// } -// } -// } -// -// private void autoBlockGUI(InventoryClickEvent e, Player p, String[] parts) { -// -// // Get the config -// AutoFeaturesFileConfig afConfig = AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig(); -// -// // Output finally the buttonname and the mode explicit out of the array -// String buttonname = parts[0]; -// String mode = parts[1]; -// -// boolean enabled = mode.equalsIgnoreCase("Enabled"); -// -// // Check the clickType and do the actions -// if ( enabled && e.isRightClick() && e.isShiftClick() || -// !enabled && e.isRightClick()){ -// -// switch (buttonname){ -// case "Gold_Block":{ -// afConfig.setFeature( AutoFeatures.blockGoldBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Iron_Block":{ -// afConfig.setFeature( AutoFeatures.blockIronBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Coal_Block":{ -// afConfig.setFeature( AutoFeatures.blockCoalBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Diamond_Block":{ -// afConfig.setFeature( AutoFeatures.blockDiamondBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Redstone_Block":{ -// afConfig.setFeature( AutoFeatures.blockRedstoneBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Emerald_Block":{ -// afConfig.setFeature( AutoFeatures.blockEmeraldBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Quartz_Block":{ -// afConfig.setFeature( AutoFeatures.blockQuartzBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Prismarine_Block":{ -// afConfig.setFeature( AutoFeatures.blockPrismarineBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Lapis_Block":{ -// afConfig.setFeature( AutoFeatures.blockLapisBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Snow_Block":{ -// afConfig.setFeature( AutoFeatures.blockSnowBlock, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "Glowstone_Block":{ -// afConfig.setFeature( AutoFeatures.blockGlowstone, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// case "All_Blocks":{ -// afConfig.setFeature( AutoFeatures.blockAllBlocks, !enabled ); -// saveConfigBlock(e, p); -// break; -// } -// default:{ -// break; -// } -// } -// } -// -// } + private void modeAction(AsyncPlayerChatEvent e, Player p, String message) { @@ -2955,7 +2519,7 @@ private void modeAction(AsyncPlayerChatEvent e, Player p, String message) { private void sellAllCurrencyChat(AsyncPlayerChatEvent e, Player p, String message) { // Check message and do the action - String registeredCmd = Prison.get().getCommandHandler().findRegisteredCommand( "sellall set currency" ); + String registeredCmd = Prison.get().getCommandHandler().findRegisteredCommand( "sellall set currency" ); if (message.equalsIgnoreCase("cancel")){ Output.get().sendInfo(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_event_cancelled)); } else if (message.equalsIgnoreCase("default")){ @@ -2970,21 +2534,6 @@ private void sellAllCurrencyChat(AsyncPlayerChatEvent e, Player p, String messag isChatEventActive = false; } -// private void prestigeAction(AsyncPlayerChatEvent e, Player p, String message) { -// -// // Check the chat message and do the actions -// if (message.equalsIgnoreCase("cancel")) { -// Output.get().sendInfo(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_prestiges_cancelled)); -// } else if (message.equalsIgnoreCase("confirm")) { -// Bukkit.getScheduler().runTask(SpigotPrison.getInstance(), () -> Bukkit.getServer().dispatchCommand(p, "rankup prestiges")); -// } else { -// Output.get().sendInfo(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_prestiges_cancelled_wrong_keyword)); -// } -// // Cancel the event -// e.setCancelled(true); -// // Set the event to false, because it got deactivated -// isChatEventActive = false; -// } private void mineAction(AsyncPlayerChatEvent e, Player p, String message) { @@ -3011,45 +2560,4 @@ private void rankAction(AsyncPlayerChatEvent e, Player p, String message) { isChatEventActive = false; } -// /** -// * Save the auto features, and then cancel the event and close the inventory. -// * -// * @param e -// * @param player -// */ -// private boolean saveAutoFeatures( InventoryClickEvent e, Player player ) { -// boolean success = AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig().saveConf(); -// e.setCancelled(true); -// player.closeInventory(); -// return success; -// } -// -// -// private boolean saveConfigBlock(InventoryClickEvent e, Player p) { -// boolean success = saveAutoFeatures( e, p ); -// SpigotAutoBlockGUI gui = new SpigotAutoBlockGUI(p); -// gui.open(); -// return success; -// } -// -// private boolean saveConfigSmelt(InventoryClickEvent e, Player p) { -// boolean success = saveAutoFeatures( e, p ); -// SpigotAutoSmeltGUI gui = new SpigotAutoSmeltGUI(p); -// gui.open(); -// return success; -// } -// -// private boolean saveConfigPickup(InventoryClickEvent e, Player p) { -// boolean success = saveAutoFeatures( e, p ); -// SpigotAutoPickupGUI gui = new SpigotAutoPickupGUI(p); -// gui.open(); -// return success; -// } -// -// private boolean saveConfigAutoFeatures(InventoryClickEvent e, Player p) { -// boolean success = saveAutoFeatures( e, p ); -// SpigotAutoFeaturesGUI gui = new SpigotAutoFeaturesGUI(p); -// gui.open(); -// return success; -// } } diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/SpigotGUIMenuTools.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/SpigotGUIMenuTools.java index 4ddb6322c..a9f7eb41c 100644 --- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/SpigotGUIMenuTools.java +++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/SpigotGUIMenuTools.java @@ -49,8 +49,6 @@ public class SpigotGUIMenuTools private boolean useDisabledButtons; -// private String loreCommand; - private SpigotGUIMenuTools() { super(); @@ -66,8 +64,6 @@ private SpigotGUIMenuTools() { this.menuGoBack = XMaterial.BARRIER; -// this.menuStateOff1 = XMaterial.BLACK_STAINED_GLASS_PANE; -// this.menuStateOff2 = XMaterial.GRAY_STAINED_GLASS_PANE; } @@ -155,7 +151,6 @@ public GUIMenuPageData( int totalArraySize, int currentPage, String commandToRun posStart = (page - 1) * pageSize; posEnd = posStart + pageSize; -// posEnd = posStart + pageSize - 1; if ( posEnd > totalArraySize ) { posEnd = totalArraySize; @@ -305,29 +300,6 @@ public void setButtons( List