xMats = new HashSet<>();
for ( SpigotItemStack sItemStack : drops ) {
- if ( sItemStack.getMaterial().getBlockType() == PrisonBlockType.CustomItems ) {
+ if ( sItemStack.getMaterial().getBlockType() == PrisonBlockType.CustomItems ||
+ sItemStack.getMaterial().getBlockType() == PrisonBlockType.ItemsAdder ) {
// cannot block custom blocks so skip XMaterial:
continue;
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerBlockBreakEvents.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerBlockBreakEvents.java
index 075b84026..65c296129 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerBlockBreakEvents.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerBlockBreakEvents.java
@@ -1,35 +1,26 @@
package tech.mcprison.prison.spigot.autofeatures.events;
-import java.util.ArrayList;
-import java.util.List;
-
import org.bukkit.Bukkit;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.EventExecutor;
import org.bukkit.plugin.PluginManager;
-import tech.mcprison.prison.Prison;
import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
import tech.mcprison.prison.autofeatures.AutoFeaturesWrapper;
import tech.mcprison.prison.mines.features.MineBlockEvent.BlockEventType;
-import tech.mcprison.prison.output.ChatDisplay;
import tech.mcprison.prison.output.Output;
-import tech.mcprison.prison.output.Output.DebugTarget;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.api.PrisonMinesBlockBreakEvent;
import tech.mcprison.prison.spigot.autofeatures.AutoManagerFeatures;
import tech.mcprison.prison.spigot.block.BlockBreakPriority;
-import tech.mcprison.prison.spigot.block.OnBlockBreakExternalEvents;
-import tech.mcprison.prison.spigot.block.SpigotBlock;
-import tech.mcprison.prison.spigot.game.SpigotHandlerList;
-import tech.mcprison.prison.spigot.game.SpigotPlayer;
public class AutoManagerBlockBreakEvents
@@ -40,8 +31,12 @@ public class AutoManagerBlockBreakEvents
public AutoManagerBlockBreakEvents() {
super();
-
}
+ public AutoManagerBlockBreakEvents( BlockBreakPriority bbPriority ) {
+ super();
+
+ this.bbPriority = bbPriority;
+ }
public BlockBreakPriority getBbPriority() {
@@ -55,28 +50,30 @@ public void setBbPriority( BlockBreakPriority bbPriority ) {
public void registerEvents() {
initialize();
-
}
public class AutoManagerBlockBreakEventListener
extends AutoManagerBlockBreakEvents
implements Listener {
+
+ public AutoManagerBlockBreakEventListener( BlockBreakPriority bbPriority ) {
+ super( bbPriority );
+ }
@EventHandler(priority=EventPriority.NORMAL)
public void onBlockBreak( BlockBreakEvent e, BlockBreakPriority bbPriority ) {
- if ( isDisabled( e.getBlock().getLocation().getWorld().getName() ) ) {
+ if ( isDisabled( e.getBlock().getLocation().getWorld().getName() ) ||
+ bbPriority.isDisabled() ) {
return;
}
handleBlockBreakEvent( e, bbPriority );
-// genericBlockEventAutoManager( e );
}
@Override
protected int checkBonusXp(Player player, Block block, ItemStack item) {
- // TODO Auto-generated method stub
return 0;
}
}
@@ -95,33 +92,23 @@ public void initialize() {
Output.get().logInfo( "AutoManager: Trying to register BlockBreakEvent" );
String eP = getMessage( AutoFeatures.blockBreakEventPriority );
- setBbPriority( BlockBreakPriority.fromString( eP ) );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ setBbPriority( bbPriority );
+
if ( getBbPriority() != BlockBreakPriority.DISABLED ) {
-
- SpigotPrison prison = SpigotPrison.getInstance();
- PluginManager pm = Bukkit.getServer().getPluginManager();
- EventPriority ePriority = getBbPriority().getBukkitEventPriority();
-
- AutoManagerBlockBreakEventListener autoManagerlListener =
- new AutoManagerBlockBreakEventListener();
-
-
- pm.registerEvent(BlockBreakEvent.class, autoManagerlListener, ePriority,
- new EventExecutor() {
- public void execute(Listener l, Event e) {
- if ( l instanceof AutoManagerBlockBreakEventListener &&
- e instanceof BlockBreakEvent ) {
-
- ((AutoManagerBlockBreakEventListener)l)
- .onBlockBreak( (BlockBreakEvent)e, getBbPriority() );
- }
- }
- },
- prison);
-
- prison.getRegisteredBlockListeners().add( autoManagerlListener );
-
+ if ( bbPriority.isComponentCompound() ) {
+
+ for (BlockBreakPriority subBBPriority : bbPriority.getComponentPriorities()) {
+
+ createListener( subBBPriority );
+ }
+ }
+ else {
+
+ createListener(bbPriority);
+ }
}
@@ -131,6 +118,32 @@ public void execute(Listener l, Event e) {
}
}
+ private void createListener( BlockBreakPriority bbPriority ) {
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+ PluginManager pm = Bukkit.getServer().getPluginManager();
+ EventPriority ePriority = bbPriority.getBukkitEventPriority();
+
+ AutoManagerBlockBreakEventListener autoManagerListener =
+ new AutoManagerBlockBreakEventListener( bbPriority );
+
+
+ pm.registerEvent(BlockBreakEvent.class, autoManagerListener, ePriority,
+ new EventExecutor() {
+ public void execute(Listener l, Event e) {
+ if ( l instanceof AutoManagerBlockBreakEventListener &&
+ e instanceof BlockBreakEvent ) {
+
+ ((AutoManagerBlockBreakEventListener)l)
+ .onBlockBreak( (BlockBreakEvent)e, getBbPriority() );
+ }
+ }
+ },
+ prison);
+
+ prison.getRegisteredBlockListeners().add( autoManagerListener );
+ }
+
// /**
// * If one BlockBreak related event needs to be unregistered, then this function will
@@ -173,27 +186,52 @@ public void dumpEventListeners( StringBuilder sb ) {
// Check to see if the class BlockBreakEvent even exists:
try {
+ HandlerList handlers = BlockBreakEvent.getHandlerList();
+
String eP = getMessage( AutoFeatures.blockBreakEventPriority );
BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
- String title = String.format(
- "BlockBreakEvent (%s)",
- ( bbPriority == null ? "--none--" : bbPriority.name()) );
-
- ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
- title,
- new SpigotHandlerList( BlockBreakEvent.getHandlerList()) );
-
- if ( eventDisplay != null ) {
- sb.append( eventDisplay.toStringBuilder() );
- sb.append( "\n" );
- }
+ dumpEventListenersCore( "BlockBreakEvent", handlers, bbPriority, sb );
+
+
+
+
+// String title = String.format(
+// "BlockBreakEvent (%s)",
+// ( bbPriority == null ? "--none--" : bbPriority.name()) );
+//
+// ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
+// title,
+// new SpigotHandlerList( handlers ) );
+//
+// if ( eventDisplay != null ) {
+// sb.append( eventDisplay.toStringBuilder() );
+// sb.append( "\n" );
+// }
+//
+// if ( bbPriority.isComponentCompound() ) {
+// StringBuilder sbCP = new StringBuilder();
+// for ( BlockBreakPriority bbp : bbPriority.getComponentPriorities() ) {
+// if ( sbCP.length() > 0 ) {
+// sbCP.append( ", " );
+// }
+// sbCP.append( "'" ).append( bbp.name() ).append( "'" );
+// }
+//
+// String msg = String.format( "Note '%s' is a compound of: [%s]",
+// bbPriority.name(),
+// sbCP );
+//
+// sb.append( msg ).append( "\n" );
+// }
}
catch ( Exception e ) {
Output.get().logInfo( "AutoManager: BlockBreakEvent failed to load. [%s]", e.getMessage() );
}
}
+
+
/**
*
This genericBlockEvent handles the basics of a BlockBreakEvent to see if it has happened
@@ -207,26 +245,33 @@ public void dumpEventListeners( StringBuilder sb ) {
*/
private void handleBlockBreakEvent( BlockBreakEvent e, BlockBreakPriority bbPriority ) {
-// boolean monitor, boolean blockEventsOnly,
-// boolean autoManager ) {
-
if ( e instanceof PrisonMinesBlockBreakEvent ) {
return;
}
+ PrisonMinesBlockBreakEvent pmEvent = null;
long start = System.nanoTime();
- if ( e.isCancelled() || ignoreMinesBlockBreakEvent( e, e.getPlayer(), e.getBlock()) ) {
+ // If the event is canceled, it still needs to be processed because of the
+ // MONITOR events:
+ // An event will be "canceled" and "ignored" if the block
+ // BlockUtils.isUnbreakable(), or if the mine is activly resetting.
+ // The event will also be ignored if the block is outside of a mine
+ // or if the targetBlock has been set to ignore all block events which
+ // means the block has already been processed.
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( e,
+ e.getPlayer(), e.getBlock() );
+ if ( eventResults.isIgnoreEvent() ) {
return;
}
// Register all external events such as mcMMO and EZBlocks:
- OnBlockBreakExternalEvents.getInstance().registerAllExternalEvents();
+// OnBlockBreakExternalEvents.getInstance().registerAllExternalEvents();
StringBuilder debugInfo = new StringBuilder();
- debugInfo.append( String.format( "&9### ** genericBlockEvent ** ### " +
+ debugInfo.append( String.format( "&9### ** handleBlockBreakEvent ** ### " +
"(event: BlockBreakEvent, config: %s, priority: %s, canceled: %s) ",
bbPriority.name(),
bbPriority.getBukkitEventPriority().name(),
@@ -234,19 +279,43 @@ private void handleBlockBreakEvent( BlockBreakEvent e, BlockBreakPriority bbPrio
) );
- if ( bbPriority != BlockBreakPriority.MONITOR && !e.isCancelled() || bbPriority == BlockBreakPriority.MONITOR ) {
+ // Process all priorities if the event has not been canceled, and
+ // process the MONITOR priority even if the event was canceled:
+ if ( !bbPriority.isMonitor() && !e.isCancelled() ||
+ bbPriority.isMonitor() ) {
// Need to wrap in a Prison block so it can be used with the mines:
- SpigotBlock sBlock = SpigotBlock.getSpigotBlock(e.getBlock());
- SpigotPlayer sPlayer = new SpigotPlayer(e.getPlayer());
+// SpigotBlock sBlock = SpigotBlock.getSpigotBlock(e.getBlock());
+// SpigotPlayer sPlayer = new SpigotPlayer(e.getPlayer());
BlockEventType eventType = BlockEventType.blockBreak;
String triggered = null;
- PrisonMinesBlockBreakEvent pmEvent = new PrisonMinesBlockBreakEvent( e.getBlock(), e.getPlayer(),
- sBlock, sPlayer, bbPriority, eventType, triggered );
+ pmEvent = new PrisonMinesBlockBreakEvent(
+ e.getBlock(),
+ e.getPlayer(),
+ eventResults.getMine(),
+// sBlock, sPlayer,
+ bbPriority, eventType, triggered,
+ debugInfo );
- if ( !validateEvent( pmEvent, debugInfo ) ) {
+
+ // NOTE: Check for the ACCESS priority and if someone does not have access, then return
+ // with a cancel on the event. Both ACCESSBLOCKEVENTS and ACCESSMONITOR will be
+ // converted to just ACCESS at this point, and the other part will run under either
+ // BLOCKEVENTS or MONITOR.
+ // This check has to be performed after creating the pmEvent object since it uses
+ // a lot of the internal variables and objects. There is not much of an impact since
+ // the validateEvent() has not been ran yet.
+ if ( checkIfNoAccess( pmEvent, start ) ) {
+
+ e.setCancelled( true );
+
+ return;
+ }
+
+ // Validate the event.
+ if ( !validateEvent( pmEvent ) ) {
// The event has not passed validation. All logging and Errors have been recorded
// so do nothing more. This is to just prevent normal processing from occurring.
@@ -255,104 +324,141 @@ private void handleBlockBreakEvent( BlockBreakEvent e, BlockBreakPriority bbPrio
e.setCancelled( true );
}
+
+ debugInfo.append( "(doAction failed validation) " );
}
- else if ( pmEvent.getBbPriority() == BlockBreakPriority.MONITOR ) {
- // Stop here, and prevent additional processing. Monitors should never process the event beyond this.
+
+ // The validation was successful, but stop processing for the MONITOR priorities.
+ // Note that BLOCKEVENTS processing occured already within validateEvent():
+ else if ( pmEvent.getBbPriority().isMonitor() ) {
+ // Stop here, and prevent additional processing.
+ // Monitors should never process the event beyond this.
}
+
// This is where the processing actually happens:
- else if ( pmEvent.getMine() != null || pmEvent.getMine() == null &&
- !isBoolean( AutoFeatures.pickupLimitToMines ) ) {
- debugInfo.append( "(normal processing initiating) " );
+ else {
- // Set the mine's PrisonBlockTypes for the block. Used to identify custom blocks.
- // Needed since processing of the block will lose track of which mine it came from.
- if ( pmEvent.getMine() != null ) {
- sBlock.setPrisonBlockTypes( pmEvent.getMine().getPrisonBlockTypes() );
- }
+// debugInfo.append( "(normal processing initiating) " );
// check all external events such as mcMMO and EZBlocks:
- debugInfo.append(
- OnBlockBreakExternalEvents.getInstance().checkAllExternalEvents( e ) );
+ if ( e instanceof BlockBreakEvent ) {
+ processPMBBExternalEvents( pmEvent, e );
+ }
- List explodedBlocks = new ArrayList<>();
- pmEvent.setExplodedBlocks( explodedBlocks );
-// String triggered = null;
-// PrisonMinesBlockBreakEvent pmbbEvent = new PrisonMinesBlockBreakEvent( e.getBlock(), e.getPlayer(),
-// pmEvent.getMine(), sBlock, explodedBlocks, BlockEventType.blockBreak, triggered );
- Bukkit.getServer().getPluginManager().callEvent( pmEvent );
- if ( pmEvent.isCancelled() ) {
- debugInfo.append( "(normal processing: &6PrisonMinesBlockBreakEvent was canceled&9) " );
- }
- else {
-
- // Cancel drops if so configured:
- if ( isBoolean( AutoFeatures.cancelAllBlockEventBlockDrops ) ) {
-
- try
- {
- e.setDropItems( false );
- }
- catch ( NoSuchMethodError e1 )
- {
- String message = String.format(
- "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
- "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
- "Modify the config settings and set this value to `false`. For now, it is temporarily " +
- "disabled. [%s]",
- e1.getMessage() );
- Output.get().logWarn( message );
-
- AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
- .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
- }
- }
-
- // doAction returns a boolean that indicates if the event should be canceled or not:
- if ( doAction( pmEvent, debugInfo ) ) {
-// if ( doAction( sBlock, pmEvent.getMine(), pmEvent.getPlayer(), debugInfo ) ) {
+ EventListenerCancelBy cancelBy = EventListenerCancelBy.none;
+
+ cancelBy = processPMBBEvent( pmEvent );
- if ( isBoolean( AutoFeatures.cancelAllBlockBreakEvents ) ) {
- e.setCancelled( true );
- }
- else {
-
- debugInfo.append( "(event was not canceled) " );
- }
-
- // Break the blocks
- finalizeBreakTheBlocks( pmEvent );
-
- // Block counts and blockEvents
- doBlockEvents( pmEvent );
-
- }
- else {
-
- debugInfo.append( "&c(doAction failed without details)&9 " );
- }
+
+ if ( cancelBy == EventListenerCancelBy.event ) {
+
+ e.setCancelled( true );
+ debugInfo.append( "(event canceled) " );
+ }
+ else if ( cancelBy == EventListenerCancelBy.drops ) {
+ try
+ {
+ e.setDropItems( false );
+ debugInfo.append( "(drop canceled) " );
+ }
+ catch ( NoSuchMethodError e1 )
+ {
+ String message = String.format(
+ "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
+ "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
+ "Modify the config settings and set this value to `false`. For now, it is temporarily " +
+ "disabled. [%s]",
+ e1.getMessage() );
+ Output.get().logWarn( message );
+
+ AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
+ .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
+ }
- }
+ }
+ }
+// // Set the mine's PrisonBlockTypes for the block. Used to identify custom blocks.
+// // Needed since processing of the block will lose track of which mine it came from.
+// if ( pmEvent.getMine() != null ) {
+// sBlock.setPrisonBlockTypes( pmEvent.getMine().getPrisonBlockTypes() );
+// }
- debugInfo.append( "(normal processing completed) " );
- }
- else {
+//
+// List explodedBlocks = new ArrayList<>();
+// pmEvent.setExplodedBlocks( explodedBlocks );
+//// String triggered = null;
+//
+// PrisonMinesBlockBreakEvent pmbbEvent = new PrisonMinesBlockBreakEvent( e.getBlock(), e.getPlayer(),
+// pmEvent.getMine(), sBlock, explodedBlocks, BlockEventType.blockBreak, triggered );
+// Bukkit.getServer().getPluginManager().callEvent( pmEvent );
+// if ( pmEvent.isCancelled() ) {
+// debugInfo.append( "(normal processing: &6PrisonMinesBlockBreakEvent was canceled by another plugin&9) " );
+// }
+// else {
+//
+// // Cancel drops if so configured:
+// if ( isBoolean( AutoFeatures.cancelAllBlockEventBlockDrops ) ) {
+//
+// try
+// {
+// e.setDropItems( false );
+// }
+// catch ( NoSuchMethodError e1 )
+// {
+// String message = String.format(
+// "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
+// "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
+// "Modify the config settings and set this value to `false`. For now, it is temporarily " +
+// "disabled. [%s]",
+// e1.getMessage() );
+// Output.get().logWarn( message );
+//
+// AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
+// .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
+// }
+// }
+//
+// // doAction returns a boolean that indicates if the event should be canceled or not:
+// if ( doAction( pmEvent, debugInfo ) ) {
+//// if ( doAction( sBlock, pmEvent.getMine(), pmEvent.getPlayer(), debugInfo ) ) {
+//
+// if ( isBoolean( AutoFeatures.cancelAllBlockBreakEvents ) ) {
+// e.setCancelled( true );
+// }
+// else {
+//
+// debugInfo.append( "(event was not canceled) " );
+// }
+//
+// // Break the blocks
+// finalizeBreakTheBlocks( pmEvent );
+//
+// // Block counts and blockEvents
+// doBlockEvents( pmEvent );
+//
+// }
+// else {
+//
+// debugInfo.append( "&c(doAction failed without details)&9 " );
+// }
+//
+// }
- debugInfo.append( "(logic bypass) " );
- }
+
+// debugInfo.append( "(normal processing completed) " );
+// }
+// else {
+//
+// debugInfo.append( "(logic bypass) " );
+// }
}
-
- if ( debugInfo.length() > 0 ) {
-
- long stop = System.nanoTime();
- debugInfo.append( " [" ).append( (stop - start) / 1000000d ).append( " ms]" );
-
- Output.get().logDebug( DebugTarget.blockBreak, debugInfo.toString() );
- }
+
+ printDebugInfo( pmEvent, start );
}
protected int checkBonusXp( Player player, Block block, ItemStack item ) {
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerCrazyEnchants.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerCrazyEnchants.java
index 37a587746..8baa62e26 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerCrazyEnchants.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerCrazyEnchants.java
@@ -6,26 +6,20 @@
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.EventExecutor;
import org.bukkit.plugin.PluginManager;
import me.badbones69.crazyenchantments.api.events.BlastUseEvent;
-import tech.mcprison.prison.Prison;
import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
import tech.mcprison.prison.mines.features.MineBlockEvent.BlockEventType;
-import tech.mcprison.prison.output.ChatDisplay;
import tech.mcprison.prison.output.Output;
-import tech.mcprison.prison.output.Output.DebugTarget;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.api.PrisonMinesBlockBreakEvent;
import tech.mcprison.prison.spigot.autofeatures.AutoManagerFeatures;
import tech.mcprison.prison.spigot.block.BlockBreakPriority;
-import tech.mcprison.prison.spigot.block.OnBlockBreakExternalEvents;
-import tech.mcprison.prison.spigot.block.SpigotBlock;
-import tech.mcprison.prison.spigot.game.SpigotHandlerList;
-import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.integrations.IntegrationCrazyEnchantmentsPickaxes;
public class AutoManagerCrazyEnchants
@@ -43,6 +37,15 @@ public AutoManagerCrazyEnchants() {
}
+ public AutoManagerCrazyEnchants( BlockBreakPriority bbPriority ) {
+ super();
+
+ this.crazyEnchantEnabled = null;
+
+ this.bbPriority = bbPriority;
+ }
+
+
public BlockBreakPriority getBbPriority() {
return bbPriority;
}
@@ -61,11 +64,16 @@ public void registerEvents() {
public class AutoManagerBlastUseEventListener
extends AutoManagerCrazyEnchants
implements Listener {
+
+ public AutoManagerBlastUseEventListener( BlockBreakPriority bbPriority ) {
+ super( bbPriority );
+ }
@EventHandler(priority=EventPriority.NORMAL)
public void onCrazyEnchantsBlockExplode( BlastUseEvent e, BlockBreakPriority bbPriority) {
- if ( isDisabled( e.getPlayer().getLocation().getWorld().getName() ) ) {
+ if ( isDisabled( e.getPlayer().getLocation().getWorld().getName() ) ||
+ bbPriority.isDisabled() ) {
return;
}
@@ -78,11 +86,13 @@ public void onCrazyEnchantsBlockExplode( BlastUseEvent e, BlockBreakPriority bbP
public void initialize() {
String eP = getMessage( AutoFeatures.CrazyEnchantsBlastUseEventPriority );
- setBbPriority( BlockBreakPriority.fromString( eP ) );
+
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+ setBbPriority( bbPriority );
// boolean isEventEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
- if ( getBbPriority() == BlockBreakPriority.DISABLED ) {
+ if ( bbPriority == BlockBreakPriority.DISABLED ) {
return;
}
@@ -96,27 +106,21 @@ public void initialize() {
Output.get().logInfo( "AutoManager: Trying to register CrazyEnchants" );
- SpigotPrison prison = SpigotPrison.getInstance();
- PluginManager pm = Bukkit.getServer().getPluginManager();
- EventPriority ePriority = getBbPriority().getBukkitEventPriority();
-
-
- AutoManagerBlastUseEventListener autoManagerlListener =
- new AutoManagerBlastUseEventListener();
-
- pm.registerEvent(BlastUseEvent.class, autoManagerlListener, ePriority,
- new EventExecutor() {
- public void execute(Listener l, Event e) {
-
- BlastUseEvent buEvent = (BlastUseEvent) e;
-
- ((AutoManagerBlastUseEventListener)l)
- .onCrazyEnchantsBlockExplode( buEvent, getBbPriority() );
- }
- },
- prison);
- prison.getRegisteredBlockListeners().add( autoManagerlListener );
-
+ if ( getBbPriority() != BlockBreakPriority.DISABLED ) {
+ if ( bbPriority.isComponentCompound() ) {
+
+ for (BlockBreakPriority subBBPriority : bbPriority.getComponentPriorities()) {
+
+ createListener( subBBPriority );
+ }
+ }
+ else {
+
+ createListener(bbPriority);
+ }
+
+ }
+
}
catch ( ClassNotFoundException e ) {
@@ -127,6 +131,32 @@ public void execute(Listener l, Event e) {
Output.get().logInfo( "AutoManager: CrazyEnchants failed to load. [%s]", e.getMessage() );
}
}
+
+
+ private void createListener(BlockBreakPriority bbPriority) {
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+ PluginManager pm = Bukkit.getServer().getPluginManager();
+ EventPriority ePriority = bbPriority.getBukkitEventPriority();
+
+
+ AutoManagerBlastUseEventListener autoManagerListener =
+ new AutoManagerBlastUseEventListener( bbPriority );
+
+ pm.registerEvent(BlastUseEvent.class, autoManagerListener, ePriority,
+ new EventExecutor() {
+ public void execute(Listener l, Event e) {
+
+ BlastUseEvent buEvent = (BlastUseEvent) e;
+
+ ((AutoManagerBlastUseEventListener)l)
+ .onCrazyEnchantsBlockExplode( buEvent, getBbPriority() );
+ }
+ },
+ prison);
+
+ prison.getRegisteredBlockListeners().add( autoManagerListener );
+ }
@Override
@@ -170,21 +200,47 @@ public void dumpEventListeners( StringBuilder sb ) {
Class.forName( "me.badbones69.crazyenchantments.api.events.BlastUseEvent", false,
this.getClass().getClassLoader() );
- BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
-
- String title = String.format(
- "BlastUseEvent (%s)",
- ( bbPriority == null ? "--none--" : bbPriority.name()) );
+ HandlerList handlers = BlastUseEvent.getHandlerList();
- ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
- title,
- new SpigotHandlerList( BlastUseEvent.getHandlerList()) );
+// String eP = getMessage( AutoFeatures.blockBreakEventPriority );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ dumpEventListenersCore( "BlastUseEvent", handlers, bbPriority, sb );
+
- if ( eventDisplay != null ) {
- sb.append( eventDisplay.toStringBuilder() );
- sb.append( "\n" );
- }
+// BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+//
+//
+// String title = String.format(
+// "BlastUseEvent (%s)",
+// ( bbPriority == null ? "--none--" : bbPriority.name()) );
+//
+// ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
+// title,
+// new SpigotHandlerList( BlastUseEvent.getHandlerList()) );
+//
+// if ( eventDisplay != null ) {
+// sb.append( eventDisplay.toStringBuilder() );
+// sb.append( "\n" );
+// }
+//
+//
+// if ( bbPriority.isComponentCompound() ) {
+// StringBuilder sbCP = new StringBuilder();
+// for ( BlockBreakPriority bbp : bbPriority.getComponentPriorities() ) {
+// if ( sbCP.length() > 0 ) {
+// sbCP.append( ", " );
+// }
+// sbCP.append( "'" ).append( bbp.name() ).append( "'" );
+// }
+//
+// String msg = String.format( "Note '%s' is a compound of: [%s]",
+// bbPriority.name(),
+// sbCP );
+//
+// sb.append( msg ).append( "\n" );
+// }
}
catch ( ClassNotFoundException e ) {
// CrazyEnchants is not loaded... so ignore.
@@ -208,22 +264,25 @@ public void dumpEventListeners( StringBuilder sb ) {
*/
public void handleBlastUseEvent( BlastUseEvent e, BlockBreakPriority bbPriority ) {
-// boolean monitor, boolean blockEventsOnly,
-// boolean autoManager ) {
-
+ PrisonMinesBlockBreakEvent pmEvent = null;
long start = System.nanoTime();
- if ( e.isCancelled() || ignoreMinesBlockBreakEvent( e, e.getPlayer(), e.getBlockList().get( 0 )) ) {
+ // If the event is canceled, it still needs to be processed because of the
+ // MONITOR events:
+ // An event will be "canceled" and "ignored" if the block
+ // BlockUtils.isUnbreakable(), or if the mine is activly resetting.
+ // The event will also be ignored if the block is outside of a mine
+ // or if the targetBlock has been set to ignore all block events which
+ // means the block has already been processed.
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( e,
+ e.getPlayer(), e.getBlockList().get( 0 ) );
+ if ( eventResults.isIgnoreEvent() ) {
return;
}
-
-
- // Register all external events such as mcMMO and EZBlocks:
- OnBlockBreakExternalEvents.getInstance().registerAllExternalEvents();
StringBuilder debugInfo = new StringBuilder();
- debugInfo.append( String.format( "### ** genericBlastUseEvent ** ### " +
+ debugInfo.append( String.format( "### ** handleBlastUseEvent ** ### " +
"(event: BlastUseEvent, config: %s, priority: %s, canceled: %s) ",
bbPriority.name(),
bbPriority.getBukkitEventPriority().name(),
@@ -232,34 +291,47 @@ public void handleBlastUseEvent( BlastUseEvent e, BlockBreakPriority bbPriority
// NOTE that check for auto manager has happened prior to accessing this function.
- if ( bbPriority != BlockBreakPriority.MONITOR && !e.isCancelled() || bbPriority == BlockBreakPriority.MONITOR &&
- e.getBlockList().size() > 0 ) {
-
- String eP = getMessage( AutoFeatures.CrazyEnchantsBlastUseEventPriority );
- boolean isCEBlockExplodeEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
+ // Process all priorities if the event has not been canceled, and
+ // process the MONITOR priority even if the event was canceled:
+ if ( !bbPriority.isMonitor() && !e.isCancelled() ||
+ bbPriority.isMonitor() &&
+ e.getBlockList().size() > 0 ) {
-
- Block bukkitBlock = e.getBlockList().get( 0 );
- // Need to wrap in a Prison block so it can be used with the mines:
- SpigotBlock sBlock = SpigotBlock.getSpigotBlock( bukkitBlock );
- SpigotPlayer sPlayer = new SpigotPlayer(e.getPlayer());
+ Block bukkitBlock = e.getBlockList().get( 0 );
BlockEventType eventType = BlockEventType.CEXplosion;
String triggered = null;
- PrisonMinesBlockBreakEvent pmEvent = new PrisonMinesBlockBreakEvent( bukkitBlock, e.getPlayer(),
- sBlock, sPlayer, bbPriority, eventType, triggered );
-
+ pmEvent = new PrisonMinesBlockBreakEvent(
+ bukkitBlock,
+ e.getPlayer(),
+ eventResults.getMine(),
+ bbPriority, eventType, triggered,
+ debugInfo );
+
+
+ // NOTE: Check for the ACCESS priority and if someone does not have access, then return
+ // with a cancel on the event. Both ACCESSBLOCKEVENTS and ACCESSMONITOR will be
+ // converted to just ACCESS at this point, and the other part will run under either
+ // BLOCKEVENTS or MONITOR.
+ // This check has to be performed after creating the pmEvent object since it uses
+ // a lot of the internal variables and objects. There is not much of an impact since
+ // the validateEvent() has not been ran yet.
+ if ( checkIfNoAccess( pmEvent, start ) ) {
+
+ e.setCancelled( true );
+ return;
+ }
for ( int i = 1; i < e.getBlockList().size(); i++ ) {
pmEvent.getUnprocessedRawBlocks().add( e.getBlockList().get( i ) );
}
- if ( !validateEvent( pmEvent, debugInfo ) ) {
+ if ( !validateEvent( pmEvent ) ) {
// The event has not passed validation. All logging and Errors have been recorded
// so do nothing more. This is to just prevent normal processing from occurring.
@@ -268,98 +340,70 @@ public void handleBlastUseEvent( BlastUseEvent e, BlockBreakPriority bbPriority
e.setCancelled( true );
}
+
+ debugInfo.append( "(doAction failed validation) " );
}
- else if ( pmEvent.getBbPriority() == BlockBreakPriority.MONITOR ) {
- // Stop here, and prevent additional processing. Monitors should never process the event beyond this.
+
+ // The validation was successful, but stop processing for the MONITOR priorities.
+ // Note that BLOCKEVENTS processing occured already within validateEvent():
+ else if ( pmEvent.getBbPriority().isMonitor() ) {
+ // Stop here, and prevent additional processing.
+ // Monitors should never process the event beyond this.
}
-
// now process all blocks (non-monitor):
- else if ( isCEBlockExplodeEnabled &&
- ( pmEvent.getMine() != null || pmEvent.getMine() == null && !isBoolean( AutoFeatures.pickupLimitToMines )) ) {
-
-
- if ( pmEvent.getExplodedBlocks().size() > 0 ) {
-
-// String triggered = null;
-
-
- // Warning: BlastUseEvent does not identify the block the player actually hit, so the dummyBlock
- // is just a random first block from the explodedBlocks list and may not be the block
- // that initiated the explosion event.
-// SpigotBlock dummyBlock = explodedBlocks.get( 0 );
-
-// PrisonMinesBlockBreakEvent pmbbEvent = new PrisonMinesBlockBreakEvent( dummyBlock.getWrapper(), e.getPlayer(),
-// mine, dummyBlock, explodedBlocks, BlockEventType.CEXplosion, triggered );
- Bukkit.getServer().getPluginManager().callEvent(pmEvent);
- if ( pmEvent.isCancelled() ) {
- debugInfo.append( "(normal processing: PrisonMinesBlockBreakEvent was canceled) " );
- }
- else {
-
-// // Cancel drops if so configured:
-// if ( isBoolean( AutoFeatures.cancelAllBlockEventBlockDrops ) ) {
-//
-// try
-// {
-// e.setDropItems( false );
-// }
-// catch ( NoSuchMethodError e1 )
-// {
-// String message = String.format(
-// "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
-// "is not valid for this version of Spigot. Modify the config settings and set " +
-// "this value to `false`. [%s]",
-// e1.getMessage() );
-// Output.get().logWarn( message );
-// }
-// }
-
- if ( doAction( pmEvent, debugInfo ) ) {
-
- if ( isBoolean( AutoFeatures.cancelAllBlockBreakEvents ) ) {
-
- e.setCancelled( true );
- }
- else {
-
- debugInfo.append( "(event was not canceled) " );
- }
-
- finalizeBreakTheBlocks( pmEvent );
-
- doBlockEvents( pmEvent );
-
- }
-
- else {
-
- debugInfo.append( "(doAction failed without details) " );
- }
-
- }
- }
+ else {
+
+ // This is where the processing actually happens:
+
+// if ( e instanceof BlockBreakEvent ) {
+// processPMBBExternalEvents( pmEvent, debugInfo, e );
+// }
+
+
+
+ EventListenerCancelBy cancelBy = EventListenerCancelBy.none;
+ cancelBy = processPMBBEvent( pmEvent );
- debugInfo.append( "(normal processing) " );
- }
- else {
- debugInfo.append( "(logic bypass) " );
+ // NOTE: you cannot cancel a crazy enchant's drops, so this will
+ // always cancel the event.
+ if ( cancelBy != EventListenerCancelBy.none ) {
+
+ e.setCancelled( true );
+ debugInfo.append( "(event canceled) " );
+ }
+// else if ( cancelBy == EventListenerCancelBy.drops ) {
+// try
+// {
+// e.setDropItems( false );
+// debugInfo.append( "(drop canceled) " );
+// }
+// catch ( NoSuchMethodError e1 )
+// {
+// String message = String.format(
+// "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
+// "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
+// "Modify the config settings and set this value to `false`. For now, it is temporarily " +
+// "disabled. [%s]",
+// e1.getMessage() );
+// Output.get().logWarn( message );
+//
+// AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
+// .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
+// }
+//
+// }
}
+
}
- if ( debugInfo.length() > 0 ) {
-
- long stop = System.nanoTime();
- debugInfo.append( " [" ).append( (stop - start) / 1000000d ).append( " ms]" );
-
- Output.get().logDebug( DebugTarget.blockBreak, debugInfo.toString() );
- }
+ printDebugInfo( pmEvent, start );
}
@Override
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerPrisonEnchants.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerPrisonEnchants.java
index 8b7986bac..bf5b992f7 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerPrisonEnchants.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerPrisonEnchants.java
@@ -6,26 +6,20 @@
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.EventExecutor;
import org.bukkit.plugin.PluginManager;
import me.pulsi_.prisonenchants.events.PEExplosionEvent;
-import tech.mcprison.prison.Prison;
import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
import tech.mcprison.prison.mines.features.MineBlockEvent.BlockEventType;
-import tech.mcprison.prison.output.ChatDisplay;
import tech.mcprison.prison.output.Output;
-import tech.mcprison.prison.output.Output.DebugTarget;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.api.PrisonMinesBlockBreakEvent;
import tech.mcprison.prison.spigot.autofeatures.AutoManagerFeatures;
import tech.mcprison.prison.spigot.block.BlockBreakPriority;
-import tech.mcprison.prison.spigot.block.OnBlockBreakExternalEvents;
-import tech.mcprison.prison.spigot.block.SpigotBlock;
-import tech.mcprison.prison.spigot.game.SpigotHandlerList;
-import tech.mcprison.prison.spigot.game.SpigotPlayer;
public class AutoManagerPrisonEnchants
extends AutoManagerFeatures
@@ -36,7 +30,13 @@ public class AutoManagerPrisonEnchants
public AutoManagerPrisonEnchants() {
super();
}
-
+
+ public AutoManagerPrisonEnchants( BlockBreakPriority bbPriority ) {
+ super();
+
+ this.bbPriority = bbPriority;
+ }
+
public BlockBreakPriority getBbPriority() {
return bbPriority;
@@ -60,10 +60,15 @@ public class AutoManagerPEExplosiveEventListener
extends AutoManagerPrisonEnchants
implements Listener {
+ public AutoManagerPEExplosiveEventListener( BlockBreakPriority bbPriority ) {
+ super( bbPriority );
+ }
+
@EventHandler(priority=EventPriority.NORMAL)
public void onPrisonEnchantsExplosiveEvent( PEExplosionEvent e, BlockBreakPriority bbPriority ) {
- if ( isDisabled( e.getBlockBroken().getLocation().getWorld().getName() ) ) {
+ if ( isDisabled( e.getBlockBroken().getLocation().getWorld().getName() ) ||
+ bbPriority.isDisabled() ) {
return;
}
@@ -81,7 +86,9 @@ public void onPrisonEnchantsExplosiveEvent( PEExplosionEvent e, BlockBreakPriori
public void initialize() {
String eP = getMessage( AutoFeatures.PrisonEnchantsExplosiveEventPriority );
- setBbPriority( BlockBreakPriority.fromString( eP ) );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ setBbPriority( bbPriority );
// boolean isEventEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
@@ -99,29 +106,20 @@ public void initialize() {
Output.get().logInfo( "AutoManager: Trying to register Pulsi_'s PrisonEnchants" );
-
-
- SpigotPrison prison = SpigotPrison.getInstance();
- PluginManager pm = Bukkit.getServer().getPluginManager();
- EventPriority ePriority = getBbPriority().getBukkitEventPriority();
-
- AutoManagerPEExplosiveEventListener autoManagerlListener =
- new AutoManagerPEExplosiveEventListener();
-
- pm.registerEvent(PEExplosionEvent.class, autoManagerlListener, ePriority,
- new EventExecutor() {
- public void execute(Listener l, Event e) {
-
- PEExplosionEvent peeEvent = (PEExplosionEvent) e;
-
- ((AutoManagerPEExplosiveEventListener)l)
- .onPrisonEnchantsExplosiveEvent( peeEvent, getBbPriority() );
- }
- },
- prison);
- prison.getRegisteredBlockListeners().add( autoManagerlListener );
-
-
+ if ( getBbPriority() != BlockBreakPriority.DISABLED ) {
+ if ( bbPriority.isComponentCompound() ) {
+
+ for (BlockBreakPriority subBBPriority : bbPriority.getComponentPriorities()) {
+
+ createListener( subBBPriority );
+ }
+ }
+ else {
+
+ createListener(bbPriority);
+ }
+
+ }
}
catch ( ClassNotFoundException e ) {
@@ -133,6 +131,29 @@ public void execute(Listener l, Event e) {
}
}
+ private void createListener(BlockBreakPriority bbPriority) {
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+ PluginManager pm = Bukkit.getServer().getPluginManager();
+ EventPriority ePriority = bbPriority.getBukkitEventPriority();
+
+ AutoManagerPEExplosiveEventListener autoManagerListener =
+ new AutoManagerPEExplosiveEventListener( bbPriority );
+
+ pm.registerEvent(PEExplosionEvent.class, autoManagerListener, ePriority,
+ new EventExecutor() {
+ public void execute(Listener l, Event e) {
+
+ PEExplosionEvent peeEvent = (PEExplosionEvent) e;
+
+ ((AutoManagerPEExplosiveEventListener)l)
+ .onPrisonEnchantsExplosiveEvent( peeEvent, getBbPriority() );
+ }
+ },
+ prison);
+ prison.getRegisteredBlockListeners().add( autoManagerListener );
+ }
+
@Override
@@ -176,20 +197,46 @@ public void dumpEventListeners( StringBuilder sb ) {
Class.forName( "me.pulsi_.prisonenchants.events.PEExplosionEvent", false,
this.getClass().getClassLoader() );
- BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
- String title = String.format(
- "Pulsi_'s PEExplosionEvent (%s)",
- ( bbPriority == null ? "--none--" : bbPriority.name()));
+ HandlerList handlers = PEExplosionEvent.getHandlerList();
- ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
- title,
- new SpigotHandlerList( PEExplosionEvent.getHandlerList()) );
+// String eP = getMessage( AutoFeatures.blockBreakEventPriority );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
- if ( eventDisplay != null ) {
- sb.append( eventDisplay.toStringBuilder() );
- sb.append( "\n" );
- }
+ dumpEventListenersCore( "Pulsi_'s PEExplosionEvent", handlers, bbPriority, sb );
+
+
+// BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+//
+// String title = String.format(
+// "Pulsi_'s PEExplosionEvent (%s)",
+// ( bbPriority == null ? "--none--" : bbPriority.name()));
+//
+// ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
+// title,
+// new SpigotHandlerList( PEExplosionEvent.getHandlerList()) );
+//
+// if ( eventDisplay != null ) {
+// sb.append( eventDisplay.toStringBuilder() );
+// sb.append( "\n" );
+// }
+//
+//
+// if ( bbPriority.isComponentCompound() ) {
+// StringBuilder sbCP = new StringBuilder();
+// for ( BlockBreakPriority bbp : bbPriority.getComponentPriorities() ) {
+// if ( sbCP.length() > 0 ) {
+// sbCP.append( ", " );
+// }
+// sbCP.append( "'" ).append( bbp.name() ).append( "'" );
+// }
+//
+// String msg = String.format( "Note '%s' is a compound of: [%s]",
+// bbPriority.name(),
+// sbCP );
+//
+// sb.append( msg ).append( "\n" );
+// }
}
catch ( ClassNotFoundException e ) {
// PrisonEnchants is not loaded... so ignore.
@@ -213,24 +260,26 @@ public void dumpEventListeners( StringBuilder sb ) {
*/
public void handlePEExplosionEvent( PEExplosionEvent e, BlockBreakPriority bbPriority) {
-
-// , boolean monitor, boolean blockEventsOnly,
-// boolean autoManager ) {
-
+ PrisonMinesBlockBreakEvent pmEvent = null;
long start = System.nanoTime();
- if ( e.isCancelled() || processMinesBlockBreakEvent( e, e.getPlayer(), e.getBlockBroken()) ) {
+ // If the event is canceled, it still needs to be processed because of the
+ // MONITOR events:
+ // An event will be "canceled" and "ignored" if the block
+ // BlockUtils.isUnbreakable(), or if the mine is activly resetting.
+ // The event will also be ignored if the block is outside of a mine
+ // or if the targetBlock has been set to ignore all block events which
+ // means the block has already been processed.
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( e,
+ e.getPlayer(), e.getBlockBroken());
+ if ( eventResults.isIgnoreEvent() ) {
return;
}
-
-
- // Register all external events such as mcMMO and EZBlocks:
- OnBlockBreakExternalEvents.getInstance().registerAllExternalEvents();
StringBuilder debugInfo = new StringBuilder();
- debugInfo.append( String.format( "### ** genericExplosiveEvent (Pulsi) ** ### " +
+ debugInfo.append( String.format( "### ** handlePEEExplosionEvent (Pulsi) ** ### " +
"(event: PEExplosionEvent, config: %s, priority: %s, canceled: %s) ",
bbPriority.name(),
bbPriority.getBukkitEventPriority().name(),
@@ -238,28 +287,40 @@ public void handlePEExplosionEvent( PEExplosionEvent e, BlockBreakPriority bbPri
) );
- if ( bbPriority != BlockBreakPriority.MONITOR && !e.isCancelled() || bbPriority == BlockBreakPriority.MONITOR ) {
-
-
-
- String eP = getMessage( AutoFeatures.PrisonEnchantsExplosiveEventPriority );
- boolean isPEExplosiveEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
-
+ // Process all priorities if the event has not been canceled, and
+ // process the MONITOR priority even if the event was canceled:
+ if ( !bbPriority.isMonitor() && !e.isCancelled() ||
+ bbPriority.isMonitor() ) {
- // Need to wrap in a Prison block so it can be used with the mines:
- SpigotBlock sBlock = SpigotBlock.getSpigotBlock(e.getBlockBroken());
- SpigotPlayer sPlayer = new SpigotPlayer(e.getPlayer());
BlockEventType eventType = BlockEventType.PEExplosive;
String triggered = null; // e.getTriggeredBy();
- PrisonMinesBlockBreakEvent pmEvent = new PrisonMinesBlockBreakEvent( e.getBlockBroken(), e.getPlayer(),
- sBlock, sPlayer, bbPriority, eventType, triggered );
+ pmEvent = new PrisonMinesBlockBreakEvent(
+ e.getBlockBroken(),
+ e.getPlayer(),
+ eventResults.getMine(),
+ bbPriority, eventType, triggered,
+ debugInfo );
+
+ // NOTE: Check for the ACCESS priority and if someone does not have access, then return
+ // with a cancel on the event. Both ACCESSBLOCKEVENTS and ACCESSMONITOR will be
+ // converted to just ACCESS at this point, and the other part will run under either
+ // BLOCKEVENTS or MONITOR.
+ // This check has to be performed after creating the pmEvent object since it uses
+ // a lot of the internal variables and objects. There is not much of an impact since
+ // the validateEvent() has not been ran yet.
+ if ( checkIfNoAccess( pmEvent, start ) ) {
+
+ e.setCancelled( true );
+ return;
+ }
+
pmEvent.setUnprocessedRawBlocks( e.getExplodedBlocks() );
- if ( !validateEvent( pmEvent, debugInfo ) ) {
+ if ( !validateEvent( pmEvent ) ) {
// The event has not passed validation. All logging and Errors have been recorded
// so do nothing more. This is to just prevent normal processing from occurring.
@@ -268,92 +329,69 @@ public void handlePEExplosionEvent( PEExplosionEvent e, BlockBreakPriority bbPri
e.setCancelled( true );
}
+
+ debugInfo.append( "(doAction failed validation) " );
}
- else if ( pmEvent.getBbPriority() == BlockBreakPriority.MONITOR ) {
- // Stop here, and prevent additional processing. Monitors should never process the event beyond this.
+
+ // The validation was successful, but stop processing for the MONITOR priorities.
+ // Note that BLOCKEVENTS processing occurred already within validateEvent():
+ else if ( pmEvent.getBbPriority().isMonitor() ) {
+ // Stop here, and prevent additional processing.
+ // Monitors should never process the event beyond this.
}
-
- // now process all blocks (non-monitor):
- else if ( isPEExplosiveEnabled &&
- ( pmEvent.getMine() != null || pmEvent.getMine() == null && !isBoolean( AutoFeatures.pickupLimitToMines )) ) {
- if ( pmEvent.getExplodedBlocks().size() > 0 ) {
-
-// String triggered = null;
-
-
-// PrisonMinesBlockBreakEvent pmbbEvent = new PrisonMinesBlockBreakEvent( dummyBlock.getWrapper(), e.getPlayer(),
-// mine, dummyBlock, explodedBlocks, BlockEventType.PEExplosive, triggered );
- Bukkit.getServer().getPluginManager().callEvent(pmEvent);
- if ( pmEvent.isCancelled() ) {
- debugInfo.append( "(normal processing: PrisonMinesBlockBreakEvent was canceled) " );
- }
- else {
-
-// // Cancel drops if so configured:
-// if ( isBoolean( AutoFeatures.cancelAllBlockEventBlockDrops ) ) {
-//
-// try
-// {
-// e.setDropItems( false );
-// }
-// catch ( NoSuchMethodError e1 )
-// {
-// String message = String.format(
-// "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
-// "is not valid for this version of Spigot. Modify the config settings and set " +
-// "this value to `false`. [%s]",
-// e1.getMessage() );
-// Output.get().logWarn( message );
-// }
-// }
-
- if ( doAction( pmEvent, debugInfo ) ) {
-
- if ( isBoolean( AutoFeatures.cancelAllBlockBreakEvents ) ) {
-
- e.setCancelled( true );
- }
- else {
-
- debugInfo.append( "(event was not canceled) " );
- }
-
- finalizeBreakTheBlocks( pmEvent );
-
- doBlockEvents( pmEvent );
-
- }
-
- else {
-
- debugInfo.append( "(doAction failed without details) " );
- }
-
- }
- }
+ // This is where the processing actually happens:
+ else {
+// debugInfo.append( "(normal processing initiating) " );
- debugInfo.append( "(normal processing) " );
- }
- else {
+ // check all external events such as mcMMO and EZBlocks:
+// if ( e instanceof BlockBreakEvent ) {
+// processPMBBExternalEvents( pmEvent, debugInfo, e );
+// }
+
+
+ EventListenerCancelBy cancelBy = EventListenerCancelBy.none;
- debugInfo.append( "(logic bypass) " );
+ cancelBy = processPMBBEvent( pmEvent );
+
+
+ if ( cancelBy != EventListenerCancelBy.none ) {
+
+ e.setCancelled( true );
+ debugInfo.append( "(event canceled) " );
+ }
+// else if ( cancelBy == EventListenerCancelBy.drops ) {
+// try
+// {
+// e.setDropItems( false );
+// debugInfo.append( "(drop canceled) " );
+// }
+// catch ( NoSuchMethodError e1 )
+// {
+// String message = String.format(
+// "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
+// "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
+// "Modify the config settings and set this value to `false`. For now, it is temporarily " +
+// "disabled. [%s]",
+// e1.getMessage() );
+// Output.get().logWarn( message );
+//
+// AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
+// .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
+// }
+//
+// }
}
+
+
}
- if ( debugInfo.length() > 0 ) {
-
- long stop = System.nanoTime();
- debugInfo.append( " [" ).append( (stop - start) / 1000000d ).append( " ms]" );
-
- Output.get().logDebug( DebugTarget.blockBreak, debugInfo.toString() );
- }
-
+ printDebugInfo( pmEvent, start );
}
@Override
@@ -362,4 +400,5 @@ protected int checkBonusXp( Player player, Block block, ItemStack item ) {
return bonusXp;
}
+
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerPrisonsExplosiveBlockBreakEvents.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerPrisonsExplosiveBlockBreakEvents.java
index 2f15e72e6..d50418cb0 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerPrisonsExplosiveBlockBreakEvents.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerPrisonsExplosiveBlockBreakEvents.java
@@ -6,27 +6,23 @@
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.EventExecutor;
import org.bukkit.plugin.PluginManager;
-import tech.mcprison.prison.Prison;
import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
+import tech.mcprison.prison.autofeatures.AutoFeaturesWrapper;
import tech.mcprison.prison.mines.features.MineBlockEvent.BlockEventType;
-import tech.mcprison.prison.output.ChatDisplay;
import tech.mcprison.prison.output.Output;
-import tech.mcprison.prison.output.Output.DebugTarget;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.api.ExplosiveBlockBreakEvent;
import tech.mcprison.prison.spigot.api.PrisonMinesBlockBreakEvent;
import tech.mcprison.prison.spigot.autofeatures.AutoManagerFeatures;
import tech.mcprison.prison.spigot.block.BlockBreakPriority;
-import tech.mcprison.prison.spigot.block.OnBlockBreakExternalEvents;
-import tech.mcprison.prison.spigot.block.SpigotBlock;
import tech.mcprison.prison.spigot.block.SpigotItemStack;
-import tech.mcprison.prison.spigot.game.SpigotHandlerList;
-import tech.mcprison.prison.spigot.game.SpigotPlayer;
public class AutoManagerPrisonsExplosiveBlockBreakEvents
extends AutoManagerFeatures
@@ -38,6 +34,12 @@ public AutoManagerPrisonsExplosiveBlockBreakEvents() {
super();
}
+ public AutoManagerPrisonsExplosiveBlockBreakEvents( BlockBreakPriority bbPriority ) {
+ super();
+
+ this.bbPriority = bbPriority;
+ }
+
public BlockBreakPriority getBbPriority() {
return bbPriority;
@@ -57,11 +59,16 @@ public void registerEvents() {
public class AutoManagerExplosiveBlockBreakEventListener
extends AutoManagerPrisonsExplosiveBlockBreakEvents
implements Listener {
-
+
+ public AutoManagerExplosiveBlockBreakEventListener( BlockBreakPriority bbPriority ) {
+ super( bbPriority );
+ }
+
@EventHandler(priority=EventPriority.NORMAL)
public void onPrisonsExplosiveBlockBreakEvent( ExplosiveBlockBreakEvent e, BlockBreakPriority bbPriority ) {
- if ( isDisabled( e.getBlock().getLocation().getWorld().getName() ) ) {
+ if ( isDisabled( e.getBlock().getLocation().getWorld().getName() ) ||
+ bbPriority.isDisabled() ) {
return;
}
@@ -74,7 +81,9 @@ public void onPrisonsExplosiveBlockBreakEvent( ExplosiveBlockBreakEvent e, Block
public void initialize() {
String eP = getMessage( AutoFeatures.ProcessPrisons_ExplosiveBlockBreakEventsPriority );
- setBbPriority( BlockBreakPriority.fromString( eP ) );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ setBbPriority( bbPriority );
// boolean isEventEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
@@ -86,28 +95,20 @@ public void initialize() {
Output.get().logInfo( "AutoManager: Trying to register ExplosiveBlockBreakEvent Listener" );
-
- SpigotPrison prison = SpigotPrison.getInstance();
- PluginManager pm = Bukkit.getServer().getPluginManager();
- EventPriority ePriority = getBbPriority().getBukkitEventPriority();
-
-
- AutoManagerExplosiveBlockBreakEventListener autoManagerlListener =
- new AutoManagerExplosiveBlockBreakEventListener();
-
- pm.registerEvent(ExplosiveBlockBreakEvent.class, autoManagerlListener, ePriority,
- new EventExecutor() {
- public void execute(Listener l, Event e) {
-
- ExplosiveBlockBreakEvent ebbEvent = (ExplosiveBlockBreakEvent) e;
-
- ((AutoManagerExplosiveBlockBreakEventListener)l)
- .onPrisonsExplosiveBlockBreakEvent( ebbEvent, getBbPriority() );
- }
- },
- prison);
- prison.getRegisteredBlockListeners().add( autoManagerlListener );
-
+ if ( getBbPriority() != BlockBreakPriority.DISABLED ) {
+ if ( bbPriority.isComponentCompound() ) {
+
+ for (BlockBreakPriority subBBPriority : bbPriority.getComponentPriorities()) {
+
+ createListener( subBBPriority );
+ }
+ }
+ else {
+
+ createListener(bbPriority);
+ }
+
+ }
}
catch ( Exception e ) {
@@ -115,6 +116,31 @@ public void execute(Listener l, Event e) {
}
}
+ private void createListener(BlockBreakPriority bbPriority) {
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+ PluginManager pm = Bukkit.getServer().getPluginManager();
+ EventPriority ePriority = bbPriority.getBukkitEventPriority();
+
+
+ AutoManagerExplosiveBlockBreakEventListener autoManagerListener =
+ new AutoManagerExplosiveBlockBreakEventListener( bbPriority );
+
+ pm.registerEvent(ExplosiveBlockBreakEvent.class, autoManagerListener, ePriority,
+ new EventExecutor() {
+ public void execute(Listener l, Event e) {
+
+ ExplosiveBlockBreakEvent ebbEvent = (ExplosiveBlockBreakEvent) e;
+
+ ((AutoManagerExplosiveBlockBreakEventListener)l)
+ .onPrisonsExplosiveBlockBreakEvent( ebbEvent, getBbPriority() );
+ }
+ },
+ prison);
+
+ prison.getRegisteredBlockListeners().add( autoManagerListener );
+ }
+
@Override
@@ -155,21 +181,47 @@ public void dumpEventListeners( StringBuilder sb ) {
// Check to see if the class ExplosiveEvent even exists:
try {
- BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
- String title = String.format(
- "ExplosiveBlockBreakEvent (%s)",
- ( bbPriority == null ? "--none--" : bbPriority.name()) );
+ HandlerList handlers = ExplosiveBlockBreakEvent.getHandlerList();
+// String eP = getMessage( AutoFeatures.blockBreakEventPriority );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
- ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
- title,
- new SpigotHandlerList( ExplosiveBlockBreakEvent.getHandlerList()) );
-
- if ( eventDisplay != null ) {
- sb.append( eventDisplay.toStringBuilder() );
- sb.append( "\n" );
- }
+ dumpEventListenersCore( "ExplosiveBlockBreakEvent", handlers, bbPriority, sb );
+
+
+// BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+//
+// String title = String.format(
+// "ExplosiveBlockBreakEvent (%s)",
+// ( bbPriority == null ? "--none--" : bbPriority.name()) );
+//
+//
+// ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
+// title,
+// new SpigotHandlerList( ExplosiveBlockBreakEvent.getHandlerList()) );
+//
+// if ( eventDisplay != null ) {
+// sb.append( eventDisplay.toStringBuilder() );
+// sb.append( "\n" );
+// }
+//
+//
+// if ( bbPriority.isComponentCompound() ) {
+// StringBuilder sbCP = new StringBuilder();
+// for ( BlockBreakPriority bbp : bbPriority.getComponentPriorities() ) {
+// if ( sbCP.length() > 0 ) {
+// sbCP.append( ", " );
+// }
+// sbCP.append( "'" ).append( bbp.name() ).append( "'" );
+// }
+//
+// String msg = String.format( "Note '%s' is a compound of: [%s]",
+// bbPriority.name(),
+// sbCP );
+//
+// sb.append( msg ).append( "\n" );
+// }
}
catch ( Exception e ) {
Output.get().logInfo( "AutoManager: PrisonEnchants failed to load. [%s]", e.getMessage() );
@@ -178,23 +230,27 @@ public void dumpEventListeners( StringBuilder sb ) {
protected void handleExplosiveBlockBreakEvent( ExplosiveBlockBreakEvent e, BlockBreakPriority bbPriority ) {
-// boolean monitor, boolean blockEventsOnly,
-// boolean autoManager ) {
-
+ PrisonMinesBlockBreakEvent pmEvent = null;
long start = System.nanoTime();
- if ( e.isCancelled() || ignoreMinesBlockBreakEvent( e, e.getPlayer(), e.getBlock()) ) {
+ // If the event is canceled, it still needs to be processed because of the
+ // MONITOR events:
+ // An event will be "canceled" and "ignored" if the block
+ // BlockUtils.isUnbreakable(), or if the mine is activly resetting.
+ // The event will also be ignored if the block is outside of a mine
+ // or if the targetBlock has been set to ignore all block events which
+ // means the block has already been processed.
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( e,
+ e.getPlayer(), e.getBlock());
+
+ if ( eventResults.isIgnoreEvent() ) {
return;
}
- // Register all external events such as mcMMO and EZBlocks:
- OnBlockBreakExternalEvents.getInstance().registerAllExternalEvents();
-
StringBuilder debugInfo = new StringBuilder();
-
- debugInfo.append( String.format( "### ** genericExplosiveEvent (Prisons's bombs) ** ### " +
+ debugInfo.append( String.format( "### ** handleExplosiveBlockBreakEvent (Prisons's bombs) ** ### " +
"(event: ExplosiveBlockBreakEvent, config: %s, priority: %s, canceled: %s) ",
bbPriority.name(),
bbPriority.getBukkitEventPriority().name(),
@@ -202,23 +258,35 @@ protected void handleExplosiveBlockBreakEvent( ExplosiveBlockBreakEvent e, Block
) );
- if ( bbPriority != BlockBreakPriority.MONITOR && !e.isCancelled() || bbPriority == BlockBreakPriority.MONITOR ) {
+ // Process all priorities if the event has not been canceled, and
+ // process the MONITOR priority even if the event was canceled:
+ if ( !bbPriority.isMonitor() && !e.isCancelled() ||
+ bbPriority.isMonitor() ) {
- String eP = getMessage( AutoFeatures.ProcessPrisons_ExplosiveBlockBreakEventsPriority );
- boolean isPPrisonExplosiveBlockBreakEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
-
-
- // Need to wrap in a Prison block so it can be used with the mines:
- SpigotBlock sBlock = SpigotBlock.getSpigotBlock(e.getBlock());
- SpigotPlayer sPlayer = new SpigotPlayer(e.getPlayer());
-
BlockEventType eventType = BlockEventType.PrisonExplosion;
String triggered = e.getTriggeredBy();
- PrisonMinesBlockBreakEvent pmEvent = new PrisonMinesBlockBreakEvent( e.getBlock(), e.getPlayer(),
- sBlock, sPlayer, bbPriority, eventType, triggered );
-
+ pmEvent = new PrisonMinesBlockBreakEvent(
+ e.getBlock(),
+ e.getPlayer(),
+ eventResults.getMine(),
+ bbPriority, eventType, triggered,
+ debugInfo );
+
+
+ // NOTE: Check for the ACCESS priority and if someone does not have access, then return
+ // with a cancel on the event. Both ACCESSBLOCKEVENTS and ACCESSMONITOR will be
+ // converted to just ACCESS at this point, and the other part will run under either
+ // BLOCKEVENTS or MONITOR.
+ // This check has to be performed after creating the pmEvent object since it uses
+ // a lot of the internal variables and objects. There is not much of an impact since
+ // the validateEvent() has not been ran yet.
+ if ( checkIfNoAccess( pmEvent, start ) ) {
+
+ e.setCancelled( true );
+ return;
+ }
// If this event is fired, but yet there are no exploded blocks, then do not set
// forceIfAirBlock to true so this event is skipped.
@@ -229,7 +297,6 @@ protected void handleExplosiveBlockBreakEvent( ExplosiveBlockBreakEvent e, Block
}
-
// Warning: toolInHand really needs to be defined in the event if the source is a
// Mine Bomb, otherwise auto features will detect the player is holding
// a mine bomb which is not a pickaxe so the drops will be ZERO. If they
@@ -250,7 +317,7 @@ protected void handleExplosiveBlockBreakEvent( ExplosiveBlockBreakEvent e, Block
pmEvent.setCalculateDurability( false );
}
- if ( !validateEvent( pmEvent, debugInfo ) ) {
+ if ( !validateEvent( pmEvent ) ) {
// The event has not passed validation. All logging and Errors have been recorded
// so do nothing more. This is to just prevent normal processing from occurring.
@@ -259,94 +326,68 @@ protected void handleExplosiveBlockBreakEvent( ExplosiveBlockBreakEvent e, Block
e.setCancelled( true );
}
+
+ debugInfo.append( "(doAction failed validation) " );
}
- else if ( pmEvent.getBbPriority() == BlockBreakPriority.MONITOR ) {
- // Stop here, and prevent additional processing. Monitors should never process the event beyond this.
- }
+
+ // The validation was successful, but stop processing for the MONITOR priorities.
+ // Note that BLOCKEVENTS processing occured already within validateEvent():
+ else if ( pmEvent.getBbPriority().isMonitor() ) {
+ // Stop here, and prevent additional processing.
+ // Monitors should never process the event beyond this.
+ }
-
- // now process all blocks (non-monitor):
- else if ( isPPrisonExplosiveBlockBreakEnabled &&
- ( pmEvent.getMine() != null || pmEvent.getMine() == null &&
- !isBoolean( AutoFeatures.pickupLimitToMines )) ) {
-
- if ( pmEvent.getExplodedBlocks().size() > 0 ) {
-
- // String triggered = null;
-
-
- // PrisonMinesBlockBreakEvent pmbbEvent = new PrisonMinesBlockBreakEvent( dummyBlock.getWrapper(), e.getPlayer(),
- // mine, dummyBlock, explodedBlocks, BlockEventType.PEExplosive, triggered );
- Bukkit.getServer().getPluginManager().callEvent(pmEvent);
- if ( pmEvent.isCancelled() ) {
- debugInfo.append( "(normal processing: PrisonMinesBlockBreakEvent was canceled) " );
+ // This is where the processing actually happens:
+ else {
+
+// debugInfo.append( "(normal processing initiating) " );
+
+ // check all external events such as mcMMO and EZBlocks:
+ if ( e instanceof BlockBreakEvent ) {
+ processPMBBExternalEvents( pmEvent, e );
+ }
+
+
+ EventListenerCancelBy cancelBy = EventListenerCancelBy.none;
+
+ cancelBy = processPMBBEvent( pmEvent );
+
+
+ if ( cancelBy == EventListenerCancelBy.event ) {
+
+ e.setCancelled( true );
+ debugInfo.append( "(event canceled) " );
+ }
+ else if ( cancelBy == EventListenerCancelBy.drops ) {
+ try
+ {
+ e.setDropItems( false );
+ debugInfo.append( "(drop canceled) " );
}
- else {
-
- // Cancel drops if so configured:
- if ( isBoolean( AutoFeatures.cancelAllBlockEventBlockDrops ) ) {
-
- try
- {
- e.setDropItems( false );
- }
- catch ( NoSuchMethodError e1 )
- {
- String message = String.format(
- "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
- "is not valid for this version of Spigot. Modify the config settings and set " +
- "this value to `false`. [%s]",
- e1.getMessage() );
- Output.get().logWarn( message );
- }
- }
-
- if ( doAction( pmEvent, debugInfo ) ) {
-
- if ( isBoolean( AutoFeatures.cancelAllBlockBreakEvents ) ) {
-
- e.setCancelled( true );
- }
- else {
-
- debugInfo.append( "(event was not canceled) " );
- }
-
- finalizeBreakTheBlocks( pmEvent );
-
- doBlockEvents( pmEvent );
-
- }
-
- else {
-
- debugInfo.append( "(doAction failed without details) " );
- }
+ catch ( NoSuchMethodError e1 )
+ {
+ String message = String.format(
+ "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
+ "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
+ "Modify the config settings and set this value to `false`. For now, it is temporarily " +
+ "disabled. [%s]",
+ e1.getMessage() );
+ Output.get().logWarn( message );
+ AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
+ .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
}
- }
-
-
- debugInfo.append( "(normal processing) " );
- }
- else {
-
- debugInfo.append( "(logic bypass) " );
- }
-
- }
-
- if ( debugInfo.length() > 0 ) {
+
+ }
+ }
- long stop = System.nanoTime();
- debugInfo.append( " [" ).append( (stop - start) / 1000000d ).append( " ms]" );
- Output.get().logDebug( DebugTarget.blockBreak, debugInfo.toString() );
}
+ printDebugInfo( pmEvent, start );
}
@Override
@@ -355,4 +396,5 @@ protected int checkBonusXp( Player player, Block block, ItemStack item ) {
return bonusXp;
}
+
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerRevEnchantsExplosiveEvent.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerRevEnchantsExplosiveEvent.java
new file mode 100644
index 000000000..f5cbcc8c5
--- /dev/null
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerRevEnchantsExplosiveEvent.java
@@ -0,0 +1,411 @@
+package tech.mcprison.prison.spigot.autofeatures.events;
+
+import org.bukkit.Bukkit;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.EventExecutor;
+import org.bukkit.plugin.PluginManager;
+
+import me.revils.revenchants.events.ExplosiveEvent;
+import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
+import tech.mcprison.prison.mines.features.MineBlockEvent.BlockEventType;
+import tech.mcprison.prison.output.Output;
+import tech.mcprison.prison.spigot.SpigotPrison;
+import tech.mcprison.prison.spigot.api.PrisonMinesBlockBreakEvent;
+import tech.mcprison.prison.spigot.autofeatures.AutoManagerFeatures;
+import tech.mcprison.prison.spigot.block.BlockBreakPriority;
+
+public class AutoManagerRevEnchantsExplosiveEvent
+ extends AutoManagerFeatures
+ implements PrisonEventManager
+{
+
+ private BlockBreakPriority bbPriority;
+
+ public AutoManagerRevEnchantsExplosiveEvent() {
+ super();
+ }
+
+ public AutoManagerRevEnchantsExplosiveEvent( BlockBreakPriority bbPriority ) {
+ super();
+
+ this.bbPriority = bbPriority;
+ }
+
+
+ public BlockBreakPriority getBbPriority() {
+ return bbPriority;
+ }
+ public void setBbPriority( BlockBreakPriority bbPriority ) {
+ this.bbPriority = bbPriority;
+ }
+
+ @Override
+ public void registerEvents() {
+
+ initialize();
+
+ }
+
+
+ public class AutoManagerRevEnchantsExplosiveEventListener
+ extends AutoManagerRevEnchantsExplosiveEvent
+ implements Listener {
+
+ public AutoManagerRevEnchantsExplosiveEventListener( BlockBreakPriority bbPriority ) {
+ super( bbPriority );
+ }
+
+ @EventHandler(priority=EventPriority.NORMAL)
+ public void onRevEnchantsExplosive(
+ ExplosiveEvent e, BlockBreakPriority bbPriority) {
+
+ if ( isDisabled( e.getPlayer().getLocation().getWorld().getName() ) ||
+ bbPriority.isDisabled() ) {
+ return;
+ }
+
+ handleRevEnchantsExplosiveEvent( e, bbPriority );
+ }
+ }
+
+
+ @Override
+ public void initialize() {
+
+ String eP = getMessage( AutoFeatures.RevEnchantsExplosiveEventPriority );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ setBbPriority( bbPriority );
+
+// boolean isEventEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
+
+ if ( getBbPriority() == BlockBreakPriority.DISABLED ) {
+ return;
+ }
+
+ // Check to see if the class ExplosiveEvent even exists:
+ try {
+ Output.get().logInfo( "AutoManager: checking if loaded: RevEnchants ExplosiveEvent" );
+
+ Class.forName( "me.revils.revenchants.events.ExplosiveEvent", false,
+ this.getClass().getClassLoader() );
+
+ Output.get().logInfo( "AutoManager: Trying to register RevEnchants ExplosiveEvent" );
+
+ if ( getBbPriority() != BlockBreakPriority.DISABLED ) {
+ if ( bbPriority.isComponentCompound() ) {
+
+ for (BlockBreakPriority subBBPriority : bbPriority.getComponentPriorities()) {
+
+ createListener( subBBPriority );
+ }
+ }
+ else {
+
+ createListener(bbPriority);
+ }
+
+ }
+ }
+ catch ( ClassNotFoundException e ) {
+ // CrazyEnchants is not loaded... so ignore.
+ Output.get().logInfo( "AutoManager: RevEnchants ExplosiveEvent is not loaded" );
+ }
+ catch ( Exception e ) {
+ Output.get().logInfo( "AutoManager: RevEnchants ExplosiveEvent failed to load. [%s]", e.getMessage() );
+ }
+ }
+
+ private void createListener( BlockBreakPriority bbPriority ) {
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+ PluginManager pm = Bukkit.getServer().getPluginManager();
+ EventPriority ePriority = bbPriority.getBukkitEventPriority();
+
+
+ AutoManagerRevEnchantsExplosiveEventListener autoManagerListener =
+ new AutoManagerRevEnchantsExplosiveEventListener( bbPriority );
+
+ pm.registerEvent(
+ ExplosiveEvent.class,
+ autoManagerListener, ePriority,
+ new EventExecutor() {
+ public void execute(Listener l, Event e) {
+
+ ExplosiveEvent exEvent = (ExplosiveEvent) e;
+
+ ((AutoManagerRevEnchantsExplosiveEventListener)l)
+ .onRevEnchantsExplosive( exEvent, getBbPriority() );
+ }
+ },
+ prison);
+ prison.getRegisteredBlockListeners().add( autoManagerListener );
+ }
+
+
+ @Override
+ public void unregisterListeners() {
+
+// super.unregisterListeners();
+ }
+
+ @Override
+ public void dumpEventListeners() {
+
+ StringBuilder sb = new StringBuilder();
+
+ dumpEventListeners( sb );
+
+ if ( sb.length() > 0 ) {
+
+
+ for ( String line : sb.toString().split( "\n" ) ) {
+
+ Output.get().logInfo( line );
+ }
+ }
+
+ }
+
+
+ @Override
+ public void dumpEventListeners( StringBuilder sb ) {
+
+ String eP = getMessage( AutoFeatures.RevEnchantsExplosiveEventPriority );
+ boolean isEventEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
+
+ if ( !isEventEnabled ) {
+ return;
+ }
+
+ // Check to see if the class BlastUseEvent even exists:
+ try {
+
+ Class.forName( "me.revils.revenchants.events.ExplosiveEvent", false,
+ this.getClass().getClassLoader() );
+
+
+ HandlerList handlers = ExplosiveEvent.getHandlerList();
+
+// String eP = getMessage( AutoFeatures.blockBreakEventPriority );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ dumpEventListenersCore( "ExplosiveEvent", handlers, bbPriority, sb );
+
+
+//
+// BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+//
+//
+// String title = String.format(
+// "ExplosiveEvent (%s)",
+// ( bbPriority == null ? "--none--" : bbPriority.name()) );
+//
+// ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
+// title,
+// new SpigotHandlerList( ExplosiveEvent.getHandlerList()) );
+//
+// if ( eventDisplay != null ) {
+// sb.append( eventDisplay.toStringBuilder() );
+// sb.append( "\n" );
+// }
+//
+//
+// if ( bbPriority.isComponentCompound() ) {
+// StringBuilder sbCP = new StringBuilder();
+// for ( BlockBreakPriority bbp : bbPriority.getComponentPriorities() ) {
+// if ( sbCP.length() > 0 ) {
+// sbCP.append( ", " );
+// }
+// sbCP.append( "'" ).append( bbp.name() ).append( "'" );
+// }
+//
+// String msg = String.format( "Note '%s' is a compound of: [%s]",
+// bbPriority.name(),
+// sbCP );
+//
+// sb.append( msg ).append( "\n" );
+// }
+ }
+ catch ( ClassNotFoundException e ) {
+ // CrazyEnchants is not loaded... so ignore.
+ }
+ catch ( Exception e ) {
+ Output.get().logInfo( "AutoManager: RevEnchants ExplosiveEvent failed to load. [%s]", e.getMessage() );
+ }
+ }
+
+
+ /**
+ * Since there are multiple blocks associated with this event, pull out the player first and
+ * get the mine, then loop through those blocks to make sure they are within the mine.
+ *
+ *
+ * The logic in this function is slightly different compared to genericBlockEvent() because this
+ * event contains multiple blocks so it's far more efficient to process the player data once.
+ * So that basically needed a slight refactoring.
+ *
+ *
+ * @param e
+ */
+ public void handleRevEnchantsExplosiveEvent( ExplosiveEvent e, BlockBreakPriority bbPriority ) {
+
+ PrisonMinesBlockBreakEvent pmEvent = null;
+ long start = System.nanoTime();
+
+ // If the event is canceled, it still needs to be processed because of the
+ // MONITOR events:
+ // An event will be "canceled" and "ignored" if the block
+ // BlockUtils.isUnbreakable(), or if the mine is actively resetting.
+ // The event will also be ignored if the block is outside of a mine
+ // or if the targetBlock has been set to ignore all block events which
+ // means the block has already been processed.
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( e,
+ e.getPlayer(), e.getBlocks().get( 0 ) );
+ if ( eventResults.isIgnoreEvent() ) {
+ return;
+ }
+
+
+ StringBuilder debugInfo = new StringBuilder();
+
+ debugInfo.append( String.format( "### ** handleRevEnchantsExplosiveEvent ** ### " +
+ "(event: ExplosiveEvent, config: %s, priority: %s, canceled: %s) ",
+ bbPriority.name(),
+ bbPriority.getBukkitEventPriority().name(),
+ (e.isCancelled() ? "TRUE " : "FALSE")
+ ) );
+
+
+ // NOTE that check for auto manager has happened prior to accessing this function.
+
+ // Process all priorities if the event has not been canceled, and
+ // process the MONITOR priority even if the event was canceled:
+ if ( !bbPriority.isMonitor() && !e.isCancelled() ||
+ bbPriority.isMonitor() &&
+ e.getBlocks().size() > 0 ) {
+
+
+
+ Block bukkitBlock = e.getBlocks().get( 0 );
+
+ BlockEventType eventType = BlockEventType.RevEnExplosion;
+ String triggered = null;
+
+
+ pmEvent = new PrisonMinesBlockBreakEvent(
+ bukkitBlock,
+ e.getPlayer(),
+ eventResults.getMine(),
+ bbPriority, eventType, triggered,
+ debugInfo );
+
+
+ // NOTE: Check for the ACCESS priority and if someone does not have access, then return
+ // with a cancel on the event. Both ACCESSBLOCKEVENTS and ACCESSMONITOR will be
+ // converted to just ACCESS at this point, and the other part will run under either
+ // BLOCKEVENTS or MONITOR.
+ // This check has to be performed after creating the pmEvent object since it uses
+ // a lot of the internal variables and objects. There is not much of an impact since
+ // the validateEvent() has not been ran yet.
+ if ( checkIfNoAccess( pmEvent, start ) ) {
+
+ e.setCancelled( true );
+ return;
+ }
+
+
+ for ( int i = 1; i < e.getBlocks().size(); i++ ) {
+ pmEvent.getUnprocessedRawBlocks().add( e.getBlocks().get( i ) );
+ }
+
+
+ if ( !validateEvent( pmEvent ) ) {
+
+ // The event has not passed validation. All logging and Errors have been recorded
+ // so do nothing more. This is to just prevent normal processing from occurring.
+
+ if ( pmEvent.isCancelOriginalEvent() ) {
+
+ e.setCancelled( true );
+ }
+
+ debugInfo.append( "(doAction failed validation) " );
+ }
+
+
+
+ // The validation was successful, but stop processing for the MONITOR priorities.
+ // Note that BLOCKEVENTS processing occured already within validateEvent():
+ else if ( pmEvent.getBbPriority().isMonitor() ) {
+ // Stop here, and prevent additional processing.
+ // Monitors should never process the event beyond this.
+ }
+
+
+
+ // This is where the processing actually happens:
+ else {
+
+// debugInfo.append( "(normal processing initiating) " );
+
+ // check all external events such as mcMMO and EZBlocks:
+// if ( e instanceof BlockBreakEvent ) {
+// processPMBBExternalEvents( pmEvent, debugInfo, e );
+// }
+//
+
+ EventListenerCancelBy cancelBy = EventListenerCancelBy.none;
+
+ cancelBy = processPMBBEvent( pmEvent );
+
+
+ if ( cancelBy != EventListenerCancelBy.none ) {
+
+ e.setCancelled( true );
+ debugInfo.append( "(event canceled) " );
+ }
+// else if ( cancelBy == EventListenerCancelBy.drops ) {
+// try
+// {
+// e.setDropItems( false );
+// debugInfo.append( "(drop canceled) " );
+// }
+// catch ( NoSuchMethodError e1 )
+// {
+// String message = String.format(
+// "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
+// "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
+// "Modify the config settings and set this value to `false`. For now, it is temporarily " +
+// "disabled. [%s]",
+// e1.getMessage() );
+// Output.get().logWarn( message );
+//
+// AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
+// .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
+// }
+//
+// }
+ }
+
+
+ }
+
+ printDebugInfo( pmEvent, start );
+ }
+
+ @Override
+ protected int checkBonusXp( Player player, Block block, ItemStack item ) {
+ int bonusXp = 0;
+
+ return bonusXp;
+ }
+
+}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerRevEnchantsJackHammerEvent.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerRevEnchantsJackHammerEvent.java
new file mode 100644
index 000000000..50d69b806
--- /dev/null
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerRevEnchantsJackHammerEvent.java
@@ -0,0 +1,411 @@
+package tech.mcprison.prison.spigot.autofeatures.events;
+
+import org.bukkit.Bukkit;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.EventExecutor;
+import org.bukkit.plugin.PluginManager;
+
+import me.revils.revenchants.events.JackHammerEvent;
+import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
+import tech.mcprison.prison.mines.features.MineBlockEvent.BlockEventType;
+import tech.mcprison.prison.output.Output;
+import tech.mcprison.prison.spigot.SpigotPrison;
+import tech.mcprison.prison.spigot.api.PrisonMinesBlockBreakEvent;
+import tech.mcprison.prison.spigot.autofeatures.AutoManagerFeatures;
+import tech.mcprison.prison.spigot.block.BlockBreakPriority;
+
+public class AutoManagerRevEnchantsJackHammerEvent
+ extends AutoManagerFeatures
+ implements PrisonEventManager {
+
+ private BlockBreakPriority bbPriority;
+
+ public AutoManagerRevEnchantsJackHammerEvent() {
+ super();
+ }
+
+ public AutoManagerRevEnchantsJackHammerEvent( BlockBreakPriority bbPriority ) {
+ super();
+
+ this.bbPriority = bbPriority;
+ }
+
+
+ public BlockBreakPriority getBbPriority() {
+ return bbPriority;
+ }
+ public void setBbPriority( BlockBreakPriority bbPriority ) {
+ this.bbPriority = bbPriority;
+ }
+
+ @Override
+ public void registerEvents() {
+
+ initialize();
+
+ }
+
+
+
+ public class AutoManagerRevEnchantsJackHammerEventListener
+ extends AutoManagerRevEnchantsJackHammerEvent
+ implements Listener {
+
+ public AutoManagerRevEnchantsJackHammerEventListener( BlockBreakPriority bbPriority ) {
+ super( bbPriority );
+ }
+
+ @EventHandler(priority=EventPriority.NORMAL)
+ public void onRevEnchantsJackHammer(
+ JackHammerEvent e, BlockBreakPriority bbPriority) {
+
+ if ( isDisabled( e.getPlayer().getLocation().getWorld().getName() ) ||
+ bbPriority.isDisabled()) {
+ return;
+ }
+
+ handleRevEnchantsJackHammerEvent( e, bbPriority );
+ }
+ }
+
+
+ @Override
+ public void initialize() {
+
+ String eP = getMessage( AutoFeatures.RevEnchantsJackHammerEventPriority );
+
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ setBbPriority( bbPriority );
+
+ // boolean isEventEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
+
+ if ( getBbPriority() == BlockBreakPriority.DISABLED ) {
+ return;
+ }
+
+ // Check to see if the class JackHammerEvent even exists:
+ try {
+ Output.get().logInfo( "AutoManager: checking if loaded: RevEnchants JackHammerEvent" );
+
+ Class.forName( "me.revils.revenchants.events.JackHammerEvent", false,
+ this.getClass().getClassLoader() );
+
+ Output.get().logInfo( "AutoManager: Trying to register RevEnchants JackHammerEvent" );
+
+ if ( getBbPriority() != BlockBreakPriority.DISABLED ) {
+ if ( bbPriority.isComponentCompound() ) {
+
+ for (BlockBreakPriority subBBPriority : bbPriority.getComponentPriorities()) {
+
+ createListener( subBBPriority );
+ }
+ }
+ else {
+
+ createListener(bbPriority);
+ }
+
+ }
+
+ }
+ catch ( ClassNotFoundException e ) {
+ // CrazyEnchants is not loaded... so ignore.
+ Output.get().logInfo( "AutoManager: RevEnchants JackHammerEvent is not loaded" );
+ }
+ catch ( Exception e ) {
+ Output.get().logInfo( "AutoManager: RevEnchants JackHammerEvent failed to load. [%s]", e.getMessage() );
+ }
+ }
+
+ private void createListener( BlockBreakPriority bbPriority ) {
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+ PluginManager pm = Bukkit.getServer().getPluginManager();
+ EventPriority ePriority = bbPriority.getBukkitEventPriority();
+
+
+ AutoManagerRevEnchantsJackHammerEventListener autoManagerlListener =
+ new AutoManagerRevEnchantsJackHammerEventListener( bbPriority );
+
+ pm.registerEvent(
+ JackHammerEvent.class,
+ autoManagerlListener, ePriority,
+ new EventExecutor() {
+ public void execute(Listener l, Event e) {
+
+ JackHammerEvent exEvent = (JackHammerEvent) e;
+
+ ((AutoManagerRevEnchantsJackHammerEventListener)l)
+ .onRevEnchantsJackHammer( exEvent, getBbPriority() );
+ }
+ },
+ prison);
+ prison.getRegisteredBlockListeners().add( autoManagerlListener );
+ }
+
+
+ @Override
+ public void unregisterListeners() {
+
+ // super.unregisterListeners();
+ }
+
+ @Override
+ public void dumpEventListeners() {
+
+ StringBuilder sb = new StringBuilder();
+
+ dumpEventListeners( sb );
+
+ if ( sb.length() > 0 ) {
+
+
+ for ( String line : sb.toString().split( "\n" ) ) {
+
+ Output.get().logInfo( line );
+ }
+ }
+
+ }
+
+
+ @Override
+ public void dumpEventListeners( StringBuilder sb ) {
+
+ String eP = getMessage( AutoFeatures.RevEnchantsJackHammerEventPriority );
+ boolean isEventEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
+
+ if ( !isEventEnabled ) {
+ return;
+ }
+
+ // Check to see if the class BlastUseEvent even exists:
+ try {
+
+ Class.forName( "me.revils.revenchants.events.JackHammerEvent", false,
+ this.getClass().getClassLoader() );
+
+
+
+ HandlerList handlers = JackHammerEvent.getHandlerList();
+
+// String eP = getMessage( AutoFeatures.blockBreakEventPriority );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ dumpEventListenersCore( "JackHammerEvent", handlers, bbPriority, sb );
+
+
+// BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+//
+//
+// String title = String.format(
+// "JackHammerEvent (%s)",
+// ( bbPriority == null ? "--none--" : bbPriority.name()) );
+//
+// ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
+// title,
+// new SpigotHandlerList( JackHammerEvent.getHandlerList()) );
+//
+// if ( eventDisplay != null ) {
+// sb.append( eventDisplay.toStringBuilder() );
+// sb.append( "\n" );
+// }
+//
+//
+// if ( bbPriority.isComponentCompound() ) {
+// StringBuilder sbCP = new StringBuilder();
+// for ( BlockBreakPriority bbp : bbPriority.getComponentPriorities() ) {
+// if ( sbCP.length() > 0 ) {
+// sbCP.append( ", " );
+// }
+// sbCP.append( "'" ).append( bbp.name() ).append( "'" );
+// }
+//
+// String msg = String.format( "Note '%s' is a compound of: [%s]",
+// bbPriority.name(),
+// sbCP );
+//
+// sb.append( msg ).append( "\n" );
+// }
+ }
+ catch ( ClassNotFoundException e ) {
+ // CrazyEnchants is not loaded... so ignore.
+ }
+ catch ( Exception e ) {
+ Output.get().logInfo( "AutoManager: RevEnchants JackHammerEnchants failed to load. [%s]", e.getMessage() );
+ }
+ }
+
+
+ /**
+ * Since there are multiple blocks associated with this event, pull out the player first and
+ * get the mine, then loop through those blocks to make sure they are within the mine.
+ *
+ *
+ * The logic in this function is slightly different compared to genericBlockEvent() because this
+ * event contains multiple blocks so it's far more efficient to process the player data once.
+ * So that basically needed a slight refactoring.
+ *
+ *
+ * @param e
+ */
+ public void handleRevEnchantsJackHammerEvent( JackHammerEvent e, BlockBreakPriority bbPriority ) {
+
+ PrisonMinesBlockBreakEvent pmEvent = null;
+ long start = System.nanoTime();
+
+ // If the event is canceled, it still needs to be processed because of the
+ // MONITOR events:
+ // An event will be "canceled" and "ignored" if the block
+ // BlockUtils.isUnbreakable(), or if the mine is activly resetting.
+ // The event will also be ignored if the block is outside of a mine
+ // or if the targetBlock has been set to ignore all block events which
+ // means the block has already been processed.
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( e,
+ e.getPlayer(), e.getBlocks().get( 0 ) );
+ if ( eventResults.isIgnoreEvent() ) {
+ return;
+ }
+
+
+ StringBuilder debugInfo = new StringBuilder();
+
+ debugInfo.append( String.format( "### ** handleRevEnchantsJackHammerEvent ** ### " +
+ "(event: JackHammerEvent, config: %s, priority: %s, canceled: %s) ",
+ bbPriority.name(),
+ bbPriority.getBukkitEventPriority().name(),
+ (e.isCancelled() ? "TRUE " : "FALSE")
+ ) );
+
+
+ // NOTE that check for auto manager has happened prior to accessing this function.
+
+ // Process all priorities if the event has not been canceled, and
+ // process the MONITOR priority even if the event was canceled:
+ if ( !bbPriority.isMonitor() && !e.isCancelled() ||
+ bbPriority.isMonitor() &&
+ e.getBlocks().size() > 0 ) {
+
+
+
+ Block bukkitBlock = e.getBlocks().get( 0 );
+
+ BlockEventType eventType = BlockEventType.RevEnJackHammer;
+ String triggered = null;
+
+
+ pmEvent = new PrisonMinesBlockBreakEvent(
+ bukkitBlock, e.getPlayer(),
+ eventResults.getMine(),
+ bbPriority, eventType, triggered,
+ debugInfo );
+
+
+ // NOTE: Check for the ACCESS priority and if someone does not have access, then return
+ // with a cancel on the event. Both ACCESSBLOCKEVENTS and ACCESSMONITOR will be
+ // converted to just ACCESS at this point, and the other part will run under either
+ // BLOCKEVENTS or MONITOR.
+ // This check has to be performed after creating the pmEvent object since it uses
+ // a lot of the internal variables and objects. There is not much of an impact since
+ // the validateEvent() has not been ran yet.
+ if ( checkIfNoAccess( pmEvent, start ) ) {
+
+ e.setCancelled( true );
+ return;
+ }
+
+
+ for ( int i = 1; i < e.getBlocks().size(); i++ ) {
+ pmEvent.getUnprocessedRawBlocks().add( e.getBlocks().get( i ) );
+ }
+
+
+ if ( !validateEvent( pmEvent ) ) {
+
+ // The event has not passed validation. All logging and Errors have been recorded
+ // so do nothing more. This is to just prevent normal processing from occurring.
+
+ if ( pmEvent.isCancelOriginalEvent() ) {
+
+ e.setCancelled( true );
+ }
+
+ debugInfo.append( "(doAction failed validation) " );
+ }
+
+
+
+ // The validation was successful, but stop processing for the MONITOR priorities.
+ // Note that BLOCKEVENTS processing occured already within validateEvent():
+ else if ( pmEvent.getBbPriority().isMonitor() ) {
+ // Stop here, and prevent additional processing.
+ // Monitors should never process the event beyond this.
+ }
+
+
+ // This is where the processing actually happens:
+ else {
+
+// debugInfo.append( "(normal processing initiating) " );
+
+ // check all external events such as mcMMO and EZBlocks:
+// if ( e instanceof BlockBreakEvent ) {
+// processPMBBExternalEvents( pmEvent, debugInfo, e );
+// }
+
+
+ EventListenerCancelBy cancelBy = EventListenerCancelBy.none;
+
+ cancelBy = processPMBBEvent( pmEvent );
+
+
+ if ( cancelBy != EventListenerCancelBy.none ) {
+
+ e.setCancelled( true );
+ debugInfo.append( "(event canceled) " );
+ }
+// else if ( cancelBy == EventListenerCancelBy.drops ) {
+// try
+// {
+// e.setDropItems( false );
+// debugInfo.append( "(drop canceled) " );
+// }
+// catch ( NoSuchMethodError e1 )
+// {
+// String message = String.format(
+// "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
+// "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
+// "Modify the config settings and set this value to `false`. For now, it is temporarily " +
+// "disabled. [%s]",
+// e1.getMessage() );
+// Output.get().logWarn( message );
+//
+// AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
+// .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
+// }
+//
+// }
+ }
+
+
+ }
+
+ printDebugInfo( pmEvent, start );
+ }
+
+ @Override
+ protected int checkBonusXp( Player player, Block block, ItemStack item ) {
+ int bonusXp = 0;
+
+ return bonusXp;
+ }
+
+}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerTokenEnchant.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerTokenEnchant.java
index 7bb9ed080..0c7468bda 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerTokenEnchant.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerTokenEnchant.java
@@ -6,6 +6,7 @@
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.EventExecutor;
@@ -13,20 +14,13 @@
import com.vk2gpz.tokenenchant.event.TEBlockExplodeEvent;
-import tech.mcprison.prison.Prison;
import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
import tech.mcprison.prison.mines.features.MineBlockEvent.BlockEventType;
-import tech.mcprison.prison.output.ChatDisplay;
import tech.mcprison.prison.output.Output;
-import tech.mcprison.prison.output.Output.DebugTarget;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.api.PrisonMinesBlockBreakEvent;
import tech.mcprison.prison.spigot.autofeatures.AutoManagerFeatures;
import tech.mcprison.prison.spigot.block.BlockBreakPriority;
-import tech.mcprison.prison.spigot.block.OnBlockBreakExternalEvents;
-import tech.mcprison.prison.spigot.block.SpigotBlock;
-import tech.mcprison.prison.spigot.game.SpigotHandlerList;
-import tech.mcprison.prison.spigot.game.SpigotPlayer;
public class AutoManagerTokenEnchant
extends AutoManagerFeatures
@@ -42,6 +36,12 @@ public AutoManagerTokenEnchant() {
this.teExplosionTriggerEnabled = true;
}
+ public AutoManagerTokenEnchant( BlockBreakPriority bbPriority ) {
+ this();
+
+ this.bbPriority = bbPriority;
+ }
+
public BlockBreakPriority getBbPriority() {
return bbPriority;
@@ -61,9 +61,14 @@ public class AutoManagerTokenEnchantEventListener
extends AutoManagerTokenEnchant
implements Listener {
+ public AutoManagerTokenEnchantEventListener( BlockBreakPriority bbPriority ) {
+ super( bbPriority );
+ }
+
@EventHandler(priority=EventPriority.LOW)
public void onTEBlockExplode( TEBlockExplodeEvent e, BlockBreakPriority bbPriority) {
- if ( isDisabled( e.getBlock().getLocation().getWorld().getName() ) ) {
+ if ( isDisabled( e.getBlock().getLocation().getWorld().getName() ) ||
+ bbPriority.isDisabled() ) {
return;
}
@@ -77,7 +82,9 @@ public void onTEBlockExplode( TEBlockExplodeEvent e, BlockBreakPriority bbPriori
public void initialize() {
String eP = getMessage( AutoFeatures.TokenEnchantBlockExplodeEventPriority );
- setBbPriority( BlockBreakPriority.fromString( eP ) );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ setBbPriority( bbPriority );
// boolean isEventEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
@@ -94,26 +101,21 @@ public void initialize() {
Output.get().logInfo( "AutoManager: Trying to register TokenEnchant" );
- SpigotPrison prison = SpigotPrison.getInstance();
- PluginManager pm = Bukkit.getServer().getPluginManager();
- EventPriority ePriority = getBbPriority().getBukkitEventPriority();
-
-
- AutoManagerTokenEnchantEventListener autoManagerlListener =
- new AutoManagerTokenEnchantEventListener();
- pm.registerEvent(TEBlockExplodeEvent.class, autoManagerlListener, ePriority,
- new EventExecutor() {
- public void execute(Listener l, Event e) {
- ((AutoManagerTokenEnchantEventListener)l)
- .onTEBlockExplode( (TEBlockExplodeEvent)e, getBbPriority() );
+ if ( getBbPriority() != BlockBreakPriority.DISABLED ) {
+ if ( bbPriority.isComponentCompound() ) {
+
+ for (BlockBreakPriority subBBPriority : bbPriority.getComponentPriorities()) {
+
+ createListener( subBBPriority );
+ }
}
- },
- prison);
- prison.getRegisteredBlockListeners().add( autoManagerlListener );
-
-
-
+ else {
+
+ createListener(bbPriority);
+ }
+
+ }
@@ -188,6 +190,27 @@ public void execute(Listener l, Event e) {
Output.get().logInfo( "AutoManager: TokenEnchant failed to load. [%s]", e.getMessage() );
}
}
+
+ private void createListener( BlockBreakPriority bbPriority ) {
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+ PluginManager pm = Bukkit.getServer().getPluginManager();
+ EventPriority ePriority = bbPriority.getBukkitEventPriority();
+
+
+ AutoManagerTokenEnchantEventListener autoManagerListener =
+ new AutoManagerTokenEnchantEventListener( bbPriority );
+
+ pm.registerEvent(TEBlockExplodeEvent.class, autoManagerListener, ePriority,
+ new EventExecutor() {
+ public void execute(Listener l, Event e) {
+ ((AutoManagerTokenEnchantEventListener)l)
+ .onTEBlockExplode( (TEBlockExplodeEvent)e, getBbPriority() );
+ }
+ },
+ prison);
+ prison.getRegisteredBlockListeners().add( autoManagerListener );
+ }
@Override
@@ -232,20 +255,47 @@ public void dumpEventListeners( StringBuilder sb ) {
Class.forName( "com.vk2gpz.tokenenchant.event.TEBlockExplodeEvent", false,
this.getClass().getClassLoader() );
- BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
-
- String title = String.format(
- "TEBlockExplodeEvent (%s)",
- ( bbPriority == null ? "--none--" : bbPriority.name()) );
- ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
- title,
- new SpigotHandlerList( TEBlockExplodeEvent.getHandlerList()) );
+ HandlerList handlers = TEBlockExplodeEvent.getHandlerList();
+
+// String eP = getMessage( AutoFeatures.blockBreakEventPriority );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
- if ( eventDisplay != null ) {
- sb.append( eventDisplay.toStringBuilder() );
- sb.append( "\n" );
- }
+ dumpEventListenersCore( "BlockBreakEvent", handlers, bbPriority, sb );
+
+
+
+// BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+//
+// String title = String.format(
+// "TEBlockExplodeEvent (%s)",
+// ( bbPriority == null ? "--none--" : bbPriority.name()) );
+//
+// ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
+// title,
+// new SpigotHandlerList( TEBlockExplodeEvent.getHandlerList()) );
+//
+// if ( eventDisplay != null ) {
+// sb.append( eventDisplay.toStringBuilder() );
+// sb.append( "\n" );
+// }
+//
+//
+// if ( bbPriority.isComponentCompound() ) {
+// StringBuilder sbCP = new StringBuilder();
+// for ( BlockBreakPriority bbp : bbPriority.getComponentPriorities() ) {
+// if ( sbCP.length() > 0 ) {
+// sbCP.append( ", " );
+// }
+// sbCP.append( "'" ).append( bbp.name() ).append( "'" );
+// }
+//
+// String msg = String.format( "Note '%s' is a compound of: [%s]",
+// bbPriority.name(),
+// sbCP );
+//
+// sb.append( msg ).append( "\n" );
+// }
}
catch ( ClassNotFoundException e ) {
// TokenEnchant is not loaded... so ignore.
@@ -269,22 +319,25 @@ public void dumpEventListeners( StringBuilder sb ) {
*/
public void handleTEBlockExplodeEvent( TEBlockExplodeEvent e, BlockBreakPriority bbPriority ) {
-// , boolean monitor, boolean blockEventsOnly,
-// boolean autoManager ) {
-
+ PrisonMinesBlockBreakEvent pmEvent = null;
long start = System.nanoTime();
- if ( e.isCancelled() || ignoreMinesBlockBreakEvent( e, e.getPlayer(), e.getBlock()) ) {
+ // If the event is canceled, it still needs to be processed because of the
+ // MONITOR events:
+ // An event will be "canceled" and "ignored" if the block
+ // BlockUtils.isUnbreakable(), or if the mine is activly resetting.
+ // The event will also be ignored if the block is outside of a mine
+ // or if the targetBlock has been set to ignore all block events which
+ // means the block has already been processed.
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( e, e.getPlayer(),
+ e.getBlock());
+ if ( eventResults.isIgnoreEvent() ) {
return;
}
-
- // Register all external events such as mcMMO and EZBlocks:
- OnBlockBreakExternalEvents.getInstance().registerAllExternalEvents();
-
+
StringBuilder debugInfo = new StringBuilder();
-
debugInfo.append( String.format( "### ** genericBlockExplodeEvent ** ### " +
"(event: TEBlockExplodeEvent, config: %s, priority: %s, canceled: %s) ",
bbPriority.name(),
@@ -293,26 +346,37 @@ public void handleTEBlockExplodeEvent( TEBlockExplodeEvent e, BlockBreakPriority
) );
-
- if ( bbPriority != BlockBreakPriority.MONITOR && !e.isCancelled() || bbPriority == BlockBreakPriority.MONITOR ) {
-
+ // Process all priorities if the event has not been canceled, and
+ // process the MONITOR priority even if the event was canceled:
+ if ( !bbPriority.isMonitor() && !e.isCancelled() ||
+ bbPriority.isMonitor() ) {
-
- String eP = getMessage( AutoFeatures.TokenEnchantBlockExplodeEventPriority );
- boolean isTEExplosiveEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
-
-
- // Need to wrap in a Prison block so it can be used with the mines:
- SpigotBlock sBlock = SpigotBlock.getSpigotBlock(e.getBlock());
- SpigotPlayer sPlayer = new SpigotPlayer(e.getPlayer());
-
BlockEventType eventType = BlockEventType.TEXplosion;
- String triggered = checkCEExplosionTriggered( e );
+ String triggered = checkTEBlockExplodeEventTriggered( e );
- PrisonMinesBlockBreakEvent pmEvent = new PrisonMinesBlockBreakEvent( e.getBlock(), e.getPlayer(),
- sBlock, sPlayer, bbPriority, eventType, triggered );
+ pmEvent = new PrisonMinesBlockBreakEvent(
+ e.getBlock(),
+ e.getPlayer(),
+ eventResults.getMine(),
+ bbPriority, eventType, triggered,
+ debugInfo );
+
+ // NOTE: Check for the ACCESS priority and if someone does not have access, then return
+ // with a cancel on the event. Both ACCESSBLOCKEVENTS and ACCESSMONITOR will be
+ // converted to just ACCESS at this point, and the other part will run under either
+ // BLOCKEVENTS or MONITOR.
+ // This check has to be performed after creating the pmEvent object since it uses
+ // a lot of the internal variables and objects. There is not much of an impact since
+ // the validateEvent() has not been ran yet.
+ if ( checkIfNoAccess( pmEvent, start ) ) {
+
+ e.setCancelled( true );
+ return;
+ }
+
+
// NOTE: Token Enchant will pass the event's block to prison, but that block may
// have already been processed by prison. Therefore the PrisonMinesBlockBreakEvent
// must enable the feature setForceIfAirBlock( true ). That block will not be used a
@@ -321,7 +385,7 @@ public void handleTEBlockExplodeEvent( TEBlockExplodeEvent e, BlockBreakPriority
pmEvent.setUnprocessedRawBlocks( e.blockList() );
- if ( !validateEvent( pmEvent, debugInfo ) ) {
+ if ( !validateEvent( pmEvent ) ) {
// The event has not passed validation. All logging and Errors have been recorded
// so do nothing more. This is to just prevent normal processing from occurring.
@@ -330,99 +394,72 @@ public void handleTEBlockExplodeEvent( TEBlockExplodeEvent e, BlockBreakPriority
e.setCancelled( true );
}
+
+ debugInfo.append( "(doAction failed validation) " );
}
- else if ( pmEvent.getBbPriority() == BlockBreakPriority.MONITOR ) {
- // Stop here, and prevent additional processing. Monitors should never process the event beyond this.
- }
+ // The validation was successful, but stop processing for the MONITOR priorities.
+ // Note that BLOCKEVENTS processing occured already within validateEvent():
+ else if ( pmEvent.getBbPriority().isMonitor() ) {
+ // Stop here, and prevent additional processing.
+ // Monitors should never process the event beyond this.
+ }
- // now process all blocks (non-monitor):
- else if ( isTEExplosiveEnabled &&
- ( pmEvent.getMine() != null || pmEvent.getMine() == null &&
- !isBoolean( AutoFeatures.pickupLimitToMines )) ) {
+
+ // This is where the processing actually happens:
+ else {
- if ( pmEvent.getExplodedBlocks().size() > 0 ) {
-
-// String triggered = checkCEExplosionTriggered( e );
-//
-//
-// PrisonMinesBlockBreakEvent pmbbEvent = new PrisonMinesBlockBreakEvent( e.getBlock(), e.getPlayer(),
-// mine, block, explodedBlocks, BlockEventType.TEXplosion, triggered );
- Bukkit.getServer().getPluginManager().callEvent( pmEvent );
- if ( pmEvent.isCancelled() ) {
- debugInfo.append( "(normal processing: PrisonMinesBlockBreakEvent was canceled) " );
- }
- else {
-
- // Cancel drops if so configured:
- if ( isBoolean( AutoFeatures.cancelAllBlockEventBlockDrops ) ) {
-
- try
- {
- e.setYield( 0 );
-// e.setDropItems( false );
- }
- catch ( NoSuchMethodError e1 )
- {
- String message = String.format(
- "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
- "is not valid for this version of Spigot. Modify the config settings and set " +
- "this value to `false`. [%s]",
- e1.getMessage() );
- Output.get().logWarn( message );
- }
- }
-
- // This is where the processing actually happens:
- if ( doAction( pmEvent, debugInfo ) ) {
-
- if ( isBoolean( AutoFeatures.cancelAllBlockBreakEvents ) ) {
-
- e.setCancelled( true );
- }
- else {
-
- debugInfo.append( "(event was not canceled) " );
- }
-
- finalizeBreakTheBlocks( pmEvent );
-
- doBlockEvents( pmEvent );
-
- }
-
- else {
-
- debugInfo.append( "(doAction failed without details) " );
- }
-
- }
-
- }
+// debugInfo.append( "(normal processing initiating) " );
+ // check all external events such as mcMMO and EZBlocks:
+// if ( e instanceof BlockBreakEvent ) {
+// processPMBBExternalEvents( pmEvent, debugInfo, e );
+// }
- debugInfo.append( "(normal processing) " );
- }
- else {
- debugInfo.append( "(logic bypass) " );
+ EventListenerCancelBy cancelBy = EventListenerCancelBy.none;
+
+ cancelBy = processPMBBEvent( pmEvent );
+
+
+ if ( cancelBy != EventListenerCancelBy.none ) {
+
+ e.setCancelled( true );
+ debugInfo.append( "(event canceled) " );
+ }
+// else if ( cancelBy == EventListenerCancelBy.drops ) {
+// try
+// {
+// e.setDropItems( false );
+// debugInfo.append( "(drop canceled) " );
+// }
+// catch ( NoSuchMethodError e1 )
+// {
+// String message = String.format(
+// "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
+// "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
+// "Modify the config settings and set this value to `false`. For now, it is temporarily " +
+// "disabled. [%s]",
+// e1.getMessage() );
+// Output.get().logWarn( message );
+//
+// AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
+// .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
+// }
+//
+// }
}
+
}
- if ( debugInfo.length() > 0 ) {
-
- long stop = System.nanoTime();
- debugInfo.append( " [" ).append( (stop - start) / 1000000d ).append( " ms]" );
-
- Output.get().logDebug( DebugTarget.blockBreak, debugInfo.toString() );
- }
+ printDebugInfo( pmEvent, start );
}
- private String checkCEExplosionTriggered( TEBlockExplodeEvent e )
+ private String checkTEBlockExplodeEventTriggered( TEBlockExplodeEvent e )
{
String triggered = null;
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerZenchantments.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerZenchantments.java
index 7340c5eb9..bb016a7a4 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerZenchantments.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/events/AutoManagerZenchantments.java
@@ -1,35 +1,26 @@
package tech.mcprison.prison.spigot.autofeatures.events;
-import java.util.ArrayList;
-import java.util.List;
-
import org.bukkit.Bukkit;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.EventExecutor;
import org.bukkit.plugin.PluginManager;
-import tech.mcprison.prison.Prison;
import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
import tech.mcprison.prison.autofeatures.AutoFeaturesWrapper;
import tech.mcprison.prison.mines.features.MineBlockEvent.BlockEventType;
-import tech.mcprison.prison.output.ChatDisplay;
import tech.mcprison.prison.output.Output;
-import tech.mcprison.prison.output.Output.DebugTarget;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.api.PrisonMinesBlockBreakEvent;
import tech.mcprison.prison.spigot.autofeatures.AutoManagerFeatures;
import tech.mcprison.prison.spigot.block.BlockBreakPriority;
-import tech.mcprison.prison.spigot.block.OnBlockBreakExternalEvents;
-import tech.mcprison.prison.spigot.block.SpigotBlock;
-import tech.mcprison.prison.spigot.game.SpigotHandlerList;
-import tech.mcprison.prison.spigot.game.SpigotPlayer;
import zedly.zenchantments.BlockShredEvent;
public class AutoManagerZenchantments
@@ -42,6 +33,12 @@ public AutoManagerZenchantments() {
super();
}
+ public AutoManagerZenchantments( BlockBreakPriority bbPriority ) {
+ super();
+
+ this.bbPriority = bbPriority;
+ }
+
public BlockBreakPriority getBbPriority() {
return bbPriority;
@@ -62,6 +59,10 @@ public class AutoManagerBlockShredEventListener
extends AutoManagerZenchantments
implements Listener {
+ public AutoManagerBlockShredEventListener( BlockBreakPriority bbPriority ) {
+ super( bbPriority );
+ }
+
@EventHandler(priority=EventPriority.NORMAL)
public void onBlockShredBreak( BlockShredEvent e, BlockBreakPriority bbPriority ) {
@@ -81,7 +82,9 @@ public void onBlockShredBreak( BlockShredEvent e, BlockBreakPriority bbPriority
public void initialize() {
String eP = getMessage( AutoFeatures.ZenchantmentsBlockShredEventPriority );
- setBbPriority( BlockBreakPriority.fromString( eP ) );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+
+ setBbPriority( bbPriority );
// boolean isEventEnabled = eP != null && !"DISABLED".equalsIgnoreCase( eP );
@@ -98,30 +101,20 @@ public void initialize() {
Output.get().logInfo( "AutoManager: Trying to register Zenchantments" );
- SpigotPrison prison = SpigotPrison.getInstance();
- PluginManager pm = Bukkit.getServer().getPluginManager();
- EventPriority ePriority = getBbPriority().getBukkitEventPriority();
-
- AutoManagerBlockShredEventListener autoManagerlListener =
- new AutoManagerBlockShredEventListener();
-
- pm.registerEvent(BlockShredEvent.class, autoManagerlListener, ePriority,
- new EventExecutor() {
- public void execute(Listener l, Event e) {
- if ( l instanceof AutoManagerBlockShredEventListener &&
- e instanceof BlockShredEvent ) {
-
- AutoManagerBlockShredEventListener lmon =
- (AutoManagerBlockShredEventListener) l;
-
- BlockShredEvent event = (BlockShredEvent) e;
- lmon.onBlockShredBreak( event, getBbPriority() );
- }
+ if ( getBbPriority() != BlockBreakPriority.DISABLED ) {
+ if ( bbPriority.isComponentCompound() ) {
+
+ for (BlockBreakPriority subBBPriority : bbPriority.getComponentPriorities()) {
+
+ createListener( subBBPriority );
+ }
}
- },
- prison);
- prison.getRegisteredBlockListeners().add( autoManagerlListener );
-
+ else {
+
+ createListener(bbPriority);
+ }
+
+ }
}
catch ( ClassNotFoundException e ) {
@@ -132,6 +125,33 @@ public void execute(Listener l, Event e) {
Output.get().logInfo( "AutoManager: Zenchantments failed to load. [%s]", e.getMessage() );
}
}
+
+ private void createListener( BlockBreakPriority bbPriority ) {
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+ PluginManager pm = Bukkit.getServer().getPluginManager();
+ EventPriority ePriority = bbPriority.getBukkitEventPriority();
+
+ AutoManagerBlockShredEventListener autoManagerListener =
+ new AutoManagerBlockShredEventListener( bbPriority );
+
+ pm.registerEvent(BlockShredEvent.class, autoManagerListener, ePriority,
+ new EventExecutor() {
+ public void execute(Listener l, Event e) {
+ if ( l instanceof AutoManagerBlockShredEventListener &&
+ e instanceof BlockShredEvent ) {
+
+ AutoManagerBlockShredEventListener lmon =
+ (AutoManagerBlockShredEventListener) l;
+
+ BlockShredEvent event = (BlockShredEvent) e;
+ lmon.onBlockShredBreak( event, getBbPriority() );
+ }
+ }
+ },
+ prison);
+ prison.getRegisteredBlockListeners().add( autoManagerListener );
+ }
@Override
public void unregisterListeners() {
@@ -174,23 +194,49 @@ public void dumpEventListeners( StringBuilder sb ) {
Class.forName( "zedly.zenchantments.BlockShredEvent", false,
this.getClass().getClassLoader() );
- BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
- String title = String.format(
- "BlockShredEvent (%s)",
- ( bbPriority == null ? "--none--" : bbPriority.name()) );
+ HandlerList handlers = BlockShredEvent.getHandlerList();
+
+// String eP = getMessage( AutoFeatures.blockBreakEventPriority );
+ BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+ dumpEventListenersCore( "BlockBreakEvent", handlers, bbPriority, sb );
- ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
- title,
- new SpigotHandlerList( BlockShredEvent.getHandlerList()) );
+
- if ( eventDisplay != null ) {
- sb.append( eventDisplay.toStringBuilder() );
- sb.append( "NOTE: Zenchantments uses the same HandlerList as BlockBreakEvent so " +
- "listeners are combined due to this bug.\n" );
- sb.append( "\n" );
- }
+// BlockBreakPriority bbPriority = BlockBreakPriority.fromString( eP );
+//
+// String title = String.format(
+// "BlockShredEvent (%s)",
+// ( bbPriority == null ? "--none--" : bbPriority.name()) );
+//
+//
+// ChatDisplay eventDisplay = Prison.get().getPlatform().dumpEventListenersChatDisplay(
+// title,
+// new SpigotHandlerList( BlockShredEvent.getHandlerList()) );
+//
+// if ( eventDisplay != null ) {
+// sb.append( eventDisplay.toStringBuilder() );
+// sb.append( "NOTE: Zenchantments uses the same HandlerList as BlockBreakEvent so " +
+// "listeners are combined due to this bug.\n" );
+// sb.append( "\n" );
+// }
+//
+// if ( bbPriority.isComponentCompound() ) {
+// StringBuilder sbCP = new StringBuilder();
+// for ( BlockBreakPriority bbp : bbPriority.getComponentPriorities() ) {
+// if ( sbCP.length() > 0 ) {
+// sbCP.append( ", " );
+// }
+// sbCP.append( "'" ).append( bbp.name() ).append( "'" );
+// }
+//
+// String msg = String.format( "Note '%s' is a compound of: [%s]",
+// bbPriority.name(),
+// sbCP );
+//
+// sb.append( msg ).append( "\n" );
+// }
}
catch ( ClassNotFoundException e ) {
// Zenchantments is not loaded... so ignore.
@@ -212,26 +258,29 @@ public void dumpEventListeners( StringBuilder sb ) {
*/
private void handleZenchantmentsBlockBreakEvent( BlockBreakEvent e, BlockBreakPriority bbPriority ) {
-// boolean monitor, boolean blockEventsOnly,
-// boolean autoManager ) {
-
if ( e instanceof PrisonMinesBlockBreakEvent ) {
return;
}
+ PrisonMinesBlockBreakEvent pmEvent = null;
long start = System.nanoTime();
- if ( e.isCancelled() || ignoreMinesBlockBreakEvent( e, e.getPlayer(), e.getBlock()) ) {
+ // If the event is canceled, it still needs to be processed because of the
+ // MONITOR events:
+ // An event will be "canceled" and "ignored" if the block
+ // BlockUtils.isUnbreakable(), or if the mine is activly resetting.
+ // The event will also be ignored if the block is outside of a mine
+ // or if the targetBlock has been set to ignore all block events which
+ // means the block has already been processed.
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( e,
+ e.getPlayer(), e.getBlock());
+ if ( eventResults.isIgnoreEvent() ) {
return;
}
-
-
- // Register all external events such as mcMMO and EZBlocks:
- OnBlockBreakExternalEvents.getInstance().registerAllExternalEvents();
StringBuilder debugInfo = new StringBuilder();
- debugInfo.append( String.format( "### ** genericBlockEvent ** ### " +
+ debugInfo.append( String.format( "### ** handleZenchantmentsBlockBreakEvent ** ### " +
"(event: BlockBreakEvent, config: %s, priority: %s, canceled: %s) ",
bbPriority.name(),
bbPriority.getBukkitEventPriority().name(),
@@ -239,19 +288,38 @@ private void handleZenchantmentsBlockBreakEvent( BlockBreakEvent e, BlockBreakPr
) );
- if ( bbPriority != BlockBreakPriority.MONITOR && !e.isCancelled() || bbPriority == BlockBreakPriority.MONITOR ) {
+ // Process all priorities if the event has not been canceled, and
+ // process the MONITOR priority even if the event was canceled:
+ if ( !bbPriority.isMonitor() && !e.isCancelled() ||
+ bbPriority.isMonitor() ) {
+
- // Need to wrap in a Prison block so it can be used with the mines:
- SpigotBlock sBlock = SpigotBlock.getSpigotBlock(e.getBlock());
- SpigotPlayer sPlayer = new SpigotPlayer(e.getPlayer());
-
BlockEventType eventType = BlockEventType.blockBreak;
String triggered = null;
- PrisonMinesBlockBreakEvent pmEvent = new PrisonMinesBlockBreakEvent( e.getBlock(), e.getPlayer(),
- sBlock, sPlayer, bbPriority, eventType, triggered );
+ pmEvent = new PrisonMinesBlockBreakEvent(
+ e.getBlock(),
+ e.getPlayer(),
+ eventResults.getMine(),
+ bbPriority, eventType, triggered,
+ debugInfo );
- if ( !validateEvent( pmEvent, debugInfo ) ) {
+
+ // NOTE: Check for the ACCESS priority and if someone does not have access, then return
+ // with a cancel on the event. Both ACCESSBLOCKEVENTS and ACCESSMONITOR will be
+ // converted to just ACCESS at this point, and the other part will run under either
+ // BLOCKEVENTS or MONITOR.
+ // This check has to be performed after creating the pmEvent object since it uses
+ // a lot of the internal variables and objects. There is not much of an impact since
+ // the validateEvent() has not been ran yet.
+ if ( checkIfNoAccess( pmEvent, start ) ) {
+
+ e.setCancelled( true );
+ return;
+ }
+
+
+ if ( !validateEvent( pmEvent ) ) {
// The event has not passed validation. All logging and Errors have been recorded
// so do nothing more. This is to just prevent normal processing from occurring.
@@ -260,103 +328,67 @@ private void handleZenchantmentsBlockBreakEvent( BlockBreakEvent e, BlockBreakPr
e.setCancelled( true );
}
+
+ debugInfo.append( "(doAction failed validation) " );
}
- else if ( pmEvent.getBbPriority() == BlockBreakPriority.MONITOR ) {
- // Stop here, and prevent additional processing. Monitors should never process the event beyond this.
+ // The validation was successful, but stop processing for the MONITOR priorities.
+ // Note that BLOCKEVENTS processing occured already within validateEvent():
+ else if ( pmEvent.getBbPriority().isMonitor() ) {
+ // Stop here, and prevent additional processing.
+ // Monitors should never process the event beyond this.
}
-
- // This is where the processing actually happens:
- else if ( pmEvent.getMine() != null || pmEvent.getMine() == null &&
- !isBoolean( AutoFeatures.pickupLimitToMines ) ) {
- debugInfo.append( "(normal processing initiating) " );
+
+ else {
- // Set the mine's PrisonBlockTypes for the block. Used to identify custom blocks.
- // Needed since processing of the block will lose track of which mine it came from.
- if ( pmEvent.getMine() != null ) {
- sBlock.setPrisonBlockTypes( pmEvent.getMine().getPrisonBlockTypes() );
- }
+ // This is where the processing actually happens:
- // check all external events such as mcMMO and EZBlocks:
- debugInfo.append(
- OnBlockBreakExternalEvents.getInstance().checkAllExternalEvents( e ) );
- List explodedBlocks = new ArrayList<>();
- pmEvent.setExplodedBlocks( explodedBlocks );
-// String triggered = null;
+ if ( e instanceof BlockBreakEvent ) {
+ processPMBBExternalEvents( pmEvent, e );
+ }
-// PrisonMinesBlockBreakEvent pmbbEvent = new PrisonMinesBlockBreakEvent( e.getBlock(), e.getPlayer(),
-// pmEvent.getMine(), sBlock, explodedBlocks, BlockEventType.blockBreak, triggered );
- Bukkit.getServer().getPluginManager().callEvent( pmEvent );
- if ( pmEvent.isCancelled() ) {
- debugInfo.append( "(normal processing: PrisonMinesBlockBreakEvent was canceled) " );
- }
- else {
-
- // Cancel drops if so configured:
- if ( isBoolean( AutoFeatures.cancelAllBlockEventBlockDrops ) ) {
-
- try
- {
- e.setDropItems( false );
- }
- catch ( NoSuchMethodError e1 )
- {
- String message = String.format(
- "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
- "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
- "Modify the config settings and set this value to `false`. For now, it is temporarily " +
- "disabled. [%s]",
- e1.getMessage() );
- Output.get().logWarn( message );
-
- AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
- .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
- }
- }
-
- // doAction returns a boolean that indicates if the event should be canceled or not:
- if ( doAction( pmEvent, debugInfo ) ) {
-// if ( doAction( sBlock, pmEvent.getMine(), pmEvent.getPlayer(), debugInfo ) ) {
-
- if ( isBoolean( AutoFeatures.cancelAllBlockBreakEvents ) ) {
- e.setCancelled( true );
- }
- else {
-
- debugInfo.append( "(event was not canceled) " );
- }
-
- finalizeBreakTheBlocks( pmEvent );
-
- doBlockEvents( pmEvent );
-
- }
- else {
-
- debugInfo.append( "(doAction failed without details) " );
- }
-
- }
- debugInfo.append( "(normal processing completed) " );
- }
- else {
+ EventListenerCancelBy cancelBy = EventListenerCancelBy.none;
- debugInfo.append( "(logic bypass) " );
+ cancelBy = processPMBBEvent( pmEvent );
+
+
+ if ( cancelBy == EventListenerCancelBy.event ) {
+
+ e.setCancelled( true );
+ debugInfo.append( "(event canceled) " );
+ }
+ else if ( cancelBy == EventListenerCancelBy.drops ) {
+ try
+ {
+ e.setDropItems( false );
+ debugInfo.append( "(drop canceled) " );
+ }
+ catch ( NoSuchMethodError e1 )
+ {
+ String message = String.format(
+ "Warning: The autoFeaturesConfig.yml setting `cancelAllBlockEventBlockDrops` " +
+ "is not valid for this version of Spigot. It's only vaid for spigot v1.12.x and higher. " +
+ "Modify the config settings and set this value to `false`. For now, it is temporarily " +
+ "disabled. [%s]",
+ e1.getMessage() );
+ Output.get().logWarn( message );
+
+ AutoFeaturesWrapper.getInstance().getAutoFeaturesConfig()
+ .setFeature( AutoFeatures.cancelAllBlockEventBlockDrops, false );
+ }
+
+ }
}
+
}
- if ( debugInfo.length() > 0 ) {
-
- long stop = System.nanoTime();
- debugInfo.append( " [" ).append( (stop - start) / 1000000d ).append( " ms]" );
-
- Output.get().logDebug( DebugTarget.blockBreak, debugInfo.toString() );
- }
+ printDebugInfo( pmEvent, start );
}
+
@Override
protected int checkBonusXp( Player player, Block block, ItemStack item ) {
@@ -364,4 +396,5 @@ protected int checkBonusXp( Player player, Block block, ItemStack item ) {
return bonusXp;
}
+
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/backpacks/BackpacksListeners.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/backpacks/BackpacksListeners.java
index d380712b0..880241c65 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/backpacks/BackpacksListeners.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/backpacks/BackpacksListeners.java
@@ -81,17 +81,17 @@ private void saveBackpackEdited(InventoryCloseEvent e) {
id = title.substring(e.getPlayer().getName().length() + 13);
}
} catch (IndexOutOfBoundsException ignored){}
- if (id != null){
+// if (id != null){
if (BackpacksUtil.backpackEdited.contains(e.getPlayer().getName())){
BackpacksUtil.get().setInventory((Player) e.getPlayer(), e.getInventory(), id);
BackpacksUtil.get().removeFromEditedBackpack((Player) e.getPlayer());
}
- } else {
- if (BackpacksUtil.backpackEdited.contains(e.getPlayer().getName())) {
- BackpacksUtil.get().setInventory((Player) e.getPlayer(), e.getInventory());
- BackpacksUtil.get().removeFromEditedBackpack((Player) e.getPlayer());
- }
- }
+// } else {
+// if (BackpacksUtil.backpackEdited.contains(e.getPlayer().getName())) {
+// BackpacksUtil.get().setInventory((Player) e.getPlayer(), e.getInventory(), null);
+// BackpacksUtil.get().removeFromEditedBackpack((Player) e.getPlayer());
+// }
+// }
}
}
@@ -107,15 +107,17 @@ private void backpackEditEvent(InventoryClickEvent e) {
id = title.substring(e.getWhoClicked().getName().length() + 13);
}
} catch (IndexOutOfBoundsException ignored){}
- if (id != null){
- if (title.equalsIgnoreCase(e.getWhoClicked().getName() + " -> Backpack-" + id)){
+ String backpackId = id == null ?
+ "" : "-" + id;
+// if (id != null){
+ if (title.equalsIgnoreCase(e.getWhoClicked().getName() + " -> Backpack" + backpackId)){
BackpacksUtil.get().addToEditedBackpack((Player) e.getWhoClicked());
}
- } else {
- if (title != null && title.equalsIgnoreCase(e.getWhoClicked().getName() + " -> Backpack")) {
- BackpacksUtil.get().addToEditedBackpack((Player) e.getWhoClicked());
- }
- }
+// } else {
+// if (title != null && title.equalsIgnoreCase(e.getWhoClicked().getName() + " -> Backpack")) {
+// BackpacksUtil.get().addToEditedBackpack((Player) e.getWhoClicked());
+// }
+// }
}
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/backpacks/BackpacksUtil.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/backpacks/BackpacksUtil.java
index 97542afce..1140f941a 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/backpacks/BackpacksUtil.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/backpacks/BackpacksUtil.java
@@ -12,6 +12,7 @@
import org.bukkit.OfflinePlayer;
import org.bukkit.Sound;
import org.bukkit.configuration.Configuration;
+import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
@@ -25,9 +26,9 @@
import tech.mcprison.prison.gui.PrisonCoreGuiMessages;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.SpigotUtil;
+import tech.mcprison.prison.spigot.block.SpigotItemStack;
import tech.mcprison.prison.spigot.compat.Compatibility;
import tech.mcprison.prison.spigot.compat.SpigotCompatibility;
-import tech.mcprison.prison.spigot.configs.BackpacksConfig;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
/**
@@ -121,17 +122,18 @@ public OfflinePlayer getBackpackOwnerOffline(String name){
return getOfflinePlayer(name);
}
- /**
- * Get Backpack owner OfflinePlayer by name and backpack ID.
- *
- * @param name - PlayerName
- * @param id - InventoryID
- *
- * @return OfflinePlayer
- * */
- public OfflinePlayer getBackpackOwnerOffline(String name, String id){
- return getOfflinePlayer(name, id);
- }
+ // The following is exactly the same as the function without the id....
+// /**
+// * Get Backpack owner OfflinePlayer by name and backpack ID.
+// *
+// * @param name - PlayerName
+// * @param id - InventoryID
+// *
+// * @return OfflinePlayer
+// * */
+// public OfflinePlayer getBackpackOwnerOffline(String name, String id){
+// return getOfflinePlayer(name, id);
+// }
/**
* Get Backpack Player by name.
@@ -303,16 +305,16 @@ public void setBackpackSize(OfflinePlayer p, int size, String id){
backpackResize(p, size, id);
}
- /**
- * Get a backpack size depending on the owner.
- *
- * @param p - Player
- *
- * @return backPackSize - Integer
- * */
- public int getBackpackSize(Player p){
- return getSize(p);
- }
+// /**
+// * Get a backpack size depending on the owner.
+// *
+// * @param p - Player
+// *
+// * @return backPackSize - Integer
+// * */
+// public int getBackpackSize(Player p){
+// return getSize(p);
+// }
/**
* Get a backpack size depending on the owner.
@@ -326,6 +328,26 @@ public int getBackpackSize(Player p, String id){
return getSize(p, id);
}
+// /**
+// * Get Prison Backpacks Inventory.
+// * Also if you need to modify it you can do it just by using BackPacksUtil getInventory(player)
+// * modify your inventory as you'd usually with spigot inventories
+// * and then use BackPacksUtil setInventory(player, inventory) is recommended.
+// *
+// * EXAMPLE for adding item:
+// * Inventory inv = BackPacksUtil.getInventory(p);
+// * ItemStack item = new ItemStack(Material.COAL_ORE, 1);
+// * inv.addItem(item)
+// * BackPacksUtil.setInventory(inv);
+// *
+// * @param p - player
+// *
+// * @return inv - Inventory/Backpack.
+// * */
+// public Inventory getBackpack(Player p){
+// return getBackpackOwn(p, null);
+// }
+
/**
* Get Prison Backpacks Inventory.
* Also if you need to modify it you can do it just by using BackPacksUtil getInventory(player)
@@ -338,15 +360,6 @@ public int getBackpackSize(Player p, String id){
* inv.addItem(item)
* BackPacksUtil.setInventory(inv);
*
- * @param p - player
- *
- * @return inv - Inventory/Backpack.
- * */
- public Inventory getBackpack(Player p){
- return getBackpackOwn(p);
- }
-
- /**
* Get Prison backpack of a Player + ID, because a player can have more than one Inventory.
*
* @param p - Player
@@ -358,14 +371,15 @@ public Inventory getBackpack(Player p, String id){
return getBackpackOwn(p, id);
}
- /**
- * Open backpack.
- *
- * @param p - Player
- * */
- public void openBackpack(Player p){
- openBackpackMethod(p);
- }
+// /**
+// * Open backpack.
+// *
+// * @param p - Player
+// * */
+// public void openBackpack(Player p){
+// String id = null;
+// openBackpackMethod(p, id);
+// }
/**
* Open backpack by ID.
@@ -392,15 +406,15 @@ public Inventory getBackpack(Player p, Inventory inv){
return getBackpackCustom(p, inv);
}
- /**
- * Merge another inventory into the backpack inventory.
- *
- * @param p - player
- * @param inv - Inventory
- * */
- public void setInventory(Player p, Inventory inv){
- saveInventory(p, inv);
- }
+// /**
+// * Merge another inventory into the backpack inventory.
+// *
+// * @param p - player
+// * @param inv - Inventory
+// * */
+// public void setInventory(Player p, Inventory inv){
+// saveInventory(p, inv, null);
+// }
/**
* Merge another inventory into the backpack inventory by ID.
@@ -413,29 +427,29 @@ public void setInventory(Player p, Inventory inv, String id){
saveInventory(p, inv, id);
}
- /**
- * Add an item to the backpack inventory
- * NOT TESTED!
- *
- * RECOMMENDED WAY:
- * If you need to modify the inventory you can do it just by using BackPacksUtil getInventory(player),
- * modify your inventory as you'd usually with spigot inventories,
- * and then use BackPacksUtil setInventory(player, inventory) is recommended.
- *
- * EXAMPLE for adding item:
- * Inventory inv = BackPacksUtil.getInventory(p);
- * ItemStack item = new ItemStack(Material.COAL_ORE, 1);
- * inv.addItem(item);
- * BackPacksUtil.setInventory(inv);
- *
- * @param p - player
- * @param item - itemstack
- *
- * @return HashMap with items that didn't fit.
- * */
- public HashMap addItem(Player p, ItemStack item){
- return addItemToBackpack(p, item);
- }
+// /**
+// * Add an item to the backpack inventory
+// * NOT TESTED!
+// *
+// * RECOMMENDED WAY:
+// * If you need to modify the inventory you can do it just by using BackPacksUtil getInventory(player),
+// * modify your inventory as you'd usually with spigot inventories,
+// * and then use BackPacksUtil setInventory(player, inventory) is recommended.
+// *
+// * EXAMPLE for adding item:
+// * Inventory inv = BackPacksUtil.getInventory(p);
+// * ItemStack item = new ItemStack(Material.COAL_ORE, 1);
+// * inv.addItem(item);
+// * BackPacksUtil.setInventory(inv);
+// *
+// * @param p - player
+// * @param item - itemstack
+// *
+// * @return HashMap with items that didn't fit.
+// * */
+// public HashMap addItem(Player p, ItemStack item){
+// return addItemToBackpack(p, item, null);
+// }
/**
* Add an item to the backpack inventory
@@ -462,29 +476,29 @@ public HashMap addItem(Player p, ItemStack item, String id){
return addItemToBackpack(p, item, id);
}
- /**
- * Remove item from backpack
- * NOT TESTED!
- *
- * RECOMMENDED WAY:
- * If you need to modify the inventory you can do it just by using BackPacksUtil getInventory(player),
- * modify your inventory as you'd usually with spigot inventories,
- * and then use BackPacksUtil setInventory(player, inventory) is recommended.
- *
- * EXAMPLE for removing item:
- * Inventory inv = BackPacksUtil.getInventory(p);
- * ItemStack item = new ItemStack(Material.COAL_ORE, 1);
- * inv.removeItem(item);
- * BackPacksUtil.setInventory(inv);
- *
- * @param p - player
- * @param item - itemstack
- *
- * @return HashMap with items that couldn't be removed.
- * */
- public HashMap removeItem(Player p, ItemStack item){
- return removeItemFromBackpack(p, item);
- }
+// /**
+// * Remove item from backpack
+// * NOT TESTED!
+// *
+// * RECOMMENDED WAY:
+// * If you need to modify the inventory you can do it just by using BackPacksUtil getInventory(player),
+// * modify your inventory as you'd usually with spigot inventories,
+// * and then use BackPacksUtil setInventory(player, inventory) is recommended.
+// *
+// * EXAMPLE for removing item:
+// * Inventory inv = BackPacksUtil.getInventory(p);
+// * ItemStack item = new ItemStack(Material.COAL_ORE, 1);
+// * inv.removeItem(item);
+// * BackPacksUtil.setInventory(inv);
+// *
+// * @param p - player
+// * @param item - itemstack
+// *
+// * @return HashMap with items that couldn't be removed.
+// * */
+// public HashMap removeItem(Player p, ItemStack item){
+// return removeItemFromBackpack(p, item, null);
+// }
/**
* Remove item from backpack
@@ -734,11 +748,11 @@ private boolean backpacksLimitSet(OfflinePlayer p, int limit) {
return true;
}
- private void backpackConfigUpdater() {
- BackpacksConfig bpTemp = new BackpacksConfig();
- bpTemp.initialize();
- backpacksConfig = bpTemp.getFileBackpacksConfig();
- }
+// private void backpackConfigUpdater() {
+// BackpacksConfig bpTemp = new BackpacksConfig();
+// bpTemp.initialize();
+// backpacksConfig = bpTemp.getFileBackpacksConfig();
+// }
private static BackpacksUtil getInstance() {
if (instance == null && SpigotPrison.getInstance().getConfig().getString("backpacks") != null && SpigotPrison.getInstance().getConfig().getString("backpacks").equalsIgnoreCase("true")){
@@ -942,42 +956,83 @@ private void backpackResize(OfflinePlayer p, int size, String id) {
updateCachedBackpack();
}
- private int getSize(Player p) {
- updateCachedBackpack();
-
- int backPackSize = backpackDefaultSize;
-
- try {
- backPackSize = Integer.parseInt(backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items.Size"));
- } catch (NumberFormatException ignored){}
-
- if (backPackSize % 9 != 0){
- backPackSize = (int) Math.ceil((float)backPackSize / 9) * 9;
- }
-
- if (backPackSize == 0) backPackSize = 9;
-
- return getBackpackPermSize(p, backPackSize);
- }
+// private int getSize(Player p) {
+// updateCachedBackpack();
+//
+// int backPackSize = backpackDefaultSize;
+//
+// try {
+// backPackSize = Integer.parseInt(backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items.Size"));
+// } catch (NumberFormatException ignored){}
+//
+// if (backPackSize % 9 != 0){
+// backPackSize = (int) Math.ceil((float)backPackSize / 9) * 9;
+// }
+//
+// if (backPackSize == 0) backPackSize = 9;
+//
+// return getBackpackPermSize(p, backPackSize);
+// }
+ public int getBackpackSize( UUID playerUuid, String id ) {
+ String backpackId = id == null ?
+ "" : "-" + id;
+
+ int backpackSize = backpackDefaultSize;
+
+ try {
+ String size = backpacksDataConfig.getString("Inventories." + playerUuid + ".Items" + backpackId + ".Size");
+
+ backpackSize = Integer.parseInt( size );
+ } catch (NumberFormatException ignored){}
+
+ if (backpackSize % 9 != 0){
+ backpackSize = (int) Math.ceil( backpackSize / 9.0d ) * 9;
+ }
+
+ if (backpackSize == 0) backpackSize = 9;
+
+ return backpackSize;
+ }
+
private int getSize(Player p, String id) {
+// String backpackId = id == null ?
+// "" : "-" + id;
+
updateCachedBackpack();
- int backPackSize = backpackDefaultSize;
-
- try {
- backPackSize = Integer.parseInt(backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items-" + id + ".Size"));
- } catch (NumberFormatException ignored){}
-
- if (backPackSize % 9 != 0){
- backPackSize = (int) Math.ceil((float)backPackSize / 9) * 9;
- }
-
- if (backPackSize == 0) backPackSize = 9;
+ int backPackSize = getBackpackSize( p.getUniqueId(), id );
+
+// int backPackSize = backpackDefaultSize;
+//
+// try {
+// String size = backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items" + backpackId + ".Size");
+//
+// backPackSize = Integer.parseInt( size );
+// } catch (NumberFormatException ignored){}
+//
+// if (backPackSize % 9 != 0){
+// backPackSize = (int) Math.ceil((float)backPackSize / 9) * 9;
+// }
+//
+// if (backPackSize == 0) backPackSize = 9;
return getBackpackPermSize(p, backPackSize);
}
+ /**
+ * This function will check for the largest backpack size permitted
+ * for a player by using the perm `prison.backpack.size.`. If a perm
+ * exists, then it will set a max size for the player, which will set the
+ * max size for the backpack if the backpack size is greater than the perm.
+ * If a player does not have this perm, then the backpack size will not be
+ * limited.
+ *
+ *
+ * @param p
+ * @param backPackSize
+ * @return
+ */
private int getBackpackPermSize(Player p, int backPackSize) {
SpigotPlayer sPlayer = new SpigotPlayer(p);
List perms = sPlayer.getPermissions("prison.backpack.size.");
@@ -995,71 +1050,122 @@ private int getBackpackPermSize(Player p, int backPackSize) {
return backPackSize;
}
- private Inventory getBackpackOwn(Player p) {
-
- updateCachedBackpack();
-
- int size = getBackpackSize(p);
- Inventory inv = Bukkit.createInventory(p, size, SpigotPrison.format("&3" + p.getName() + " -> Backpack"));
-
- // Get the Items config section
- Set slots;
- try {
- slots = backpacksDataConfig.getConfigurationSection("Inventories." + p.getUniqueId() + ".Items").getKeys(false);
- } catch (NullPointerException ex){
- return inv;
- }
- if (slots.size() != 0) {
- for (String slot : slots) {
- ItemStack finalItem = backpacksDataConfig.getItemStack("Inventories." + p.getUniqueId() + ".Items." + slot + ".ITEMSTACK");
- if (finalItem != null) {
- int slotNumber = Integer.parseInt(slot);
- if (size > slotNumber) {
- inv.setItem(slotNumber, finalItem);
- }
- }
- }
- }
-
- return inv;
- }
+// private Inventory getBackpackOwn(Player p) {
+//
+// updateCachedBackpack();
+//
+// int size = getBackpackSize(p, null);
+// Inventory inv = Bukkit.createInventory(p, size, SpigotPrison.format("&3" + p.getName() + " -> Backpack"));
+//
+// // Get the Items config section
+// Set slots;
+// try {
+// slots = backpacksDataConfig.getConfigurationSection("Inventories." + p.getUniqueId() + ".Items").getKeys(false);
+// } catch (NullPointerException ex){
+// return inv;
+// }
+// if (slots.size() != 0) {
+// for (String slot : slots) {
+// ItemStack finalItem = backpacksDataConfig.getItemStack("Inventories." + p.getUniqueId() + ".Items." + slot + ".ITEMSTACK");
+// if (finalItem != null) {
+// int slotNumber = Integer.parseInt(slot);
+// if (size > slotNumber) {
+// inv.setItem(slotNumber, finalItem);
+// }
+// }
+// }
+// }
+//
+// return inv;
+// }
+ /**
+ * This function returns prison based objects.
+ *
+ *
+ * @param player
+ * @param id
+ * @return
+ */
+ public List getPrisonBackpackContents( UUID playerUuid, String id ) {
+ List contents = new ArrayList<>();
+
+ String backpackId = id == null ?
+ "" : "-" + id;
+
+ updateCachedBackpack();
+
+ int size = getBackpackSize( playerUuid, id);
+
+ // Get the Items config section
+ Set slots;
+ try {
+ slots = backpacksDataConfig.getConfigurationSection(
+ "Inventories." + playerUuid + ".Items" + backpackId).getKeys(false);
+ } catch (NullPointerException ex){
+ return contents;
+ }
+
+ if (slots.size() != 0) {
+ for (String slot : slots) {
+ ItemStack finalItem = backpacksDataConfig.getItemStack(
+ "Inventories." + playerUuid + ".Items" + backpackId + "." + slot + ".ITEMSTACK");
+ if (finalItem != null) {
+ int slotNumber = Integer.parseInt(slot);
+ if (size > slotNumber) {
+
+ contents.add( new SpigotItemStack( finalItem ));
+ }
+ }
+ }
+ }
+
+ return contents;
+ }
+
private Inventory getBackpackOwn(Player p, String id) {
- updateCachedBackpack();
-
- int size = getBackpackSize(p, id);
- Inventory inv = Bukkit.createInventory(p, size, SpigotPrison.format("&3" + p.getName() + " -> Backpack-" + id));
-
- // Get the Items config section
- Set slots;
- try {
- slots = backpacksDataConfig.getConfigurationSection("Inventories." + p.getUniqueId() + ".Items-" + id).getKeys(false);
- } catch (NullPointerException ex){
- return inv;
- }
- if (slots.size() != 0) {
- for (String slot : slots) {
- ItemStack finalItem = backpacksDataConfig.getItemStack("Inventories." + p.getUniqueId() + ".Items-" + id + "." + slot + ".ITEMSTACK");
- if (finalItem != null) {
- int slotNumber = Integer.parseInt(slot);
- if (size > slotNumber) {
- inv.setItem(slotNumber, finalItem);
- }
- }
- }
- }
-
- return inv;
- }
-
- private void openBackpackMethod(Player p) {
- playOpenBackpackSound(p);
- Inventory inv = getBackpack(p);
- p.openInventory(inv);
- if (!openBackpacks.contains(p.getName())){
- openBackpacks.add(p.getName());
- }
- }
+ String backpackId = id == null ?
+ "" : "-" + id;
+
+ updateCachedBackpack();
+
+ int size = getBackpackSize(p, id);
+
+ Inventory inv = Bukkit.createInventory(p, size, SpigotPrison.format("&3" + p.getName() + " -> Backpack" + backpackId));
+
+ // Get the Items config section
+ Set slots;
+ try {
+ slots = backpacksDataConfig.getConfigurationSection(
+ "Inventories." + p.getUniqueId() + ".Items" + backpackId).getKeys(false);
+ } catch (NullPointerException ex){
+ return inv;
+ }
+ if (slots.size() != 0) {
+ for (String slot : slots) {
+ ItemStack finalItem = backpacksDataConfig.getItemStack(
+ "Inventories." + p.getUniqueId() + ".Items" + backpackId + "." + slot + ".ITEMSTACK");
+ if (finalItem != null) {
+ int slotNumber = Integer.parseInt(slot);
+ if (size > slotNumber) {
+ inv.setItem(slotNumber, finalItem);
+ }
+ }
+ }
+ }
+
+ return inv;
+ }
+
+// private void openBackpackMethod(Player p) {
+// playOpenBackpackSound(p);
+// String id = null;
+// Inventory inv = getBackpack(p, id);
+// p.openInventory(inv);
+// if (!openBackpacks.contains(p.getName())){
+// openBackpacks.add(p.getName());
+// }
+// }
private void openBackpackMethod(Player p, String id) {
playOpenBackpackSound(p);
@@ -1094,68 +1200,71 @@ private Inventory getBackpackCustom(Player p, Inventory inv) {
return inv;
}
- private void saveInventory(Player p, Inventory inv) {
- updateCachedBackpack();
-
- // Set dimensions if null or error.
- boolean needToSetNewDimensions = checkDimensionError(p);
- boolean needToSetNewOwner = checkBackpackOwnerMissing(p);
- boolean needToSetNewOwnerID = checkBackpackOwnerIDMissing(p);
-
- if (inv.getContents() != null){
-
- int backpackSize = getBackpackSize(p);
- int slot = 0;
-
- try {
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items", null);
- backpacksDataConfig.save(backpacksFile);
- } catch (IOException ex){
- ex.printStackTrace();
- return;
- }
-
- updateCachedBackpack();
-
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items.Size", backpackSize);
-
- for (ItemStack item : inv.getContents()){
- if (item != null){
-
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items." + slot + ".ITEMSTACK", item);
-
- slot++;
- }
- }
-
- oldDataVersionUpdater(p, false, true, true);
-
- try {
- backpacksDataConfig.save(backpacksFile);
- } catch (IOException ex){
- ex.printStackTrace();
- }
- } else {
- // If it's null just delete the whole stored inventory.
- oldDataVersionUpdater(p, needToSetNewDimensions, needToSetNewOwner, needToSetNewOwnerID);
- try {
- backpacksDataConfig.set("Inventories." + p.getUniqueId().toString() + ".Items", null);
- backpacksDataConfig.save(backpacksFile);
- } catch (IOException ex){
- ex.printStackTrace();
- }
- }
-
- updateCachedBackpack();
- }
+// private void saveInventory(Player p, Inventory inv) {
+// updateCachedBackpack();
+//
+// // Set dimensions if null or error.
+// boolean needToSetNewDimensions = checkDimensionError(p, null);
+// boolean needToSetNewOwner = checkBackpackOwnerMissing(p);
+// boolean needToSetNewOwnerID = checkBackpackOwnerIDMissing(p);
+//
+// if (inv.getContents() != null){
+//
+// int backpackSize = getBackpackSize(p, null);
+// int slot = 0;
+//
+// try {
+// backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items", null);
+// backpacksDataConfig.save(backpacksFile);
+// } catch (IOException ex){
+// ex.printStackTrace();
+// return;
+// }
+//
+// updateCachedBackpack();
+//
+// backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items.Size", backpackSize);
+//
+// for (ItemStack item : inv.getContents()){
+// if (item != null){
+//
+// backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items." + slot + ".ITEMSTACK", item);
+//
+// slot++;
+// }
+// }
+//
+// oldDataVersionUpdater(p, null, false, true, true);
+//
+// try {
+// backpacksDataConfig.save(backpacksFile);
+// } catch (IOException ex){
+// ex.printStackTrace();
+// }
+// } else {
+// // If it's null just delete the whole stored inventory.
+// oldDataVersionUpdater(p, null, needToSetNewDimensions, needToSetNewOwner, needToSetNewOwnerID);
+// try {
+// backpacksDataConfig.set("Inventories." + p.getUniqueId().toString() + ".Items", null);
+// backpacksDataConfig.save(backpacksFile);
+// } catch (IOException ex){
+// ex.printStackTrace();
+// }
+// }
+//
+// updateCachedBackpack();
+// }
private void saveInventory(Player p, Inventory inv, String id) {
+ String backpackId = id == null ?
+ "" : "-" + id;
+
updateCachedBackpack();
// Set dimensions if null or error.
boolean needToSetNewDimensions = checkDimensionError(p, id);
- boolean needToSetNewOwner = checkBackpackOwnerMissing(p, id);
- boolean needToSetNewOwnerID = checkBackpackOwnerIDMissing(p, id);
+ boolean needToSetNewOwner = checkBackpackOwnerMissing(p);
+ boolean needToSetNewOwnerID = checkBackpackOwnerIDMissing(p);
if (inv.getContents() != null){
@@ -1163,7 +1272,7 @@ private void saveInventory(Player p, Inventory inv, String id) {
int slot = 0;
try {
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items-" + id, null);
+ backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items" + backpackId, null);
backpacksDataConfig.save(backpacksFile);
} catch (IOException ex){
ex.printStackTrace();
@@ -1172,14 +1281,14 @@ private void saveInventory(Player p, Inventory inv, String id) {
updateCachedBackpack();
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items-" + id + ".Size", backpackSize);
+ backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items" + backpackId + ".Size", backpackSize);
oldDataVersionUpdater(p, id, false, true, true);
for (ItemStack item : inv.getContents()){
if (item != null){
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items-" + id + "." + slot + ".ITEMSTACK", item);
+ backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items" + backpackId + "." + slot + ".ITEMSTACK", item);
slot++;
}
@@ -1195,7 +1304,7 @@ private void saveInventory(Player p, Inventory inv, String id) {
// If it's null just delete the whole stored inventory.
oldDataVersionUpdater(p, id, needToSetNewDimensions, needToSetNewOwner, needToSetNewOwnerID);
try {
- backpacksDataConfig.set("Inventories." + p.getUniqueId().toString() + ".Items-" + id, null);
+ backpacksDataConfig.set("Inventories." + p.getUniqueId().toString() + ".Items" + backpackId, null);
backpacksDataConfig.save(backpacksFile);
} catch (IOException ex){
ex.printStackTrace();
@@ -1205,21 +1314,26 @@ private void saveInventory(Player p, Inventory inv, String id) {
updateCachedBackpack();
}
- private void oldDataVersionUpdater(Player p, boolean needToSetNewDimensions, boolean needToSetNewOwner, boolean needToSetNewOwnerID) {
- if (needToSetNewDimensions){
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items.Size", Integer.parseInt(backpacksConfig.getString("Options.BackPack_Default_Size")));
- }
- if (needToSetNewOwner){
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".PlayerName", p.getName());
- }
- if (needToSetNewOwnerID){
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".UniqueID", p.getUniqueId().toString());
- }
- }
+// private void oldDataVersionUpdater(Player p, boolean needToSetNewDimensions, boolean needToSetNewOwner, boolean needToSetNewOwnerID) {
+// if (needToSetNewDimensions){
+// backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items.Size",
+// Integer.parseInt(backpacksConfig.getString("Options.BackPack_Default_Size")));
+// }
+// if (needToSetNewOwner){
+// backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".PlayerName", p.getName());
+// }
+// if (needToSetNewOwnerID){
+// backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".UniqueID", p.getUniqueId().toString());
+// }
+// }
private void oldDataVersionUpdater(Player p, String id, boolean needToSetNewDimensions, boolean needToSetNewOwner, boolean needToSetNewOwnerID) {
- if (needToSetNewDimensions){
- backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items-" + id + ".Size", Integer.parseInt(backpacksConfig.getString("Options.BackPack_Default_Size")));
+ String backpackId = id == null ?
+ "" : "-" + id;
+
+ if (needToSetNewDimensions){
+ backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".Items" + backpackId + ".Size",
+ Integer.parseInt(backpacksConfig.getString("Options.BackPack_Default_Size")));
}
if (needToSetNewOwner){
backpacksDataConfig.set("Inventories." + p.getUniqueId() + ".PlayerName", p.getName());
@@ -1229,12 +1343,13 @@ private void oldDataVersionUpdater(Player p, String id, boolean needToSetNewDime
}
}
- private HashMap addItemToBackpack(Player p, ItemStack item) {
- Inventory inv = getBackpack(p);
- HashMap overflow = inv.addItem(item);
- setInventory(p, inv);
- return overflow;
- }
+// private HashMap addItemToBackpack(Player p, ItemStack item) {
+// String id = null;
+// Inventory inv = getBackpack(p, id);
+// HashMap overflow = inv.addItem(item);
+// setInventory(p, inv);
+// return overflow;
+// }
private HashMap addItemToBackpack(Player p, ItemStack item, String id) {
Inventory inv = getBackpack(p, id);
@@ -1243,12 +1358,13 @@ private HashMap addItemToBackpack(Player p, ItemStack item,
return overflow;
}
- private HashMap removeItemFromBackpack(Player p, ItemStack item) {
- Inventory inv = getBackpack(p);
- HashMap underflow = inv.removeItem(item);
- setInventory(p, inv);
- return underflow;
- }
+// private HashMap removeItemFromBackpack(Player p, ItemStack item) {
+// String id = null;
+// Inventory inv = getBackpack(p, id );
+// HashMap underflow = inv.removeItem(item);
+// setInventory(p, inv);
+// return underflow;
+// }
private HashMap removeItemFromBackpack(Player p, ItemStack item, String id) {
Inventory inv = getBackpack(p, id);
@@ -1356,24 +1472,35 @@ private int getNumberOfBackpacksOwnedByPlayer(Player p) {
return backpacksNumber;
}
- private boolean checkDimensionError(Player p) {
- try{
- if (backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items" + ".Size") == null){
- return true;
- }
- Integer.parseInt(backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items" + ".Size"));
- } catch (NumberFormatException ex){
- return true;
- }
- return false;
- }
+// private boolean checkDimensionError(Player p) {
+// try{
+// if (backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items" + ".Size") == null){
+// return true;
+// }
+// Integer.parseInt(backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items" + ".Size"));
+// } catch (NumberFormatException ex){
+// return true;
+// }
+// return false;
+// }
+ /**
+ * This function ONLY checks to confirm if the config setting is an integer!? \
+ *
+ * @param p
+ * @param id
+ * @return
+ */
private boolean checkDimensionError(Player p, String id) {
+ String backpackId = id == null ?
+ "" : "-" + id;
try{
- if (backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items-" + id + ".Size") == null){
+ String size = backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items" + backpackId + ".Size");
+
+ if ( size == null){
return true;
}
- Integer.parseInt(backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".Items-" + id + ".Size"));
+ Integer.parseInt( size );
} catch (NumberFormatException ex){
return true;
}
@@ -1384,40 +1511,45 @@ private boolean checkBackpackOwnerMissing(Player p) {
return backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".PlayerName") == null;
}
- private boolean checkBackpackOwnerMissing(Player p, String id) {
- return backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".PlayerName") == null;
- }
+// private boolean checkBackpackOwnerMissing(Player p, String id) {
+// return backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".PlayerName") == null;
+// }
private boolean checkBackpackOwnerIDMissing(Player p) {
return backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".UniqueID") == null;
}
- private boolean checkBackpackOwnerIDMissing(Player p, String id) {
- return backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".UniqueID") == null;
- }
+// private boolean checkBackpackOwnerIDMissing(Player p, String id) {
+// return backpacksDataConfig.getString("Inventories." + p.getUniqueId() + ".UniqueID") == null;
+// }
- private OfflinePlayer getOfflinePlayer(String name) {
- if (name != null) {
- updateCachedBackpack();
- if (backpacksDataConfig.getConfigurationSection("Inventories") != null) {
- for (String uniqueID : backpacksDataConfig.getConfigurationSection("Inventories").getKeys(false)) {
- if (backpacksDataConfig.getString("Inventories." + uniqueID + ".PlayerName").equalsIgnoreCase(name) && backpacksDataConfig.getString("Inventories." + uniqueID + ".UniqueID") != null) {
- return Bukkit.getOfflinePlayer(UUID.fromString(backpacksDataConfig.getString("Inventories." + uniqueID + ".UniqueID")));
- }
- }
- }
- }
- return null;
- }
+// private OfflinePlayer getOfflinePlayer(String name) {
+// if (name != null) {
+// updateCachedBackpack();
+// if (backpacksDataConfig.getConfigurationSection("Inventories") != null) {
+// for (String uniqueID : backpacksDataConfig.getConfigurationSection("Inventories").getKeys(false)) {
+// if (backpacksDataConfig.getString("Inventories." + uniqueID + ".PlayerName").equalsIgnoreCase(name) && backpacksDataConfig.getString("Inventories." + uniqueID + ".UniqueID") != null) {
+// return Bukkit.getOfflinePlayer(UUID.fromString(backpacksDataConfig.getString("Inventories." + uniqueID + ".UniqueID")));
+// }
+// }
+// }
+// }
+// return null;
+// }
- private OfflinePlayer getOfflinePlayer(String name, String id) {
+ // what the hell? two functions with different parms but the damn exact same code????
+// private OfflinePlayer getOfflinePlayer(String name, String id) {
+ private OfflinePlayer getOfflinePlayer(String name) {
if (name != null) {
updateCachedBackpack();
- if (backpacksDataConfig.getConfigurationSection("Inventories") != null) {
- for (String uniqueID : backpacksDataConfig.getConfigurationSection("Inventories").getKeys(false)) {
- if (backpacksDataConfig.getString("Inventories." + uniqueID + ".PlayerName") != null && backpacksDataConfig.getString("Inventories." + uniqueID + ".UniqueID") != null){
- if (backpacksDataConfig.getString("Inventories." + uniqueID + ".PlayerName").equalsIgnoreCase(name)){
- return Bukkit.getOfflinePlayer(UUID.fromString(backpacksDataConfig.getString("Inventories." + uniqueID + ".UniqueID")));
+ ConfigurationSection inventories = backpacksDataConfig.getConfigurationSection("Inventories");
+ if (inventories != null) {
+ for (String uniqueID : inventories.getKeys(false)) {
+ String playerName = inventories.getString(uniqueID + ".PlayerName");
+ String uuid = inventories.getString(uniqueID + ".UniqueID");
+ if (playerName != null && uuid != null){
+ if (playerName.equalsIgnoreCase(name)){
+ return Bukkit.getOfflinePlayer(UUID.fromString(uuid));
}
}
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/BlockBreakPriority.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/BlockBreakPriority.java
index 8d0df0060..544a9f659 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/BlockBreakPriority.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/BlockBreakPriority.java
@@ -1,5 +1,8 @@
package tech.mcprison.prison.spigot.block;
+import java.util.ArrayList;
+import java.util.List;
+
import org.bukkit.event.EventPriority;
/**
@@ -25,20 +28,37 @@
public enum BlockBreakPriority {
DISABLED( null ),
- BLOCKEVENTS( EventPriority.HIGHEST ),
LOWEST( EventPriority.LOWEST ),
LOW( EventPriority.LOW ),
NORMAL( EventPriority.NORMAL ),
HIGH( EventPriority.HIGH ),
HIGHEST( EventPriority.HIGHEST ),
- MONITOR( EventPriority.MONITOR )
+
+ BLOCKEVENTS( EventPriority.HIGHEST ),
+ MONITOR( EventPriority.MONITOR ),
+
+ ACCESS( EventPriority.LOWEST ),
+ ACCESSBLOCKEVENTS( EventPriority.HIGHEST, ACCESS, BLOCKEVENTS ),
+ ACCESSMONITOR( EventPriority.MONITOR, ACCESS, MONITOR ),
;
private final EventPriority bukkitEventPriority;
+ private final List componentPriorities;
+
private BlockBreakPriority( EventPriority bukkitEventPriority ) {
this.bukkitEventPriority = bukkitEventPriority;
+
+ this.componentPriorities = new ArrayList<>();
+ }
+
+ private BlockBreakPriority( EventPriority bukkitEventPriority, BlockBreakPriority... components ) {
+ this( bukkitEventPriority );
+
+ for (BlockBreakPriority bbPriority : components) {
+ this.componentPriorities.add( bbPriority );
+ }
}
public static BlockBreakPriority fromString( String value ) {
@@ -57,7 +77,28 @@ public static BlockBreakPriority fromString( String value ) {
return results;
}
+ public boolean isMonitor() {
+ return this == MONITOR ||
+ this == BLOCKEVENTS ||
+ this == ACCESSBLOCKEVENTS ||
+ this == ACCESSMONITOR
+ ;
+ }
+
+ public boolean isDisabled() {
+ return this == DISABLED;
+ }
+
+ public boolean isComponentCompound() {
+ return getComponentPriorities().size() > 0
+ ;
+ }
+
public EventPriority getBukkitEventPriority() {
return bukkitEventPriority;
}
-}
\ No newline at end of file
+
+ public List getComponentPriorities() {
+ return componentPriorities;
+ }
+}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakEventCore.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakEventCore.java
index 5f8dbed56..0d0c02134 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakEventCore.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakEventCore.java
@@ -13,6 +13,8 @@
import org.bukkit.inventory.meta.ItemMeta;
import me.pulsi_.prisonenchants.events.PEExplosionEvent;
+import me.revils.revenchants.events.ExplosiveEvent;
+import me.revils.revenchants.events.JackHammerEvent;
import tech.mcprison.prison.Prison;
import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig;
import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
@@ -34,6 +36,7 @@
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.sellall.SellAllUtil;
import tech.mcprison.prison.spigot.utils.BlockUtils;
+import tech.mcprison.prison.spigot.utils.tasks.PlayerAutoRankupTask;
import tech.mcprison.prison.util.Text;
public abstract class OnBlockBreakEventCore
@@ -153,26 +156,63 @@ public enum ItemLoreEnablers {
- protected boolean ignoreMinesBlockBreakEvent( Cancellable event, Player player, Block block ) {
+ protected MinesEventResults ignoreMinesBlockBreakEvent( Cancellable event, Player player, Block block ) {
MinesEventResults eventResults = ignoreMinesBlockBreakEvent( player, block );
if ( eventResults.isCancelEvent() ) {
event.setCancelled( eventResults.isCancelEvent() );
}
- return eventResults.isIgnoreEvent();
+
+// return eventResults.isIgnoreEvent();
+ return eventResults;
}
- protected boolean processMinesBlockBreakEvent( PEExplosionEvent event, Player player, Block block ) {
+ /**
+ * Note that this function is required since ExplosiveEvent does not implement the
+ * interface Cancellable.
+ *
+ *
+ * @param event
+ * @param player
+ * @param block
+ * @return
+ */
+ protected MinesEventResults ignoreMinesBlockBreakEvent( ExplosiveEvent event, Player player, Block block ) {
MinesEventResults eventResults = ignoreMinesBlockBreakEvent( player, block );
if ( eventResults.isCancelEvent() ) {
event.setCancelled( eventResults.isCancelEvent() );
}
- return eventResults.isIgnoreEvent();
+// return eventResults.isIgnoreEvent();
+ return eventResults;
}
+ protected MinesEventResults ignoreMinesBlockBreakEvent( JackHammerEvent event, Player player, Block block ) {
+
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( player, block );
+
+ if ( eventResults.isCancelEvent() ) {
+ event.setCancelled( eventResults.isCancelEvent() );
+ }
+// return eventResults.isIgnoreEvent();
+ return eventResults;
+ }
+
+ protected MinesEventResults ignoreMinesBlockBreakEvent( PEExplosionEvent event, Player player, Block block ) {
+
+ MinesEventResults eventResults = ignoreMinesBlockBreakEvent( player, block );
+
+ if ( eventResults.isCancelEvent() ) {
+ event.setCancelled( eventResults.isCancelEvent() );
+ }
+// return eventResults.isIgnoreEvent();
+ return eventResults;
+ }
+
+
+
/**
* This processes the block finalizations, which are counting the block breakage,
@@ -188,16 +228,26 @@ protected void doBlockEvents( PrisonMinesBlockBreakEvent pmEvent )
if ( pmEvent.getMine() != null ) {
- // apply to ALL blocks including exploded:
- applyBlockFinalizations( pmEvent, pmEvent.getTargetBlock() );
+ // Count the blocks that were mined:
+ countBlocksMined( pmEvent, pmEvent.getTargetBlock() );
+
+ // process the prison blockEvents commands:
+ processPrisonBlockEventCommands( pmEvent, pmEvent.getTargetBlock() );
for ( MineTargetPrisonBlock teBlock : pmEvent.getTargetExplodedBlocks() ) {
- applyBlockFinalizations( pmEvent, teBlock );
+ // Count the blocks that were mined:
+ countBlocksMined( pmEvent, teBlock );
+
+ // process the prison blockEvents commands:
+ processPrisonBlockEventCommands( pmEvent, teBlock );
}
checkZeroBlockReset( pmEvent.getMine() );
+
+ // Check Mine Sweeper:
+ checkMineSweeper( pmEvent.getMine() );
}
}
@@ -282,26 +332,41 @@ private List finalizeBreakTheBlocksCollectEm( PrisonMinesBlockBreak
* @param debugInfo
* @return
*/
- protected boolean validateEvent( PrisonMinesBlockBreakEvent pmEvent, StringBuilder debugInfo )
+ protected boolean validateEvent( PrisonMinesBlockBreakEvent pmEvent )
{
boolean results = true;
+ StringBuilder debugInfo = pmEvent.getDebugInfo();
SpigotBlock sBlockHit = pmEvent.getSpigotBlock();
-
- Mine mine = findMine( pmEvent.getPlayer(), sBlockHit,
- pmEvent.getUnprocessedRawBlocks(), pmEvent );
-
- pmEvent.setMine( mine );
+
+ // Mine should already be set:
+ // Mine mine = findMine( pmEvent.getPlayer(), sBlockHit,
+// pmEvent.getUnprocessedRawBlocks(), pmEvent );
+//
+// pmEvent.setMine( mine );
+ Mine mine = pmEvent.getMine();
debugInfo.append( "mine=" + (mine == null ? "none" : mine.getName()) + " " );
debugInfo.append( sBlockHit.getLocation().toWorldCoordinates() ).append( " " );
+
+ SpigotItemStack itemInHand = pmEvent.getItemInHand();
+ debugInfo.append( "itemInHand=[" +
+ ( itemInHand == null ? "AIR" : itemInHand.getDebugInfo()) + "] ");
+
+
// Since BlastUseEvent (crazy enchant) does not identify the block that is initially
// broke, an explosion for them is greater than 1.
+ // Same applies to the RevEnchant events where they do not identify the original block
+ // that caused the "explosion".
+ boolean hasOriginalBLockIncluded =
+ pmEvent.getBlockEventType() == BlockEventType.CEXplosion ||
+ pmEvent.getBlockEventType() == BlockEventType.RevEnExplosion ||
+ pmEvent.getBlockEventType() == BlockEventType.RevEnJackHammer;
boolean isExplosionEvent = pmEvent.getUnprocessedRawBlocks().size() >
- (pmEvent.getBlockEventType() == BlockEventType.CEXplosion ? 0 : 1);
+ (hasOriginalBLockIncluded ? 0 : 1);
// validate the blocks, if there are some. Add them to the exploded blocks list
if ( mine != null ) {
@@ -317,6 +382,7 @@ protected boolean validateEvent( PrisonMinesBlockBreakEvent pmEvent, StringBuild
MineTargetPrisonBlock targetBlock = mine.getTargetPrisonBlock( sBlockHit );
pmEvent.setTargetBlock( targetBlock );
+ // NOTE: I have no idea why 25 blocks and less should be bypassed for validation:
boolean bypassMatchedBlocks = pmEvent.getMine().getBounds().getTotalBlockCount() <= 25;
if ( bypassMatchedBlocks ) {
debugInfo.append( "(TargetBlock match requirement is disabled [blocks<=25]) " );
@@ -324,13 +390,32 @@ protected boolean validateEvent( PrisonMinesBlockBreakEvent pmEvent, StringBuild
boolean matchedBlocks = isBlockAMatch( targetBlock, sBlockHit );
+ // If MONITOR or BLOCKEVENTS or etc... and block does not match, and if the block is AIR,
+ // and the block has not been mined before, then allow the breakage by
+ // setting bypassMatchedBlocks to true to allow normal processing:
+ if ( !matchedBlocks &&
+ !targetBlock.isMined() &&
+ sBlockHit.isAir() &&
+ pmEvent.getBbPriority().isMonitor() ) {
+ bypassMatchedBlocks = true;
+ }
+
// If ignore all block events has been set on this target block, then shutdown.
// Same if this block was already included in an explosion... prevent it from spawning
// more explosions, which could result in a chain reaction.
if ( targetBlock != null &&
(targetBlock.isIgnoreAllBlockEvents() ||
targetBlock.isExploded()) ) {
- debugInfo.setLength( 0 );
+
+// debugInfo.setLength( 0 );
+ debugInfo.append( "(Primary TargetBlock forcedFastFail validateEvent [ ");
+ if ( targetBlock.isIgnoreAllBlockEvents() ) {
+ debugInfo.append( "ignoreAllBlockEvents " );
+ }
+ if ( targetBlock.isExploded() ) {
+ debugInfo.append( "alreadyExploded" );
+ }
+ debugInfo.append( "]) " );
pmEvent.setForceIfAirBlock( false );
@@ -619,7 +704,9 @@ else if ( targetExplodedBlock.isMined() ) {
pmEvent.setCancelOriginalEvent( true );
// Ignore event and clear debugInfo:
- debugInfo.setLength( 0 );
+// debugInfo.setLength( 0 );
+
+ debugInfo.append( "(TargetBlock forcedFastFail validateEvent [BlockAlreadyMined]) " );
return results;
}
@@ -664,87 +751,155 @@ else if ( targetExplodedBlock.isMined() ) {
}
-
- if ( results && pmEvent.getBbPriority() == BlockBreakPriority.BLOCKEVENTS ) {
-
-
- // This is true if the player cannot toggle the autosell, and it's
- // true if they can, and the have it enabled:
- boolean isPlayerAutosellEnabled = SellAllUtil.get() != null &&
- SellAllUtil.get().checkIfPlayerAutosellIsActive(
- pmEvent.getSpigotPlayer().getWrapper() )
- ;
+// // Process BLOCKEVENTS and ACCESSBLOCKEVENTs here...
+// // Include autosell on full inventory if isAutoSellIfInventoryIsFullForBLOCKEVENTSPriority
+// // is enabled.
+// // Includes running block events, mine sweeper, and zero-block (reset-threshold) reset.
+// if ( results &&
+// (pmEvent.getBbPriority() == BlockBreakPriority.BLOCKEVENTS ||
+// pmEvent.getBbPriority() == BlockBreakPriority.ACCESSBLOCKEVENTS ) ) {
+//
+// debugInfo.append( "(BLOCKEVENTS processing) " );
+//
+// // This is true if the player cannot toggle the autosell, and it's
+// // true if they can, and the have it enabled:
+// boolean isPlayerAutosellEnabled = SellAllUtil.get() != null &&
+// SellAllUtil.get().checkIfPlayerAutosellIsActive(
+// pmEvent.getSpigotPlayer().getWrapper() )
+// ;
+//
+// // AutoSell on full inventory when using BLOCKEVENTS:
+// if ( isBoolean( AutoFeatures.isAutoSellIfInventoryIsFullForBLOCKEVENTSPriority ) &&
+// SpigotPrison.getInstance().isSellAllEnabled() &&
+// isPlayerAutosellEnabled &&
+// pmEvent.getSpigotPlayer().isInventoryFull() ) {
+//
+//
+// final long nanoStart = System.nanoTime();
+// boolean success = SellAllUtil.get().sellAllSell( pmEvent.getPlayer(),
+// false, false, false, true, true, false);
+// final long nanoStop = System.nanoTime();
+// double milliTime = (nanoStop - nanoStart) / 1000000d;
+//
+// DecimalFormat dFmt = Prison.get().getDecimalFormat("#,##0.00");
+// debugInfo.append( "(autosell BLOCKEVENTS: " + (success ? "success" : "failed") +
+// " ms: " + dFmt.format( milliTime ) + ") ");
+//
+// PlayerAutoRankupTask.autoSubmitPlayerRankupTask( pmEvent.getSpigotPlayer(), debugInfo );
+//
+// }
+//
+//
+// // Process block counts and then block events:
+// countBlocksMined( pmEvent, sBlockHit );
+// processPrisonBlockEventCommands( pmEvent, sBlockHit );
+//
+// debugInfo.append( "(primary block: block counts and block events) " );
+//
+// if ( pmEvent.getExplodedBlocks().size() > 0 ) {
+//
+// for ( SpigotBlock sBlock : pmEvent.getExplodedBlocks() ) {
+//
+// countBlocksMined( pmEvent, sBlock );
+// processPrisonBlockEventCommands( pmEvent, sBlock );
+// }
+//
+// debugInfo.append( "(" +
+// pmEvent.getExplodedBlocks().size() +
+// " Exploded Blocks: block counts and block events) " );
+// }
+//
+// // Check Mine Sweeper:
+// checkMineSweeper( pmEvent.getMine() );
+//
+// // Check zero-block reset (reset-threshold):
+// checkZeroBlockReset( pmEvent.getMine() );
+//
+// // why return false?
+//// results = false;
+// }
+ else if ( results && pmEvent.getBbPriority().isMonitor() && mine == null ) {
+ // bypass all processing since the block break is outside any mine:
- // AutoSell on full inventory when using BLOCKEVENTS:
- if ( isBoolean( AutoFeatures.isAutoSellIfInventoryIsFullForBLOCKEVENTSPriority ) &&
- SpigotPrison.getInstance().isSellAllEnabled() &&
- isPlayerAutosellEnabled &&
- pmEvent.getSpigotPlayer().isInventoryFull() ) {
-
-
- final long nanoStart = System.nanoTime();
- boolean success = SellAllUtil.get().sellAllSell( pmEvent.getPlayer(),
- false, false, false, true, true, false);
- final long nanoStop = System.nanoTime();
- double milliTime = (nanoStop - nanoStart) / 1000000d;
-
- DecimalFormat dFmt = new DecimalFormat("#,##0.00");
- debugInfo.append( "(autosellBLOCKEVENTS: " + (success ? "success" : "failed") +
- " ms: " + dFmt.format( milliTime ) + ") ");
-
- }
+ debugInfo.append( "(MONITOR bypassed: no mine) " );
+ results = false;
+ }
+
+ // Performs the MONITOR block counts, zero-block, and mine sweeper:
+ else if ( results && pmEvent.getBbPriority().isMonitor() && mine != null ) {
- String triggered = null;
- doActionBlockEventOnly( sBlockHit, mine, pmEvent.getPlayer(),
- BlockEventType.blockBreak, triggered );
+ // Process BLOCKEVENTS and ACCESSBLOCKEVENTs here...
+ // Include autosell on full inventory if isAutoSellIfInventoryIsFullForBLOCKEVENTSPriority
+ // is enabled.
+ // Includes running block events, mine sweeper, and zero-block (reset-threshold) reset.
+ if ( pmEvent.getBbPriority() == BlockBreakPriority.BLOCKEVENTS ||
+ pmEvent.getBbPriority() == BlockBreakPriority.ACCESSBLOCKEVENTS ) {
- debugInfo.append( "(actionBlockEventOnly singluar) " );
-
- if ( pmEvent.getExplodedBlocks().size() > 0 ) {
+ debugInfo.append( "(BLOCKEVENTS processing) " );
- for ( SpigotBlock sBlock : pmEvent.getExplodedBlocks() ) {
+ // This is true if the player cannot toggle the autosell, and it's
+ // true if they can, and the have it enabled:
+ boolean isPlayerAutosellEnabled = SellAllUtil.get() != null &&
+ SellAllUtil.get().checkIfPlayerAutosellIsActive(
+ pmEvent.getSpigotPlayer().getWrapper() )
+ ;
+
+ // AutoSell on full inventory when using BLOCKEVENTS:
+ if ( isBoolean( AutoFeatures.isAutoSellIfInventoryIsFullForBLOCKEVENTSPriority ) &&
+ SpigotPrison.getInstance().isSellAllEnabled() &&
+ isPlayerAutosellEnabled &&
+ pmEvent.getSpigotPlayer().isInventoryFull() ) {
+
+
+ final long nanoStart = System.nanoTime();
+ boolean success = SellAllUtil.get().sellAllSell( pmEvent.getPlayer(),
+ false, false, false, true, true, false);
+ final long nanoStop = System.nanoTime();
+ double milliTime = (nanoStop - nanoStart) / 1000000d;
+
+ DecimalFormat dFmt = Prison.get().getDecimalFormat("#,##0.00");
+ debugInfo.append( "(autosell BLOCKEVENTS: " + (success ? "success" : "failed") +
+ " ms: " + dFmt.format( milliTime ) + ") ");
+
+ PlayerAutoRankupTask.autoSubmitPlayerRankupTask( pmEvent.getSpigotPlayer(), debugInfo );
- doActionBlockEventOnly( sBlock, mine, pmEvent.getPlayer(),
- pmEvent.getBlockEventType(), pmEvent.getTriggered() );
}
-
- debugInfo.append( "(actionBlockEventOnly - " +
- pmEvent.getExplodedBlocks().size() +
- " Exploded Blocks - finalized) " );
}
- results = false;
- }
- else if ( results && pmEvent.getBbPriority() == BlockBreakPriority.MONITOR && mine == null ) {
- // bypass all processing since the block break is outside any mine:
-
- debugInfo.append( "(bypassed monitor no mine) " );
- results = false;
- }
- else if ( results && pmEvent.getBbPriority() == BlockBreakPriority.MONITOR && mine != null ) {
-
- doActionMonitor( sBlockHit, mine );
+ countBlocksMined( pmEvent, sBlockHit );
+ processPrisonBlockEventCommands( pmEvent, sBlockHit );
- debugInfo.append( "(monitor - singular) " );
+ debugInfo.append( "(MONITOR - singular) " );
if ( pmEvent.getExplodedBlocks().size() > 0 ) {
for ( SpigotBlock sBlock : pmEvent.getExplodedBlocks() ) {
- doActionMonitor( sBlock, mine );
+ countBlocksMined( pmEvent, sBlock );
+ processPrisonBlockEventCommands( pmEvent, sBlock );
}
- debugInfo.append( "(monitor - " +
+ debugInfo.append( "(MONITOR - " +
pmEvent.getExplodedBlocks().size() +
" Exploded Blocks - finalized) " );
}
- // should be true at this point:
+
+ // submit a mine sweeper task. It will only run if it is enabled and another
+ // mine sweeper task has not been submitted.
+ mine.submitMineSweeperTask();
+
+ // Checks to see if the mine ran out of blocks, and if it did, then
+ // it will reset the mine:
+ mine.checkZeroBlockReset();
+
+ // should be true at this point: (already is true):
//results = true;
}
+
if ( results && isBoolean( AutoFeatures.cancelAllBlockEventBlockDrops ) ) {
clearBukkitDrops( pmEvent.getBukkitDrops(), pmEvent.getTargetBlock() );
@@ -861,58 +1016,100 @@ else if ( results && pmEvent.getBbPriority() == BlockBreakPriority.MONITOR && mi
+
+
- public void doActionMonitor( SpigotBlock block, Mine mine ) {
- if ( mine != null ) {
+
+ /**
+ * Performs block counts.
+ *
+ *
+ * @param block
+ * @param mine
+ */
+ private void countBlocksMined( PrisonMinesBlockBreakEvent pmEvent, SpigotBlock block ) {
+
+ if ( pmEvent.getMine() != null && block != null ) {
+
+ Mine mine = pmEvent.getMine();
// Good chance the block was already counted, but just in case it wasn't:
MineTargetPrisonBlock targetBlock = mine.getTargetPrisonBlock( block );
- // Record the block break:
+ // Record the block break counts:
+ countBlocksMined( pmEvent, targetBlock );
+
+ }
+ }
+
+ private boolean countBlocksMined( PrisonMinesBlockBreakEvent pmEvent,
+ MineTargetPrisonBlock targetBlock ) {
+ boolean results = false;
+
+ if ( targetBlock != null &&
+ pmEvent.getMine() != null &&
+ targetBlock.getPrisonBlock() != null &&
+ !targetBlock.isCounted() ) {
+
+ Mine mine = pmEvent.getMine();
+
+
+ // Increment the block break counts if they have not been processed before.
+ // Since the function return true if it can count the block, then we can
+ // then have the player counts be incremented.
if ( mine.incrementBlockMiningCount( targetBlock ) ) {
+ results = true;
- // submit a mine sweeper task. It will only run if it is enabled and another
- // mine sweeper task has not been submitted.
- mine.submitMineSweeperTask();
+ // Now in AutoManagerFeatures.autoPickup and calculateNormalDrop:
+ PlayerCache.getInstance().addPlayerBlocks( pmEvent.getSpigotPlayer(),
+ mine.getName(), targetBlock.getPrisonBlock(), 1 );
- // Checks to see if the mine ran out of blocks, and if it did, then
- // it will reset the mine:
- mine.checkZeroBlockReset();
}
-
}
+ return results;
}
- public void doActionBlockEventOnly( SpigotBlock spigotBlock, Mine mine, Player player,
- BlockEventType blockEventType, String triggered ) {
- if ( mine != null && spigotBlock != null ) {
+
+ private void processPrisonBlockEventCommands(
+ PrisonMinesBlockBreakEvent pmEvent, SpigotBlock spigotBlock ) {
+
+ if ( pmEvent.getMine() != null && spigotBlock != null ) {
+ Mine mine = pmEvent.getMine();
+
MineTargetPrisonBlock targetBlock = mine.getTargetPrisonBlock( spigotBlock );
- if ( targetBlock != null && targetBlock.getPrisonBlock() != null && !targetBlock.isCounted() ) {
-
+ if ( targetBlock != null ) {
-// String targetBlockName = mine == null ?
-// spigotBlock.getPrisonBlock().getBlockName()
-// : targetBlock.getPrisonBlock().getBlockName();
-
- // Process mine block break events:
-
- if ( mine.incrementBlockMiningCount( targetBlock ) ) {
-
- SpigotPlayer sPlayer = new SpigotPlayer( player );
- PlayerCache.getInstance().addPlayerBlocks( sPlayer, mine.getName(), targetBlock.getPrisonBlock(), 1 );
-
-
- PrisonBlock prisonBlock = spigotBlock.getPrisonBlock();
- mine.processBlockBreakEventCommands( prisonBlock, targetBlock, sPlayer, blockEventType, triggered );
- }
-
+ processPrisonBlockEventCommands( pmEvent, targetBlock );
}
}
}
+ private void processPrisonBlockEventCommands( PrisonMinesBlockBreakEvent pmEvent,
+ MineTargetPrisonBlock targetBlock ) {
+
+ // Do not allow MONITOR or ACCESSMONITOR to process the block events:
+ if ( targetBlock != null && pmEvent.getMine() != null &&
+ pmEvent.getBbPriority() != BlockBreakPriority.MONITOR &&
+ pmEvent.getBbPriority() != BlockBreakPriority.ACCESSMONITOR ) {
+
+ Mine mine = pmEvent.getMine();
+
+ SpigotBlock sBlock = (SpigotBlock) targetBlock.getMinedBlock();
+ PrisonBlock pBlock = sBlock == null ? null : sBlock.getPrisonBlock();
+
+ mine.processBlockBreakEventCommands( pBlock,
+ targetBlock,
+ pmEvent.getSpigotPlayer(),
+ pmEvent.getBlockEventType(),
+ pmEvent.getTriggered() );
+
+ }
+
+ }
+
// public boolean doActionX( PrisonMinesBlockBreakEvent pmEvent, StringBuilder debugInfo ) {
// boolean cancel = false;
@@ -966,28 +1163,30 @@ public void doActionBlockEventOnly( SpigotBlock spigotBlock, Mine mine, Player p
* @param e
* @param teExplosiveBlocks
*/
- public boolean doAction( PrisonMinesBlockBreakEvent pmEvent, StringBuilder debugInfo ) {
+ public boolean doAction( PrisonMinesBlockBreakEvent pmEvent ) {
AutoManagerFeatures aMan = SpigotPrison.getInstance().getAutoFeatures();
- int totalDrops = aMan.calculateNormalDrop( pmEvent, debugInfo );
+ int totalDrops = aMan.calculateNormalDrop( pmEvent );
- debugInfo.append( "(normalDrops totalDrops: " + totalDrops + ") ");
+ pmEvent.getDebugInfo().append( "(normalDrops totalDrops: " + totalDrops + ") ");
- return applyDropsBlockBreakage( pmEvent, totalDrops, debugInfo );
+ return applyDropsBlockBreakage( pmEvent, totalDrops );
}
- public boolean applyDropsBlockBreakage( PrisonMinesBlockBreakEvent pmEvent, int totalDrops, StringBuilder debugInfo ) {
+ public boolean applyDropsBlockBreakage( PrisonMinesBlockBreakEvent pmEvent, int totalDrops ) {
boolean success = false;
// The explodedBlocks list have already been validated as being within the mine:
- debugInfo.append( "(applyDropsBlockBreakage multi-blocks: " + pmEvent.getTargetExplodedBlocks().size() + ") ");
+ pmEvent.getDebugInfo().append( "(applyDropsBlockBreakage multi-blocks: " + pmEvent.getTargetExplodedBlocks().size() + ") ");
// Process the blockBreakage which actually breaks the block, calculates and gives the player xp,
// calculates the durability, applies food exhaustion:
- processBlockBreakage( pmEvent, debugInfo );
+ processBlockBreakage( pmEvent );
+
+// forcedAutoRankups( pmEvent, debugInfo );
// autosellPerBlockBreak( pmEvent.getPlayer() );
@@ -998,12 +1197,21 @@ public boolean applyDropsBlockBreakage( PrisonMinesBlockBreakEvent pmEvent, int
if ( totalDrops > 0 ) {
success = true;
}
+ else {
+ pmEvent.getDebugInfo().append( "(fail:totalDrops=0) ");
+ }
return success;
}
+// private void forcedAutoRankups(PrisonMinesBlockBreakEvent pmEvent, StringBuilder debugInfo) {
+//
+// PlayerAutoRankupTask.autoSubmitPlayerRankupTask( pmEvent.getSpigotPlayer(), debugInfo );
+//
+// }
+
// /**
// * This function is processed when auto manager is disabled and process crazy enchant explosions
// * is enabled. This function is overridden in AutoManager when auto manager is enabled.
@@ -1086,7 +1294,7 @@ public boolean applyDropsBlockBreakage( PrisonMinesBlockBreakEvent pmEvent, int
- public void processBlockBreakage( PrisonMinesBlockBreakEvent pmEvent, StringBuilder debugInfo )
+ private void processBlockBreakage( PrisonMinesBlockBreakEvent pmEvent )
{
// If this block is not in the mine (if null) and it has not been broke before
@@ -1097,8 +1305,8 @@ public void processBlockBreakage( PrisonMinesBlockBreakEvent pmEvent, StringBuil
// Calculate XP for all blocks if enabled:
- int totalXp = xpCalculateXP( pmEvent, debugInfo );
- xpGivePlayerXp( pmEvent.getSpigotPlayer(), totalXp, debugInfo );
+ int totalXp = xpCalculateXP( pmEvent );
+ xpGivePlayerXp( pmEvent.getSpigotPlayer(), totalXp, pmEvent.getDebugInfo() );
int blocksMined = (pmEvent.getTargetBlock() == null ? 0 : 1 ) + pmEvent.getTargetExplodedBlocks().size();
@@ -1119,7 +1327,9 @@ public void processBlockBreakage( PrisonMinesBlockBreakEvent pmEvent, StringBuil
}
calculateAndApplyDurability( pmEvent.getPlayer(), pmEvent.getItemInHand(),
- blocksMined, durabilityResistance, debugInfo );
+ blocksMined,
+ durabilityResistance,
+ pmEvent.getDebugInfo() );
}
@@ -1201,35 +1411,44 @@ public void processBlockBreakage( PrisonMinesBlockBreakEvent pmEvent, StringBuil
// mine.checkZeroBlockReset();
// }
// }
-
- private void applyBlockFinalizations( PrisonMinesBlockBreakEvent pmEvent, MineTargetPrisonBlock targetBlock ) {
-
- if ( targetBlock != null ) {
-
- Mine mine = pmEvent.getMine();
-
- // Increment the block break counts if they have not been processed before.
- // Since the function return true if it can count the block, then we can
- // then have the player counts be incremented.
- if ( mine.incrementBlockMiningCount( targetBlock ) ) {
-
- // Now in AutoManagerFeatures.autoPickup and calculateNormalDrop:
+//
+// private void applyBlockFinalizations( PrisonMinesBlockBreakEvent pmEvent,
+// MineTargetPrisonBlock targetBlock ) {
+//
+// if ( targetBlock != null ) {
+//
+// Mine mine = pmEvent.getMine();
+//
+// // Increment the block break counts if they have not been processed before.
+// // Since the function return true if it can count the block, then we can
+// // then have the player counts be incremented.
+// if ( mine.incrementBlockMiningCount( targetBlock ) ) {
+//
+// // Now in AutoManagerFeatures.autoPickup and calculateNormalDrop:
// PlayerCache.getInstance().addPlayerBlocks( pmEvent.getSpigotPlayer(),
// mine.getName(), targetBlock.getPrisonBlock(), 1 );
-
- }
-
-
- SpigotBlock sBlock = (SpigotBlock) targetBlock.getMinedBlock();
- PrisonBlock pBlock = sBlock == null ? null : sBlock.getPrisonBlock();
-
- mine.processBlockBreakEventCommands( pBlock,
- targetBlock, pmEvent.getSpigotPlayer(), pmEvent.getBlockEventType(), pmEvent.getTriggered() );
-
- }
- }
-
- protected int xpCalculateXP( PrisonMinesBlockBreakEvent pmEvent, StringBuilder debugInfo ) {
+//
+// }
+//
+// // Do not allow MONITOR or ACCESSMONITOR to process the block events:
+// if ( pmEvent.getBbPriority() != BlockBreakPriority.MONITOR &&
+// pmEvent.getBbPriority() != BlockBreakPriority.ACCESSMONITOR ) {
+//
+// SpigotBlock sBlock = (SpigotBlock) targetBlock.getMinedBlock();
+// PrisonBlock pBlock = sBlock == null ? null : sBlock.getPrisonBlock();
+//
+// mine.processBlockBreakEventCommands( pBlock,
+// targetBlock, pmEvent.getSpigotPlayer(), pmEvent.getBlockEventType(), pmEvent.getTriggered() );
+//
+// }
+//
+// }
+//
+// //TODO What about zero-block reset and mine sweeper?
+//
+// }
+//
+ protected int xpCalculateXP( PrisonMinesBlockBreakEvent pmEvent ) {
int xp = 0;
if (isBoolean(AutoFeatures.isCalculateXPEnabled) ) {
@@ -1262,7 +1481,7 @@ protected int xpCalculateXP( PrisonMinesBlockBreakEvent pmEvent, StringBuilder d
String message = String.format( "(XP calcs: blocks: %d xp: %d bonusXp: %d) ",
totalBlocks, totalXp, totalBonusXp );
- debugInfo.append( message );
+ pmEvent.getDebugInfo().append( message );
}
}
@@ -1284,7 +1503,8 @@ private int xpCalculateBlockXP( MineTargetPrisonBlock targetBlock, SpigotPlayer
}
return xp;
}
- private int xpCalculateBonusXP( MineTargetPrisonBlock targetBlock, SpigotPlayer player, ItemStack itemInHand )
+ private int xpCalculateBonusXP( MineTargetPrisonBlock targetBlock, SpigotPlayer player,
+ ItemStack itemInHand )
{
int xp = 0;
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakEventListener.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakEventListener.java
index 080a3e22a..6fa167d13 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakEventListener.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakEventListener.java
@@ -17,6 +17,8 @@
import tech.mcprison.prison.spigot.autofeatures.events.AutoManagerCrazyEnchants;
import tech.mcprison.prison.spigot.autofeatures.events.AutoManagerPrisonEnchants;
import tech.mcprison.prison.spigot.autofeatures.events.AutoManagerPrisonsExplosiveBlockBreakEvents;
+import tech.mcprison.prison.spigot.autofeatures.events.AutoManagerRevEnchantsExplosiveEvent;
+import tech.mcprison.prison.spigot.autofeatures.events.AutoManagerRevEnchantsJackHammerEvent;
import tech.mcprison.prison.spigot.autofeatures.events.AutoManagerTokenEnchant;
import tech.mcprison.prison.spigot.autofeatures.events.AutoManagerZenchantments;
import tech.mcprison.prison.spigot.autofeatures.events.PrisonDebugBlockInspector;
@@ -108,6 +110,10 @@ public class OnBlockBreakEventListener
private AutoManagerPrisonEnchants peEvents;
private AutoManagerTokenEnchant teEvents;
private AutoManagerZenchantments zcEvents;
+
+ private AutoManagerRevEnchantsExplosiveEvent reEEvents;
+ private AutoManagerRevEnchantsJackHammerEvent reJHEvents;
+
private PrisonDebugBlockInspector pdBlockInspector;
@@ -222,6 +228,12 @@ private void registerEvents() {
zcEvents = new AutoManagerZenchantments();
zcEvents.registerEvents();
+ reEEvents = new AutoManagerRevEnchantsExplosiveEvent();
+ reEEvents.registerEvents();
+
+ reJHEvents = new AutoManagerRevEnchantsJackHammerEvent();
+ reJHEvents.registerEvents();
+
pdBlockInspector = new PrisonDebugBlockInspector();
pdBlockInspector.init();
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakMines.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakMines.java
index 83bfa5cbc..059dac480 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakMines.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/OnBlockBreakMines.java
@@ -41,11 +41,20 @@ public OnBlockBreakMines() {
public class MinesEventResults {
private boolean cancelEvent = false;
private boolean ignoreEvent = false;
+ private Mine mine = null;
public MinesEventResults() {
super();
}
+
+ public Mine getMine() {
+ return mine;
+ }
+ public void setMine(Mine mine) {
+ this.mine = mine;
+ }
+
public boolean isCancelEvent() {
return cancelEvent;
}
@@ -141,7 +150,21 @@ public Mine findMine( UUID playerUUID, SpigotBlock sBlock, List altBlocks
// }
+ /**
+ * If the event is canceled, it still needs to be processed because of the MONITOR events:
+ * An event will be "canceled" and "ignored" if the block
+ * BlockUtils.isUnbreakable(), or if the mine is activly resetting.
+ * The event will also be ignored if the block is outside of a mine
+ * or if the targetBlock has been set to ignore all block events which
+ * means the block has already been processed.
+ *
+ *
+ * @param player
+ * @param block
+ * @return
+ */
protected MinesEventResults ignoreMinesBlockBreakEvent( Player player, Block block ) {
+
MinesEventResults results = new MinesEventResults();
SpigotBlock sBlock = SpigotBlock.getSpigotBlock( block );
@@ -151,6 +174,7 @@ protected MinesEventResults ignoreMinesBlockBreakEvent( Player player, Block blo
}
Mine mine = findMine( player, sBlock, null, null );
+ results.setMine( mine );
if ( mine == null ) {
// Prison is unable to process blocks outside of mines right now, so exit:
@@ -166,20 +190,25 @@ protected MinesEventResults ignoreMinesBlockBreakEvent( Player player, Block blo
results.setCancelEvent( true );
results.setIgnoreEvent( true );
}
- MineTargetPrisonBlock targetBlock = mine.getTargetPrisonBlock( sBlock );
-
- // If ignore all block events, then exit this function without logging anything:
- if ( targetBlock != null && targetBlock.isIgnoreAllBlockEvents() ) {
+ else {
- // Do not cancel the event... let other plugins deal with it... prison does not care about this block.
- //event.setCancelled( true );
- results.setIgnoreEvent( true );
+ MineTargetPrisonBlock targetBlock = mine.getTargetPrisonBlock( sBlock );
+
+ // If ignore all block events, then exit this function without logging anything:
+ if ( targetBlock != null && targetBlock.isIgnoreAllBlockEvents() ) {
+
+ // Do not cancel the event... let other plugins deal with it... prison does not care about this block.
+ //event.setCancelled( true );
+ results.setIgnoreEvent( true );
+ }
}
+
}
return results;
}
+
// /**
// * Warning... this is a temp copy of the real function and will be removed
// * if PEExplosionEvent adds the interface Cancellable.
@@ -226,13 +255,15 @@ protected MinesEventResults ignoreMinesBlockBreakEvent( Player player, Block blo
// return processEvent;
// }
+ /**
+ *
If mine is not null, then it will check for a zero-block reset (reset-threshold).
+ *
+ *
+ * @param mine
+ */
public void checkZeroBlockReset( Mine mine ) {
if ( mine != null ) {
- // submit a mine sweeper task. It will only run if it is enabled and another
- // mine sweeper task has not been submitted.
- mine.submitMineSweeperTask();
-
// Checks to see if the mine ran out of blocks, and if it did, then
// it will reset the mine:
mine.checkZeroBlockReset();
@@ -240,6 +271,24 @@ public void checkZeroBlockReset( Mine mine ) {
}
+ /**
+ * If mine is not null, then it will perform a mine sweeper
+ * for the mine, if it is enabled.
+ *
+ *
+ * @param mine
+ */
+ public void checkMineSweeper( Mine mine ) {
+ if ( mine != null ) {
+
+ // submit a mine sweeper task. It will only run if it is enabled and another
+ // mine sweeper task has not been submitted.
+ mine.submitMineSweeperTask();
+ }
+ }
+
+
+
/**
* Checks only if the names match. Does not check locations within any worlds.
*
@@ -310,7 +359,8 @@ public boolean collectBukkitDrops( List bukkitDrops, MineTarget
{
boolean results = false;
- if ( targetBlock != null && targetBlock.getPrisonBlock().getBlockType() == PrisonBlockType.CustomItems ) {
+ if ( targetBlock != null &&
+ targetBlock.getPrisonBlock().getBlockType().isCustomBlockType() ) {
List cbIntegrations =
PrisonAPI.getIntegrationManager().getCustomBlockIntegrations();
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotBlock.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotBlock.java
index 8422f5e28..0ace4bf8c 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotBlock.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotBlock.java
@@ -189,6 +189,7 @@ public PrisonBlock getPrisonBlock() {
// return results;
}
+ @SuppressWarnings("unused")
private PrisonBlock getPrisonBlockFromCustomBlockIntegration( PrisonBlockType blockType ) {
PrisonBlock results = null;
@@ -198,6 +199,7 @@ private PrisonBlock getPrisonBlockFromCustomBlockIntegration( PrisonBlockType bl
// No special processing for minecraft types since that will be the fallback later on:
case CustomItems:
+ case ItemsAdder:
{
CustomBlockIntegration customItemsIntegration =
PrisonAPI.getIntegrationManager().getCustomBlockIntegration( blockType );
@@ -210,6 +212,19 @@ private PrisonBlock getPrisonBlockFromCustomBlockIntegration( PrisonBlockType bl
break;
+// case ItemsAdder:
+// {
+// CustomBlockIntegration customItemsIntegration =
+// PrisonAPI.getIntegrationManager().getCustomBlockIntegration( blockType );
+// // NOTE: This would be the situation where the admin added the Custom Items plugin, added blocks
+// // then removed the plugin. So if it's null, ignore it.
+// if ( customItemsIntegration != null ) {
+// results = customItemsIntegration.getCustomBlock( this );
+// }
+// }
+//
+// break;
+
default:
break;
}
@@ -246,6 +261,7 @@ public void setPrisonBlock( PrisonBlock prisonBlock ) {
break;
case CustomItems:
+ case ItemsAdder:
{
CustomBlockIntegration customItemsIntegration =
PrisonAPI.getIntegrationManager().getCustomBlockIntegration( prisonBlock.getBlockType() );
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotBlockSetAsynchronously.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotBlockSetAsynchronously.java
index 84bf8fff8..f7a3ddae4 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotBlockSetAsynchronously.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotBlockSetAsynchronously.java
@@ -28,6 +28,7 @@ public void setBlockAsync( PrisonBlock prisonBlock, Location location ) {
break;
case CustomItems:
+ case ItemsAdder:
{
CustomBlockIntegration customItemsIntegration =
PrisonAPI.getIntegrationManager().getCustomBlockIntegration( prisonBlock.getBlockType() );
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotItemStack.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotItemStack.java
index 3f7ca702b..9c8b13e23 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotItemStack.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/block/SpigotItemStack.java
@@ -4,9 +4,11 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.meta.ItemMeta;
import com.cryptomorin.xseries.XMaterial;
@@ -17,6 +19,7 @@
import tech.mcprison.prison.internal.block.PrisonBlock;
import tech.mcprison.prison.output.Output;
import tech.mcprison.prison.spigot.SpigotUtil;
+import tech.mcprison.prison.spigot.compat.SpigotCompatibility;
import tech.mcprison.prison.util.Text;
public class SpigotItemStack
@@ -428,4 +431,70 @@ public Map serialize()
return results;
}
+
+ /**
+ * This function will return information on the item in the item stack, which is for
+ * debugging purposes, such as displayed within the autoFeatures debug info.
+ *
+ *
+ * @return
+ */
+ public String getDebugInfo() {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append( getName() );
+
+ ItemMeta meta = getMeta();
+ if ( meta != null &&
+ meta.getEnchants() != null &&
+ meta.getEnchants().size() > 0 ) {
+ sb.append( " " );
+
+ StringBuilder sbE = new StringBuilder();
+ Set keys = meta.getEnchants().keySet();
+ for (Enchantment key : keys) {
+ if ( sbE.length() > 0 ) {
+ sbE.append(",");
+ }
+ String name = key.toString();
+ name = name.substring(name.indexOf(" ") + 1, name.length() - 1);
+
+ Integer level = meta.getEnchants().get(key);
+ sbE.append( name );
+ sbE.append(":");
+ sbE.append( level );
+ }
+
+ if ( sbE.length() > 0 ) {
+ sb.append("(");
+ sb.append( sbE );
+ sb.append(")");
+ }
+ }
+
+ if ( SpigotCompatibility.getInstance().hasDurability( this ) ) {
+ int durabilityMax = SpigotCompatibility.getInstance().getDurabilityMax( this );
+ int durability = SpigotCompatibility.getInstance().getDurability( this );
+
+ sb.append(" durability:");
+ sb.append(durabilityMax);
+ sb.append(":");
+ sb.append(durability);
+ }
+
+ if ( getAmount() != 1 ) {
+ sb.append( " amount=" );
+ sb.append( getAmount() );
+ }
+
+ sb.append( " " );
+ if ( isAir() ) {
+ sb.append( "::AIR" );
+ }
+ else if ( isBlock() ) {
+ sb.append( "::BLOCK" );
+ }
+
+ return sb.toString();
+ }
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/bstats/PrisonBStats.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/bstats/PrisonBStats.java
index b92915184..c4fc01adb 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/bstats/PrisonBStats.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/bstats/PrisonBStats.java
@@ -41,6 +41,7 @@ public class PrisonBStats {
// private List reportVault;
private List reportEnchantments;
private List reportAdminTools;
+ private List reportConflicts;
private TreeSet pluginsUsed;
@@ -60,6 +61,7 @@ public PrisonBStats( SpigotPrison spigotPrison ) {
// this.reportVault = new ArrayList<>();
this.reportEnchantments = new ArrayList<>();
this.reportAdminTools = new ArrayList<>();
+ this.reportConflicts = new ArrayList<>();
this.pluginsUsed = new TreeSet<>();
@@ -182,14 +184,18 @@ public void initMetricsOnEnable() {
}) );
getbStatsMetrics().addCustomChart( new SimplePie( "prison_total_active_player_counts", () -> {
-
- int playerCountActive = TopNPlayers.getInstance().getTopNSize();
+
+ int playerCountActive = PrisonRanks.getInstance().getPlayerManager() == null ?
+ -1 :
+ TopNPlayers.getInstance().getTopNSize();
return Integer.toString( playerCountActive );
}) );
getbStatsMetrics().addCustomChart( new SimplePie( "prison_total_archived_player_counts", () -> {
- int playerCountArchived = TopNPlayers.getInstance().getArchivedSize();
+ int playerCountArchived = PrisonRanks.getInstance().getPlayerManager() == null ?
+ -1 :
+ TopNPlayers.getInstance().getArchivedSize();
return Integer.toString( playerCountArchived );
}) );
@@ -322,15 +328,16 @@ public void initMetricsOnEnable() {
createNewBstatReport( "enchantment_plugins", reportEnchantments, plugins, pluginsUsed );
createNewBstatReport( "admin_tools_plugins", reportAdminTools, plugins, pluginsUsed );
+ createNewBstatReport( "potential_conflicts_plugins", reportConflicts, plugins, pluginsUsed );
//this.reportVault = new ArrayList<>(); "prison_integrated_vault_plugins"
- TreeMap pluginsAtoE = getSubsetOfPlugins(plugins, 'a', 'f', false, pluginsUsed );
- TreeMap pluginsFtoM = getSubsetOfPlugins(plugins, 'f', 'n', false, pluginsUsed );
- TreeMap pluginsNtoS = getSubsetOfPlugins(plugins, 'n', 't', false, pluginsUsed );
- TreeMap pluginsTto9 = getSubsetOfPlugins(plugins, 't', 'z', true, pluginsUsed );
+// TreeMap pluginsAtoE = getSubsetOfPlugins(plugins, 'a', 'f', false, pluginsUsed );
+// TreeMap pluginsFtoM = getSubsetOfPlugins(plugins, 'f', 'n', false, pluginsUsed );
+// TreeMap pluginsNtoS = getSubsetOfPlugins(plugins, 'n', 't', false, pluginsUsed );
+// TreeMap pluginsTto9 = getSubsetOfPlugins(plugins, 't', 'z', true, pluginsUsed );
// Remove "plugins" - Too much info on one report
// DrilldownPie mlcPrisonPlugins = new DrilldownPie("plugins", () -> {
@@ -379,72 +386,72 @@ public void initMetricsOnEnable() {
getbStatsMetrics().addCustomChart( mlcPrisonVaultPlugins );
- DrilldownPie mlcPrisonPluginsAtoE = new DrilldownPie("plugins_a_to_e", () -> {
- Map> map = new HashMap<>();
-
- for (String pluginName : pluginsAtoE.keySet() ) {
- RegisteredPluginsData pluginData = pluginsAtoE.get( pluginName );
-
- Map entry = new HashMap<>();
- entry.put( pluginData.getPluginVersion(), 1 );
-
- map.put( pluginData.getPluginName(), entry );
- }
-
- return map;
- });
- getbStatsMetrics().addCustomChart( mlcPrisonPluginsAtoE );
+// DrilldownPie mlcPrisonPluginsAtoE = new DrilldownPie("plugins_a_to_e", () -> {
+// Map> map = new HashMap<>();
+//
+// for (String pluginName : pluginsAtoE.keySet() ) {
+// RegisteredPluginsData pluginData = pluginsAtoE.get( pluginName );
+//
+// Map entry = new HashMap<>();
+// entry.put( pluginData.getPluginVersion(), 1 );
+//
+// map.put( pluginData.getPluginName(), entry );
+// }
+//
+// return map;
+// });
+// getbStatsMetrics().addCustomChart( mlcPrisonPluginsAtoE );
- DrilldownPie mlcPrisonPluginsFtoM = new DrilldownPie("plugins_f_to_m", () -> {
- Map> map = new HashMap<>();
-
- for (String pluginName : pluginsFtoM.keySet() ) {
- RegisteredPluginsData pluginData = pluginsFtoM.get( pluginName );
-
- Map entry = new HashMap<>();
- entry.put( pluginData.getPluginVersion(), 1 );
-
- map.put( pluginData.getPluginName(), entry );
- }
-
- return map;
- });
- getbStatsMetrics().addCustomChart( mlcPrisonPluginsFtoM );
+// DrilldownPie mlcPrisonPluginsFtoM = new DrilldownPie("plugins_f_to_m", () -> {
+// Map> map = new HashMap<>();
+//
+// for (String pluginName : pluginsFtoM.keySet() ) {
+// RegisteredPluginsData pluginData = pluginsFtoM.get( pluginName );
+//
+// Map entry = new HashMap<>();
+// entry.put( pluginData.getPluginVersion(), 1 );
+//
+// map.put( pluginData.getPluginName(), entry );
+// }
+//
+// return map;
+// });
+// getbStatsMetrics().addCustomChart( mlcPrisonPluginsFtoM );
- DrilldownPie mlcPrisonPluginsNtoS = new DrilldownPie("plugins_n_to_s", () -> {
- Map> map = new HashMap<>();
-
- for (String pluginName : pluginsNtoS.keySet() ) {
- RegisteredPluginsData pluginData = pluginsNtoS.get( pluginName );
-
- Map entry = new HashMap<>();
- entry.put( pluginData.getPluginVersion(), 1 );
-
- map.put( pluginData.getPluginName(), entry );
- }
-
- return map;
- });
- getbStatsMetrics().addCustomChart( mlcPrisonPluginsNtoS );
+// DrilldownPie mlcPrisonPluginsNtoS = new DrilldownPie("plugins_n_to_s", () -> {
+// Map> map = new HashMap<>();
+//
+// for (String pluginName : pluginsNtoS.keySet() ) {
+// RegisteredPluginsData pluginData = pluginsNtoS.get( pluginName );
+//
+// Map entry = new HashMap<>();
+// entry.put( pluginData.getPluginVersion(), 1 );
+//
+// map.put( pluginData.getPluginName(), entry );
+// }
+//
+// return map;
+// });
+// getbStatsMetrics().addCustomChart( mlcPrisonPluginsNtoS );
- DrilldownPie mlcPrisonPluginsTto9 = new DrilldownPie("plugins_t_to_z_plus_others", () -> {
- Map> map = new HashMap<>();
-
- for (String pluginName : pluginsTto9.keySet() ) {
- RegisteredPluginsData pluginData = pluginsTto9.get( pluginName );
-
- Map entry = new HashMap<>();
- entry.put( pluginData.getPluginVersion(), 1 );
-
- map.put( pluginData.getPluginName(), entry );
- }
-
- return map;
- });
- getbStatsMetrics().addCustomChart( mlcPrisonPluginsTto9 );
+// DrilldownPie mlcPrisonPluginsTto9 = new DrilldownPie("plugins_t_to_z_plus_others", () -> {
+// Map> map = new HashMap<>();
+//
+// for (String pluginName : pluginsTto9.keySet() ) {
+// RegisteredPluginsData pluginData = pluginsTto9.get( pluginName );
+//
+// Map entry = new HashMap<>();
+// entry.put( pluginData.getPluginVersion(), 1 );
+//
+// map.put( pluginData.getPluginName(), entry );
+// }
+//
+// return map;
+// });
+// getbStatsMetrics().addCustomChart( mlcPrisonPluginsTto9 );
@@ -471,58 +478,58 @@ public void initMetricsOnEnable() {
}
- /**
- * This function will split up a list of active plugins in to sub-groups.
- * This is controlled by the rangeLow through rangeHigh parameters.
- * The parameter includeNonAlpha will include all other plugins where their
- * names do not begin with an alpha character; this is a catch-all to prevent plugins
- * from being omitted.
- *
- *
- * The parameter pluginsUsed is a set plugins that have already been
- * included in other reports so therefore should be omitted from these reports.
- *
- *
- * @param plugins
- * @param rangeLow
- * @param rangeHigh
- * @param includeNonAlpha
- * @param pluginsUsed
- * @return
- */
- private TreeMap getSubsetOfPlugins(
- TreeMap plugins,
- char rangeLow, char rangeHigh,
- boolean includeNonAlpha,
- TreeSet pluginsUsed ) {
-
- TreeMap results = new TreeMap<>();
-
- Set keys = plugins.keySet();
- for (String key : keys) {
-
- if ( !pluginsUsed.contains( key ) ) {
-
- char keyFirstChar = key.toLowerCase().charAt(0);
-
- if ( Character.isAlphabetic(keyFirstChar) ) {
-
- if ( Character.compare(keyFirstChar, rangeLow) >= 0 && Character.compare( keyFirstChar, rangeHigh) < 0 ) {
-
- results.put( key, plugins.get(key) );
- }
- }
- else {
-
- // Add all non-alpha plugins to this result:
- results.put( key, plugins.get(key) );
- }
- }
-
- }
-
- return results;
- }
+// /**
+// * This function will split up a list of active plugins in to sub-groups.
+// * This is controlled by the rangeLow through rangeHigh parameters.
+// * The parameter includeNonAlpha will include all other plugins where their
+// * names do not begin with an alpha character; this is a catch-all to prevent plugins
+// * from being omitted.
+// *
+// *
+// * The parameter pluginsUsed is a set plugins that have already been
+// * included in other reports so therefore should be omitted from these reports.
+// *
+// *
+// * @param plugins
+// * @param rangeLow
+// * @param rangeHigh
+// * @param includeNonAlpha
+// * @param pluginsUsed
+// * @return
+// */
+// private TreeMap getSubsetOfPlugins(
+// TreeMap plugins,
+// char rangeLow, char rangeHigh,
+// boolean includeNonAlpha,
+// TreeSet pluginsUsed ) {
+//
+// TreeMap results = new TreeMap<>();
+//
+// Set keys = plugins.keySet();
+// for (String key : keys) {
+//
+// if ( !pluginsUsed.contains( key ) ) {
+//
+// char keyFirstChar = key.toLowerCase().charAt(0);
+//
+// if ( Character.isAlphabetic(keyFirstChar) ) {
+//
+// if ( Character.compare(keyFirstChar, rangeLow) >= 0 && Character.compare( keyFirstChar, rangeHigh) < 0 ) {
+//
+// results.put( key, plugins.get(key) );
+// }
+// }
+// else {
+//
+// // Add all non-alpha plugins to this result:
+// results.put( key, plugins.get(key) );
+// }
+// }
+//
+// }
+//
+// return results;
+// }
/**
@@ -586,12 +593,14 @@ private void setupPluginReports() {
reportPermissions.add( "LPC" );
reportPermissions.add( "PermissionsEx" );
+
reportEconomy.add( "Essentials" );
reportEconomy.add( "Economy_CMI" );
+ reportEconomy.add( "CMIEInjector" );
reportEconomy.add( "GemsEconomy" );
reportEconomy.add( "SDFEconomy" );
reportEconomy.add( "SaneEconomy" );
- reportEconomy.add( "Tokens" );
+// reportEconomy.add( "Tokens" );
reportEconomy.add( "Ultimate_Economy" );
reportEconomy.add( "XConomy" );
@@ -602,6 +611,7 @@ private void setupPluginReports() {
reportPlaceholders.add( "AnimatedScoreboard" );
reportPlaceholders.add( "DecentHolograms" );
reportPlaceholders.add( "DeluxeMenus" );
+ reportPlaceholders.add( "EconomyShopGUI" );
reportPlaceholders.add( "EssentialsChat" );
reportPlaceholders.add( "HolographicDisplays" );
reportPlaceholders.add( "HolographicExtension" );
@@ -610,10 +620,11 @@ private void setupPluginReports() {
reportPlaceholders.add( "RealScoreboard" );
reportPlaceholders.add( "TAB" );
reportPlaceholders.add( "TabList" );
+
+ reportPlaceholders.add( "ajLeaderBoards" );
+ reportPlaceholders.add( "FeatherBoard" );
- //reportVault.add( "" );
-
reportEnchantments.add( "AdvancedEnchantmens" );
reportEnchantments.add( "CrazyEnchantments" );
@@ -623,26 +634,60 @@ private void setupPluginReports() {
reportEnchantments.add( "PrisonEnchants" );
reportEnchantments.add( "RevEnchants" );
+ reportEnchantments.add( "mcMMO" );
- reportAdminTools.add( "WorldEdit" );
- reportAdminTools.add( "WorldGuard" );
+
+
+ reportAdminTools.add( "Citizens" );
+ reportAdminTools.add( "CoreProtect" );
+ reportAdminTools.add( "CMI" );
+ reportAdminTools.add( "CMILib" );
+ reportAdminTools.add( "EssentialsSpawn" );
+ reportAdminTools.add( "FastAsyncWorldEdit" );
reportAdminTools.add( "Multiverse-Core" );
reportAdminTools.add( "Multiverse" );
reportAdminTools.add( "Multiworld" );
reportAdminTools.add( "MyCommand" );
- reportAdminTools.add( "CMI" );
- reportAdminTools.add( "CMIEInjector" );
- reportAdminTools.add( "FastAsyncWorldEdit" );
- reportAdminTools.add( "VoidGen" );
+ reportAdminTools.add( "NBTAPI" );
+ reportAdminTools.add( "PlayerKits" );
+ reportAdminTools.add( "PlotSquared" );
+ reportAdminTools.add( "SkinsRestorer" );
reportAdminTools.add( "Skript" );
- reportAdminTools.add( "PlugMan" ); // Just to get an idea of how many may be causing issues
reportAdminTools.add( "ViaBackwards" );
reportAdminTools.add( "ViaRewind" );
reportAdminTools.add( "ViaVersion" );
- reportAdminTools.add( "Citizens" );
- reportAdminTools.add( "NBTAPI" );
+ reportAdminTools.add( "VoidGen" );
+ reportAdminTools.add( "WorldEdit" );
+ reportAdminTools.add( "WorldGuard" );
+ reportAdminTools.add( "WorldGuardExtraFlags" );
+
+ reportAdminTools.add( "ConsoleSpamFix" );
+ reportAdminTools.add( "GriefPrevention" );
+
+
+
+ reportConflicts.add( "AutoSell" );
+ reportConflicts.add( "CataMines" );
+ reportConflicts.add( "DeluxeMines" );
+ reportConflicts.add( "EZPrestige" );
+ reportConflicts.add( "EZRanksPro" );
+ reportConflicts.add( "JetsPrisonCells" );
+ reportConflicts.add( "MineCrates" );
+ reportConflicts.add( "MineBomb" );
+ reportConflicts.add( "MineBuddy" );
+ reportConflicts.add( "MineChess" );
+ reportConflicts.add( "MineResetLite" );
+ reportConflicts.add( "MineResetLitePlus" );
+ reportConflicts.add( "NonSquareMines" );
+ reportConflicts.add( "PlugMan" ); // Just to get an idea of how many may be causing issues
+ reportConflicts.add( "PrisonControl" );
+ reportConflicts.add( "PrisonGames" );
+ reportConflicts.add( "PrivateMines" );
+ reportConflicts.add( "Rankup" );
+ reportConflicts.add( "Tokens" );
}
+
public Metrics getbStatsMetrics() {
return bStatsMetrics;
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotBackpackCommands.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotBackpackCommands.java
index 9913c3c4d..4d07b0d54 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotBackpackCommands.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotBackpackCommands.java
@@ -25,7 +25,8 @@ public class PrisonSpigotBackpackCommands extends PrisonSpigotBaseCommands {
@Command(identifier = "backpack", description = "Backpacks", onlyPlayers = false)
private void backpackMainCommand(CommandSender sender,
- @Arg(name = "ID", def = "null", description = "Leave empty if you want to open your main backpack, add an ID if you've more than one.") String id){
+ @Arg(name = "ID", def = "null",
+ description = "Leave empty if you want to open your main backpack, add an ID if you've more than one.") String id){
if (sender.hasPermission("prison.admin") || sender.isOp()){
String registeredCmd = Prison.get().getCommandHandler().findRegisteredCommand("backpack help");
@@ -96,7 +97,7 @@ private void deleteBackpackCommand(CommandSender sender,
if (isOnlinePlayer) {
success = BackpacksUtil.get().resetBackpack(Bukkit.getPlayerExact(name), id);
} else {
- success = BackpacksUtil.get().resetBackpack(BackpacksUtil.get().getBackpackOwnerOffline(name, id), id);
+ success = BackpacksUtil.get().resetBackpack(BackpacksUtil.get().getBackpackOwnerOffline(name), id);
}
}
if (success) {
@@ -108,9 +109,9 @@ private void deleteBackpackCommand(CommandSender sender,
@Command(identifier = "backpack set size", description = "Resize a player's backpack.", permissions = "prison.admin", onlyPlayers = false)
private void resizeBackpackCommand(CommandSender sender,
- @Arg(name = "Owner", description = "The backpack owner name", def = "null") String name,
- @Arg(name = "Backpack size", description = "Backpack size multiple of 9", def = "9") String size,
- @Arg(name = "id", description = "The backpack ID optional", def = "null") String id){
+ @Arg(name = "Owner", description = "The backpack owner name", def = "null") String name,
+ @Arg(name = "Backpack size", description = "Backpack size multiple of 9", def = "9") String size,
+ @Arg(name = "id", description = "The backpack ID optional", def = "null") String id){
if (name.equalsIgnoreCase("null")){
Output.get().sendWarn(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_backpack_missing_playername)));
@@ -149,7 +150,7 @@ private void resizeBackpackCommand(CommandSender sender,
} else {
- BackpacksUtil.get().setBackpackSize(BackpacksUtil.get().getBackpackOwnerOffline(name, id), sizeInt, id);
+ BackpacksUtil.get().setBackpackSize(BackpacksUtil.get().getBackpackOwnerOffline(name), sizeInt, id);
}
}
@@ -157,15 +158,17 @@ private void resizeBackpackCommand(CommandSender sender,
Output.get().sendInfo(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_backpack_resize_success)));
}
- @Command(identifier = "backpack limit", permissions = "prison.admin", description = "Backpacks limit for player, to use this multiple backpacks must be enabled from the backpacks config or it won't have effect.", onlyPlayers = false)
+ @Command(identifier = "backpack limit", permissions = "prison.admin",
+ description = "Backpacks limit for player, to use this multiple backpacks must be enabled from the backpacks config or it won't have effect.", onlyPlayers = false)
private void backpackLimitMainCommand(CommandSender sender){
sender.dispatchCommand("backpack limit help");
}
- @Command(identifier = "backpack limit set", permissions = "prison.admin", description = "Set backpacks limit of a player, to use this multiple backpacks must be enabled or it won't have effect.", onlyPlayers = false)
+ @Command(identifier = "backpack limit set",
+ permissions = "prison.admin", description = "Set backpacks limit of a player, to use this multiple backpacks must be enabled or it won't have effect.", onlyPlayers = false)
private void setBackpackLimitCommand(CommandSender sender,
- @Arg(name = "Owner", description = "The backpack owner name", def = "null") String name,
- @Arg(name = "Limit", description = "The Backpacks limit that a player can own", def = "null") String limit) {
+ @Arg(name = "Owner", description = "The backpack owner name", def = "null") String name,
+ @Arg(name = "Limit", description = "The Backpacks limit that a player can own", def = "null") String limit) {
if (name.equalsIgnoreCase("null") || limit.equalsIgnoreCase("null")){
Output.get().sendWarn(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_command_wrong_format)));
@@ -189,10 +192,12 @@ private void setBackpackLimitCommand(CommandSender sender,
Output.get().sendInfo(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_backpack_limit_edit_success)));
}
- @Command(identifier = "backpack limit add", permissions = "prison.admin", description = "Increment backpacks limit of a player, multiple backpacks must be enabled or this won't take effect.", onlyPlayers = false)
+ @Command(identifier = "backpack limit add",
+ permissions = "prison.admin",
+ description = "Increment backpacks limit of a player, multiple backpacks must be enabled or this won't take effect.", onlyPlayers = false)
private void addBackpackLimitCommand(CommandSender sender,
- @Arg(name = "Owner", description = "The backpack owner name", def = "null") String name,
- @Arg(name = "Limit", description = "The Backpacks increment value", def = "null") String limit) {
+ @Arg(name = "Owner", description = "The backpack owner name", def = "null") String name,
+ @Arg(name = "Limit", description = "The Backpacks increment value", def = "null") String limit) {
if (name.equalsIgnoreCase("null") || limit.equalsIgnoreCase("null")){
Output.get().sendWarn(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_command_wrong_format)));
@@ -218,10 +223,11 @@ private void addBackpackLimitCommand(CommandSender sender,
Output.get().sendInfo(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_backpack_limit_edit_success)));
}
- @Command(identifier = "backpack limit decrement", permissions = "prison.admin", description = "Decrement backpacks limit of a player, to use this multiple backpacks must be enabled or it won't have effect.", onlyPlayers = false)
+ @Command(identifier = "backpack limit decrement", permissions = "prison.admin",
+ description = "Decrement backpacks limit of a player, to use this multiple backpacks must be enabled or it won't have effect.", onlyPlayers = false)
private void decrementBackpackLimitCommand(CommandSender sender,
- @Arg(name = "Owner", description = "The backpack owner name", def = "null") String name,
- @Arg(name = "Value", description = "The Backpacks decrement value", def = "null") String limit) {
+ @Arg(name = "Owner", description = "The backpack owner name", def = "null") String name,
+ @Arg(name = "Value", description = "The Backpacks decrement value", def = "null") String limit) {
if (name.equalsIgnoreCase("null") || limit.equalsIgnoreCase("null")){
Output.get().sendWarn(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_command_wrong_format)));
@@ -257,7 +263,8 @@ private void decrementBackpackLimitCommand(CommandSender sender,
Output.get().sendInfo(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_backpack_limit_edit_success)));
}
- @Command(identifier = "backpack admin", description = "Open backpack admin GUI", permissions = "prison.admin", onlyPlayers = true)
+ @Command(identifier = "backpack admin", description = "Open backpack admin GUI",
+ permissions = "prison.admin", onlyPlayers = true)
private void openBackpackAdminGUI(CommandSender sender){
Player p = getSpigotPlayer(sender);
@@ -273,7 +280,8 @@ private void openBackpackAdminGUI(CommandSender sender){
@Command(identifier = "gui backpack", description = "Backpack as a GUI", onlyPlayers = true)
private void backpackGUIOpenCommand(CommandSender sender,
- @Arg(name = "Backpack-ID", def = "null", description = "If user have more than backpack, he'll be able to choose another backpack on ID") String id){
+ @Arg(name = "Backpack-ID", def = "null",
+ description = "If user have more than backpack, he'll be able to choose another backpack on ID") String id){
Player p = getSpigotPlayer(sender);
@@ -303,7 +311,7 @@ private void backpackGUIOpenCommand(CommandSender sender,
if (!id.equalsIgnoreCase("null") && getBoolean(BackpacksUtil.get().getBackpacksConfig().getString("Options.Multiple-BackPacks-For-Player-Enabled"))){
BackpacksUtil.get().openBackpack(p, id);
} else {
- BackpacksUtil.get().openBackpack(p);
+ BackpacksUtil.get().openBackpack(p, (String) null );
}
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotBaseCommands.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotBaseCommands.java
index 729a9b43b..141a2b09a 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotBaseCommands.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotBaseCommands.java
@@ -3,6 +3,7 @@
import org.bukkit.configuration.Configuration;
import org.bukkit.entity.Player;
+import tech.mcprison.prison.commands.BaseCommands;
import tech.mcprison.prison.internal.CommandSender;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.configs.MessagesConfig;
@@ -11,10 +12,15 @@
/**
* @author RoyalBlueRanger
*/
-public class PrisonSpigotBaseCommands {
+public class PrisonSpigotBaseCommands
+ extends BaseCommands {
private final MessagesConfig messages = SpigotPrison.getInstance().getMessagesConfig();
+ public PrisonSpigotBaseCommands() {
+ super( "SpigotBaseCommands");
+ }
+
public MessagesConfig getMessages() {
return messages;
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotGUICommands.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotGUICommands.java
index 5bfece03a..f2a9b8a8d 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotGUICommands.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotGUICommands.java
@@ -69,7 +69,7 @@ private void prisonManagerPrestiges( CommandSender sender,
"prestiges are shown on multiple pages. The page parameter starts with " +
"page 1.", def = "1" ) int page
) {
- cmdPrisonManagerPrestiges( sender, page, "gui prestiges", "gui" );
+ cmdPrisonManagerPrestiges( sender, page, "gui prestiges", "close" );
}
protected void cmdPrisonManagerPrestiges( CommandSender sender, int page, String cmdPage, String cmdReturn ) {
@@ -122,7 +122,7 @@ private void prisonManagerMines(CommandSender sender,
"page 1.", def = "1" ) int page
) {
- cmdPrisonManagerMines( sender, page, "gui mines", "gui" );
+ cmdPrisonManagerMines( sender, page, "gui mines", "close" );
}
protected void cmdPrisonManagerMines( CommandSender sender, int page, String cmdPage, String cmdReturn ) {
@@ -205,7 +205,7 @@ private void prisonManagerRanks(CommandSender sender,
"page 1.", def = "1" ) int page
) {
- cmdPrisonManagerRanks( sender, page, "gui ranks", "gui" );
+ cmdPrisonManagerRanks( sender, page, "gui ranks", "close" );
}
protected void cmdPrisonManagerRanks(CommandSender sender, int page, String cmdPage, String cmdReturn ) {
Player player = getSpigotPlayer(sender);
@@ -323,7 +323,7 @@ private void prisonManagerLadders(CommandSender sender,
"page 1.", def = "1" ) int page
) {
- cmdPrisonManagerLadders( sender, page, "gui ladders", "gui" );
+ cmdPrisonManagerLadders( sender, page, "gui ladders", "close" );
}
protected void cmdPrisonManagerLadders(CommandSender sender, int page, String cmdPage, String cmdReturn ) {
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotPrestigeCommands.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotPrestigeCommands.java
index 8d14087bf..de747116b 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotPrestigeCommands.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotPrestigeCommands.java
@@ -1,22 +1,21 @@
package tech.mcprison.prison.spigot.commands;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Optional;
-import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import tech.mcprison.prison.Prison;
+import tech.mcprison.prison.commands.Arg;
import tech.mcprison.prison.commands.Command;
+import tech.mcprison.prison.commands.Wildcard;
import tech.mcprison.prison.internal.CommandSender;
import tech.mcprison.prison.modules.Module;
-import tech.mcprison.prison.modules.ModuleManager;
import tech.mcprison.prison.output.Output;
import tech.mcprison.prison.ranks.PrisonRanks;
-import tech.mcprison.prison.ranks.data.RankLadder;
-import tech.mcprison.prison.ranks.managers.LadderManager;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.configs.MessagesConfig;
-import tech.mcprison.prison.spigot.gui.ListenersPrisonManager;
import tech.mcprison.prison.spigot.gui.rank.SpigotConfirmPrestigeGUI;
/**
@@ -49,110 +48,145 @@ public void prestigesGUICommand(CommandSender sender) {
}
}
- @Command(identifier = "prestige", onlyPlayers = true)
- public void prestigesPrestigeCommand(CommandSender sender) {
- if ( isPrisonConfig( "prestiges" ) || isPrisonConfig( "prestige.enabled" ) ) {
-
-
- Optional ranksModule = Prison.get().getModuleManager().getModule( PrisonRanks.MODULE_NAME );
- if ( !ranksModule.isPresent() || ranksModule.isPresent() && !ranksModule.get().isEnabled() ) {
-
- Output.get().sendWarn( sender, "The command '/prestige' is disabled because the Ranks module is not active." );
- return;
- }
-
-
- prisonManagerPrestige(sender);
- }
- }
-
- @Command( identifier = "gui prestige", description = "GUI Prestige",
+ @Command( identifier = "gui prestigeConfirm",
+ description = "GUI Prestige Confirmation screeen. Use the command `/prestige help` instead of "
+ + "trying to call this directly. This is strictly a 'dumb' internal GUI that has "
+ + "no validation logic.",
aliases = {"prisonmanager prestige"} )
- public void prisonManagerPrestige(CommandSender sender ) {
-
- if ( isPrisonConfig( "prestige.enabled" ) ) {
-
-
- Optional ranksModule = Prison.get().getModuleManager().getModule( PrisonRanks.MODULE_NAME );
- if ( !ranksModule.isPresent() || ranksModule.isPresent() && !ranksModule.get().isEnabled() ) {
-
- Output.get().sendWarn( sender, "The command '/gui prestiges' is disabled because the Ranks module is not active." );
- return;
- }
-
- if ( PrisonRanks.getInstance().getLadderManager().getLadder("prestiges") == null ) {
- Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "ranks ladder create prestiges");
- }
-
- PrisonRanks rankPlugin;
-
- ModuleManager modMan = Prison.get().getModuleManager();
- Module module = modMan == null ? null : modMan.getModule( PrisonRanks.MODULE_NAME ).orElse( null );
-
- if ( module != null ) {
-
- rankPlugin = (PrisonRanks) module;
-
- LadderManager lm = null;
- if (rankPlugin != null) {
- lm = rankPlugin.getLadderManager();
-
- RankLadder ladderDefault = lm.getLadder("default");
- if ( ( ladderDefault == null ||
- !(ladderDefault.getLowestRank().isPresent()) ||
- ladderDefault.getLowestRank().get().getName() == null)) {
- Output.get().sendInfo(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_ladder_default_empty)));
- return;
- }
-
- RankLadder ladderPrestiges = lm.getLadder("prestiges");
- if ( ( ladderPrestiges == null ||
- !(ladderPrestiges.getLowestRank().isPresent()) ||
- ladderPrestiges.getLowestRank().get().getName() == null)) {
- Output.get().sendInfo(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_prestiges_empty)));
- return;
- }
- }
-
-
- if ( isPrisonConfig( "prestige.confirmation-enabled") && isPrisonConfig( "prestige.prestige-confirm-gui") ) {
- try {
-
- Player player = getSpigotPlayer( sender );
-
- SpigotConfirmPrestigeGUI gui = new SpigotConfirmPrestigeGUI( player );
- gui.open();
- } catch (Exception ex) {
- prestigeByChat( sender );
- }
- }
- else if ( isPrisonConfig( "prestige.confirmation-enabled") ) {
- prestigeByChat( sender );
- }
- else {
- // Bypassing prestige confirmations:
- Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "rankup prestiges");
- }
- }
- }
- else {
- sender.sendMessage( "Prestiges are disabled. Refresh and then reconfigure config.yml and try again." );
- }
+ public void prisonManagerPrestige(CommandSender sender,
+ @Wildcard(join=true)
+ @Arg(name = "lores", def = "",
+ description = "This field represents a list lore values that will be " +
+ "shown in the prestige confirmation GUI. This should not be used directly." )
+ String lores) {
+
+ if ( lores == null || lores.trim().length() == 0 ) {
+ sender.sendMessage( "Invalid use of `/gui prestigeConfirm`. Please use `/prestige` instead." );
+ return;
+ }
+
+ List lore = new ArrayList<>();
+
+ for ( String loreRaw : lores.split( " " ) ) {
+ String loreValue = loreRaw.replace( "_", " ").trim();
+ if ( loreValue.length() > 0 ) {
+ lore.add( loreValue );
+ }
+ }
+
+ Player player = getSpigotPlayer( sender );
+
+ SpigotConfirmPrestigeGUI gui = new SpigotConfirmPrestigeGUI( player, lore );
+ gui.open();
+
}
- private void prestigeByChat(CommandSender sender) {
-
- ListenersPrisonManager listenersPrisonManager = ListenersPrisonManager.get();
- listenersPrisonManager.chatEventActivator();
-
- Output.get().sendInfo(sender, messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_1) + " "
- + messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_2) + " " + messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_3));
- Output.get().sendInfo(sender, "&a" + messages.getString(MessagesConfig.StringID.spigot_message_prestiges_confirm));
- Output.get().sendInfo(sender, "&c" + messages.getString(MessagesConfig.StringID.spigot_message_prestiges_cancel));
-
- final Player player = getSpigotPlayer( sender );
- listenersPrisonManager.chatInteractData(player, ListenersPrisonManager.ChatMode.Prestige);
- }
+// @Command(identifier = "prestige", onlyPlayers = true)
+// public void prestigesPrestigeCommand(CommandSender sender) {
+//
+// if ( isPrisonConfig( "prestiges" ) || isPrisonConfig( "prestige.enabled" ) ) {
+//
+//
+// Optional ranksModule = Prison.get().getModuleManager().getModule( PrisonRanks.MODULE_NAME );
+// if ( !ranksModule.isPresent() || ranksModule.isPresent() && !ranksModule.get().isEnabled() ) {
+//
+// Output.get().sendWarn( sender, "The command '/prestige' is disabled because the Ranks module is not active." );
+// return;
+// }
+//
+//
+// prisonManagerPrestige(sender);
+// }
+// }
+
+// @Command( identifier = "gui prestige", description = "GUI Prestige",
+// aliases = {"prisonmanager prestige"} )
+// public void prisonManagerPrestige(CommandSender sender ) {
+//
+// if ( isPrisonConfig( "prestige.enabled" ) ) {
+//
+//
+// Optional ranksModule = Prison.get().getModuleManager().getModule( PrisonRanks.MODULE_NAME );
+// if ( !ranksModule.isPresent() || ranksModule.isPresent() && !ranksModule.get().isEnabled() ) {
+//
+// Output.get().sendWarn( sender, "The command '/gui prestiges' is disabled because the Ranks module is not active." );
+// return;
+// }
+//
+// if ( PrisonRanks.getInstance().getLadderManager().getLadder("prestiges") == null ) {
+// Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "ranks ladder create prestiges");
+// }
+//
+// PrisonRanks rankPlugin;
+//
+// ModuleManager modMan = Prison.get().getModuleManager();
+// Module module = modMan == null ? null : modMan.getModule( PrisonRanks.MODULE_NAME ).orElse( null );
+//
+// if ( module != null ) {
+//
+// rankPlugin = (PrisonRanks) module;
+//
+// LadderManager lm = null;
+// if (rankPlugin != null) {
+// lm = rankPlugin.getLadderManager();
+//
+// RankLadder ladderDefault = lm.getLadder("default");
+// if ( ( ladderDefault == null ||
+// !(ladderDefault.getLowestRank().isPresent()) ||
+// ladderDefault.getLowestRank().get().getName() == null)) {
+// Output.get().sendInfo(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_ladder_default_empty)));
+// return;
+// }
+//
+// RankLadder ladderPrestiges = lm.getLadder("prestiges");
+// if ( ( ladderPrestiges == null ||
+// !(ladderPrestiges.getLowestRank().isPresent()) ||
+// ladderPrestiges.getLowestRank().get().getName() == null)) {
+// Output.get().sendInfo(sender, SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_message_prestiges_empty)));
+// return;
+// }
+// }
+//
+//
+// if ( isPrisonConfig( "prestige.confirmation-enabled") && isPrisonConfig( "prestige.prestige-confirm-gui") ) {
+// try {
+//
+// Player player = getSpigotPlayer( sender );
+//
+// SpigotConfirmPrestigeGUI gui = new SpigotConfirmPrestigeGUI( player );
+// gui.open();
+// } catch (Exception ex) {
+// prestigeByChat( sender );
+// }
+// }
+// else if ( isPrisonConfig( "prestige.confirmation-enabled") ) {
+// prestigeByChat( sender );
+// }
+// else {
+// // Bypassing prestige confirmations:
+// Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "rankup prestiges");
+// }
+// }
+// }
+// else {
+// sender.sendMessage( "Prestiges are disabled. Refresh and then reconfigure config.yml and try again." );
+// }
+// }
+
+// private void prestigeByChat(CommandSender sender) {
+//
+// ListenersPrisonManager listenersPrisonManager = ListenersPrisonManager.get();
+// listenersPrisonManager.chatEventActivator();
+//
+// Output.get().sendInfo(sender, messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_1) + " "
+// + messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_2) + " " + messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_3));
+//
+// Output.get().sendInfo(sender, "&a" + messages.getString(MessagesConfig.StringID.spigot_message_prestiges_confirm));
+// Output.get().sendInfo(sender, "&c" + messages.getString(MessagesConfig.StringID.spigot_message_prestiges_cancel));
+//
+// final Player player = getSpigotPlayer( sender );
+// listenersPrisonManager.chatInteractData(player, ListenersPrisonManager.ChatMode.Prestige);
+// }
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotSellAllCommands.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotSellAllCommands.java
index 4c376d10b..d4108c081 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotSellAllCommands.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/commands/PrisonSpigotSellAllCommands.java
@@ -24,10 +24,12 @@
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.compat.Compatibility;
import tech.mcprison.prison.spigot.configs.MessagesConfig;
+import tech.mcprison.prison.spigot.game.SpigotOfflinePlayer;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.gui.sellall.SellAllAdminBlocksGUI;
import tech.mcprison.prison.spigot.sellall.SellAllBlockData;
import tech.mcprison.prison.spigot.sellall.SellAllUtil;
+import tech.mcprison.prison.spigot.utils.tasks.PlayerAutoRankupTask;
/**
* @author GABRYCA
@@ -236,20 +238,57 @@ private void sellAllAutoSellPerUserToggleable(CommandSender sender,
}
}
- @Command(identifier = "sellall sell", description = "SellAll sell command.", onlyPlayers = true)
+ @Command(identifier = "sellall sell", description = "SellAll sell command.", onlyPlayers = false)
public void sellAllSellCommand(CommandSender sender,
- @Arg(name = "notification", def="",
- description = "Notification about the sellall transaction. Defaults to normal. " +
- "'silent' suppresses results. [silent]") String notification ){
+ @Arg(name = "player", def = "", description = "An online player name to sell their inventory - " +
+ "Only console or prison commands can include this parameter") String playerName,
+ @Arg(name = "notification", def="",
+ description = "Notification about the sellall transaction. Defaults to normal. " +
+ "'silent' suppresses results. [silent]") String notification ){
if (!isEnabled()) return;
Player p = getSpigotPlayer(sender);
+
- if (p == null){
- Output.get().sendInfo(sender, "&cSorry but you can't use that from the console!");
+ boolean isOp = sender.isOp();
+
+ tech.mcprison.prison.internal.Player sPlayerAlt = getOnlinePlayer( sender, playerName );
+ if ( sPlayerAlt == null ){
+ // If sPlayerAlt is null then the value in playerName is really intended for notification:
+ notification = playerName;
+ }
+
+ if ( isOp && !sender.isPlayer() && sPlayerAlt != null ) {
+ // Only if OP and a valid player name was provided, then OP is trying to run this
+ // for another player
+
+ if ( !sPlayerAlt.isOnline() ) {
+ sender.sendMessage( "Player is not online." );
+ return;
+ }
+
+ // Set the active player to who OP specified:
+ p = ((SpigotPlayer) sPlayerAlt).getWrapper();
+ }
+
+
+ else if (p == null){
+
+ if ( getPlayer( sender, playerName ) != null ) {
+
+ Output.get().sendInfo(sender, "&cSorry but the specified player must be online "
+ + "[/sellall sell %s]", playerName );
+ }
+ else {
+
+ Output.get().sendInfo(sender, "&cSorry but you can't use that from the console!");
+ }
+
+
return;
}
+
SellAllUtil sellAllUtil = SellAllUtil.get();
if (sellAllUtil == null){
@@ -269,6 +308,9 @@ public void sellAllSellCommand(CommandSender sender,
boolean notifications = (notification != null && "silent".equalsIgnoreCase( notification ));
sellAllUtil.sellAllSell(p, false, notifications, true, true, false, true);
+
+ SpigotPlayer sPlayer = new SpigotPlayer( p );
+ PlayerAutoRankupTask.autoSubmitPlayerRankupTask( sPlayer, null );
}
@Command(identifier = "sellall hand", description = "Sell only what is in your hand if sellable.",
@@ -340,6 +382,11 @@ public void sellAllSell(Player p){
}
sellAllUtil.sellAllSell(p, true, false, true, true, false, true);
+
+
+ SpigotPlayer sPlayer = new SpigotPlayer( p );
+ PlayerAutoRankupTask.autoSubmitPlayerRankupTask( sPlayer, null );
+
}
@Command(identifier = "sellall delaysell", description = "Like SellAll Sell command but this will be delayed for some " +
@@ -375,11 +422,14 @@ public void sellAllSellWithDelayCommand(CommandSender sender){
}
if (!sellAllUtil.isAutoSellEarningNotificationDelayEnabled){
- sellAllSellCommand(sender, "silent");
+ sellAllSellCommand(sender, null, "silent");
return;
}
sellAllUtil.sellAllSell(p, false, false, false, false, true, false);
+
+ SpigotPlayer sPlayer = new SpigotPlayer( p );
+ PlayerAutoRankupTask.autoSubmitPlayerRankupTask( sPlayer, null );
}
@@ -655,7 +705,7 @@ private void sellAllMultiplierCommand(CommandSender sender){
TreeMap mults = new TreeMap<>( sellAllUtil.getPrestigeMultipliers() );
// TreeMap items = new TreeMap<>( sellAllUtil.getSellAllBlocks() );
- DecimalFormat fFmt = new DecimalFormat("#,##0.00");
+ DecimalFormat fFmt = Prison.get().getDecimalFormat("#,##0.00");
Set keys = mults.keySet();
@@ -929,7 +979,7 @@ private void sellAllListItems( CommandSender sender ) {
}
TreeMap items = new TreeMap<>( sellAllUtil.getSellAllBlocks() );
- DecimalFormat fFmt = new DecimalFormat("#,##0.00");
+ DecimalFormat fFmt = Prison.get().getDecimalFormat("#,##0.00");
Set keys = items.keySet();
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/configs/GuiConfig.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/configs/GuiConfig.java
index 938920fa6..904f97b4c 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/configs/GuiConfig.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/configs/GuiConfig.java
@@ -58,12 +58,20 @@ public void initialize() {
changeCount++;
}
- if ( conf.getList( "EditableLore.README" ) == null ) {
+ if ( conf.getList( "EditableLore.README-Updated-2022-12-22" ) == null ) {
List lore = new ArrayList<>();
lore.add(" ");
lore.add("&8-----------------------");
lore.add("&7 WARNING!! DO NOT EDIT THESE!!");
- lore.add("&7 THESE ARE JUST INFORMATIONAL NOTES AND WILL BE IGNORED BY PRISON.");
+ lore.add("&7 - THESE ARE JUST INFORMATIONAL NOTES AND WILL BE IGNORED BY PRISON.");
+ lore.add(" ");
+ lore.add("&7 PLEASE READ - IMPORTANT CHANGESE!!");
+ lore.add("&7 - You can safely remove other 'EditableLore.README*' notes since they ");
+ lore.add("&7 are now obsolete.");
+ lore.add("&7 - Remove everything under 'EditableLore.Mines' and then reload the GUI: ");
+ lore.add("&7 /prison reload gui ");
+ lore.add("&7 The Mines LORE layout has been updated and this will help apply the ");
+ lore.add("&7 new update to your configs");
lore.add("&8-----------------------");
lore.add("&7 There are three types of placeholders that will work with EditableLore:");
lore.add("&7 1. GUI placeholders");
@@ -74,11 +82,14 @@ public void initialize() {
lore.add("&7so they can be nested in the prison placeholders: ");
lore.add("&7 ");
lore.add("&7 For Ranks ONLY: ");
- lore.add("&7 {rankName} {rankTag} {rankPrice} {rankMultiplier} {ladderName} {linkedMines}");
- lore.add("&7 Not yet available in Ranks: {mineName} {mineTag} ");
+ lore.add("&7 {rankName} {rankTag} {rankPrice} {rankMultiplier}");
+ lore.add("&7 {ladderName} {linkedMines}");
+ lore.add("&7 {linkedMines}");
lore.add("&7 ");
lore.add("&7 For Mines ONLY: ");
- lore.add("&7 {mineName} {mineTag} {mineSize} {mineVolume} {mineRemaining} {mineRemaingPercent} ");
+ lore.add("&7 {mineName} {mineTag} {mineSize} {mineVolume} ");
+ lore.add("&7 {mineRemaining} {mineRemaingPercent} ");
+ lore.add("&7 {clickToTeleport} {lockStatus} {playerCount} {linkedRank} ");
lore.add("&8-----------------------");
lore.add("&7Prison placeholders can include any that are within these placeholder ");
lore.add("&7Groups: PLAYER, RANKS, RANKPLAYERS, MINES, STATSMINES, and STATSRANKS");
@@ -94,7 +105,7 @@ public void initialize() {
lore.add("&8-----------------------");
- conf.set("EditableLore.README", lore);
+ conf.set("EditableLore.README-Updated-2022-12-22", lore);
changeCount++;
}
@@ -140,11 +151,15 @@ public void initialize() {
lore.add(" ");
lore.add("&8-----------------------");
lore.add("&3Mine: &a{mineName} &r{mineTag}");
+ lore.add("&3Rank: &a{linkedRank}");
lore.add(" ");
lore.add("&3Size: &a{mineSize}");
lore.add("&3Volume: &a{mineVolume}");
lore.add("&3Blocks Remaining: &a{mineRemaining} &a{mineRemainingPercent}%");
+ lore.add("&3Players in Mine: &a{playerCount}");
lore.add(" ");
+ lore.add(" {clickToTeleport}");
+ lore.add(" {lockStatus}");
lore.add("&8-----------------------");
conf.set("EditableLore.Mines", lore);
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/configs/MessagesConfig.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/configs/MessagesConfig.java
index fa9109509..14d29f89d 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/configs/MessagesConfig.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/configs/MessagesConfig.java
@@ -121,7 +121,7 @@ public void reload(){
public enum StringID {
- spigot_gui_lore_click_to_add,
+// spigot_gui_lore_click_to_add,
spigot_gui_lore_click_to_add_backpack,
// spigot_gui_lore_click_to_cancel,
// spigot_gui_lore_click_to_close,
@@ -132,14 +132,14 @@ public enum StringID {
// spigot_gui_lore_click_to_edit,
// spigot_gui_lore_click_to_enable,
// spigot_gui_lore_click_to_increase,
- spigot_gui_lore_click_to_manage_rank,
+// spigot_gui_lore_click_to_manage_rank,
// spigot_gui_lore_click_to_open,
- spigot_gui_lore_click_to_rankup,
- spigot_gui_lore_click_to_rename,
- spigot_gui_lore_click_to_select,
- spigot_gui_lore_click_to_start_block_setup,
- spigot_gui_lore_click_to_teleport,
- spigot_gui_lore_click_to_use,
+// spigot_gui_lore_click_to_rankup,
+// spigot_gui_lore_click_to_rename,
+// spigot_gui_lore_click_to_select,
+// spigot_gui_lore_click_to_start_block_setup,
+// spigot_gui_lore_click_to_teleport,
+// spigot_gui_lore_click_to_use,
// spigot_gui_lore_click_left_to_confirm,
// spigot_gui_lore_click_left_to_edit,
@@ -156,42 +156,42 @@ public enum StringID {
// spigot_gui_lore_click_right_and_shift_to_disable,
// spigot_gui_lore_click_right_and_shift_to_toggle,
- spigot_gui_lore_backpack_id,
- spigot_gui_lore_blocks,
- spigot_gui_lore_blocktype,
- spigot_gui_lore_chance,
- spigot_gui_lore_command,
+// spigot_gui_lore_backpack_id,
+// spigot_gui_lore_blocks,
+// spigot_gui_lore_blocktype,
+// spigot_gui_lore_chance,
+// spigot_gui_lore_command,
spigot_gui_lore_currency,
// spigot_gui_lore_delay,
- spigot_gui_lore_id,
- spigot_gui_lore_info,
- spigot_gui_lore_minename,
+// spigot_gui_lore_id,
+// spigot_gui_lore_info,
+// spigot_gui_lore_minename,
// spigot_gui_lore_multiplier,
- spigot_gui_lore_name,
- spigot_gui_lore_owner,
- spigot_gui_lore_percentage,
+// spigot_gui_lore_name,
+// spigot_gui_lore_owner,
+// spigot_gui_lore_percentage,
// spigot_gui_lore_permission,
- spigot_gui_lore_players_at_rank,
+// spigot_gui_lore_players_at_rank,
// spigot_gui_lore_prestige_name,
// spigot_gui_lore_price,
- spigot_gui_lore_radius,
- spigot_gui_lore_rank_tag,
- spigot_gui_lore_reset_time,
- spigot_gui_lore_show_item,
- spigot_gui_lore_size,
- spigot_gui_lore_spawnpoint,
- spigot_gui_lore_volume,
+// spigot_gui_lore_radius,
+// spigot_gui_lore_rank_tag,
+// spigot_gui_lore_reset_time,
+// spigot_gui_lore_show_item,
+// spigot_gui_lore_size,
+// spigot_gui_lore_spawnpoint,
+// spigot_gui_lore_volume,
// spigot_gui_lore_value,
- spigot_gui_lore_world,
+// spigot_gui_lore_world,
spigot_gui_lore_disabled,
spigot_gui_lore_enabled,
- spigot_gui_lore_locked,
+// spigot_gui_lore_locked,
// spigot_gui_lore_next_page,
// spigot_gui_lore_prior_page,
spigot_gui_lore_rankup,
- spigot_gui_lore_selected,
- spigot_gui_lore_unlocked,
+// spigot_gui_lore_selected,
+// spigot_gui_lore_unlocked,
spigot_gui_lore_add_backpack_instruction_1,
spigot_gui_lore_add_backpack_instruction_2,
@@ -209,28 +209,28 @@ public enum StringID {
spigot_gui_lore_ranks_setup_8,
spigot_gui_lore_sellall_delay_use_1,
spigot_gui_lore_sellall_delay_use_2,
- spigot_gui_lore_set_mine_delay_instruction_1,
- spigot_gui_lore_set_mine_delay_instruction_2,
- spigot_gui_lore_set_mine_delay_instruction_3,
- spigot_gui_lore_show_item_description_1,
- spigot_gui_lore_show_item_description_2,
- spigot_gui_lore_show_item_description_3,
- spigot_gui_lore_skip_reset_instruction_1,
- spigot_gui_lore_skip_reset_instruction_2,
- spigot_gui_lore_skip_reset_instruction_3,
+// spigot_gui_lore_set_mine_delay_instruction_1,
+// spigot_gui_lore_set_mine_delay_instruction_2,
+// spigot_gui_lore_set_mine_delay_instruction_3,
+// spigot_gui_lore_show_item_description_1,
+// spigot_gui_lore_show_item_description_2,
+// spigot_gui_lore_show_item_description_3,
+// spigot_gui_lore_skip_reset_instruction_1,
+// spigot_gui_lore_skip_reset_instruction_2,
+// spigot_gui_lore_skip_reset_instruction_3,
spigot_gui_lore_autofeatures_button_description,
spigot_gui_lore_backpacks_button_description,
- spigot_gui_lore_disable_notifications,
- spigot_gui_lore_enable_radius_mode,
- spigot_gui_lore_enable_within_mode,
+// spigot_gui_lore_disable_notifications,
+// spigot_gui_lore_enable_radius_mode,
+// spigot_gui_lore_enable_within_mode,
spigot_gui_lore_mines_button_description,
spigot_gui_lore_no_multipliers,
spigot_gui_lore_ranks_button_description,
- spigot_gui_lore_rankup_if_enough_money,
+// spigot_gui_lore_rankup_if_enough_money,
spigot_gui_lore_sellall_button_description,
spigot_gui_lore_sellall_edit_info,
- spigot_gui_lore_tp_to_mine,
+// spigot_gui_lore_tp_to_mine,
spigot_message_missing_permission,
@@ -261,7 +261,7 @@ public enum StringID {
spigot_message_backpack_size_must_be_multiple_of_9,
spigot_message_prestiges_disabled,
- spigot_message_prestiges_empty,
+// spigot_message_prestiges_empty,
spigot_message_prestiges_or_gui_disabled,
spigot_message_prestiges_confirm,
spigot_message_prestiges_cancel,
@@ -342,16 +342,16 @@ public enum StringID {
spigot_message_gui_backpack_too_many,
spigot_message_gui_close_success,
spigot_message_gui_error,
- spigot_message_gui_error_empty,
- spigot_message_gui_ladder_empty,
+// spigot_message_gui_error_empty,
+// spigot_message_gui_ladder_empty,
spigot_message_gui_ladder_too_many,
spigot_message_gui_mines_empty,
spigot_message_gui_mines_too_many,
spigot_message_gui_prestiges_empty,
spigot_message_gui_prestiges_too_many,
- spigot_message_gui_ranks_empty,
- spigot_message_gui_ranks_rankup_commands_empty,
- spigot_message_gui_ranks_rankup_commands_too_many,
+// spigot_message_gui_ranks_empty,
+// spigot_message_gui_ranks_rankup_commands_empty,
+// spigot_message_gui_ranks_rankup_commands_too_many,
spigot_message_gui_ranks_too_many,
spigot_message_gui_reload_success,
// spigot_message_gui_sellall_disabled,
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/CustomItems.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/CustomItems.java
index 689756d4a..96aabd3dc 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/CustomItems.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/CustomItems.java
@@ -19,7 +19,7 @@
import tech.mcprison.prison.util.Location;
/**
- * Custom Items 3.7.11 — New API features
+ * Custom Items 3.7.11 New API features
This version adds two new features to the Custom Items API: listCustomItemIDs and listBlockCustomItemIDs
*
*/
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/PrisonItemAdderStartupListener.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/PrisonItemAdderStartupListener.java
new file mode 100644
index 000000000..988c02b75
--- /dev/null
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/PrisonItemAdderStartupListener.java
@@ -0,0 +1,62 @@
+package tech.mcprison.prison.spigot.customblock;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.PluginManager;
+
+import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent;
+import tech.mcprison.prison.output.Output;
+import tech.mcprison.prison.spigot.SpigotPrison;
+
+public class PrisonItemAdderStartupListener
+ implements Listener {
+
+
+ public PrisonItemAdderStartupListener() {
+ super();
+
+ initialize();
+ }
+
+ public void initialize() {
+
+
+ // Check to see if the class BlastUseEvent even exists:
+ try {
+ Output.get().logInfo( "PrisonItemAdderStartupListener: checking if loaded: ItemsAdder" );
+
+ Class.forName( "dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent", false,
+ this.getClass().getClassLoader() );
+
+ Output.get().logInfo( "PrisonItemAdderStartupListener: Trying to register ItemsAdder" );
+
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+ PluginManager pm = Bukkit.getServer().getPluginManager();
+
+ pm.registerEvents( this, prison);
+
+
+ }
+ catch ( ClassNotFoundException e ) {
+ // CrazyEnchants is not loaded... so ignore.
+ Output.get().logInfo( "PrisonItemAdderStartupListener: ItemsAdder is not loaded" );
+ }
+ catch ( Exception e ) {
+ Output.get().logInfo(
+ "PrisonItemAdderStartupListener: ItemsAdder failed to load. [%s]", e.getMessage() );
+ }
+
+ }
+
+ @EventHandler
+ public void onItemsAdderStartup( ItemsAdderLoadDataEvent e ) {
+
+ SpigotPrison prison = SpigotPrison.getInstance();
+
+ PrisonItemsAdder pia = new PrisonItemsAdder();
+
+ prison.registerIntegration( pia );
+ }
+}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/PrisonItemsAdder.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/PrisonItemsAdder.java
new file mode 100644
index 000000000..da8153d09
--- /dev/null
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/PrisonItemsAdder.java
@@ -0,0 +1,194 @@
+package tech.mcprison.prison.spigot.customblock;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import tech.mcprison.prison.integration.CustomBlockIntegration;
+import tech.mcprison.prison.internal.ItemStack;
+import tech.mcprison.prison.internal.Player;
+import tech.mcprison.prison.internal.block.Block;
+import tech.mcprison.prison.internal.block.PrisonBlock;
+import tech.mcprison.prison.internal.block.PrisonBlock.PrisonBlockType;
+import tech.mcprison.prison.output.Output;
+import tech.mcprison.prison.spigot.SpigotPrison;
+import tech.mcprison.prison.spigot.SpigotUtil;
+import tech.mcprison.prison.spigot.block.SpigotItemStack;
+import tech.mcprison.prison.spigot.game.SpigotPlayer;
+import tech.mcprison.prison.util.Location;
+
+public class PrisonItemsAdder
+ extends CustomBlockIntegration {
+
+ private PrisonItemsAdderWrapper itemsAdderWrapper;
+
+ public PrisonItemsAdder() {
+ super("ItemsAdder", "ItemsAdder", PrisonBlockType.ItemsAdder, "itemsadder:" );
+ }
+
+
+
+
+ @Override
+ public void integrate() {
+
+ // BluesSpigetSemVerComparator semVer = new BluesSpigetSemVerComparator();
+
+ if ( isRegistered()) {
+ try {
+
+ this.itemsAdderWrapper = new PrisonItemsAdderWrapper();
+
+
+ List prisonBlocks = getCustomBlockList();
+ for ( PrisonBlock block : prisonBlocks )
+ {
+ Output.get().logInfo( "#### Custom Block: " + block.toString() );
+ }
+
+ String message = String.format(
+ "Enabling ItemsAdder v%s custom blocks loaded: %d",
+ getVersion(),
+ prisonBlocks.size() );
+
+ Output.get().logInfo( "&7" + message + "enabled." );
+
+
+ }
+ catch ( NoClassDefFoundError | IllegalStateException e ) {
+ // ignore this exception since it means the plugin was not loaded
+ }
+ catch ( Exception e ) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+
+
+ @Override
+ public boolean hasIntegrated() {
+ return (itemsAdderWrapper != null);
+ }
+
+ @Override
+ public String getCustomBlockId( Block block ) {
+ return itemsAdderWrapper.getCustomBlockId( block );
+ }
+
+
+ public String getCustomBlockId( org.bukkit.block.Block spigotBlock ) {
+
+ return itemsAdderWrapper.getCustomBlockId( spigotBlock );
+ }
+
+ /**
+ * This function is supposed to identify if the given block is a custom block, and
+ * if it is a custom block, then this function will return the correct PrisonBlock
+ * to match it's type. The PrisonBlock that will be returned, will come from the
+ * collection of valid blocks that were generated upon server startup.
+ *
+ *
+ * If there is no match, then this function will return a null.
+ *
+ *
+ * It's also important to know that the original block that is retrieved from
+ * PrisonBlockTypes.getBlockTypesByName() is cloned prior to returning it to this
+ * function, so it's safe to do anything you want with it.
+ *
+ *
+ * @param block
+ * @return The matched and cloned PrisonBlock, otherwise it will return a null if no match.
+ */
+ @Override
+ public PrisonBlock getCustomBlock( Block block ) {
+ PrisonBlock results = null;
+
+ String customBlockId = getCustomBlockId( block );
+
+ if ( customBlockId != null ) {
+ results = SpigotPrison.getInstance().getPrisonBlockTypes()
+ .getBlockTypesByName( customBlockId );
+
+ if ( results != null ) {
+
+ Location loc = new Location( block.getLocation() );
+ results.setLocation( loc );
+ }
+ }
+
+ return results;
+ }
+
+ public PrisonBlock getCustomBlock( org.bukkit.block.Block spigotBlock ) {
+ PrisonBlock results = null;
+
+ String customBlockId = getCustomBlockId( spigotBlock );
+
+ if ( customBlockId != null ) {
+ results = SpigotPrison.getInstance().getPrisonBlockTypes()
+ .getBlockTypesByName( customBlockId );
+
+ if ( results != null ) {
+ Location loc = SpigotUtil.bukkitLocationToPrison( spigotBlock.getLocation() );
+
+ results.setLocation( loc );
+ }
+
+// SpigotBlock sBlock = new SpigotBlock();
+ }
+
+ return results;
+ }
+
+
+ @Override
+ public Block setCustomBlockId( Block block, String customId, boolean doBlockUpdate ) {
+ return itemsAdderWrapper.setCustomBlockId( block, customId, doBlockUpdate );
+ }
+
+
+ @Override
+ public void setCustomBlockIdAsync( PrisonBlock prisonBlock, Location location ) {
+ itemsAdderWrapper.setCustomBlockIdAsync( prisonBlock, location );
+ }
+
+ @Override
+ public List getDrops( Player player, PrisonBlock prisonBlock, ItemStack tool ) {
+
+ SpigotPlayer sPlayer = player != null && player instanceof SpigotPlayer ?
+ (SpigotPlayer) player : null;
+ SpigotItemStack sTool = tool != null && tool instanceof SpigotItemStack ?
+ (SpigotItemStack) tool : null;
+
+ List results = itemsAdderWrapper.getDrops( prisonBlock, sPlayer, sTool );
+
+ return results;
+ }
+
+ @Override
+ public List getCustomBlockList()
+ {
+ List results = new ArrayList<>();
+
+ for ( String block : itemsAdderWrapper.getCustomBlockList() ) {
+
+ PrisonBlock prisonBlock = new PrisonBlock( getBlockType(), block );
+
+ prisonBlock.setValid( true );
+ prisonBlock.setBlock( true );
+
+ results.add( prisonBlock );
+ }
+
+ return results;
+ }
+
+
+
+ @Override
+ public String getPluginSourceURL() {
+ return "https://polymart.org/resource/itemsadder-custom-items-etc.1851";
+ }
+
+
+}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/PrisonItemsAdderWrapper.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/PrisonItemsAdderWrapper.java
new file mode 100644
index 000000000..b327280e3
--- /dev/null
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/customblock/PrisonItemsAdderWrapper.java
@@ -0,0 +1,249 @@
+package tech.mcprison.prison.spigot.customblock;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import dev.lone.itemsadder.api.CustomBlock;
+import dev.lone.itemsadder.api.CustomStack;
+import dev.lone.itemsadder.api.ItemsAdder;
+import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
+import tech.mcprison.prison.autofeatures.AutoFeaturesWrapper;
+import tech.mcprison.prison.internal.block.Block;
+import tech.mcprison.prison.internal.block.PrisonBlock;
+import tech.mcprison.prison.internal.block.PrisonBlock.PrisonBlockType;
+import tech.mcprison.prison.output.Output;
+import tech.mcprison.prison.spigot.SpigotPrison;
+import tech.mcprison.prison.spigot.block.SpigotBlock;
+import tech.mcprison.prison.spigot.block.SpigotItemStack;
+import tech.mcprison.prison.spigot.game.SpigotPlayer;
+import tech.mcprison.prison.util.Location;
+
+public class PrisonItemsAdderWrapper {
+
+ private boolean supportsDrops = false;
+
+ private final SpigotPrison plugin;
+
+ public PrisonItemsAdderWrapper() {
+ this.plugin = SpigotPrison.getInstance();
+ }
+
+ public String getCustomBlockId( Block block ) {
+
+ org.bukkit.block.Block spigotBlock = ((SpigotBlock) block).getWrapper();
+
+ return getCustomBlockId( spigotBlock );
+ //return CustomItemsAPI.getCustomItemIDAtBlock( spigotBlock );
+ }
+
+ public String getCustomBlockId( org.bukkit.block.Block spigotBlock ) {
+
+ CustomBlock cBlock = CustomBlock.byAlreadyPlaced(spigotBlock);
+
+ return ( cBlock == null ? null : cBlock.getDisplayName() );
+ //return CustomItemsAPI.getCustomItemIDAtBlock( spigotBlock );
+ }
+
+
+ /**
+ * This should only be called when running in the bukkit synchronous thread.
+ *
+ *
+ * @param block
+ * @param customId
+ * @param doBlockUpdate
+ * @return
+ */
+ public Block setCustomBlockId( Block block, String customId, boolean doBlockUpdate ) {
+
+ String cBlockId = getCustomBlockId( block );
+
+ SpigotBlock sBlock = (SpigotBlock) block;
+
+ CustomBlock cBlock = CustomBlock.place( cBlockId, sBlock.getWrapper().getLocation() );
+
+ return SpigotBlock.getSpigotBlock( cBlock.getBlock() );
+
+
+// org.bukkit.block.Block spigotBlock = ((SpigotBlock) block).getWrapper();
+
+ // So to prevent this from causing lag, we will only get back the block with no updates
+ // This will allow this function to exit:
+// org.bukkit.block.Block resultBlock =
+// CustomItemsAPI.setCustomItemIDAtBlock( spigotBlock, customId, doBlockUpdate );
+
+// return SpigotBlock.getSpigotBlock( resultBlock );
+ }
+
+
+ /**
+ * This should only be ran through an asynchronous thread since it will submit a task
+ * on the bukkit synchronous thread to perform the actual update. This does not need to
+ * return a block.
+ *
+ *
+ * @param prisonBlock
+ * @param location
+ * @param doBlockUpdate
+ * @return
+ */
+ public void setCustomBlockIdAsync( PrisonBlock prisonBlock, Location location )
+ {
+
+ new BukkitRunnable() {
+ @Override
+ public void run() {
+
+
+ String cBlockId = getCustomBlockId( prisonBlock );
+
+ SpigotBlock sBlock = (SpigotBlock) location.getBlockAt();
+
+ @SuppressWarnings("unused")
+ CustomBlock cBlock = CustomBlock.place( cBlockId, sBlock.getWrapper().getLocation() );
+
+
+ // No physics update:
+
+// SpigotBlock sBlock = (SpigotBlock) location.getBlockAt();
+//
+// org.bukkit.block.Block spigotBlock = sBlock.getWrapper();
+ //org.bukkit.block.Block spigotBlock = ((SpigotBlock) prisonBlock).getWrapper();
+
+ // Request the block change, but we don't need the results so ignore it
+// org.bukkit.block.Block resultBlock =
+// CustomItemsAPI.setCustomItemIDAtBlock( spigotBlock, prisonBlock.getBlockName(), true );
+
+ }
+ }.runTaskLater( getPlugin(), 0 );
+
+ }
+
+ /**
+ *
+ */
+ public List getDrops( PrisonBlock prisonBlock, SpigotPlayer player, SpigotItemStack tool ) {
+ List results = new ArrayList<>();
+
+ if ( isSupportsDrops() &&
+ AutoFeaturesWrapper.getInstance().isBoolean( AutoFeatures.isUseCustomBlocksCustomItemsGetDrops ) &&
+ prisonBlock instanceof SpigotBlock ) {
+
+ SpigotBlock sBlock = (SpigotBlock) prisonBlock;
+
+ org.bukkit.block.Block bBlock = sBlock.getWrapper();
+ Player bPlayer = player.getWrapper();
+ ItemStack bTool = tool.getBukkitStack();
+
+ boolean includeSelfBlock = false;
+
+ if ( bBlock != null && bTool != null ) {
+
+
+
+ List drops = CustomBlock.getLoot( bBlock, bTool, includeSelfBlock );
+ StringBuilder sb = new StringBuilder();
+
+ if ( drops != null ) {
+
+ for (ItemStack iStack : drops ) {
+ SpigotItemStack sItemStack = new SpigotItemStack( iStack );
+
+ results.add( sItemStack );
+
+ sb.append( "[" ).append( sItemStack.toString() ).append( "]" );
+ }
+ }
+
+
+ String message = String.format(
+ "PrisonItemsAdder.getDrops() results for block: %s "
+ + "player: %s tool: %s drops: %s ",
+ bBlock == null ? "null" : prisonBlock.getBlockName(),
+ bPlayer == null ? "null" : player.getName(),
+ bTool == null ? "null" : bTool.toString(),
+ sb.toString()
+ );
+
+ Output.get().logDebug( message );
+ }
+ else {
+ if ( Output.get().isDebug() ) {
+ String message = String.format(
+ "PrisonItemsAdder.getDrops(): failed to provide non-null inputs. "
+ + "block: %s player: %s tool: %s",
+ bBlock == null ? "null" : prisonBlock.getBlockName(),
+ bPlayer == null ? "null" : player.getName(),
+ bTool == null ? "null" : tool.getName()
+ );
+
+ Output.get().logDebug( message );
+ }
+ }
+
+ }
+
+ if ( results.size() == 0 ) {
+
+ String itemsAdderBlockId = getCustomBlockId( prisonBlock );
+
+ org.bukkit.inventory.ItemStack bItemStack =
+ CustomBlock.getInstance( itemsAdderBlockId ).getItemStack();
+
+ SpigotItemStack sItemStack = new SpigotItemStack( bItemStack );
+
+ // Fix itemStack's displayName and set to the correct BlockType:
+ sItemStack.setPrisonBlock( prisonBlock );
+
+ results.add( sItemStack );
+ }
+
+ return results;
+ }
+
+
+ public List getCustomBlockList() {
+ List customList = new ArrayList<>();
+
+// List customListx = new ArrayList<>( CustomBlock.getNamespacedIdsInRegistry() );
+
+
+ List allItems = ItemsAdder.getAllItems();
+
+ for ( CustomStack cStack : allItems ) {
+ if ( cStack.isBlock() ) {
+ String namespace = cStack.getNamespacedID();
+ String name = cStack.getDisplayName();
+
+ Output.get().logDebug(
+ "ItemsAdder: namespacedID: %s displayName: %s PrisonBlock: %s:%s",
+ namespace,
+ name,
+ PrisonBlockType.ItemsAdder,
+ name
+ );
+
+ customList.add( namespace );
+ }
+ }
+
+ return customList;
+ }
+
+ public SpigotPrison getPlugin() {
+ return plugin;
+ }
+
+ public boolean isSupportsDrops() {
+ return supportsDrops;
+ }
+ public void setSupportsDrops(boolean supportsDrops) {
+ this.supportsDrops = supportsDrops;
+ }
+
+
+}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/economies/EssEconomyWrapper.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/economies/EssEconomyWrapper.java
index ff19a4a2f..b1cf349d8 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/economies/EssEconomyWrapper.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/economies/EssEconomyWrapper.java
@@ -9,7 +9,29 @@
import tech.mcprison.prison.internal.Player;
/**
- * A non-static wrapper of Essentials' annoyingly static {@link net.ess3.api.Economy} API.
+ * A non-static wrapper of Essentials' annoyingly static {@link net.ess3.api.Economy} API.
+ *
+ *
+ * Warning: There is a known issue with essentials where internally
+ * they are generating a NPE when trying it initially look up
+ * a player when their names do not match, or their UUIDs have
+ * been changed due to changing to an offline server. Basically
+ * it's an issue that has been troubling essentials for a while
+ * now (a few years), so they are internally generating a
+ * stack trace when they detect a certain condition. This
+ * stack trace is not able to be caught and suppressed by Prison,
+ * so as such, it may appear frequently within the servers
+ * console. The bottom line is that essentials still works
+ * even through they are generating this stack trace (they want
+ * to log a certain kind of condition) and prison still works.
+ * It just produces a ton of confusing garbage. It is unknown
+ * when they will fix their code and remove it.
+ *
+ *
+ * View this issue 3956 with the comment title: "Problem: EssentialsX is flooding
+ * my console with UUID errors!"
+ * https://github.com/EssentialsX/Essentials/issues/3956
+ *
*
* @author Faizaan A. Datoo
*/
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/economies/VaultEconomyWrapper.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/economies/VaultEconomyWrapper.java
index ae0f20c35..b34c0f9a8 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/economies/VaultEconomyWrapper.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/economies/VaultEconomyWrapper.java
@@ -7,6 +7,7 @@
import org.bukkit.plugin.RegisteredServiceProvider;
import net.milkbowl.vault.economy.EconomyResponse;
+import tech.mcprison.prison.Prison;
import tech.mcprison.prison.internal.Player;
import tech.mcprison.prison.output.Output;
import tech.mcprison.prison.spigot.SpigotUtil;
@@ -208,7 +209,7 @@ else if (economy != null) {
results = response.transactionSuccess();
if ( !results ) {
- DecimalFormat dFmt = new DecimalFormat("#,##0.00");
+ DecimalFormat dFmt = Prison.get().getDecimalFormat("#,##0.00");
String message = String.format(
"VaultEconomy.addBalance failed: %s amount: %s " +
"balance: %s error: %s",
@@ -256,7 +257,7 @@ public boolean removeBalance(Player player, double amount) {
results = response.transactionSuccess();
if ( !results ) {
- DecimalFormat dFmt = new DecimalFormat("#,##0.00");
+ DecimalFormat dFmt = Prison.get().getDecimalFormat("#,##0.00");
String message = String.format(
"VaultEconomy.removeBalance failed: %s amount: %s " +
"balance: %s error: %s",
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 ac9f715c6..758ca41a6 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
@@ -18,12 +18,16 @@
import tech.mcprison.prison.internal.inventory.Inventory;
import tech.mcprison.prison.internal.scoreboard.Scoreboard;
import tech.mcprison.prison.output.Output;
+import tech.mcprison.prison.ranks.PrisonRanks;
+import tech.mcprison.prison.ranks.data.RankPlayer;
import tech.mcprison.prison.util.Gamemode;
import tech.mcprison.prison.util.Location;
public class SpigotOfflinePlayer
implements OfflineMcPlayer {
+ private RankPlayer rankPlayer;
+
private OfflinePlayer offlinePlayer;
public SpigotOfflinePlayer(OfflinePlayer offlinePlayer) {
@@ -324,6 +328,13 @@ public void setTitle( String title, String subtitle, int fadeIn, int stay, int f
public void setActionBar( String actionBar ) {
}
+ public RankPlayer getRankPlayer() {
+ if ( rankPlayer == null ) {
+ rankPlayer = PrisonRanks.getInstance().getPlayerManager().getPlayer( this );
+ }
+ return rankPlayer;
+ }
+
@Override
public PlayerCache getPlayerCache() {
return PlayerCache.getInstance();
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 dd11d45d9..fc899a239 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
@@ -161,6 +161,61 @@ 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;
}
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 1bc40011e..cb91343e8 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
@@ -25,9 +25,6 @@
import com.cryptomorin.xseries.XMaterial;
import tech.mcprison.prison.Prison;
-import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig;
-import tech.mcprison.prison.autofeatures.AutoFeaturesFileConfig.AutoFeatures;
-import tech.mcprison.prison.autofeatures.AutoFeaturesWrapper;
import tech.mcprison.prison.mines.PrisonMines;
import tech.mcprison.prison.mines.data.Mine;
import tech.mcprison.prison.modules.Module;
@@ -46,14 +43,9 @@
import tech.mcprison.prison.spigot.compat.SpigotCompatibility;
import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
-import tech.mcprison.prison.spigot.gui.autofeatures.SpigotAutoBlockGUI;
-import tech.mcprison.prison.spigot.gui.autofeatures.SpigotAutoFeaturesGUI;
-import tech.mcprison.prison.spigot.gui.autofeatures.SpigotAutoPickupGUI;
-import tech.mcprison.prison.spigot.gui.autofeatures.SpigotAutoSmeltGUI;
import tech.mcprison.prison.spigot.gui.backpacks.BackpacksAdminGUI;
import tech.mcprison.prison.spigot.gui.backpacks.BackpacksAdminListGUI;
import tech.mcprison.prison.spigot.gui.backpacks.BackpacksAdminPlayerListGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
import tech.mcprison.prison.spigot.gui.mine.SpigotBlocksListGUI;
import tech.mcprison.prison.spigot.gui.mine.SpigotBlocksMineListGUI;
import tech.mcprison.prison.spigot.gui.mine.SpigotMineBlockPercentageGUI;
@@ -69,6 +61,7 @@
import tech.mcprison.prison.spigot.gui.rank.SpigotRankPriceGUI;
import tech.mcprison.prison.spigot.gui.rank.SpigotRankUPCommandsGUI;
import tech.mcprison.prison.spigot.gui.rank.SpigotRanksGUI;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
import tech.mcprison.prison.spigot.gui.sellall.SellAllAdminAutoSellGUI;
import tech.mcprison.prison.spigot.gui.sellall.SellAllAdminBlocksGUI;
import tech.mcprison.prison.spigot.gui.sellall.SellAllAdminGUI;
@@ -77,13 +70,16 @@
import tech.mcprison.prison.spigot.gui.sellall.SellAllPrestigesSetMultiplierGUI;
import tech.mcprison.prison.spigot.gui.sellall.SellAllPriceGUI;
import tech.mcprison.prison.spigot.sellall.SellAllUtil;
+import tech.mcprison.prison.spigot.utils.tasks.PlayerAutoRankupTask;
import tech.mcprison.prison.util.Text;
/**
* @author GABRYCA
* @author RoyalBlueRanger
*/
-public class ListenersPrisonManager implements Listener {
+public class ListenersPrisonManager
+ extends SpigotGUIMessages
+ implements Listener {
private static ListenersPrisonManager instance;
public static List activeGui = new ArrayList<>();
@@ -103,7 +99,7 @@ public class ListenersPrisonManager implements Listener {
public enum ChatMode{
RankName,
MineName,
- Prestige,
+// Prestige,
SellAll_Currency
}
@@ -212,9 +208,17 @@ public void onPlayerInteractEvent(PlayerInteractEvent e){
for (XMaterial xMaterialConf : items) {
if (xMaterialConf == inHandXMaterial) {
sellAllUtil.sellAllSell(p, false, false, true, false, false, true);
+
+ SpigotPlayer sPlayer = new SpigotPlayer( p );
+ PlayerAutoRankupTask.autoSubmitPlayerRankupTask( sPlayer, null );
+
return;
} else if (xMaterialConf == SpigotUtil.getXMaterial(p.getInventory().getItemInMainHand().getType())) {
sellAllUtil.sellAllSell(p, false, false, true, false, false, true);
+
+ SpigotPlayer sPlayer = new SpigotPlayer( p );
+ PlayerAutoRankupTask.autoSubmitPlayerRankupTask( sPlayer, null );
+
return;
}
}
@@ -833,7 +837,8 @@ private void backpacksList(Player p, String buttonNameMain, String[] parts) {
}
} else if (buttonNameMain.equalsIgnoreCase("Backpack")){
- BackpacksUtil.get().openBackpack(p);
+ String id = null;
+ BackpacksUtil.get().openBackpack(p, id);
} else {
BackpacksUtil.get().openBackpack(p, buttonNameMain.substring(9));
}
@@ -1275,7 +1280,7 @@ private void sellAllAdminGUI(InventoryClickEvent e, Player p, String buttonNameM
} else {
if (sellAllConfig.getConfigurationSection("Multiplier").getKeys(false).size() == 0) {
- Output.get().sendWarn(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_gui_error_empty));
+ guiRanksErrorEmptyMsg( new SpigotPlayer(p) );
e.setCancelled(true);
return;
} else {
@@ -1806,25 +1811,53 @@ private void playerPrestigesGUI(InventoryClickEvent e, Player p, String buttonNa
private void prestigeConfirmationGUI(InventoryClickEvent e, Player p, String buttonNameMain) {
+ String playerName = p.getName();
+
// 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'" );
+
+ 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( "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'" );
+ 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 + "." );
+
// Send a message to the player.
- Output.get().sendInfo(new SpigotPlayer(p), "&cCancelled");
- // Close the inventory.
- p.closeInventory();
+// 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);
}
@@ -2843,10 +2876,10 @@ private void radiusGUI(InventoryClickEvent e, Player p, String[] parts) {
private void modeAction(AsyncPlayerChatEvent e, Player p, String message) {
switch(mode){
- case Prestige:{
- prestigeAction(e, p, message);
- break;
- }
+// case Prestige:{
+// prestigeAction(e, p, message);
+// break;
+// }
case SellAll_Currency:{
sellAllCurrencyChat(e, p, message);
break;
@@ -2883,21 +2916,21 @@ 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 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) {
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 7067f1439..e5279fe08 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
@@ -27,6 +27,9 @@ public class SpigotGUIMenuTools
public static final String GUI_MENU_TOOLS_NBT_ENABLED = "guiNBT";
public static final String GUI_MENU_TOOLS_NBT_COMMAND = "guiNBTCommand";
+
+ public static final String GUI_MENU_TOOLS_NBT_RANK_NAME = "guiNBTRankName";
+ public static final String GUI_MENU_TOOLS_NBT_MINE_NAME = "guiNBTMineName";
private static SpigotGUIMenuTools instance;
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/backpacks/BackpacksAdminListGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/backpacks/BackpacksAdminListGUI.java
index 8a7603317..ee74a5f76 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/backpacks/BackpacksAdminListGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/backpacks/BackpacksAdminListGUI.java
@@ -1,29 +1,31 @@
package tech.mcprison.prison.spigot.gui.backpacks;
-import com.cryptomorin.xseries.XMaterial;
+import java.util.Set;
+
import org.bukkit.configuration.Configuration;
import org.bukkit.entity.Player;
+
+import com.cryptomorin.xseries.XMaterial;
+
import tech.mcprison.prison.spigot.backpacks.BackpacksUtil;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
-
-import java.util.Set;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author AnonymousGCA (GABRYCA)
* */
-public class BackpacksAdminListGUI extends SpigotGUIComponents {
+public class BackpacksAdminListGUI
+ extends SpigotGUIMessages {
private final Player p;
private final String playerBackpackName;
private final Configuration backpacksData = BackpacksUtil.get().getBackpacksData();
private final String loreShiftAndRightClickToDelete = guiRightClickShiftToDeleteMsg();
- private final String loreInfo = messages.getString(MessagesConfig.StringID.spigot_gui_lore_info);
- private final String lorePlayerOwner = messages.getString(MessagesConfig.StringID.spigot_gui_lore_owner);
- private final String loreBackpackID = messages.getString(MessagesConfig.StringID.spigot_gui_lore_backpack_id);
+ private final String loreInfo = guiRanksLoreInfoMsg();
+ private final String lorePlayerOwner = guiRanksLoreOwnerMsg();
+ private final String loreBackpackID = guiRanksLoreBackpackIdMsg();
public BackpacksAdminListGUI(Player p, String playerBackpackName){
this.p = p;
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotBlocksListGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotBlocksListGUI.java
index a8980a93b..8261be131 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotBlocksListGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotBlocksListGUI.java
@@ -10,16 +10,16 @@
import tech.mcprison.prison.internal.block.PrisonBlock;
import tech.mcprison.prison.internal.block.PrisonBlockTypes;
import tech.mcprison.prison.spigot.SpigotUtil;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author GABRYCA
*/
-public class SpigotBlocksListGUI extends SpigotGUIComponents {
+public class SpigotBlocksListGUI
+ extends SpigotGUIMessages {
private final Player p;
private final String mineName;
@@ -40,7 +40,7 @@ public void open(){
// Create the inventory
PrisonGUI gui = new PrisonGUI(p, dimension, "&3Mines -> BlocksList");
- ButtonLore lore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_start_block_setup), null);
+ ButtonLore lore = new ButtonLore(guiRanksLoreClickToStartBlockSetupMsg(), null);
// This will skip all BlockTypes that are invalid for the versions of MC that the server is running:
PrisonBlockTypes prisonBlockTypes = Prison.get().getPlatform().getPrisonBlockTypes();
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotBlocksMineListGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotBlocksMineListGUI.java
index 039035bd3..66a36c883 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotBlocksMineListGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotBlocksMineListGUI.java
@@ -1,23 +1,25 @@
package tech.mcprison.prison.spigot.gui.mine;
-import com.cryptomorin.xseries.XMaterial;
+import java.util.List;
+
import org.bukkit.entity.Player;
+
+import com.cryptomorin.xseries.XMaterial;
+
import tech.mcprison.prison.Prison;
import tech.mcprison.prison.internal.block.PrisonBlock;
import tech.mcprison.prison.internal.block.PrisonBlockTypes;
import tech.mcprison.prison.spigot.SpigotUtil;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
-
-import java.util.List;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author GABRYCA
*/
-public class SpigotBlocksMineListGUI extends SpigotGUIComponents {
+public class SpigotBlocksMineListGUI
+ extends SpigotGUIMessages {
private final Player p;
private final String mineName;
@@ -38,7 +40,7 @@ public void open(){
// Create the inventory
PrisonGUI gui = new PrisonGUI(p, dimension, "&3Select -> ShowBlock");
- ButtonLore lore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_select), null);
+ ButtonLore lore = new ButtonLore( guiRanksLoreClickToSelectMsg(), null);
// This will skip all BlockTypes that are invalid for the versions of MC that the server is running:
PrisonBlockTypes prisonBlockTypes = Prison.get().getPlatform().getPrisonBlockTypes();
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineBlockPercentageGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineBlockPercentageGUI.java
index 57a80989c..f37b2dfb2 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineBlockPercentageGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineBlockPercentageGUI.java
@@ -6,16 +6,16 @@
import tech.mcprison.prison.internal.block.PrisonBlock;
import tech.mcprison.prison.spigot.SpigotUtil;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author GABRYCA (AnonymousGCA)
*/
-public class SpigotMineBlockPercentageGUI extends SpigotGUIComponents {
+public class SpigotMineBlockPercentageGUI
+ extends SpigotGUIMessages {
private final Player p;
private final String mineName;
@@ -40,7 +40,7 @@ public void open() {
ButtonLore confirmButtonLore = new ButtonLore(createLore(
guiClickToConfirmMsg(),
guiRightClickToCancelMsg() ),
- createLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_percentage) + " " + val));
+ createLore( guiRanksLorePercentageMsg() + " " + val));
ButtonLore changeIncreaseValueLore = new ButtonLore( guiClickToIncreaseMsg(), null);
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineInfoGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineInfoGUI.java
index e4d5dc642..858c17949 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineInfoGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineInfoGUI.java
@@ -6,18 +6,18 @@
import tech.mcprison.prison.mines.data.Mine;
import tech.mcprison.prison.spigot.SpigotUtil;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools.GUIMenuPageData;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author GABRYCA
*/
-public class SpigotMineInfoGUI extends SpigotGUIComponents {
+public class SpigotMineInfoGUI
+ extends SpigotGUIMessages {
private final Player p;
private final Mine mine;
@@ -43,29 +43,36 @@ public void open(){
guiLeftClickToResetMsg(),
guiRightClickToToggleMsg(),
guiRightClickShiftToToggleMsg() ),
- createLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_skip_reset_instruction_1),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_skip_reset_instruction_2),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_skip_reset_instruction_3),
+ createLore(
+ guiRanksLoreSkipResetInstruction1Msg(),
+ guiRanksLoreSkipResetInstruction2Msg(),
+ guiRanksLoreSkipResetInstruction3Msg(),
"",
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_set_mine_delay_instruction_1),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_set_mine_delay_instruction_2),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_set_mine_delay_instruction_3)));
+ guiRanksLoreSetMineDelayInstruction1Msg(),
+ guiRanksLoreSetMineDelayInstruction2Msg(),
+ guiRanksLoreSetMineDelayInstruction3Msg() ));
- ButtonLore mineSpawnLore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_use), messages.getString(MessagesConfig.StringID.spigot_gui_lore_spawnpoint));
+ ButtonLore mineSpawnLore = new ButtonLore(
+ guiRanksLoreClickToUseMsg(),
+ guiRanksLoreSpawnPointMsg());
ButtonLore minesNotificationsLore = new ButtonLore( guiClickToOpenMsg(), guiClickToEditMsg() );
- ButtonLore minesTpLore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_teleport), messages.getString(MessagesConfig.StringID.spigot_gui_lore_tp_to_mine));
+ ButtonLore minesTpLore = new ButtonLore(
+ guiRanksLoreClickToTeleportMsg(),
+ guiRanksLoreTpToMineMsg() );
ButtonLore blocksOfTheMineLore = new ButtonLore(
guiClickToOpenMsg(),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_blocks));
+ guiRanksLoreBlocksMsg());
ButtonLore mineResetTimeLore = new ButtonLore(createLore( guiClickToOpenMsg() ),
createLore(
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_reset_time) + " &7" + mine.getResetTime()));
+ guiRanksLoreResetTimeMsg() + " &7" + mine.getResetTime()));
- ButtonLore mineRenameLore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_rename), messages.getString(MessagesConfig.StringID.spigot_gui_lore_minename) + " " + mineName);
+ ButtonLore mineRenameLore = new ButtonLore(
+ guiRanksLoreClickToRenameMsg(),
+ guiRanksLoreMineNameMsg() + " " + mineName);
// ButtonLore closeGUILore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_close), null);
// Create the button, set the material, amount, lore and name
@@ -91,10 +98,10 @@ public void open(){
// Lore
ButtonLore mineShowItemLore = new ButtonLore(createLore( guiClickToEditMsg() ),
createLore(
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_show_item) + " &7" + xMaterial.name(),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_show_item_description_1),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_show_item_description_2),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_show_item_description_3)
+ guiRanksLoreShowItemMsg() + " &7" + xMaterial.name(),
+ guiRanksLoreShowItemDescription1Msg(),
+ guiRanksLoreShowItemDescription2Msg(),
+ guiRanksLoreShowItemDescription3Msg()
));
// ItemStack
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineNotificationRadiusGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineNotificationRadiusGUI.java
index 962d0169e..3ea9a531a 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineNotificationRadiusGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineNotificationRadiusGUI.java
@@ -1,17 +1,19 @@
package tech.mcprison.prison.spigot.gui.mine;
-import com.cryptomorin.xseries.XMaterial;
import org.bukkit.entity.Player;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
+
+import com.cryptomorin.xseries.XMaterial;
+
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author GABRYCA (AnonymousGCA)
*/
-public class SpigotMineNotificationRadiusGUI extends SpigotGUIComponents {
+public class SpigotMineNotificationRadiusGUI
+ extends SpigotGUIMessages {
private final Player p;
private final String mineName;
@@ -36,7 +38,7 @@ public void open() {
ButtonLore confirmButtonLore = new ButtonLore(createLore(
guiLeftClickToConfirmMsg() ),
createLore(
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_radius) + " " + val,
+ guiRanksLoreRadiusMsg() + " " + val,
guiRightClickToCancelMsg() ));
ButtonLore changeIncreaseValueLore = new ButtonLore( guiClickToIncreaseMsg(), null);
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineNotificationsGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineNotificationsGUI.java
index 90368b47a..56f26608a 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineNotificationsGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineNotificationsGUI.java
@@ -7,16 +7,16 @@
import tech.mcprison.prison.mines.PrisonMines;
import tech.mcprison.prison.mines.data.Mine;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author GABRYCA
*/
-public class SpigotMineNotificationsGUI extends SpigotGUIComponents {
+public class SpigotMineNotificationsGUI
+ extends SpigotGUIMessages {
private final Player p;
private final String mineName;
@@ -37,9 +37,12 @@ public void open() {
Mine m = pMines.getMine(mineName);
String enabledOrDisabled = m.getNotificationMode().name();
- ButtonLore modeWithinLore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_select), messages.getString(MessagesConfig.StringID.spigot_gui_lore_enable_within_mode));
- ButtonLore modeRadiusLore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_select), messages.getString(MessagesConfig.StringID.spigot_gui_lore_enable_radius_mode));
- ButtonLore disabledModeLore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_select), messages.getString(MessagesConfig.StringID.spigot_gui_lore_disable_notifications));
+ ButtonLore modeWithinLore = new ButtonLore(
+ guiRanksLoreClickToSelectMsg(), guiRanksLoreEnableWithinModeMsg() );
+ ButtonLore modeRadiusLore = new ButtonLore(
+ guiRanksLoreClickToSelectMsg(), guiRanksLoreEnableRadiusModeMsg() );
+ ButtonLore disabledModeLore = new ButtonLore(
+ guiRanksLoreClickToSelectMsg(), guiRanksLoreDisableNotificationsMsg() );
ButtonLore closeGUILore = new ButtonLore( guiClickToCloseMsg(), null);
// Add button.
@@ -49,17 +52,17 @@ public void open() {
if (enabledOrDisabled.equalsIgnoreCase("disabled")){
// Add the selected lore
- disabledModeLore.addLineLoreDescription( messages.getString(MessagesConfig.StringID.spigot_gui_lore_selected) );
+ disabledModeLore.addLineLoreDescription( guiRanksLoreSelecteMsg() );
} else if (enabledOrDisabled.equalsIgnoreCase("within")){
// Add the selected lore
- modeWithinLore.addLineLoreDescription( messages.getString(MessagesConfig.StringID.spigot_gui_lore_selected) );
+ modeWithinLore.addLineLoreDescription( guiRanksLoreSelecteMsg() );
} else if (enabledOrDisabled.equalsIgnoreCase("radius")){
// Add the selected lore
- modeRadiusLore.addLineLoreDescription( messages.getString(MessagesConfig.StringID.spigot_gui_lore_selected) );
+ modeRadiusLore.addLineLoreDescription( guiRanksLoreSelecteMsg() );
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineResetTimeGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineResetTimeGUI.java
index 4fd611bbb..8d9295c04 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineResetTimeGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMineResetTimeGUI.java
@@ -1,17 +1,19 @@
package tech.mcprison.prison.spigot.gui.mine;
-import com.cryptomorin.xseries.XMaterial;
import org.bukkit.entity.Player;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
+
+import com.cryptomorin.xseries.XMaterial;
+
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author GABRYCA
*/
-public class SpigotMineResetTimeGUI extends SpigotGUIComponents {
+public class SpigotMineResetTimeGUI
+ extends SpigotGUIMessages {
private final Player p;
private final String mineName;
@@ -35,7 +37,7 @@ public void open() {
ButtonLore confirmButtonLore = new ButtonLore(createLore(
guiLeftClickToConfirmMsg(),
guiRightClickToCancelMsg() ),
- createLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_reset_time) + " " + val));
+ createLore( guiRanksLoreResetTimeMsg() + " " + val));
ButtonLore changeIncreaseValueLore = new ButtonLore( guiClickToIncreaseMsg(), null);
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMinesBlocksGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMinesBlocksGUI.java
index 96f6bd971..87af6340c 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMinesBlocksGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMinesBlocksGUI.java
@@ -8,17 +8,17 @@
import tech.mcprison.prison.mines.PrisonMines;
import tech.mcprison.prison.mines.data.Mine;
import tech.mcprison.prison.spigot.SpigotUtil;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author GABRYCA
* @author RoyalBlueRanger (rBluer)
*/
-public class SpigotMinesBlocksGUI extends SpigotGUIComponents {
+public class SpigotMinesBlocksGUI
+ extends SpigotGUIMessages {
private final Player p;
private final String mineName;
@@ -26,9 +26,9 @@ public class SpigotMinesBlocksGUI extends SpigotGUIComponents {
// Global Strings.
private final String loreShiftRightClickToDelete = guiRightClickShiftToDeleteMsg();
private final String loreClickToEditBlock = guiClickToEditMsg();
- private final String loreInfo = messages.getString(MessagesConfig.StringID.spigot_gui_lore_info);
- private final String loreChance = messages.getString(MessagesConfig.StringID.spigot_gui_lore_chance);
- private final String loreBlockType = messages.getString(MessagesConfig.StringID.spigot_gui_lore_blocktype);
+ private final String loreInfo = guiRanksLoreInfoMsg();
+ private final String loreChance = guiRanksLoreChanceMsg();
+ private final String loreBlockType = guiRanksLoreBlockTypeMsg();
public SpigotMinesBlocksGUI(Player p, String mineName){
this.p = p;
@@ -43,7 +43,7 @@ public void open(){
// Get Mine
Mine m = PrisonMines.getInstance().getMine(mineName);
- ButtonLore addBlockLore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_add), null);
+ ButtonLore addBlockLore = new ButtonLore( guiRanksLoreClickToAddMsg(), null);
// Add the button to the GUI.
gui.addButton(new Button(dimension - 1, XMaterial.LIME_STAINED_GLASS_PANE, addBlockLore, "&aAdd " + mineName));
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMinesGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMinesGUI.java
index 1a23be812..3493c0a1e 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMinesGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotMinesGUI.java
@@ -8,25 +8,26 @@
import com.cryptomorin.xseries.XMaterial;
+import tech.mcprison.prison.Prison;
import tech.mcprison.prison.internal.block.PrisonBlock;
import tech.mcprison.prison.mines.PrisonMines;
import tech.mcprison.prison.mines.data.Mine;
import tech.mcprison.prison.mines.data.PrisonSortableResults;
import tech.mcprison.prison.mines.managers.MineManager.MineSortOrder;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.gui.PrisonSetupGUI;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools.GUIMenuPageData;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
/**
* @author GABRYCA
* @author RoyalBlueRanger (rBluer)
*/
-public class SpigotMinesGUI extends SpigotGUIComponents {
+public class SpigotMinesGUI
+ extends SpigotGUIMessages {
private final Player p;
// private int counter;
@@ -79,13 +80,13 @@ public void open(){
// Global Strings.
String loreLeftClickOpen = guiLeftClickToOpenMsg();
String loreShiftRightClickToDelete = guiRightClickShiftToDeleteMsg();
- String loreInfo = messages.getString(MessagesConfig.StringID.spigot_gui_lore_info);
- String loreWorld = messages.getString(MessagesConfig.StringID.spigot_gui_lore_world);
- String loreSpawnPoint = messages.getString(MessagesConfig.StringID.spigot_gui_lore_spawnpoint);
- String loreResetTime = messages.getString(MessagesConfig.StringID.spigot_gui_lore_reset_time);
- String loreSizeOfMine = messages.getString(MessagesConfig.StringID.spigot_gui_lore_size);
- String loreVolume = messages.getString(MessagesConfig.StringID.spigot_gui_lore_volume);
- String loreBlocks = messages.getString(MessagesConfig.StringID.spigot_gui_lore_blocks);
+ String loreInfo = guiRanksLoreInfoMsg();
+ String loreWorld = guiRanksLoreWorldMsg();
+ String loreSpawnPoint = guiRanksLoreSpawnPointMsg();
+ String loreResetTime = guiRanksLoreResetTimeMsg();
+ String loreSizeOfMine = guiRanksLoreSizeMsg();
+ String loreVolume = guiRanksLoreVolumeMsg();
+ String loreBlocks = guiRanksLoreBlocksMsg();
for ( Mine m : minesDisplay )
@@ -111,7 +112,7 @@ public void open(){
minesLore.addLineLoreDescription("&7" + loreBlocks);
// Init some variables and do the actions
- DecimalFormat dFmt = new DecimalFormat("##0.00");
+ DecimalFormat dFmt = Prison.get().getDecimalFormat("##0.00");
double totalChance = 0.0d;
for (PrisonBlock block : m.getPrisonBlocks()) {
@@ -159,7 +160,7 @@ public void open(){
// minesLore.addLineLoreDescription("&7" + loreBlocks);
//
// // Init some variables and do the actions
-// DecimalFormat dFmt = new DecimalFormat("##0.00");
+// DecimalFormat dFmt = Prison.get().getDecimalFormat("##0.00");
// double totalChance = 0.0d;
//
//
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotPlayerMinesGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotPlayerMinesGUI.java
index 6967f8c0d..f3161c9ad 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotPlayerMinesGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/mine/SpigotPlayerMinesGUI.java
@@ -9,7 +9,9 @@
import com.cryptomorin.xseries.XMaterial;
+import de.tr7zw.nbtapi.NBTItem;
import me.clip.placeholderapi.PlaceholderAPI;
+import tech.mcprison.prison.Prison;
import tech.mcprison.prison.mines.PrisonMines;
import tech.mcprison.prison.mines.data.Mine;
import tech.mcprison.prison.mines.data.PrisonSortableResults;
@@ -17,28 +19,29 @@
import tech.mcprison.prison.output.Output;
import tech.mcprison.prison.spigot.SpigotUtil;
import tech.mcprison.prison.spigot.configs.GuiConfig;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools.GUIMenuPageData;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+import tech.mcprison.prison.spigot.gui.rank.SpigotGUIMessages;
+import tech.mcprison.prison.spigot.nbt.PrisonNBTUtil;
import tech.mcprison.prison.util.Text;
/**
* @author GABRYCA
* @author RoyalBlueRanger (rBluer)
*/
-public class SpigotPlayerMinesGUI extends SpigotGUIComponents {
+public class SpigotPlayerMinesGUI
+ extends SpigotGUIMessages {
private final Player p;
private final SpigotPlayer spigotPlayer;
private final String permissionWarpPlugin = guiConfig.getString("Options.Mines.PermissionWarpPlugin");
- private final String statusUnlockedMine = messages.getString(MessagesConfig.StringID.spigot_gui_lore_unlocked);
- private final String clickToTeleport = messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_teleport);
- private final String statusLockedMine = messages.getString(MessagesConfig.StringID.spigot_gui_lore_locked);
+ private final String statusUnlockedMine = guiRanksLoreUnlockedMsg();
+ private final String clickToTeleport = guiRanksLoreClickToTeleportMsg();
+ private final String statusLockedMine = guiRanksLoreLockedMsg();
private int page;
private String cmdPage;
@@ -95,10 +98,11 @@ public void open() {
guiConfig = guiConfigClass.getFileGuiConfig();
String permission = Text.translateAmpColorCodes(permissionWarpPlugin);
- // Create GUI.
+ // Create GUI but use the gui title as defined within the ConfigGui.yml file:
PrisonGUI gui = new PrisonGUI(p, guiPageData.getDimension(), guiConfig.getString("Options.Titles.PlayerMinesGUI"));
-
+
+ // Load the generic mine LORE that would be displayed first:
List configCustomLore = guiConfig.getStringList("EditableLore.Mines");
@@ -110,6 +114,7 @@ public void open() {
ButtonLore minesLore = new ButtonLore();
+ // If a mine has custom LORE, then try to load it:
String mineLoreKey = "EditableLore.Mine." + m.getName();
List mineLore = new ArrayList<>( configCustomLore );
List mineLore2 = guiConfig.getStringList( mineLoreKey );
@@ -125,15 +130,35 @@ public void open() {
// Get Mine Name.
String mineName = m.getName();
- // Add mineName lore for TP.
- minesLore.addLineLoreAction( "&3" + mineName );
+// // Add mineName lore for TP.
+// minesLore.addLineLoreAction( "&3" + mineName );
+
+ boolean hasMineAccess = m.hasMiningAccess(spigotPlayer);
+ String permMineAccess = permission + m.getName();
+ boolean hasPermMine = p.hasPermission( permMineAccess );
+ String permAccess = permission.substring(0, permission.length() - 1);
+ boolean hasPerm = p.hasPermission( permAccess );
+
+ String lockStatus = statusLockedMine;
// If the player has permission to access the mine, then see if there is a custom
// block set for the mine... otherwise it will use XMaterial.COAL_ORE:
- if (m.hasMiningAccess(spigotPlayer) || p.hasPermission(permission + m.getName()) ||
- p.hasPermission(permission.substring(0, permission.length() - 1)))
+ if ( hasMineAccess ||
+ hasPermMine ||
+ hasPerm )
{
+
+ if ( !hasMineAccess ) {
+ Output.get().logInfo(
+ "GUI Player Mines: Has access to mine %s through perms: %s=%s OR %s=%s",
+ m.getName(),
+ permMineAccess, Boolean.toString(hasPermMine),
+ permAccess, Boolean.toString(hasPerm)
+ );
+ }
+
+
// Default to COAL_ORE since the player has access to the mine:
xMat = XMaterial.COAL_ORE;
@@ -160,15 +185,17 @@ public void open() {
}
}
+ lockStatus = statusUnlockedMine;
+
// material = ( mineMaterial == null ? Material.COAL_ORE : mineMaterial);
- minesLore.addLineLoreDescription( statusUnlockedMine );
- minesLore.addLineLoreAction( clickToTeleport );
+// minesLore.addLineLoreDescription( statusUnlockedMine );
+// minesLore.addLineLoreAction( clickToTeleport );
}
else {
xMat = XMaterial.REDSTONE_BLOCK;
// material = XMaterial.REDSTONE_BLOCK.parseMaterial();
- minesLore.addLineLoreDescription( statusLockedMine );
+// minesLore.addLineLoreDescription( statusLockedMine );
}
// Get mine Tag, but make sure it is valid and the mine's name is not null:
@@ -179,7 +206,7 @@ public void open() {
mineTag = m.getTag();
}
- DecimalFormat iFmt = new DecimalFormat( "#,##0" );
+ DecimalFormat iFmt = Prison.get().getDecimalFormatInt();
for (String stringValue : mineLore) {
@@ -195,6 +222,18 @@ public void open() {
stringValue = stringValue.replace( "{mineRemaining}", iFmt.format( remaining ));
stringValue = stringValue.replace( "{mineRemainingPercent}", iFmt.format( m.getPercentRemainingBlockCount() ));
+ stringValue = stringValue.replace( "{clickToTeleport}", clickToTeleport );
+ stringValue = stringValue.replace( "{lockStatus}", lockStatus );
+
+ stringValue = stringValue.replace( "{playerCount}", iFmt.format( m.getPlayerCount()) );
+
+ if ( m.getRank() == null ) {
+ stringValue = stringValue.replace( "{linkedRank}", "Not linked" );
+ }
+ else {
+ stringValue = stringValue.replace( "{linkedRank}", m.getRank().getTag() );
+ }
+
minesLore.addLineLoreAction( stringValue );
}
@@ -207,10 +246,26 @@ public void open() {
minesLore.setLoreAction( lores );
}
+
+
+ Button itemMine = new Button(null, xMat, minesLore, "&3" + mineTag);
+
+ String mineTeleportCommand =
+ Output.stringFormat(
+ "mines tp %s %s",
+ m.getName(),
+ p.getName() );
+ // Before adding the button, add an NBT tag for the command and rank name:
+ PrisonNBTUtil nbtUtil = new PrisonNBTUtil();
+ NBTItem nbtItem = nbtUtil == null ? null : nbtUtil.getNBT( itemMine.getButtonItem());
+ nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_ENABLED, "true");
+ nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_COMMAND, mineTeleportCommand );
+ nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_MINE_NAME, m.getName() );
+
// Add the button to the inventory.
- gui.addButton(new Button(null, xMat, minesLore, "&3" + mineTag));
+ gui.addButton( itemMine );
// String mineTag = m.getTag();
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotConfirmPrestigeGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotConfirmPrestigeGUI.java
index c852e82c9..95c3b9a6a 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotConfirmPrestigeGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotConfirmPrestigeGUI.java
@@ -1,10 +1,11 @@
package tech.mcprison.prison.spigot.gui.rank;
+import java.util.List;
+
import org.bukkit.entity.Player;
import com.cryptomorin.xseries.XMaterial;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
@@ -15,31 +16,52 @@
*/
public class SpigotConfirmPrestigeGUI extends SpigotGUIComponents {
- private final Player p;
+ private final Player player;
+ private final List lore;
- public SpigotConfirmPrestigeGUI(Player p) {
- this.p = p;
+ public SpigotConfirmPrestigeGUI(Player player, List lore ) {
+ this.player = player;
+ this.lore = lore;
}
-
+
public void open(){
-
- // Create the inventory
- int dimension = 9;
- PrisonGUI gui = new PrisonGUI(p, dimension, "&3Prestige -> Confirmation");
-
- ButtonLore confirmLore = new ButtonLore(createLore(
- guiClickToConfirmMsg()), createLore(
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_1),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_2),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_3)));
-
- ButtonLore cancelLore = new ButtonLore( guiClickToCancelMsg(), null);
-
-
- // Create the button, set up the material, amount, lore and name
- gui.addButton(new Button(2, XMaterial.EMERALD_BLOCK, confirmLore, "&3Confirm: Prestige" ));
- gui.addButton(new Button(6, XMaterial.REDSTONE_BLOCK, cancelLore, "&3Cancel: Don't Prestige" ));
-
- gui.open();
+
+ // Create the inventory
+ int dimension = 9;
+ PrisonGUI gui = new PrisonGUI( player, dimension, "&3Prestige -> Confirmation");
+
+ ButtonLore confirmLore = new ButtonLore(createLore(
+ guiClickToConfirmMsg()), lore );
+
+ ButtonLore cancelLore = new ButtonLore( guiClickToCancelMsg(), null);
+
+
+ // Create the button, set up the material, amount, lore and name
+ gui.addButton(new Button(2, XMaterial.EMERALD_BLOCK, confirmLore, "&3Confirm: Prestige" ));
+ gui.addButton(new Button(6, XMaterial.REDSTONE_BLOCK, cancelLore, "&3Cancel: Don't Prestige" ));
+
+ gui.open();
}
+
+// public void open(){
+//
+// // Create the inventory
+// int dimension = 9;
+// PrisonGUI gui = new PrisonGUI(p, dimension, "&3Prestige -> Confirmation");
+//
+// ButtonLore confirmLore = new ButtonLore(createLore(
+// guiClickToConfirmMsg()), createLore(
+// messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_1),
+// messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_2),
+// messages.getString(MessagesConfig.StringID.spigot_gui_lore_prestige_warning_3)));
+//
+// ButtonLore cancelLore = new ButtonLore( guiClickToCancelMsg(), null);
+//
+//
+// // Create the button, set up the material, amount, lore and name
+// gui.addButton(new Button(2, XMaterial.EMERALD_BLOCK, confirmLore, "&3Confirm: Prestige" ));
+// gui.addButton(new Button(6, XMaterial.REDSTONE_BLOCK, cancelLore, "&3Cancel: Don't Prestige" ));
+//
+// gui.open();
+// }
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotGUIMessages.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotGUIMessages.java
new file mode 100644
index 000000000..bec585c42
--- /dev/null
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotGUIMessages.java
@@ -0,0 +1,345 @@
+package tech.mcprison.prison.spigot.gui.rank;
+
+import tech.mcprison.prison.internal.CommandSender;
+import tech.mcprison.prison.spigot.SpigotPrison;
+import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
+
+public class SpigotGUIMessages
+ extends SpigotGUIComponents {
+
+
+ protected void exampleMsg( CommandSender sender, String parameter ) {
+ SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_examples__" )
+ .withReplacements(
+ parameter )
+ .sendTo( sender );
+ }
+
+ protected String exampleReturnMsg( String parameter ) {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_examples__" )
+ .withReplacements(
+ parameter )
+ .localize();
+ }
+
+
+
+ protected void guiRanksNoRanksMsg( CommandSender sender ) {
+ SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_message_gui_ranks_empty" )
+ .sendTo( sender );
+ }
+
+ protected String guiRanksClickToManageRankMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_click_to_manage_rank" )
+ .localize();
+ }
+
+ protected String guiRanksLoreInfoMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_info" )
+ .localize();
+ }
+
+ protected String guiRanksLoreIdMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_id" )
+ .localize();
+ }
+
+ protected String guiRanksLoreNameMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_name" )
+ .localize();
+ }
+
+ protected String guiRanksLoreRankTagMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_rank_tag" )
+ .localize();
+ }
+
+ protected String guiRanksLorePlayersWithRankMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_players_at_rank" )
+ .localize();
+ }
+
+
+ protected String guiRanksLoreCommandMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_command" )
+ .localize();
+ }
+
+ protected String guiRanksLoreOwnerMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_owner" )
+ .localize();
+ }
+
+ protected String guiRanksLoreBackpackIdMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_backpack_id" )
+ .localize();
+ }
+
+ protected String guiRanksLoreChanceMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_chance" )
+ .localize();
+ }
+
+ protected String guiRanksLoreBlockTypeMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_blocktype" )
+ .localize();
+ }
+
+ protected String guiRanksLoreClickToAddMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_click_to_add" )
+ .localize();
+ }
+
+ protected String guiRanksLoreClickToUseMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_click_to_use" )
+ .localize();
+ }
+
+ protected String guiRanksLoreWorldMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_world" )
+ .localize();
+ }
+
+ protected String guiRanksLoreSpawnPointMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_spawnpoint" )
+ .localize();
+ }
+
+ protected String guiRanksLoreResetTimeMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_reset_time" )
+ .localize();
+ }
+
+ protected String guiRanksLoreSizeMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_size" )
+ .localize();
+ }
+
+ protected String guiRanksLoreVolumeMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_volume" )
+ .localize();
+ }
+
+ protected String guiRanksLoreBlocksMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_blocks" )
+ .localize();
+ }
+
+ protected String guiRanksLoreSkipResetInstruction1Msg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_skip_reset_instruction_1" )
+ .localize();
+ }
+
+ protected String guiRanksLoreSkipResetInstruction2Msg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_skip_reset_instruction_2" )
+ .localize();
+ }
+
+ protected String guiRanksLoreSkipResetInstruction3Msg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_skip_reset_instruction_3" )
+ .localize();
+ }
+
+ protected String guiRanksLoreSetMineDelayInstruction1Msg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_set_mine_delay_instruction_1" )
+ .localize();
+ }
+
+ protected String guiRanksLoreSetMineDelayInstruction2Msg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_set_mine_delay_instruction_2" )
+ .localize();
+ }
+
+ protected String guiRanksLoreSetMineDelayInstruction3Msg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_set_mine_delay_instruction_3" )
+ .localize();
+ }
+
+ protected String guiRanksLoreClickToTeleportMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_click_to_teleport" )
+ .localize();
+ }
+
+ protected String guiRanksLoreTpToMineMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_tp_to_mine" )
+ .localize();
+ }
+
+ protected String guiRanksLoreClickToRenameMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_click_to_rename" )
+ .localize();
+ }
+
+ protected String guiRanksLoreMineNameMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_minename" )
+ .localize();
+ }
+
+ protected String guiRanksLoreShowItemMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_show_item" )
+ .localize();
+ }
+
+ protected String guiRanksLoreShowItemDescription1Msg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_show_item_description_1" )
+ .localize();
+ }
+
+ protected String guiRanksLoreShowItemDescription2Msg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_show_item_description_2" )
+ .localize();
+ }
+
+ protected String guiRanksLoreShowItemDescription3Msg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_show_item_description_3" )
+ .localize();
+ }
+
+ protected String guiRanksLoreUnlockedMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_unlocked" )
+ .localize();
+ }
+
+ protected String guiRanksLoreLockedMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_locked" )
+ .localize();
+ }
+
+ protected String guiRanksLoreClickToSelectMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_click_to_select" )
+ .localize();
+ }
+
+ protected String guiRanksLoreEnableWithinModeMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_enable_within_mode" )
+ .localize();
+ }
+
+ protected String guiRanksLoreEnableRadiusModeMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_enable_radius_mode" )
+ .localize();
+ }
+
+ protected String guiRanksLoreDisableNotificationsMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_disable_notifications" )
+ .localize();
+ }
+
+ protected String guiRanksLoreSelecteMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_selected" )
+ .localize();
+ }
+
+ protected String guiRanksLoreRadiusMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_radius" )
+ .localize();
+ }
+
+ protected String guiRanksLorePercentageMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_percentage" )
+ .localize();
+ }
+
+ protected String guiRanksLoreClickToStartBlockSetupMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_click_to_start_block_setup" )
+ .localize();
+ }
+
+
+
+ protected void guiRanksLadderIsEmptyMsg( CommandSender sender, String ladderName ) {
+ SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_message_gui_ladder_empty" )
+ .withReplacements(
+ ladderName )
+ .sendTo( sender );
+ }
+
+
+ protected String guiRanksLoreClickToRankupMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_click_to_rankup" )
+ .localize();
+ }
+
+ protected String guiRanksLoreRankupIfEnoughMoneyMsg() {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_gui_lore_rankup_if_enough_money" )
+ .localize();
+ }
+
+
+
+ protected void guiRanksPrestigesLadderIsEmptyMsg( CommandSender sender ) {
+ SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_message_prestiges_empty" )
+ .sendTo( sender );
+ }
+
+
+ protected void guiRanksRankupCommandsEmptyMsg( CommandSender sender ) {
+ SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_message_gui_ranks_rankup_commands_empty" )
+ .sendTo( sender );
+ }
+
+ protected void guiRanksErrorEmptyMsg( CommandSender sender ) {
+ SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_message_gui_error_empty" )
+ .sendTo( sender );
+ }
+
+ protected void guiRanksRankupCommandsTooManyMsg( CommandSender sender ) {
+ SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_message_gui_ranks_rankup_commands_too_many" )
+ .sendTo( sender );
+ }
+
+
+}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotLaddersGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotLaddersGUI.java
index f66041e75..f74411182 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotLaddersGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotLaddersGUI.java
@@ -6,24 +6,21 @@
import com.cryptomorin.xseries.XMaterial;
-import tech.mcprison.prison.output.Output;
import tech.mcprison.prison.ranks.PrisonRanks;
import tech.mcprison.prison.ranks.data.RankLadder;
import tech.mcprison.prison.ranks.managers.LadderManager;
-import tech.mcprison.prison.spigot.SpigotPrison;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools.GUIMenuPageData;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
/**
* @author GABRYCA
*/
-public class SpigotLaddersGUI extends SpigotGUIComponents {
+public class SpigotLaddersGUI
+ extends SpigotGUIMessages {
private final Player p;
@@ -53,7 +50,7 @@ public void open(){
// If the inventory is empty
if (lm == null || lm.getLadders().size() == 0){
- Output.get().sendWarn(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_gui_ladder_empty));
+ guiRanksLadderIsEmptyMsg( new SpigotPlayer(p), "" );
p.closeInventory();
return;
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotPlayerPrestigesGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotPlayerPrestigesGUI.java
index fd372e1da..139a8e11c 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotPlayerPrestigesGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotPlayerPrestigesGUI.java
@@ -24,19 +24,18 @@
import tech.mcprison.prison.ranks.managers.LadderManager;
import tech.mcprison.prison.ranks.managers.PlayerManager;
import tech.mcprison.prison.spigot.SpigotPrison;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools.GUIMenuPageData;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
/**
* @author GABRYCA
*/
-public class SpigotPlayerPrestigesGUI extends SpigotGUIComponents {
+public class SpigotPlayerPrestigesGUI
+ extends SpigotGUIMessages {
private final Player player;
private PrisonRanks rankPlugin;
@@ -144,7 +143,8 @@ public void open() {
// Create the inventory and set up the owner, dimensions or number of slots, and title
// int dimension = (int) (Math.ceil(ladder.getRanks().size() / 9D) * 9) + 9;
- PrisonGUI gui = new PrisonGUI(getPlayer(), guiPageData.getDimension(), guiConfig.getString("Options.Titles.PlayerPrestigesGUI"));
+ PrisonGUI gui = new PrisonGUI(getPlayer(), guiPageData.getDimension(),
+ guiConfig.getString("Options.Titles.PlayerPrestigesGUI"));
// dead code:
// if ( ladder == null ){
@@ -153,7 +153,7 @@ public void open() {
// }
if (!ladder.getLowestRank().isPresent()){
- Output.get().sendWarn(new SpigotPlayer(player), messages.getString(MessagesConfig.StringID.spigot_message_prestiges_empty));
+ guiRanksPrestigesLadderIsEmptyMsg( new SpigotPlayer(player) );
return;
}
@@ -181,7 +181,7 @@ public void open() {
int hackyCounterEnchant = 0;
// Global strings.
- String loreInfo = messages.getString(MessagesConfig.StringID.spigot_gui_lore_info);
+ String loreInfo = guiRanksLoreInfoMsg();
// String lorePrice3 = messages.getString(MessagesConfig.StringID.spigot_gui_lore_price);
// Global boolean.
@@ -242,12 +242,17 @@ public void open() {
SpigotGUIMenuTools.getInstance().addMenuPageButtonsStandard( gui, guiPageData );
+
+ if (Prison.get().getPlatform().getConfigBooleanTrue( "ranks.gui-prestiges-include-rankup-button") ) {
+
+ ButtonLore rankupLore = new ButtonLore( guiRanksLoreClickToRankupMsg(),
+ guiRanksLoreRankupIfEnoughMoneyMsg() );
+ Button rankupButton = new Button(0, XMaterial.EMERALD_BLOCK, rankupLore, "&aPrestige" );
+ // NOTE: Button position will be properly assigned in the setButtonNextAvilable:
+ gui.addButton( guiPageData.setButtonNextAvailable( rankupButton ) );
+
+ }
- ButtonLore rankupLore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_rankup), messages.getString(MessagesConfig.StringID.spigot_gui_lore_rankup_if_enough_money));
- Button rankupButton = new Button(0, XMaterial.EMERALD_BLOCK, rankupLore, "&aPrestige" );
- // NOTE: Button position will be properly assigned in the setButtonNextAvilable:
- gui.addButton( guiPageData.setButtonNextAvailable( rankupButton ) );
-
// Open GUI.
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotPlayerRanksGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotPlayerRanksGUI.java
index ab41bf0c6..d59b2aec3 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotPlayerRanksGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotPlayerRanksGUI.java
@@ -28,14 +28,12 @@
import tech.mcprison.prison.ranks.managers.LadderManager;
import tech.mcprison.prison.ranks.managers.PlayerManager;
import tech.mcprison.prison.spigot.SpigotPrison;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools.GUIMenuPageData;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
import tech.mcprison.prison.spigot.nbt.PrisonNBTUtil;
import tech.mcprison.prison.util.Text;
@@ -43,7 +41,8 @@
* @author GABRYCA
* @author RoyalBlueRanger (rBluer)
*/
-public class SpigotPlayerRanksGUI extends SpigotGUIComponents {
+public class SpigotPlayerRanksGUI
+ extends SpigotGUIMessages {
private final Player player;
@@ -130,14 +129,14 @@ public void open() {
// Ensure ladder is present and that it has a rank:
if ( ladder == null || !ladder.getLowestRank().isPresent()){
- Output.get().sendWarn(new SpigotPlayer(getPlayer()), messages.getString(MessagesConfig.StringID.spigot_message_gui_ladder_empty) + " [" + guiConfig.getString("Options.Ranks.Ladder") + "]");
+ guiRanksLadderIsEmptyMsg( new SpigotPlayer(getPlayer()), guiConfig.getString("Options.Ranks.Ladder") );
getPlayer().closeInventory();
return;
}
// Get the dimensions and if needed increases them
if (ladder.getRanks().size() == 0) {
- Output.get().sendWarn(new SpigotPlayer(getPlayer()), messages.getString(MessagesConfig.StringID.spigot_message_gui_ranks_empty));
+ guiRanksNoRanksMsg( new SpigotPlayer(getPlayer()) );
return;
}
@@ -178,8 +177,8 @@ public void open() {
boolean enchantmentEffectEnabled = getBoolean(guiConfig.getString("Options.Ranks.Enchantment_effect_current_rank"));
// Decimal Rank cost format.
- DecimalFormat formatDecimal = new DecimalFormat("###,##0.00");
- DecimalFormat mFmt = new DecimalFormat("###,##0.0000");
+ DecimalFormat formatDecimal = Prison.get().getDecimalFormat("###,##0.00");
+ DecimalFormat mFmt = Prison.get().getDecimalFormat("###,##0.0000");
boolean showNumber = getBoolean(guiConfig.getString("Options.Ranks.Number_of_Rank_Player_GUI"));
// PlayerRank pRank = rankPlayerFactory.getRank( getRankPlayer(), ladder, true );
@@ -202,6 +201,20 @@ public void open() {
double rankPrice = calPRank.getRankCost();
double rankMultiplier = calPRank.getRankMultiplier();
+ StringBuilder sbMines = new StringBuilder();
+ if ( rank.getMines() != null && rank.getMines().size() > 0 ) {
+
+ for (ModuleElement mine : rank.getMines() ) {
+ if ( sbMines.length() > 0 ) {
+ sbMines.append( " " );
+ }
+ sbMines.append( mine.getTag() );
+ }
+ }
+ else {
+ sbMines.append( "&3None" );
+ }
+
for ( String stringValue : rankLore ) {
String currency = (rank.getCurrency() == null ||
@@ -219,14 +232,6 @@ public void open() {
stringValue = stringValue.replace("{rankMultiplier}", mFmt.format( rankMultiplier ));
stringValue = stringValue.replace("{ladderName}", rank.getLadder().getName());
- StringBuilder sbMines = new StringBuilder();
- for ( ModuleElement mine : rank.getMines() )
- {
- if ( sbMines.length() > 0 ) {
- sbMines.append( ", " );
- }
- sbMines.append( mine.getName() );
- }
stringValue = stringValue.replace("{linkedMines}", sbMines.toString() );
ranksLore.addLineLoreAction(stringValue);
@@ -261,6 +266,15 @@ public void open() {
}
}
+
+ // Before adding the button, add an NBT tag for the command and rank name:
+ PrisonNBTUtil nbtUtil = new PrisonNBTUtil();
+ NBTItem nbtItem = nbtUtil == null ? null : nbtUtil.getNBT( itemRank.getButtonItem());
+ nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_ENABLED, "true");
+// nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_COMMAND, noCommmand );
+ nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_RANK_NAME, rank.getName() );
+
+
gui.addButton(itemRank);
// rank = rank.getRankNext();
@@ -273,23 +287,35 @@ public void open() {
SpigotGUIMenuTools.getInstance().addMenuPageButtonsStandard( gui, guiPageData );
-
- // Add Rankup button: Using NBTs:
- String rankupTitle = ladderName.equalsIgnoreCase("prestiges") ? "Prestige" : "Rankup";
- ButtonLore rankupLore = new ButtonLore(messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_rankup), messages.getString(MessagesConfig.StringID.spigot_gui_lore_rankup_if_enough_money));
- Button rankupButton = new Button( 0, XMaterial.EMERALD_BLOCK, rankupLore, rankupTitle );
- String rankupCommand = "rankup " + (ladderName.equalsIgnoreCase("default") ? "" : ladderName);
-
- PrisonNBTUtil nbtUtil = new PrisonNBTUtil();
- NBTItem nbtItem = nbtUtil == null ? null : nbtUtil.getNBT(rankupButton.getButtonItem());
- nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_ENABLED, "true");
- nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_COMMAND, rankupCommand);
-
+ if ( LadderManager.LADDER_DEFAULT.equalsIgnoreCase( ladderName ) &&
+ Prison.get().getPlatform().getConfigBooleanTrue( "ranks.gui-default-include-rankup-button") ||
+ LadderManager.LADDER_PRESTIGES.equalsIgnoreCase( ladderName ) &&
+ Prison.get().getPlatform().getConfigBooleanTrue( "ranks.gui-prestiges-include-rankup-button") ||
+ !LadderManager.LADDER_DEFAULT.equalsIgnoreCase( ladderName ) &&
+ !LadderManager.LADDER_PRESTIGES.equalsIgnoreCase( ladderName ) &&
+ Prison.get().getPlatform().getConfigBooleanTrue( "ranks.gui-others-include-rankup-button")
+ ) {
+
+ // Add Rankup button: Using NBTs:
+ String rankupTitle = ladderName.equalsIgnoreCase("prestiges") ? "Prestige" : "Rankup";
+
+ ButtonLore rankupLore = new ButtonLore( guiRanksLoreClickToRankupMsg(),
+ guiRanksLoreRankupIfEnoughMoneyMsg());
+
+ Button rankupButton = new Button( 0, XMaterial.EMERALD_BLOCK, rankupLore, rankupTitle );
+ String rankupCommand = "rankup " + (ladderName.equalsIgnoreCase("default") ? "" : ladderName);
+
+ PrisonNBTUtil nbtUtil = new PrisonNBTUtil();
+ NBTItem nbtItem = nbtUtil == null ? null : nbtUtil.getNBT(rankupButton.getButtonItem());
+ nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_ENABLED, "true");
+ nbtUtil.setNBTString(nbtItem, SpigotGUIMenuTools.GUI_MENU_TOOLS_NBT_COMMAND, rankupCommand);
+
// SpigotPrison.format(messages.getString(MessagesConfig.StringID.spigot_gui_lore_rankup)));
- // NOTE: Button position will be properly assigned in the setButtonNextAvilable:
- gui.addButton( guiPageData.setButtonNextAvailable( rankupButton ) );
-
-
+ // NOTE: Button position will be properly assigned in the setButtonNextAvilable:
+ gui.addButton( guiPageData.setButtonNextAvailable( rankupButton ) );
+
+ }
+
// Open GUI.
gui.open();
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRankManagerGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRankManagerGUI.java
index 140c5387c..e687ef08a 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRankManagerGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRankManagerGUI.java
@@ -6,23 +6,23 @@
import com.cryptomorin.xseries.XMaterial;
+import tech.mcprison.prison.Prison;
import tech.mcprison.prison.placeholders.PlaceholdersUtil;
import tech.mcprison.prison.ranks.PrisonRanks;
import tech.mcprison.prison.ranks.data.PlayerRank;
import tech.mcprison.prison.ranks.data.Rank;
import tech.mcprison.prison.ranks.data.RankPlayer;
import tech.mcprison.prison.ranks.data.RankPlayerFactory;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
/**
* @author GABRYCA
*/
-public class SpigotRankManagerGUI extends SpigotGUIComponents {
+public class SpigotRankManagerGUI
+ extends SpigotGUIMessages {
private final Player p;
private final Rank rank;
@@ -45,7 +45,7 @@ public void open() {
ButtonLore rankupCommandsLore = new ButtonLore( guiLeftClickToOpenMsg(), null);
// Decimal Rank cost format.
- DecimalFormat formatDecimal = new DecimalFormat("###,##0.00");
+ DecimalFormat formatDecimal = Prison.get().getDecimalFormat("###,##0.00");
RankPlayerFactory rankPlayerFactory = new RankPlayerFactory();
@@ -62,14 +62,12 @@ public void open() {
ButtonLore editPriceLore = new ButtonLore(
createLore( guiLeftClickToOpenMsg()),
- createLore(
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_info),
+ createLore( guiRanksLoreInfoMsg(),
guiPriceMsg( rankCost) ));
ButtonLore editTagLore = new ButtonLore(createLore( guiLeftClickToOpenMsg() ),
- createLore(
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_info),
- messages.getString(MessagesConfig.StringID.spigot_gui_lore_rank_tag) + " " + rank.getTag()));
+ createLore( guiRanksLoreInfoMsg(),
+ guiRanksLoreRankTagMsg() + " " + rank.getTag()));
ButtonLore closeGUILore = new ButtonLore( guiClickToCloseMsg(), null);
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRankUPCommandsGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRankUPCommandsGUI.java
index 9ff9009b2..c8f398838 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRankUPCommandsGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRankUPCommandsGUI.java
@@ -4,28 +4,26 @@
import com.cryptomorin.xseries.XMaterial;
-import tech.mcprison.prison.output.Output;
import tech.mcprison.prison.ranks.data.Rank;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
/**
* @author GABRYCA
*/
-public class SpigotRankUPCommandsGUI extends SpigotGUIComponents {
+public class SpigotRankUPCommandsGUI
+ extends SpigotGUIMessages {
private final Player p;
private final Rank rank;
// Global Strings.
private final String shiftRightClickToDelete = guiRightClickShiftToDeleteMsg();
- private final String loreInfo = messages.getString(MessagesConfig.StringID.spigot_gui_lore_info);
- private final String loreCommand = messages.getString(MessagesConfig.StringID.spigot_gui_lore_command);
-
+ private final String loreInfo = guiRanksLoreInfoMsg();
+ private final String loreCommand = guiRanksLoreCommandMsg();
+
public SpigotRankUPCommandsGUI(Player p, Rank rank) {
this.p = p;
this.rank = rank;
@@ -39,7 +37,7 @@ public void open() {
}
if (rank.getRankUpCommands().size() == 0){
- Output.get().sendWarn(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_gui_ranks_rankup_commands_empty));
+ guiRanksRankupCommandsEmptyMsg( new SpigotPlayer(p) );
return;
}
@@ -48,14 +46,14 @@ public void open() {
// If the inventory is empty
if (dimension == 0){
- Output.get().sendWarn(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_gui_error_empty));
+ guiRanksErrorEmptyMsg( new SpigotPlayer(p) );
p.closeInventory();
return;
}
// If the dimension's too big, don't open the GUI
if (dimension > 54){
- Output.get().sendWarn(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_gui_ranks_rankup_commands_too_many));
+ guiRanksRankupCommandsTooManyMsg( new SpigotPlayer(p) );
p.closeInventory();
return;
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRanksGUI.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRanksGUI.java
index 833f664a6..cb392ec87 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRanksGUI.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/gui/rank/SpigotRanksGUI.java
@@ -7,23 +7,22 @@
import com.cryptomorin.xseries.XMaterial;
-import tech.mcprison.prison.output.Output;
+import tech.mcprison.prison.Prison;
import tech.mcprison.prison.placeholders.PlaceholdersUtil;
import tech.mcprison.prison.ranks.data.Rank;
import tech.mcprison.prison.ranks.data.RankLadder;
-import tech.mcprison.prison.spigot.configs.MessagesConfig;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools;
import tech.mcprison.prison.spigot.gui.SpigotGUIMenuTools.GUIMenuPageData;
import tech.mcprison.prison.spigot.gui.guiutility.Button;
import tech.mcprison.prison.spigot.gui.guiutility.ButtonLore;
import tech.mcprison.prison.spigot.gui.guiutility.PrisonGUI;
-import tech.mcprison.prison.spigot.gui.guiutility.SpigotGUIComponents;
/**
* @author GABRYCA
*/
-public class SpigotRanksGUI extends SpigotGUIComponents {
+public class SpigotRanksGUI
+ extends SpigotGUIMessages {
private final Player p;
private final RankLadder ladder;
@@ -53,7 +52,7 @@ public void open(){
// Get the dimensions and if needed increases them
if (ladder == null || ladder.getRanks().size() == 0) {
- Output.get().sendWarn(new SpigotPlayer(p), messages.getString(MessagesConfig.StringID.spigot_message_gui_ranks_empty));
+ guiRanksNoRanksMsg( new SpigotPlayer(p) );
return;
}
@@ -75,16 +74,16 @@ public void open(){
// Global Strings.
String loreShiftRightClickDelete = guiRightClickShiftToDeleteMsg();
- String loreClickToManageRank = messages.getString(MessagesConfig.StringID.spigot_gui_lore_click_to_manage_rank);
- String loreInfo = messages.getString(MessagesConfig.StringID.spigot_gui_lore_info);
- String loreId = messages.getString(MessagesConfig.StringID.spigot_gui_lore_id);
- String loreName = messages.getString(MessagesConfig.StringID.spigot_gui_lore_name);
- String loreTag2 = messages.getString(MessagesConfig.StringID.spigot_gui_lore_rank_tag);
+ String loreClickToManageRank = guiRanksClickToManageRankMsg();
+ String loreInfo = guiRanksLoreInfoMsg();
+ String loreId = guiRanksLoreIdMsg();
+ String loreName = guiRanksLoreNameMsg();
+ String loreTag2 = guiRanksLoreRankTagMsg();
// String lorePrice3 = messages.getString(MessagesConfig.StringID.spigot_gui_lore_price);
- String lorePlayersWithRank = messages.getString(MessagesConfig.StringID.spigot_gui_lore_players_at_rank);
+ String lorePlayersWithRank = guiRanksLorePlayersWithRankMsg();
// Decimal Rank cost format.
- DecimalFormat formatDecimal = new DecimalFormat("###,##0.00");
+ DecimalFormat formatDecimal = Prison.get().getDecimalFormat("###,##0.00");
// Only loop over the blocks that we need to show:
for ( Rank rank : ranksDisplay )
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/nbt/PrisonNBTUtil.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/nbt/PrisonNBTUtil.java
index 7fa01561c..07b8f68f7 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/nbt/PrisonNBTUtil.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/nbt/PrisonNBTUtil.java
@@ -6,8 +6,23 @@
import de.tr7zw.nbtapi.NBTItem;
import tech.mcprison.prison.output.Output;
+/**
+ * This class manages the use of NBTs within prison so it's a common interface
+ * that is consistent and works properly.
+ *
+ *
+ * This class has debug logging, but by default it is turned off to keep it from
+ * getting to be too verbose in the logs. The idea is that once a section of code
+ * is working then it does not need to have debugging enabled. So this is used
+ * more for testing new sections of code.
+ *
+ *
+ * @author Blue
+ *
+ */
public class PrisonNBTUtil {
+ private boolean enableDebugLogging = false;
public NBTItem getNBT( ItemStack bukkitStack ) {
NBTItem nbtItemStack = null;
@@ -16,7 +31,10 @@ public NBTItem getNBT( ItemStack bukkitStack ) {
try {
nbtItemStack = new NBTItem( bukkitStack, true );
- nbtDebugLog( nbtItemStack, "getNbt" );
+ if ( isEnableDebugLogging() ) {
+ nbtDebugLog( nbtItemStack, "getNbt" );
+ }
+
} catch (Exception e) {
// ignore - the bukkit item stack is not compatible with the NBT library
}
@@ -32,7 +50,7 @@ private void nbtDebugLog( NBTItem nbtItem, String desc ) {
int sysId = System.identityHashCode(iStack);
- String message = String.format(
+ String message = Output.stringFormat(
"NBT %s ItemStack for %s: %s sysId: %d",
desc,
iStack.hasItemMeta() && iStack.getItemMeta().hasDisplayName() ?
@@ -72,8 +90,19 @@ public void setNBTString( NBTItem nbtItem, String key, String value ) {
if ( nbtItem != null ) {
nbtItem.setString( key, value );
- nbtDebugLog( nbtItem, "setNBTString" );
+
+ if ( isEnableDebugLogging() ) {
+ nbtDebugLog( nbtItem, "setNBTString" );
+ }
}
}
+
+
+ public boolean isEnableDebugLogging() {
+ return enableDebugLogging;
+ }
+ public void setEnableDebugLogging(boolean enableDebugLogging) {
+ this.enableDebugLogging = enableDebugLogging;
+ }
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/MVdWPlaceholderIntegration.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/MVdWPlaceholderIntegration.java
index e479e9630..44c020524 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/MVdWPlaceholderIntegration.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/MVdWPlaceholderIntegration.java
@@ -1,23 +1,5 @@
package tech.mcprison.prison.spigot.placeholder;
-import java.util.List;
-import java.util.function.Function;
-
-import org.bukkit.Bukkit;
-
-import tech.mcprison.prison.PrisonAPI;
-import tech.mcprison.prison.internal.Player;
-import tech.mcprison.prison.mines.PrisonMines;
-import tech.mcprison.prison.mines.managers.MineManager;
-import tech.mcprison.prison.output.Output;
-import tech.mcprison.prison.placeholders.PlaceHolderKey;
-import tech.mcprison.prison.placeholders.PlaceholderIdentifier;
-import tech.mcprison.prison.placeholders.PlaceholderIntegration;
-import tech.mcprison.prison.ranks.PrisonRanks;
-import tech.mcprison.prison.ranks.managers.PlayerManager;
-import tech.mcprison.prison.ranks.managers.RankManager;
-import tech.mcprison.prison.util.Text;
-
/**
* This hooks up the registration when the Prison plugin starts to run.
* The MVdWPlaceholderIntegrationWrapper sets up the registrations. It should
@@ -35,186 +17,187 @@
*
*/
public class MVdWPlaceholderIntegration
- extends PlaceholderIntegration {
+// extends PlaceholderIntegration
+ {
- private MVdWPlaceholderIntegrationWrapper placeholderWrapper;
+// private MVdWPlaceholderIntegrationWrapper placeholderWrapper;
+//
+// public MVdWPlaceholderIntegration() {
+// super( "MVdWPlaceholderAPI", "MVdWPlaceholderAPI" );
+// }
- public MVdWPlaceholderIntegration() {
- super( "MVdWPlaceholderAPI", "MVdWPlaceholderAPI" );
- }
+// @Override
+// public void integrate() {
+// if ( isRegistered()) {
+// try {
+// if ( Bukkit.getPluginManager().isPluginEnabled(getProviderName())) {
+//
+//
+// // The integration was written for MVdW v3.0.0, but if used with older versions
+// // it will fail.
+//
+// // This will fail if the version of mvdw is v2.x.x, which is what we want:
+// Class.forName("be.maximvdw.placeholderapi.PlaceholderAPI", false, getClass().getClassLoader());
+//
+// MVdWPlaceholderIntegrationWrapper wrap = new MVdWPlaceholderIntegrationWrapper(getProviderName());
+//
+// placeholderWrapper = wrap;
+//
+// PrisonAPI.getIntegrationManager().addDeferredInitialization( this );
+// }
+// }
+// catch ( NoClassDefFoundError e ) {
+// // ignore this exception since it means the plugin was not loaded
+// Output.get().logWarn( "Attempted to enable the MVdWPlaceholderIntegration but it failed to find the " +
+// "class 'be.maximvdw.placeholderapi.PlaceholderAPI'. This could happen when using " +
+// "MVdWPlaceholderApi v2.x.x. Prison ONLY support MVdW v3.x.x. " +
+// "&c****&7 Try using PlaceholderAPI (papi) instead. &c****" );
+// }
+// catch ( IllegalStateException e ) {
+// // ignore ... plugin is not loaded
+// }
+// catch ( Exception e ) {
+// e.printStackTrace();
+// }
+// }
+// }
- @Override
- public void integrate() {
- if ( isRegistered()) {
- try {
- if ( Bukkit.getPluginManager().isPluginEnabled(getProviderName())) {
-
-
- // The integration was written for MVdW v3.0.0, but if used with older versions
- // it will fail.
-
- // This will fail if the version of mvdw is v2.x.x, which is what we want:
- Class.forName("be.maximvdw.placeholderapi.PlaceholderAPI", false, getClass().getClassLoader());
-
- MVdWPlaceholderIntegrationWrapper wrap = new MVdWPlaceholderIntegrationWrapper(getProviderName());
-
- placeholderWrapper = wrap;
-
- PrisonAPI.getIntegrationManager().addDeferredInitialization( this );
- }
- }
- catch ( NoClassDefFoundError e ) {
- // ignore this exception since it means the plugin was not loaded
- Output.get().logWarn( "Attempted to enable the MVdWPlaceholderIntegration but it failed to find the " +
- "class 'be.maximvdw.placeholderapi.PlaceholderAPI'. This could happen when using " +
- "MVdWPlaceholderApi v2.x.x. Prison ONLY support MVdW v3.x.x. " +
- "&c****&7 Try using PlaceholderAPI (papi) instead. &c****" );
- }
- catch ( IllegalStateException e ) {
- // ignore ... plugin is not loaded
- }
- catch ( Exception e ) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- *
Register both the player and mines placeholders with the MVdW plugin.
- *
- */
- @Override
- public void deferredInitialization()
- {
- boolean registered = false;
- if ( PrisonRanks.getInstance() != null && PrisonRanks.getInstance().isEnabled() ) {
-
- PlayerManager pm = PrisonRanks.getInstance().getPlayerManager();
- if ( pm != null ) {
- List placeholderPlayerKeys = pm.getTranslatedPlaceHolderKeys();
-
- for ( PlaceHolderKey placeHolderKey : placeholderPlayerKeys ) {
- if ( !placeHolderKey.getPlaceholder().isSuppressed() ) {
-
-
- registerPlaceholder(placeHolderKey.getKey(),
- player -> {
-
- PlaceholderIdentifier identifier = new PlaceholderIdentifier( placeHolderKey.getPlaceholder().name() );
- identifier.setPlayer( player.getUUID(), player.getName() );
-
- if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
-
- pm.getTranslatePlayerPlaceHolder( identifier );
- }
-
-
- return Text.translateAmpColorCodes( identifier.getText() );
- });
- if ( !registered ) {
- registered = true;
- }
- }
- }
- }
-
- RankManager rm = PrisonRanks.getInstance().getRankManager();
- if ( rm != null ) {
- List placeholderPlayerKeys = rm.getTranslatedPlaceHolderKeys();
-
- for ( PlaceHolderKey placeHolderKey : placeholderPlayerKeys ) {
- if ( !placeHolderKey.getPlaceholder().isSuppressed() ) {
-
-
- registerPlaceholder(placeHolderKey.getKey(),
- player -> {
-
- PlaceholderIdentifier identifier = new PlaceholderIdentifier( placeHolderKey.getPlaceholder().name() );
- identifier.setPlayer( player.getUUID(), player.getName() );
-
- if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
-
- rm.getTranslateRanksPlaceHolder( identifier );
- }
-
-
- return Text.translateAmpColorCodes( identifier.getText() );
- });
- if ( !registered ) {
- registered = true;
- }
- }
- }
- }
- }
-
-
- if ( PrisonMines.getInstance() != null && PrisonMines.getInstance().isEnabled() ) {
- MineManager mm = PrisonMines.getInstance().getMineManager();
- if ( mm != null ) {
- List placeholderMinesKeys = mm.getTranslatedPlaceHolderKeys();
-
- for ( PlaceHolderKey placeHolderKey : placeholderMinesKeys ) {
- if ( !placeHolderKey.getPlaceholder().isSuppressed() ) {
-
- registerPlaceholder(placeHolderKey.getKey(),
- player -> {
-
- PlaceholderIdentifier identifier = new PlaceholderIdentifier( placeHolderKey.getPlaceholder().name() );
- identifier.setPlayer( player.getUUID(), player.getName() );
-
- if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
-
- mm.getTranslateMinesPlaceholder( identifier );
- }
-
- return Text.translateAmpColorCodes( identifier.getText() );
- } );
- if ( !registered ) {
- registered = true;
- }
- }
- }
- }
- }
-
-// if ( registered ) {
-// Output.get().logWarn( "Prison registered all placeholders with MVdWPlaceholderAPI, " +
-// "but unfortunately MVdWPlaceholderAPI does not support dynamic placeholders " +
-// "that are available for customizations within prison. Please try adding " +
-// "Vault and PlaceholderAPI (papi) to your setup, if they do not already exist, " +
-// "to enable these features.");
+// /**
+// * Register both the player and mines placeholders with the MVdW plugin.
+// *
+// */
+// @Override
+// public void deferredInitialization()
+// {
+// boolean registered = false;
+// if ( PrisonRanks.getInstance() != null && PrisonRanks.getInstance().isEnabled() ) {
+//
+// PlayerManager pm = PrisonRanks.getInstance().getPlayerManager();
+// if ( pm != null ) {
+// List placeholderPlayerKeys = pm.getTranslatedPlaceHolderKeys();
+//
+// for ( PlaceHolderKey placeHolderKey : placeholderPlayerKeys ) {
+// if ( !placeHolderKey.getPlaceholder().isSuppressed() ) {
+//
+//
+// registerPlaceholder(placeHolderKey.getKey(),
+// player -> {
+//
+// PlaceholderIdentifier identifier = new PlaceholderIdentifier( placeHolderKey.getPlaceholder().name() );
+// identifier.setPlayer( player.getUUID(), player.getName() );
+//
+// if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
+//
+// pm.getTranslatePlayerPlaceHolder( identifier );
+// }
+//
+//
+// return Text.translateAmpColorCodes( identifier.getText() );
+// });
+// if ( !registered ) {
+// registered = true;
+// }
+// }
+// }
+// }
+//
+// RankManager rm = PrisonRanks.getInstance().getRankManager();
+// if ( rm != null ) {
+// List placeholderPlayerKeys = rm.getTranslatedPlaceHolderKeys();
+//
+// for ( PlaceHolderKey placeHolderKey : placeholderPlayerKeys ) {
+// if ( !placeHolderKey.getPlaceholder().isSuppressed() ) {
+//
+//
+// registerPlaceholder(placeHolderKey.getKey(),
+// player -> {
+//
+// PlaceholderIdentifier identifier = new PlaceholderIdentifier( placeHolderKey.getPlaceholder().name() );
+// identifier.setPlayer( player.getUUID(), player.getName() );
+//
+// if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
+//
+// rm.getTranslateRanksPlaceHolder( identifier );
+// }
+//
+//
+// return Text.translateAmpColorCodes( identifier.getText() );
+// });
+// if ( !registered ) {
+// registered = true;
+// }
+// }
+// }
+// }
// }
- }
-
-
- @Override
- public void registerPlaceholder(String placeholder, Function action) {
- if (placeholderWrapper != null) {
- placeholderWrapper.registerPlaceholder( placeholder, action );
- }
- }
-
- @Override
- public boolean hasIntegrated() {
- return (placeholderWrapper != null);
- }
-
- @Override
- public void disableIntegration() {
- placeholderWrapper = null;
- }
-
- @Override
- public String getAlternativeInformation() {
- return null;
- }
-
-
- @Override
- public String getPluginSourceURL() {
- return "https://www.spigotmc.org/resources/mvdwplaceholderapi.11182/";
- }
+//
+//
+// if ( PrisonMines.getInstance() != null && PrisonMines.getInstance().isEnabled() ) {
+// MineManager mm = PrisonMines.getInstance().getMineManager();
+// if ( mm != null ) {
+// List placeholderMinesKeys = mm.getTranslatedPlaceHolderKeys();
+//
+// for ( PlaceHolderKey placeHolderKey : placeholderMinesKeys ) {
+// if ( !placeHolderKey.getPlaceholder().isSuppressed() ) {
+//
+// registerPlaceholder(placeHolderKey.getKey(),
+// player -> {
+//
+// PlaceholderIdentifier identifier = new PlaceholderIdentifier( placeHolderKey.getPlaceholder().name() );
+// identifier.setPlayer( player.getUUID(), player.getName() );
+//
+// if ( identifier.checkPlaceholderKey(placeHolderKey) ) {
+//
+// mm.getTranslateMinesPlaceholder( identifier );
+// }
+//
+// return Text.translateAmpColorCodes( identifier.getText() );
+// } );
+// if ( !registered ) {
+// registered = true;
+// }
+// }
+// }
+// }
+// }
+//
+//// if ( registered ) {
+//// Output.get().logWarn( "Prison registered all placeholders with MVdWPlaceholderAPI, " +
+//// "but unfortunately MVdWPlaceholderAPI does not support dynamic placeholders " +
+//// "that are available for customizations within prison. Please try adding " +
+//// "Vault and PlaceholderAPI (papi) to your setup, if they do not already exist, " +
+//// "to enable these features.");
+//// }
+// }
+//
+//
+// @Override
+// public void registerPlaceholder(String placeholder, Function action) {
+// if (placeholderWrapper != null) {
+// placeholderWrapper.registerPlaceholder( placeholder, action );
+// }
+// }
+//
+// @Override
+// public boolean hasIntegrated() {
+// return (placeholderWrapper != null);
+// }
+//
+// @Override
+// public void disableIntegration() {
+// placeholderWrapper = null;
+// }
+//
+// @Override
+// public String getAlternativeInformation() {
+// return null;
+// }
+//
+//
+// @Override
+// public String getPluginSourceURL() {
+// return "https://www.spigotmc.org/resources/mvdwplaceholderapi.11182/";
+// }
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/MVdWPlaceholderIntegrationWrapper.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/MVdWPlaceholderIntegrationWrapper.java
index 98606f626..187005edc 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/MVdWPlaceholderIntegrationWrapper.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/MVdWPlaceholderIntegrationWrapper.java
@@ -1,27 +1,19 @@
package tech.mcprison.prison.spigot.placeholder;
-import java.util.function.Function;
-
-import org.bukkit.Bukkit;
-
-import be.maximvdw.placeholderapi.PlaceholderAPI;
-import tech.mcprison.prison.internal.Player;
-import tech.mcprison.prison.spigot.game.SpigotPlayer;
-
/**
* Register the non-suppressed place holders for prison.
*/
public class MVdWPlaceholderIntegrationWrapper
{
- public MVdWPlaceholderIntegrationWrapper(String providerName) {
- super();
- }
-
- public void registerPlaceholder(String placeholder, Function action) {
- PlaceholderAPI.registerPlaceholder(
- Bukkit.getPluginManager().getPlugin("Prison"), placeholder,
- e -> action.apply(new SpigotPlayer(e.getPlayer())));
- }
+// public MVdWPlaceholderIntegrationWrapper(String providerName) {
+// super();
+// }
+//
+// public void registerPlaceholder(String placeholder, Function action) {
+// PlaceholderAPI.registerPlaceholder(
+// Bukkit.getPluginManager().getPlugin("Prison"), placeholder,
+// e -> action.apply(new SpigotPlayer(e.getPlayer())));
+// }
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/SpigotPlaceholders.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/SpigotPlaceholders.java
index f9400dee3..d95853d7b 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/SpigotPlaceholders.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/placeholder/SpigotPlaceholders.java
@@ -222,14 +222,18 @@ private String processPlaceholderIdentifier( PlaceholderIdentifier identifier )
String results = null;
+ // If past usage of this identifier resulted in a failure (no placeholderKey) then
+ // skip processing...
if ( !stats.isFailedMatch() ) {
if ( identifier.getPlaceholderKey() == null ) {
+ // Lookup the correct placeholderKey:
results = processPlaceholderSearchForPlaceholderKey( identifier );
}
else {
+ // Use the existing placeholderKey:
results = processPlaceholderHavePlaceholderKey( identifier );
}
@@ -237,6 +241,8 @@ private String processPlaceholderIdentifier( PlaceholderIdentifier identifier )
long nanoEnd = System.nanoTime();
+ // Save the stats to the placeholderCache, and store the placeholderKey if not already
+ // stored in the cache.
PlaceholdersStats.getInstance().setStats( identifier, stats, nanoStart, nanoEnd );
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/sellall/SellAllUtil.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/sellall/SellAllUtil.java
index 66296e8c2..8a3c8859b 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/sellall/SellAllUtil.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/sellall/SellAllUtil.java
@@ -374,7 +374,7 @@ public double getPlayerMultiplier(Player p){
multiplier += multiplierExtraByPerms;
// long tPoint3 = System.nanoTime();
-// DecimalFormat dFmt = new DecimalFormat( "0.0000" );
+// DecimalFormat dFmt = Prison.get().getDecimalFormat( "0.0000" );
// String debugMsg = "{sellallMult::" + dFmt.format( multiplier ) + ":t1=" +
// dFmt.format( (tPoint2 - tPoint1)/1000000d ) +
// ":t2=" + dFmt.format( (tPoint3 - tPoint2)/1000000 ) + "}";
@@ -440,7 +440,7 @@ public double getSellMoney(Player p, HashMap xMaterialIntege
double total = earned * multiplier;
if ( debug ) {
- DecimalFormat dFmt = new DecimalFormat( "#,##0.00" );
+ DecimalFormat dFmt = Prison.get().getDecimalFormat( "#,##0.00" );
sb.append( " earned: " ).append( dFmt.format(earned) )
.append( " mult: " ).append( dFmt.format(multiplier) )
.append( " total: " ).append( dFmt.format(total) );
@@ -558,7 +558,9 @@ private HashMap getHashMapOfPlayerInventories(Player p) {
xMaterialIntegerHashMap = addInventoryToHashMap(xMaterialIntegerHashMap, backpacksUtil.getBackpack(p, id));
}
} else {
- xMaterialIntegerHashMap = addInventoryToHashMap(xMaterialIntegerHashMap, backpacksUtil.getBackpack(p));
+ String id = null;
+ xMaterialIntegerHashMap = addInventoryToHashMap(xMaterialIntegerHashMap,
+ backpacksUtil.getBackpack(p, id));
}
}
@@ -1459,7 +1461,8 @@ public void removeSellableItems(Player p){
backpacksUtil.setInventory(p, removeSellableItems(p, backpacksUtil.getBackpack(p, id)), id);
}
} else {
- backpacksUtil.setInventory(p, removeSellableItems(p, backpacksUtil.getBackpack(p)));
+ String id = null;
+ backpacksUtil.setInventory(p, removeSellableItems(p, backpacksUtil.getBackpack(p, id)), id);
}
}
@@ -1494,7 +1497,7 @@ public void removeFromDelay(Player p){
public void removeFromAutoSellDelayAndNotify(Player p){
if (autoSellEarningsNotificationWaiting.containsKey(p) && autoSellEarningsNotificationWaiting.get(p) > 0.00){
- DecimalFormat fFmt = new DecimalFormat("#,##0.00");
+ DecimalFormat fFmt = Prison.get().getDecimalFormat("#,##0.00");
String amt = fFmt.format( autoSellEarningsNotificationWaiting.get(p) );
String message = sellallAmountEarnedMsg( amt );
@@ -1802,7 +1805,7 @@ public boolean sellAllSell(Player p, boolean isUsingSign, boolean completelySile
addDelayedEarningAutoSellNotification(p, money);
} else if (notifyPlayerEarned){
- DecimalFormat fFmt = new DecimalFormat("#,##0.00");
+ DecimalFormat fFmt = Prison.get().getDecimalFormat("#,##0.00");
String amt = fFmt.format( money );
String message = sellallAmountEarnedMsg( amt );
@@ -1886,7 +1889,7 @@ public double sellAllSell(Player p, SpigotItemStack itemStack,
addDelayedEarningAutoSellNotification(p, money);
}
else if (notifyPlayerEarned){
- DecimalFormat fFmt = new DecimalFormat("#,##0.00");
+ DecimalFormat fFmt = Prison.get().getDecimalFormat("#,##0.00");
String amt = fFmt.format( money );
String message = sellallAmountEarnedMsg( amt ) ;
@@ -1902,7 +1905,7 @@ else if (notifyPlayerEarned){
}
-// DecimalFormat dFmt = new DecimalFormat( "0.0000" );
+// DecimalFormat dFmt = Prison.get().getDecimalFormat( "0.0000" );
// String debugMsg = "{sellAllSell::" + dFmt.format( money ) +
// ":t1=" + dFmt.format( (tPoint2 - tPoint1)/1000000d ) +
// ":t2=" + dFmt.format( (tPoint3 - tPoint2)/1000000d ) +
@@ -2015,7 +2018,7 @@ public ArrayList sellAllSell(Player p, ArrayList itemStack
addDelayedEarningAutoSellNotification(p, money);
}
} else if (notifyPlayerEarned){
- DecimalFormat fFmt = new DecimalFormat("#,##0.00");
+ DecimalFormat fFmt = Prison.get().getDecimalFormat("#,##0.00");
String amt = fFmt.format( money );
String message = sellallAmountEarnedMsg( amt );
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/slime/SlimeBlockFunEventData.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/slime/SlimeBlockFunEventData.java
index e0601f985..39a9a92b9 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/slime/SlimeBlockFunEventData.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/slime/SlimeBlockFunEventData.java
@@ -4,6 +4,7 @@
import org.bukkit.entity.Player;
+import tech.mcprison.prison.Prison;
import tech.mcprison.prison.util.Text;
public class SlimeBlockFunEventData {
@@ -23,8 +24,8 @@ public class SlimeBlockFunEventData {
private double recordBoost = 0.0;
private double recordVelocity = 0.0;
- private DecimalFormat sFmt = new DecimalFormat("#,##0.0");
- private DecimalFormat dFmt = new DecimalFormat("#,##0.00");
+ private DecimalFormat sFmt = Prison.get().getDecimalFormat("#,##0.0");
+ private DecimalFormat dFmt = Prison.get().getDecimalFormat("#,##0.00");
public SlimeBlockFunEventData( Long playerUUIDLSB, double y ) {
super();
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/slime/SlimeBlockFunEventListener.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/slime/SlimeBlockFunEventListener.java
index d90b0dd46..8b4f44971 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/slime/SlimeBlockFunEventListener.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/slime/SlimeBlockFunEventListener.java
@@ -16,6 +16,7 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;
+import tech.mcprison.prison.Prison;
import tech.mcprison.prison.spigot.SpigotPrison;
import tech.mcprison.prison.spigot.compat.SpigotCompatibility;
@@ -131,7 +132,7 @@ private Vector calculateVelocityY( double boost, Vector velocityOriginal, Player
if ( velocityY > 1024.0 ) {
- DecimalFormat f4Fmt = new DecimalFormat("#,##0.0000");
+ DecimalFormat f4Fmt = Prison.get().getDecimalFormat("#,##0.0000");
player.sendMessage( "SlimeFun: Exceeded max velocity!! velY:" +
f4Fmt.format( velocityY ) );
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonBombListener.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonBombListener.java
index ed2dc5c3e..f0e88deff 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonBombListener.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonBombListener.java
@@ -8,7 +8,6 @@
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.EquipmentSlot;
import de.tr7zw.nbtapi.NBTItem;
import tech.mcprison.prison.bombs.MineBombData;
@@ -17,6 +16,8 @@
import tech.mcprison.prison.output.Output;
import tech.mcprison.prison.spigot.block.OnBlockBreakMines;
import tech.mcprison.prison.spigot.block.SpigotBlock;
+import tech.mcprison.prison.spigot.compat.Compatibility.EquipmentSlot;
+import tech.mcprison.prison.spigot.compat.SpigotCompatibility;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.util.Location;
@@ -75,9 +76,10 @@ public void onInteract( PlayerInteractEvent event ) {
String bombName = nbtItem.getString( MineBombs.MINE_BOMBS_NBT_BOMB_KEY );
- if ( Output.get().isDebug() && nbtItem != null ) {
- Output.get().logInfo( "PrisonBombListener.onInteract ntb: %s :: %s",
- bombName, nbtItem.toString() );
+ if ( Output.get().isDebug() ) {
+ Output.get().logInfo( "PrisonBombListener.onInteract bombName: &7%s&r &3:: nbt: &r%s",
+ bombName,
+ (nbtItem == null ? "&a-no-nbt-" : nbtItem.toString()) );
}
Player player = event.getPlayer();
@@ -104,7 +106,10 @@ public void onInteract( PlayerInteractEvent event ) {
if ( bomb == null ) {
-
+ if ( Output.get().isDebug() ) {
+ Output.get().logInfo( "MineBombs: The bomb named '%s' cannot be mapped to a mine bomb.",
+ bombName );
+ }
return;
}
@@ -130,17 +135,28 @@ public void onInteract( PlayerInteractEvent event ) {
if ( mine == null ) {
// player is not in a mine, so do not allow them to trigger a mine bomb:
+ if ( Output.get().isDebug() ) {
+ Output.get().logInfo( "MineBombs: Cannot mine bombs use outside of mines." );
+ }
+
event.setCancelled( true );
return;
}
else if ( !mine.hasMiningAccess( sPlayer ) ) {
// Player does not have access to the mine, so don't allow them to trigger a mine bomb:
+ if ( Output.get().isDebug() ) {
+ Output.get().logInfo( "MineBombs: Player %s&r does not have access to Mine %s&r.",
+ sPlayer.getName(), mine.getName());
+ }
+
event.setCancelled( true );
return;
}
- EquipmentSlot hand = event.getHand();
+ // getHand() is not available with bukkit 1.8.8 so use the compatibility functions:
+ EquipmentSlot hand = SpigotCompatibility.getInstance().getHand(event);
+// EquipmentSlot hand = event.getHand();
// Output.get().logInfo( "### PrisonBombListener: PlayerInteractEvent 02 " );
if ( getPrisonUtilsMineBombs().setBombInHand( player, bomb, sBlock, hand ) ) {
@@ -154,8 +170,6 @@ else if ( !mine.hasMiningAccess( sPlayer ) ) {
-
-
}
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombs.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombs.java
index 198a7ede8..3341b3053 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombs.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombs.java
@@ -1,6 +1,5 @@
package tech.mcprison.prison.spigot.utils;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -10,7 +9,7 @@
import org.bukkit.Effect;
import org.bukkit.Particle;
import org.bukkit.entity.Player;
-import org.bukkit.inventory.EquipmentSlot;
+//import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import com.cryptomorin.xseries.XMaterial;
@@ -34,6 +33,7 @@
import tech.mcprison.prison.spigot.block.PrisonItemStackNotSupportedRuntimeException;
import tech.mcprison.prison.spigot.block.SpigotBlock;
import tech.mcprison.prison.spigot.block.SpigotItemStack;
+import tech.mcprison.prison.spigot.compat.Compatibility.EquipmentSlot;
import tech.mcprison.prison.spigot.compat.SpigotCompatibility;
import tech.mcprison.prison.spigot.game.SpigotPlayer;
import tech.mcprison.prison.spigot.game.SpigotWorld;
@@ -43,7 +43,7 @@
import tech.mcprison.prison.util.Text;
public class PrisonUtilsMineBombs
- extends PrisonUtilsMineBombsTasks
+ extends PrisonUtilsMineBombsMessages
{
public static final String MINE_BOMBS_LORE_1 = "&4Prison Mine Bomb:";
public static final String MINE_BOMBS_LORE_2_PREFIX = " &7";
@@ -131,7 +131,12 @@ public void utilsMineBombs( CommandSender sender,
int radius = 3;
- radius = Integer.parseInt( radiusSize );
+ try {
+ radius = Integer.parseInt( radiusSize );
+ } catch (NumberFormatException e) {
+ Output.get().logInfo( "Prison utils bomb: invalid value for radius [%s] defaulting to %d",
+ radiusSize, radius);
+ }
MineBombs mBombs = MineBombs.getInstance();
@@ -745,7 +750,8 @@ public MineBombData getBombItem( String bombName ) {
* @return
*/
public boolean setBombInHand( Player player,
- MineBombData bomb, SpigotBlock sBlock, EquipmentSlot hand ) {
+ MineBombData bomb, SpigotBlock sBlock,
+ tech.mcprison.prison.spigot.compat.Compatibility.EquipmentSlot hand ) {
boolean isABomb = false;
// MineBombData bomb = getBombItem( player );
@@ -958,13 +964,15 @@ else if ( bomb != null ) {
else {
- float cooldownSeconds = cooldownTicks / 20.0f;
- DecimalFormat dFmt = new DecimalFormat( "0.0" );
+ mineBombsCoolDownMsg( sPlayer, cooldownTicks );
- String message =
- String.format( "You cannot use another Prison Mine Bomb for %s seconds.",
- dFmt.format( cooldownSeconds ) );
- sPlayer.sendMessage( message );
+// float cooldownSeconds = cooldownTicks / 20.0f;
+// DecimalFormat dFmt = Prison.get().getDecimalFormat( "0.0" );
+//
+// String message =
+// String.format( "You cannot use another Prison Mine Bomb for %s seconds.",
+// dFmt.format( cooldownSeconds ) );
+// sPlayer.sendMessage( message );
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombsMessages.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombsMessages.java
new file mode 100644
index 000000000..3daf4ac78
--- /dev/null
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombsMessages.java
@@ -0,0 +1,45 @@
+package tech.mcprison.prison.spigot.utils;
+
+import java.text.DecimalFormat;
+
+import tech.mcprison.prison.Prison;
+import tech.mcprison.prison.internal.CommandSender;
+import tech.mcprison.prison.spigot.SpigotPrison;
+
+public abstract class PrisonUtilsMineBombsMessages
+ extends PrisonUtilsMineBombsTasks
+{
+ public PrisonUtilsMineBombsMessages() {
+ super();
+ }
+
+ protected void exampleMsg( CommandSender sender, String mineName ) {
+ SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_minebombs__" )
+ .withReplacements(
+ mineName )
+ .sendTo( sender );
+ }
+
+ protected String exampleReturnMsg( String mineTagName ) {
+ return SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_minebombs__" )
+ .withReplacements(
+ mineTagName )
+ .localize();
+ }
+
+
+ protected void mineBombsCoolDownMsg( CommandSender sender, double cooldownTicks ) {
+
+ double cooldownSeconds = cooldownTicks / 20.0f;
+ DecimalFormat dFmt = Prison.get().getDecimalFormat( "0.0" );
+
+ SpigotPrison.getInstance().getLocaleManager()
+ .getLocalizable( "spigot_minebombs__cooldown_delay" )
+ .withReplacements(
+ dFmt.format(cooldownSeconds) )
+ .sendTo( sender );
+ }
+
+}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombsTasks.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombsTasks.java
index 071101d6a..a50a06d04 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombsTasks.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/PrisonUtilsMineBombsTasks.java
@@ -20,6 +20,7 @@
import com.cryptomorin.xseries.XSound;
import com.cryptomorin.xseries.particles.ParticleDisplay;
+import tech.mcprison.prison.Prison;
import tech.mcprison.prison.bombs.MineBombData;
import tech.mcprison.prison.bombs.MineBombEffectsData;
import tech.mcprison.prison.bombs.MineBombEffectsData.EffectState;
@@ -496,7 +497,7 @@ public PlacedMineBombItemTask( MineBombData bomb,
this.isDyanmicTag = bomb.getNameTag().contains( "{countdown}" );
this.tagName = "";
- this.dFmt = new DecimalFormat( "0.0" );
+ this.dFmt = Prison.get().getDecimalFormat( "0.0" );
initializeArmorStand();
}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/tasks/PlayerAutoRankupTask.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/tasks/PlayerAutoRankupTask.java
new file mode 100644
index 000000000..7f5a60d61
--- /dev/null
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/tasks/PlayerAutoRankupTask.java
@@ -0,0 +1,62 @@
+package tech.mcprison.prison.spigot.utils.tasks;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import tech.mcprison.prison.Prison;
+import tech.mcprison.prison.ranks.data.PlayerRank;
+import tech.mcprison.prison.ranks.data.RankPlayer;
+import tech.mcprison.prison.spigot.game.SpigotPlayer;
+import tech.mcprison.prison.spigot.utils.tasks.PrisonUtilsTaskTypes.PrisonUtilsTaskTypRunCommand;
+
+public class PlayerAutoRankupTask {
+
+
+ /**
+ * If the config.yml settings 'prison-mines.forced-auto-rankups' is enabled,
+ * then it will check to see if the player has enough money to rankup.
+ * This will perform all rankups; `/rankup` and `/prestige`. The prestige is
+ * actually just `/rankup prestiges [playerName]`.
+ *
+ *
+ * @param sPlayer
+ */
+ public static void autoSubmitPlayerRankupTask( SpigotPlayer sPlayer, StringBuilder debugInfo ) {
+
+ if ( Prison.get().getPlatform().getConfigBooleanFalse( "prison-mines.forced-auto-rankups" ) ) {
+
+ RankPlayer rPlayer = sPlayer.getRankPlayer();
+
+ PlayerRank nextRank = rPlayer.getNextPlayerRank();
+
+ if ( nextRank != null ) {
+
+ String currency = nextRank.getCurrency();
+ double balance = rPlayer.getBalance( currency );
+
+ double rankBalance = nextRank.getRankCost();
+
+ if ( balance >= rankBalance ) {
+
+ if ( debugInfo != null ) {
+ debugInfo.append( "(forcing auto rankup) " );
+ }
+
+ String cmd =
+ String.format( "rankup %s %s",
+ nextRank.getRank().getLadder().getName(),
+ rPlayer.getName() );
+
+ List tasks = new ArrayList<>();
+ PrisonUtilsTaskTypRunCommand task = new PrisonUtilsTaskTypRunCommand( rPlayer, cmd );
+ tasks.add( task );
+
+ PrisonUtilsTask taskRunner = new PrisonUtilsTask( tasks );
+ taskRunner.submit();
+
+ }
+ }
+
+ }
+ }
+}
diff --git a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/tasks/PrisonUtilsTaskTypes.java b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/tasks/PrisonUtilsTaskTypes.java
index 1c751f5a6..f87217ddf 100644
--- a/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/tasks/PrisonUtilsTaskTypes.java
+++ b/prison-spigot/src/main/java/tech/mcprison/prison/spigot/utils/tasks/PrisonUtilsTaskTypes.java
@@ -144,6 +144,7 @@ public boolean isAsyc() {
return false;
}
+ @SuppressWarnings("unused")
private Player getPlayer() {
return player;
}
diff --git a/prison-spigot/src/main/resources/config.yml b/prison-spigot/src/main/resources/config.yml
index a7b6c7414..a1caed820 100644
--- a/prison-spigot/src/main/resources/config.yml
+++ b/prison-spigot/src/main/resources/config.yml
@@ -47,12 +47,47 @@ show-alerts: true
# Confirmation requires action from the player. If GUI is disabled, then it will use
# the command based confiration. If confirm-enabled is false, then no confirmation
# will be used.
+# The value for prestige.no-prestige-value is use when a player has no prestige rank with
+# the base placeholders: prison_rank, prison_rank_laddername, prison_rank_tag, and
+# prison_rank_tag_laddername. If not defined, an empty String is used.
prestige:
enabled: true
resetMoney: true
resetDefaultLadder: true
confirmation-enabled: true
prestige-confirm-gui: true
+ force-sellall: false
+ no-prestige-value: ""
+
+
+ranks:
+ gui-default-include-rankup-button: true
+ gui-prestiges-include-rankup-button: true
+ gui-others-include-rankup-button: true
+
+
+
+# WARNING: Never use the following setting to disable the vault-economy
+# integration unless directed by Prison support to do so.
+# WARNING: Prison will not allow the Ranks module to be enabled if a valid
+# economy cannot be found and enabled succesfully. Use of this setting
+# may prevent prison from finding a workable economy to use.
+# This setting, integrations.prevent-economy-vault-usage, will prevent
+# the use of vault for any economy transactions. Prison primarily uses vault,
+# so enabling this setting could be dangerous.
+# Where it can be useful, is if prison cannot communicate through vault,
+# but is able to successfully communicate directly with the
+# EssentialsEconomy, SaneEconomy, or GemsEconomy. Enabling this setting
+# will NOT work for any other plugins.
+# To test vault, run the following commands when vault economy has been
+# succesfully loaded. Run these command in the console:
+# /balance
+# /ranks player
+# Compare the total balance for the specified player from both commands.
+# They should match. If not, then there is an issue with vault.
+# Please contact the Prison support team through our discord server.
+integrations:
+ prevent-economy-vault-usage: false
@@ -119,6 +154,29 @@ placeholder:
default-language: en_US
+
+# Prison defaults to a location code of en_US for the formatting of numbers
+# which uses a "." for the decimal position, and "," for the thousands separator.
+# Prison overries the use of the server's and Java's location code, for the
+# exclusive purpose of formatting numbers, of which may not be
+# controllable by admins if they are using a hosted server.
+# This allows separation between the default_language codes and the
+# number formatting language code.
+# The problem with using some other locations, such as en_UK, is that they
+# may use a Non-Blanking SPace (NBSP) for the thousands separator, of which
+# Minecraft cannot display that uni-code correctly and shows it as a
+# squre with the letters NB on the first line, and SP on the second.
+# Examples of number formatting patterns and the results:
+# #,##0 and #,##0.000
+# 1,000 and 1,000.123
+# This controls number formatting of the symbols used throughout all of
+# prison. This is the only way to control the symbols used. This does not
+# change the use of any of the number formatting patterns.
+number-format-location: en_US
+
+
+
+
# The storage engine that Prison should use to store data.
# The only valid storageType is json.
storageType: "json"
@@ -141,7 +199,6 @@ top-stats:
hesitancy-delay-penalty: true
-# NEW:
# Prison mines reset gap is the number of milliseconds that are used to
# space out the mine resets when starting the server. This value should
# not be changed unless you understand what you are doing. This value
@@ -150,6 +207,23 @@ top-stats:
# if more than one mine tries to reset at the same time, or close to each
# other. This may be changed to ticks in the near future.
#prison-mines-reset-gap: 5000
+#
+# The tp-warmup will delay the player's attempt to teleport out of a mine,
+# where the delay is in ticks and if they move more than the max distance
+# in blocks, then the TP will be canceled.
+#
+# access-to-prior-mines defaults to true, and if enabled, players will
+# have access to mine in the mines that are tied to ranks that preceeded
+# their current rank. Note, that mines must be tied to ranks to allow
+# this to work.,
+#
+# tp-to-spawn-on-mine-resets: if enabled, players will be TP'd to the mine's
+# spawn location when the mine resets or if they suffocate in the mine.
+# If spawn is not set, then they will be tp'd to the top center of the mine.
+#
+# enable-suffocation-in-mines: defaults to false so players will not suffocate
+# if they get stuck in a block. Normally this is not an issue since they will
+# be TP'd out, but if that is disabled, then they risk suffocation.
prison-mines:
reset-gap-ms: 5000
@@ -164,7 +238,10 @@ prison-mines:
enabled: false
movementMaxDistance: 1.0
delayInTicks: 20
-
+ forced-auto-rankups: false
+ access-to-prior-mines: true
+ tp-to-spawn-on-mine-resets: true
+ enable-suffocation-in-mines: false
# Warning: Do not use the following option. This could break the natural Bukkit
@@ -245,10 +322,47 @@ prison-events:
priority: LOW
+
+# The prisonCommandHander allows you to fine tune the Prison Command Handler
+# by adding aliases for any command, prevent non-op players from using specific
+# commands, viewing the command's' help, or list the blocked commands.
+#
+# Commands must be listed in a hierarchy format. For example the command
+# `/mines tp` must be listed under the appropreiate sections as:
+# mines:
+# tp:
+#
+# For the exclude-non-ops there is a global setting that will apply the
+# restriction to specified command, plus their aliases. If set to false,
+# then each alias would have to be listed for them to be excluded.
+#
+# For each exclude-non-ops entry, you can specify the includeCmdPerms and
+# the includeCmdAltPerms, both of which defaults to false. You would have
+# to explicity enable them to prevent them from applying; use a value of true.
+#
+# For the includeCmdPerms, all perms included in the command are tested for
+# each player, and if there is a hit then the command is excluded for that player.
+# For the includeCmdAltPerms all are tested too, but no translations are
+# applied so most may not produce any hits.
+# The listed perms for each command are tested as is, with no translations.
+# If the given player has a hit on the perm, then they are excluded from
+# being able to use the command.
+#
+# OPs, including console, are bypassed and cannot be excluded from any command.
+#
prisonCommandHandler:
exclude-worlds:
- lobby
- plotWorld
+ exclude-non-ops:
+ exclude-related-aliases: true
+ commands:
+ mines:
+ tp:
+ includeCmdPerms: true
+ includeCmdAltPerms: true
+ perms:
+ - prison.exclude.test
aliases:
mines:
tp:
diff --git a/prison-spigot/src/main/resources/plugin.yml b/prison-spigot/src/main/resources/plugin.yml
index 159dbda26..9e1e90088 100644
--- a/prison-spigot/src/main/resources/plugin.yml
+++ b/prison-spigot/src/main/resources/plugin.yml
@@ -63,7 +63,7 @@ permissions:
description: Access to the /mines rename command.
mines.set:
- description: Access to the /mines set command.
+ description: Access to various /mines set commands.
mines.block:
description: Access to the /mines block command.
@@ -83,30 +83,18 @@ permissions:
mines.list:
description: Access to the /mines list command.
- mines.skipreset:
- description: Access to the /mines set skipReset command.
-
- mines.zeroblockresetdelay:
- description: Access to the /mines set zeroBlockResetDelay command.
-
mines.stats:
description: Access to the /mines stats command.
mines.whereami:
description: Access to the /mines whereami command.
- mines.resettime:
- description: Access to the /mines set resetTime command.
-
mines.notification:
description: Access to the /mines set notification command.
mines.tp:
description: Access to the /mines tp command.
- mines.command:
- description: Access to the /mines command command.
-
mines.admin:
description: Contains all the commands for managing mines.
default: op
@@ -120,11 +108,8 @@ permissions:
mines.wand: true
mines.list: true
mines.reset: true
- mines.skipreset: true
- mines.zeroblockresetdelay: true
mines.stats: true
mines.whereami: true
- mines.resettime: true
mines.notification: true
mines.tp: true
mines.command: true
+The command `/mines info 
+