Merge pull request #22 from Streamline-Essentials/dev

Dev

Author: DrakDv

build.gradle

@@ -57,8 +57,33 @@ dependencies {
  shadow(SHADOW)
 
  // TheBase
- implementation("com.github.server-utilities:TheBase:${rootProject.properties['base-version']}").exclude(group: 'com.zaxxer', module: 'HikariCP')
- shadow("com.github.server-utilities:TheBase:${rootProject.properties['base-version']}").exclude(group: 'com.zaxxer', module: 'HikariCP')
+ implementation('com.github.simplix-softworks:simplixstorage:3.2.7')
+ shadow('com.github.simplix-softworks:simplixstorage:3.2.7')
+
+ implementation('mysql:mysql-connector-java:8.0.33')
+ shadow('mysql:mysql-connector-java:8.0.33')
+
+ implementation('org.xerial:sqlite-jdbc:3.46.1.0')
+ .exclude(group: 'org.slf4j', module: 'slf4j-api')
+ shadow('org.xerial:sqlite-jdbc:3.46.1.0')
+ .exclude(group: 'org.slf4j', module: 'slf4j-api')
+
+ implementation('com.zaxxer:HikariCP:5.1.0')
+ .exclude(group: 'org.slf4j', module: 'slf4j-api')
+ .exclude(group: 'org.apache.logging.log4j', module: 'log4j-api')
+ .exclude(group: 'org.apache.logging.log4j', module: 'log4j-core')
+ .exclude(group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl')
+ shadow('com.zaxxer:HikariCP:5.1.0')
+ .exclude(group: 'org.slf4j', module: 'slf4j-api')
+ .exclude(group: 'org.apache.logging.log4j', module: 'log4j-api')
+ .exclude(group: 'org.apache.logging.log4j', module: 'log4j-core')
+ .exclude(group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl')
+
+ implementation('net.objecthunter:exp4j:0.4.8')
+ shadow('net.objecthunter:exp4j:0.4.8')
+
+ implementation('com.google.re2j:re2j:1.7')
+ shadow('com.google.re2j:re2j:1.7')
 
  // OblivateInvs
  implementation("com.github.hamza-cskn.obliviate-invs:core:4.1.12").exclude(group: 'com.google.code.gson', module: 'gson')
@@ -101,6 +126,8 @@ shadowJar {
  relocate('com.github.Anon8281.universalScheduler', 'host.plas.bou.libs.universalScheduler')
  relocate('com.github.benmanes.caffeine', 'host.plas.bou.libs.caffeine')
  relocate('com.google.gson', 'host.plas.bou.libs.gson')
+
+ relocate('de.leonhard', 'tv.quaint.thebase.lib.leonhard')
 }
 
 artifacts {

dependencies.gradle

@@ -1,10 +1,12 @@
 ext {
  IMPL = [
+ 'com.github.Server-Utilities:TheBase:6e4c8814',
  'com.github.streamline-essentials:UniversalScheduler:main-SNAPSHOT',
  'com.github.ben-manes.caffeine:caffeine:3.1.8',
  'com.google.code.gson:gson:2.11.0',
  ]
  SHADOW = [
+ 'com.github.Server-Utilities:TheBase:6e4c8814',
  'com.github.streamline-essentials:UniversalScheduler:main-SNAPSHOT',
  'com.github.ben-manes.caffeine:caffeine:3.1.8',
  'com.google.code.gson:gson:2.11.0',

gradle.properties

@@ -1,7 +1,7 @@
 name = BukkitOfUtils
 group = com.github.streamline-essentials
-version = 1.9.0
+version = 1.10.0
 
-base-version = c8388399
+base-version = 6e4c8814
 
 plugin.main = host.plas.bou.BukkitOfUtils

src/main/java/host/plas/bou/BetterPlugin.java

@@ -12,6 +12,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import tv.quaint.async.SyncInstance;
 import tv.quaint.async.ThreadHolder;
@@ -25,7 +26,7 @@
 import java.util.function.Consumer;
 
 @Getter @Setter
-public class BetterPlugin extends JavaPlugin implements IModifierEventable, Identified, WithSync, BaseEventListener {
+public class BetterPlugin extends JavaPlugin implements IModifierEventable, Identified, WithSync, BaseEventListener, ListenerConglomerate {
  @Getter
  private final ModifierType modifierType;
 
@@ -66,6 +67,8 @@ public void onLoad() {
 
  @Override
  public void onEnable() {
+ registerSelfListener();
+
  onBaseEnabling();
 
  if (! (this instanceof BukkitOfUtils)) {
@@ -80,6 +83,18 @@ public void onDisable() {
  onBaseDisable();
 
  PluginDisableEvent event = new PluginDisableEvent(this).fire();
+
+ unregisterSelfListener();
+ }
+
+ public void registerSelfListener() {
+ registerListener((Listener) this);
+ registerListener((BaseEventListener) this);
+ }
+
+ public void unregisterSelfListener() {
+ unregisterListener((Listener) this);
+ unregisterListener((BaseEventListener) this);
  }
 
  public void registerListenerConglomerate(ListenerConglomerate listener) {
@@ -113,7 +128,7 @@ public void unregisterListener(Listener listener) {
  }
 
  public void unregisterAllBukkitListeners() {
- HandlerList.unregisterAll(this);
+ HandlerList.unregisterAll((Plugin) this);
  }
 
  public void unregisterAllListeners() {

src/main/java/host/plas/bou/events/MainListener.java

@@ -4,6 +4,8 @@
 import host.plas.bou.BukkitOfUtils;
 import host.plas.bou.compat.papi.PAPICompat;
 import host.plas.bou.events.self.plugin.PluginDisableEvent;
+import host.plas.bou.gui.ScreenManager;
+import host.plas.bou.gui.screens.events.BlockRedrawEvent;
 import host.plas.bou.utils.DatabaseUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;
@@ -30,4 +32,9 @@ public void onPluginDisable(PluginDisableEvent event) {
  BukkitOfUtils.getInstance().logWarning("Failed to fully disable a Better Plugin!", t);
  }
  }
+
+ @BaseProcessor
+ public void onRedrawEvent(BlockRedrawEvent event) {
+ event.getScreenBlock().onRedraw(event);
+ }
 }

src/main/java/host/plas/bou/firestring/FireString.java

@@ -4,8 +4,8 @@
 import lombok.Setter;
 import tv.quaint.objects.Identifiable;
 import tv.quaint.objects.SingleSet;
-import tv.quaint.thebase.lib.re2j.Matcher;
 import tv.quaint.utils.MatcherUtils;
+import com.google.re2j.Matcher;
 
 import java.util.List;
 

src/main/java/host/plas/bou/gui/ScreenManager.java

@@ -10,6 +10,7 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
 
 public class ScreenManager {
  @Getter @Setter
@@ -77,4 +78,43 @@ public static ConcurrentSkipListSet<ScreenInstance> getPlayersOf(ScreenBlock blo
 
  return players;
  }
+
+ @Getter @Setter
+ private static ConcurrentSkipListSet<ScreenBlock> loadedBlocks = new ConcurrentSkipListSet<>();
+
+ public static void addBlock(ScreenBlock block) {
+ loadedBlocks.add(block);
+ }
+
+ public static void removeBlock(Predicate<ScreenBlock> predicate) {
+ loadedBlocks.removeIf(predicate);
+ }
+
+ public static Optional<ScreenBlock> getScreenBlock(ScreenInstance instance) {
+ AtomicReference<Optional<ScreenBlock>> block = new AtomicReference<>(Optional.empty());
+
+ loadedBlocks.forEach(b -> {
+ if (block.get().isPresent()) return;
+
+ if (instance.getScreenBlock().isPresent() && instance.getScreenBlock().get().equals(b)) {
+ block.set(Optional.of(b));
+ }
+ });
+
+ return block.get();
+ }
+
+ public static Optional<ScreenBlock> getScreenBlockOf(Player player) {
+ AtomicReference<Optional<ScreenBlock>> block = new AtomicReference<>(Optional.empty());
+
+ getScreen(player).ifPresent(screen -> {
+ block.set(getScreenBlock(screen));
+ });
+
+ return block.get();
+ }
+
+ public static boolean hasBlock(ScreenBlock block) {
+ return loadedBlocks.contains(block);
+ }
 }

src/main/java/host/plas/bou/gui/screens/ScreenInstance.java

@@ -139,7 +139,20 @@ public void close() {
  }
 
  public void redraw() {
+ redraw(true);
+ }
+
+ public void redraw(boolean reshow) {
  build(inventorySheet);
+
+ if (reshow) {
+ reshow();
+ }
+ }
+
+ public void reshow() {
+ close();
+ open();
  }
 
  public ConcurrentSkipListMap<String, HumanEntity> getViewers() {

src/main/java/host/plas/bou/gui/screens/blocks/ScreenBlock.java

@@ -52,11 +52,12 @@ public void onRedraw() {
  public void onOpen(BlockOpenEvent event) {
  Player player = event.getPlayer();
 
- if (ScreenManager.hasScreen(player)) {
+ if (ScreenManager.hasScreen(player) && ! event.isOverride()) {
  ScreenManager.getScreen(player).ifPresent(ScreenInstance::open);
- } else {
- buildScreen(event).open();
+ return;
  }
+
+ buildScreen(event).open();
  }
 
  public void onClose(BlockCloseEvent event) {
@@ -86,9 +87,10 @@ public ScreenInstance buildScreen(BlockOpenEvent event) {
  public void onRedraw(BlockRedrawEvent event) {
  ScreenBlock block = event.getScreenBlock();
 
- ScreenManager.getPlayersOf(block).forEach(s -> {
- s.close();
- s.open();
- });
+ ScreenManager.getPlayersOf(block).forEach(ScreenInstance::redraw);
+ }
+
+ public void redraw() {
+ BlockRedrawEvent event = new BlockRedrawEvent(this).fire();
  }
 }

src/main/java/host/plas/bou/gui/screens/events/BlockOpenEvent.java

@@ -8,10 +8,12 @@
 @Getter @Setter
 public class BlockOpenEvent extends ScreenBlockEvent {
  private Player player;
+ private boolean override;
 
  public BlockOpenEvent(Player player, ScreenBlock screenBlock) {
  super(screenBlock);
 
  this.player = player;
+ this.override = true;
  }
 }