Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2025-12-28 19:29:16 +00:00
Code Issues Releases Activity

Add debug messages, readd 1.16 support

Browse Source
This commit is contained in:
SamB440
2021-06-15 15:30:20 +01:00
parent 91a40f659a
commit 036d704f7f
6 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/net/islandearth/rpgregions/api/IRPGRegionsAPI.java
View File

@@ -25,6 +25,8 @@ public interface IRPGRegionsAPI {
IRPGRegionsManagers getManagers();
boolean debug();
void debug(String debug);
boolean hasHeadDatabase();
}

3
api/src/main/java/net/islandearth/rpgregions/utils/TitleAnimator.java
View File

@@ -16,12 +16,15 @@ public class TitleAnimator {
public void run() {
String title = current < titles.size() ? titles.get(current) : "";
String subtitle = current < subtitles.size() ? subtitles.get(current) : "";
plugin.debug("Title is: " + title + " Subtitle is: " + subtitle);
if (current >= titles.size()
&& current >= subtitles.size()) {
plugin.debug("Cancelling! No more titles left to send.");
this.cancel();
return;
}
plugin.debug("Successful title send!");
player.sendTitle(title,
subtitle,
plugin.getConfig().getInt("settings.server.discoveries.discovered.title.fadein"),

5
modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java
View File

@@ -38,6 +38,7 @@ public class WorldGuardIntegration implements IntegrationManager {
@Override
public void handleMove(PlayerMoveEvent pme) {
if (pme.getTo() == null) return;
plugin.debug("Handling movement");
Player player = pme.getPlayer();
int oldX = pme.getFrom().getBlockX();
int oldY = pme.getFrom().getBlockY();
@@ -50,6 +51,9 @@ public class WorldGuardIntegration implements IntegrationManager {
Optional<ConfiguredRegion> configuredRegion = getPrioritisedRegion(pme.getTo());
configuredRegion.ifPresent(prioritisedRegion -> {
plugin.debug("Priority region found");
plugin.debug("Old: " + oldRegions);
plugin.debug("New: " + regions);
List<String> stringRegions = new ArrayList<>();
regions.forEach(region -> {
if (!prioritisedRegion.getId().equals(region.getId())
@@ -57,6 +61,7 @@ public class WorldGuardIntegration implements IntegrationManager {
});
if (checkRequirements(pme, prioritisedRegion.getId())) {
plugin.debug("Requirements passed, calling");
stringRegions.add(0, prioritisedRegion.getId());
Bukkit.getPluginManager().callEvent(new RegionsEnterEvent(player, stringRegions, !oldRegions.equals(regions)));
}

1
rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java
View File

@@ -406,6 +406,7 @@ public final class RPGRegions extends JavaPlugin implements IRPGRegionsAPI, Lang
return this.getConfig().getBoolean("settings.dev.debug");
}
@Override
public void debug(String debug) {
this.debug(debug, Level.INFO);
}

28
rpgregions/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java
View File

@@ -45,6 +45,7 @@ public class RegionListener implements Listener {
Player player = event.getPlayer();
plugin.getManagers().getStorageManager().getAccount(player.getUniqueId()).thenAccept(account -> {
for (String region : event.getRegions()) {
plugin.debug("Checking region: " + region);
plugin.getManagers().getRegionsCache().getConfiguredRegion(region).ifPresent(configuredRegion -> {
boolean has = false;
boolean prioritised = event.getPriority().equals(region);
@@ -54,7 +55,9 @@ public class RegionListener implements Listener {
break;
}
}
plugin.debug("Has the player discovered this region? " + has);
plugin.debug("Is this the prioritised region? " + prioritised);
Bukkit.getScheduler().runTask(plugin, () -> this.checkEffects(configuredRegion, player));
if (configuredRegion.alwaysShowTitles() && event.hasChanged() && has && prioritised) {
@@ -66,6 +69,7 @@ public class RegionListener implements Listener {
}
if (!has && configuredRegion.isDiscoverable() && prioritised) {
plugin.debug("Discovering region.");
LocalDateTime date = LocalDateTime.now();
String formattedDate = date.format(format);
account.addDiscovery(new WorldDiscovery(formattedDate, region));
@@ -110,16 +114,21 @@ public class RegionListener implements Listener {
}
private void sendTitles(Player player, ConfiguredRegion configuredRegion, boolean discovered) {
if (titleCooldown.contains(player.getUniqueId())) return;
else {
titleCooldown.add(player.getUniqueId());
Bukkit.getScheduler().runTaskLater(plugin, () -> {
titleCooldown.remove(player.getUniqueId());
}, plugin.getConfig().getInt("settings.server.discoveries.discovered.title.cooldown"));
if (titleCooldown.contains(player.getUniqueId())) {
plugin.debug("Player is on title cooldown");
return;
}
plugin.debug("Added to title cooldown");
titleCooldown.add(player.getUniqueId());
Bukkit.getScheduler().runTaskLater(plugin, () -> {
plugin.debug("Removed from title cooldown");
titleCooldown.remove(player.getUniqueId());
}, plugin.getConfig().getInt("settings.server.discoveries.discovered.title.cooldown"));
if (!discovered) {
List<String> discoveredTitle = configuredRegion.getDiscoveredTitle(player);
List<String> discoveredSubtitle = configuredRegion.getDiscoveredSubtitle(player);
plugin.debug("Region is not discovered, sending discovery titles! " + discoveredTitle + ":" + discoveredSubtitle);
new TitleAnimator(player,
plugin,
discoveredTitle,
@@ -130,6 +139,7 @@ public class RegionListener implements Listener {
List<String> title = configuredRegion.getTitle(player);
List<String> subtitle = configuredRegion.getSubtitle(player);
plugin.debug("Region is discovered, sending discovery titles! " + title + ":" + subtitle);
new TitleAnimator(player,
plugin,
title,
@@ -139,6 +149,7 @@ public class RegionListener implements Listener {
private void checkEffects(ConfiguredRegion configuredRegion, Player player) {
if (configuredRegion.getEffects() != null) {
plugin.debug("Checking effects");
configuredRegion.getEffects().forEach(regionEffect -> {
boolean canEffect = true;
if (regionEffect.isWearingRequired()) {
@@ -148,7 +159,7 @@ public class RegionListener implements Listener {
break;
}
}
plugin.debug("Wearing required, canEffect? " + canEffect);
if (canEffect) regionEffect.effect(player);
return;
}
@@ -160,6 +171,7 @@ public class RegionListener implements Listener {
}
}
plugin.debug("Wearing not required, canEffect? " + canEffect);
if (canEffect) regionEffect.effect(player);
});
}

6
rpgregions/src/main/resources/plugin.yml
View File

@@ -1,9 +1,9 @@
name: RPGRegions
version: @version@
main: net.islandearth.rpgregions.RPGRegions
api-version: '1.17'
libraries:
- "com.zaxxer:HikariCP:4.0.3" # database
api-version: '1.16'
#libraries:
# - "com.zaxxer:HikariCP:4.0.3" # database
softdepend: [Hyperverse, Multiverse, Languagy, UltraRegions, WorldGuard, PlaceholderAPI, HeadDatabase, Residence, Plan, GriefPrevention, Vault, MythicMobs, AlonsoLevels, Dynmap]
authors: [SamB440]
description: Discoverable regions