Skip to content

Commit

Permalink
Rename ActivateBlockRecorder option to ActivatePlayerRecorder
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshi1999
joshi1999 committed Feb 25, 2024
1 parent 5af69cd commit 3422c0f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
14 changes: 7 additions & 7 deletions Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public class Minigame implements ScriptObject {
@NotNull
private final ScoreboardData sbData = new ScoreboardData();
private final Map<MinigameStat, StatSettings> statSettings = Maps.newHashMap();
private final BooleanFlag activateBlockRecorder = new BooleanFlag(true, "activateBlockRecorder");
private final BooleanFlag activatePlayerRecorder = new BooleanFlag(true, "activatePlayerRecorder");

//Unsaved data
private final List<MinigamePlayer> players = new ArrayList<>();
Expand Down Expand Up @@ -181,7 +181,7 @@ private void setup(MinigameType type, Location start) {

flags.setFlag(new ArrayList<>());

addConfigFlag(activateBlockRecorder);
addConfigFlag(activatePlayerRecorder);
addConfigFlag(allowEnderPearls);
addConfigFlag(allowFlight);
addConfigFlag(allowMPCheckpoints);
Expand Down Expand Up @@ -900,12 +900,12 @@ public void setMaxChestRandom(int maxChestRandom) {
this.maxChestRandom.setFlag(maxChestRandom);
}

public boolean getActivateBlockRecorder() {
return activateBlockRecorder.getFlag();
public boolean getActivatePlayerRecorder() {
return activatePlayerRecorder.getFlag();
}

public void setActivateBlockRecorder(boolean activateBlockRecorder) {
this.activateBlockRecorder.setFlag(activateBlockRecorder);
public void setActivatePlayerRecorder(boolean activatePlayerRecorder) {
this.activatePlayerRecorder.setFlag(activatePlayerRecorder);
}

public Collection<MgRegion> getRegenRegions() {
Expand Down Expand Up @@ -1248,7 +1248,7 @@ public void setValue(Integer value) {
rndChstDes.add("Max. item randomization");
itemsMain.add(maxChestRandom.getMenuItem("Max. Chest Random", Material.STONE, rndChstDes, 0, null));
itemsMain.add(new MenuItemStatisticsSettings(this, "Stat Settings", Material.WRITABLE_BOOK));
itemsMain.add(activateBlockRecorder.getMenuItem("Activate Player Block Recorder", Material.COMMAND_BLOCK));
itemsMain.add(activatePlayerRecorder.getMenuItem("Activate Player Block Recorder", Material.COMMAND_BLOCK));
itemsMain.add(new MenuItemNewLine());

//--------------//
Expand Down
34 changes: 17 additions & 17 deletions Minigames/src/main/java/au/com/mineauz/minigames/recorder/BasicRecorder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private boolean handleBlockBreak(BlockBreakEvent event, MinigamePlayer mgPlayer)
}
}

if (mgm.getActivateBlockRecorder()) {
if (mgm.getActivatePlayerRecorder()) {
recData.addBlock(event.getBlock(), mgPlayer);
}

Expand Down Expand Up @@ -143,7 +143,7 @@ private void blockPlace(BlockPlaceEvent event) {
if (recData.getWhitelistMode()) {
//white list --> blocks that are allowed to be placed
if (recData.getWBBlocks().contains(event.getBlock().getType())) {
if (mgm.getActivateBlockRecorder()) {
if (mgm.getActivatePlayerRecorder()) {
recData.addBlock(event.getBlockReplacedState(), mgPlayer);
}
} else {
Expand All @@ -152,7 +152,7 @@ private void blockPlace(BlockPlaceEvent event) {
//black list --> blocks that are not allowed to be placed
} else if (recData.getWBBlocks().contains(event.getBlock().getType())) {
event.setCancelled(true);
} else if (mgm.getActivateBlockRecorder()) {
} else if (mgm.getActivatePlayerRecorder()) {
recData.addBlock(event.getBlockReplacedState(), mgPlayer);
}
} else {
Expand All @@ -174,7 +174,7 @@ private void changeAnotherInventory(PlayerInteractEvent event) {
Minigame mgm = mgPlayer.getMinigame();
RecorderData recData = mgm.getRecorderData();

if (event.getClickedBlock().getState() instanceof InventoryHolder && mgm.getActivateBlockRecorder()) {
if (event.getClickedBlock().getState() instanceof InventoryHolder && mgm.getActivatePlayerRecorder()) {
recData.addBlock(event.getClickedBlock().getLocation().getBlock(), mgPlayer);
}
}
Expand All @@ -197,12 +197,12 @@ public void igniteBlock(BlockIgniteEvent event) {
if (recData.getWhitelistMode()) {
//white list --> blocks that are allowed to be broken
if (recData.getWBBlocks().contains(event.getBlock().getType())
&& mgm.getActivateBlockRecorder()) {
&& mgm.getActivatePlayerRecorder()) {
recData.addBlock(event.getBlock(), playerManager.getMinigamePlayer(event.getPlayer()));
}
//black list --> blocks that are not allowed to be broken
} else if (!recData.getWBBlocks().contains(event.getBlock().getType())
&& mgm.getActivateBlockRecorder()) {
&& mgm.getActivatePlayerRecorder()) {
recData.addBlock(event.getBlock(), playerManager.getMinigamePlayer(event.getPlayer()));
}
} else {
Expand Down Expand Up @@ -238,12 +238,12 @@ private void hangingPlace(HangingPlaceEvent event) {

if (recData.getWhitelistMode()) {
//white list --> blocks that are allowed to be broken
if (recData.getWBBlocks().contains(usedMaterial) && mgm.getActivateBlockRecorder()) {
if (recData.getWBBlocks().contains(usedMaterial) && mgm.getActivatePlayerRecorder()) {
recData.addEntity(event.getEntity(), mgPlayer, true);
return;
}
//black list --> blocks that are not allowed to be broken
} else if (!recData.getWBBlocks().contains(usedMaterial) && mgm.getActivateBlockRecorder()) {
} else if (!recData.getWBBlocks().contains(usedMaterial) && mgm.getActivatePlayerRecorder()) {
recData.addEntity(event.getEntity(), mgPlayer, true);
return;
}
Expand Down Expand Up @@ -273,7 +273,7 @@ private void animalHurt(EntityDamageByEntityEvent event) {
}

if (mgPlayer != null) {
if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) {
if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivatePlayerRecorder()) {
mgPlayer.getMinigame().getRecorderData().addEntity(animal, mgPlayer, false);
}
}
Expand All @@ -296,7 +296,7 @@ private void hangingBreak(HangingBreakByEntityEvent event) {

}
if (mgPlayer != null) {
if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) {
if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivatePlayerRecorder()) {
mgPlayer.getMinigame().getRecorderData().addEntity(event.getEntity(), mgPlayer, false);
}
}
Expand All @@ -310,7 +310,7 @@ private void arrowShoot(EntityShootBowEvent event) {
if (event.getEntity() instanceof Player player) {
MinigamePlayer mgPlayer = playerManager.getMinigamePlayer(player);

if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) {
if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivatePlayerRecorder()) {
mgPlayer.getMinigame().getRecorderData().addEntity(event.getProjectile(), mgPlayer, true);
}
}
Expand All @@ -324,7 +324,7 @@ private void throwEnderPearl(ProjectileLaunchEvent event) {
if (event.getEntity().getShooter() instanceof Player player) {
MinigamePlayer mgPlayer = playerManager.getMinigamePlayer(player);

if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) {
if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivatePlayerRecorder()) {
mgPlayer.getMinigame().getRecorderData().addEntity(event.getEntity(), mgPlayer, true);
}
}
Expand All @@ -344,12 +344,12 @@ private void bucketFill(PlayerBucketFillEvent event) {
if (mgm.canBlockBreak()) {
if (recData.getWhitelistMode()) {
//white list --> blocks that are allowed to be broken
if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivateBlockRecorder()) {
if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivatePlayerRecorder()) {
recData.addBlock(event.getBlockClicked(), playerManager.getMinigamePlayer(event.getPlayer()));
}
//black list --> blocks that are not allowed to be broken
} else if (!recData.getWBBlocks().contains(event.getBlock().getType())
&& mgm.getActivateBlockRecorder()) {
&& mgm.getActivatePlayerRecorder()) {
recData.addBlock(event.getBlockClicked(), playerManager.getMinigamePlayer(event.getPlayer()));
}
} else {
Expand All @@ -372,7 +372,7 @@ private void bucketEmpty(PlayerBucketEmptyEvent event) {
if (mgm.canBlockPlace()) {
if (recData.getWhitelistMode()) {
//white list --> blocks that are allowed to be broken
if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivateBlockRecorder()) {
if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivatePlayerRecorder()) {
Location loc = new Location(event.getBlockClicked().getWorld(),
event.getBlockFace().getModX() + event.getBlockClicked().getX(),
event.getBlockFace().getModY() + event.getBlockClicked().getY(),
Expand All @@ -381,7 +381,7 @@ private void bucketEmpty(PlayerBucketEmptyEvent event) {
}
//black list --> blocks that are not allowed to be broken
} else if (!recData.getWBBlocks().contains(event.getBlock().getType())
&& mgm.getActivateBlockRecorder()) {
&& mgm.getActivatePlayerRecorder()) {
Location loc = new Location(event.getBlockClicked().getWorld(),
event.getBlockFace().getModX() + event.getBlockClicked().getX(),
event.getBlockFace().getModY() + event.getBlockClicked().getY(),
Expand All @@ -404,7 +404,7 @@ private void vehicleDestroy(VehicleDestroyEvent event) {
MinigamePlayer mgPlayer = playerManager.getMinigamePlayer(player);
Minigame mg = mgPlayer.getMinigame();

if (mgPlayer.isInMinigame() && mg.getActivateBlockRecorder()) {
if (mgPlayer.isInMinigame() && mg.getActivatePlayerRecorder()) {
mg.getRecorderData().addEntity(event.getVehicle(), mgPlayer, false);
}
}
Expand Down

0 comments on commit 3422c0f

Please sign in to comment.