diff --git a/.github/workflows/java16-maven.yml b/.github/workflows/java17-maven.yml
similarity index 75%
rename from .github/workflows/java16-maven.yml
rename to .github/workflows/java17-maven.yml
index 92896df8..43d090ab 100644
--- a/.github/workflows/java16-maven.yml
+++ b/.github/workflows/java17-maven.yml
@@ -1,9 +1,9 @@
-name: Java16-Maven-Build
+name: Java17-Maven-Build
on: [push]
jobs:
- build-java-16:
+ build-java-17:
runs-on: ubuntu-latest
@@ -12,10 +12,10 @@ jobs:
- uses: actions/checkout@v1
# Java 16 Builds
- - name: Set up JDK 16
+ - name: Set up JDK 17
uses: actions/setup-java@v2.3.0
with:
- java-version: 16
+ java-version: 17
distribution: 'adopt'
- name: Build with Maven
run: mvn -B package --file pom.xml
diff --git a/SECURITY.md b/SECURITY.md
index adc91e1d..a18bd56e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -11,20 +11,23 @@ These versions are currently actively supported by our team, and you should expe
| Version | Supported | Support End: |
| ------------------- | ------------------ | ------------------------------ |
-| 2021.05 | :white_check_mark: | No Earlier than August 2021 |
+| 2021.09 | :white_check_mark: | No Earlier than December 2021 |
### Legacy Supported
These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate.
| Version | Supported | Support End: |
| ------------------- | ------------------ | ------------ |
-| 2021.04 | :white_check_mark: | July 2021 |
+| 2021.06 | :white_check_mark: | October 2021 |
+
### No Longer Supported
These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions.
| Version | Supported | Support Ended: |
| ------------------- | ------------------ | ------------------- |
+| 2021.05 | :white_check_mark: | September 2021 |
+| 2021.04 | :white_check_mark: | July 2021 |
| 2021.02 | :x: | 6 June 2021 |
| 2020.11 | :x: | 3 May 2021 |
| 6.0.x (Pre-Release) | :x: | December 2020 |
diff --git a/pom.xml b/pom.xml
index 53f437a8..77a1b10f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
me.totalfreedom
TotalFreedomMod
- 2021.06
+ 2021.09
jar
@@ -247,7 +247,7 @@
org.junit.jupiter
junit-jupiter
- 5.7.2
+ 5.8.0
compile
@@ -429,8 +429,8 @@
org.reflections:reflections
org.javassist:javassist
io.papermc:paperlib
- com.github.speedxx:Mojangson
org.bstats:bstats-bukkit
+ org.bstats:bstats-base
org.jetbrains:annotations
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java
index 1db19d19..2653c8ef 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java
@@ -269,8 +269,25 @@ public class CoreProtectBridge extends FreedomService
Block block = event.getClickedBlock();
final CoreProtectAPI coreProtect = getCoreProtectAPI();
+ // TODO: Rewrite this
if (data.hasInspection())
{
+ int cooldownTime = 3;
+
+ // Cooldown check
+ if ((event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_BLOCK)
+ && cooldown.containsKey(player.getName()))
+ {
+ long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
+ if (secondsLeft > 0L)
+ {
+ event.setCancelled(true);
+ player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
+ return;
+ }
+ }
+
+ // Actual lookup time
if (event.getAction() == Action.LEFT_CLICK_BLOCK)
{
if (block != null)
@@ -278,19 +295,6 @@ public class CoreProtectBridge extends FreedomService
event.setCancelled(true);
List lookup = coreProtect.blockLookup(block, -1);
- int cooldownTime = 3;
-
- if (cooldown.containsKey(player.getName()))
- {
- long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
- if (secondsLeft > 0L)
- {
- event.setCancelled(true);
- player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
- return;
- }
- }
-
if (!plugin.al.isAdmin(player))
{
cooldown.put(player.getName(), System.currentTimeMillis());
@@ -357,91 +361,75 @@ public class CoreProtectBridge extends FreedomService
{
if (block != null)
{
- if (data.hasInspection())
- {
- BlockState blockState = block.getRelative(event.getBlockFace()).getState();
- Block placedBlock = blockState.getBlock();
- event.setCancelled(true);
- List lookup = coreProtect.blockLookup(placedBlock, -1);
+ BlockState blockState = block.getRelative(event.getBlockFace()).getState();
+ Block placedBlock = blockState.getBlock();
+ event.setCancelled(true);
+ List lookup = coreProtect.blockLookup(placedBlock, -1);
+ if (lookup.isEmpty())
+ {
+ lookup = coreProtect.blockLookup(block, -1);
+ }
+
+ if (!plugin.al.isAdmin(player))
+ {
+ cooldown.put(player.getName(), System.currentTimeMillis());
+ }
+
+ if (lookup != null)
+ {
if (lookup.isEmpty())
{
- lookup = coreProtect.blockLookup(block, -1);
+ player.sendMessage(net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector " + ChatColor.WHITE + "- " + "No block data found for this location");
+ return;
}
- int cooldownTime = 3;
+ HISTORY_MAP.remove(event.getPlayer());
+ HISTORY_MAP.put(event.getPlayer(), new FUtil.PaginationList<>(10));
+ FUtil.PaginationList paged = HISTORY_MAP.get(event.getPlayer());
- if (cooldown.containsKey(player.getName()))
+ player.sendMessage("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- " +
+ ChatColor.GRAY + "(x" + block.getX() + "/" + "y" + block.getY() + "/" + "z" + block.getZ() + ")");
+
+ for (String[] value : lookup)
{
- long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
- if (secondsLeft > 0L)
+ CoreProtectAPI.ParseResult result = coreProtect.parseResult(value);
+ BlockData bl = result.getBlockData();
+
+ String s;
+ String st = "";
+
+ if (result.getActionString().equals("Placement"))
{
- event.setCancelled(true);
- player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
- return;
+ s = " placed ";
}
+ else if (result.getActionString().equals("Removal"))
+ {
+ s = " broke ";
+ }
+ else
+ {
+ s = " interacted with ";
+ }
+
+ if (result.isRolledBack())
+ {
+ st += "§m";
+ }
+
+ int time = (int)(System.currentTimeMillis() / 1000L);
+
+ paged.add(ChatColor.GRAY + getTimeAgo(result.getTime(), time) + ChatColor.WHITE + " - " + net.md_5.bungee.api.ChatColor.of("#30ade4") +
+ st + result.getPlayer() + ChatColor.WHITE + st + s + net.md_5.bungee.api.ChatColor.of("#30ade4") + st + bl.getMaterial().toString().toLowerCase());
}
- if (!plugin.al.isAdmin(player))
+ List page = paged.getPage(1);
+ for (String entries : page)
{
- cooldown.put(player.getName(), System.currentTimeMillis());
+ player.sendMessage(entries);
}
- if (lookup != null)
- {
- if (lookup.isEmpty())
- {
- player.sendMessage(net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector " + ChatColor.WHITE + "- " + "No block data found for this location");
- return;
- }
-
- HISTORY_MAP.remove(event.getPlayer());
- HISTORY_MAP.put(event.getPlayer(), new FUtil.PaginationList<>(10));
- FUtil.PaginationList paged = HISTORY_MAP.get(event.getPlayer());
-
- player.sendMessage("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- " +
- ChatColor.GRAY + "(x" + block.getX() + "/" + "y" + block.getY() + "/" + "z" + block.getZ() + ")");
-
- for (String[] value : lookup)
- {
- CoreProtectAPI.ParseResult result = coreProtect.parseResult(value);
- BlockData bl = result.getBlockData();
-
- String s;
- String st = "";
-
- if (result.getActionString().equals("Placement"))
- {
- s = " placed ";
- }
- else if (result.getActionString().equals("Removal"))
- {
- s = " broke ";
- }
- else
- {
- s = " interacted with ";
- }
-
- if (result.isRolledBack())
- {
- st += "§m";
- }
-
- int time = (int)(System.currentTimeMillis() / 1000L);
-
- paged.add(ChatColor.GRAY + getTimeAgo(result.getTime(), time) + ChatColor.WHITE + " - " + net.md_5.bungee.api.ChatColor.of("#30ade4") +
- st + result.getPlayer() + ChatColor.WHITE + st + s + net.md_5.bungee.api.ChatColor.of("#30ade4") + st + bl.getMaterial().toString().toLowerCase());
- }
-
- List page = paged.getPage(1);
- for (String entries : page)
- {
- player.sendMessage(entries);
- }
-
- player.sendMessage("Page 1/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history ");
- }
+ player.sendMessage("Page 1/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history ");
}
}
}