Merge pull request #23 from Streamline-Essentials/dev

make even

Author: DrakDv

build.gradle

@@ -127,7 +127,7 @@ shadowJar {
  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')
+ relocate('de.leonhard', 'host.plas.bou.libs.de.leonhard')
 }
 
 artifacts {

dependencies.gradle

@@ -1,12 +1,12 @@
 ext {
  IMPL = [
- 'com.github.Server-Utilities:TheBase:6e4c8814',
+ 'com.github.Server-Utilities:TheBase:master-SNAPSHOT',
  '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.Server-Utilities:TheBase:master-SNAPSHOT',
  '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 @@
+# Project Details
 name = BukkitOfUtils
 group = com.github.streamline-essentials
-version = 1.10.0
-
-base-version = 6e4c8814
+version = 1.13.0
 
+# Plugin Details
 plugin.main = host.plas.bou.BukkitOfUtils

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

@@ -4,15 +4,10 @@
 import host.plas.bou.firestring.FireStringManager;
 import host.plas.bou.gui.ScreenManager;
 import host.plas.bou.instances.BaseManager;
-import host.plas.bou.owncmd.DebugCMD;
-import host.plas.bou.owncmd.EntityCountCMD;
-import host.plas.bou.owncmd.MessageCMD;
-import host.plas.bou.owncmd.TitleCMD;
+import host.plas.bou.owncmd.*;
 import host.plas.bou.utils.ClassHelper;
 import lombok.Getter;
 import lombok.Setter;
-import tv.quaint.async.AsyncUtils;
-import tv.quaint.async.WithSync;
 
 public class BukkitOfUtils extends BetterPlugin {
  @Getter @Setter
@@ -23,12 +18,21 @@ public BukkitOfUtils() {
  }
 
  @Override
- public void onBaseEnabled() {
+ public void onLoad() {
+ setInstance(this);
+
  BaseManager.init(this);
+ }
+
+ @Override
+ public void onBaseEnabled() {
+ BaseManager.initOnEnabled();
+
  // Plugin startup logic
 // instance = this; // Set earlier.
  new DebugCMD();
  new EntityCountCMD();
+ new FireStringCMD();
  new MessageCMD();
  new TitleCMD();
 

src/main/java/host/plas/bou/commands/CommandContext.java

@@ -1,12 +1,10 @@
 package host.plas.bou.commands;
 
-import host.plas.bou.instances.BaseManager;
 import host.plas.bou.utils.obj.ContextedString;
 import lombok.Getter;
 import lombok.Setter;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
-import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -86,6 +84,22 @@ public Player getPlayerOrNull() {
  return getPlayer().orElse(null);
  }
 
+ public String getFullCommand() {
+ return command.getName() + " " + getArgsAsString();
+ }
+
+ public String getArgsAsString() {
+ return String.join(" ", getArgsAsStringArray());
+ }
+
+ public String[] getArgsAsStringArray() {
+ String[] args = new String[getArgs().size()];
+ for (int i = 0; i < getArgs().size(); i++) {
+ args[i] = getArg(i).getContent();
+ }
+ return args;
+ }
+
  public static ConcurrentSkipListSet<CommandArgument> getArgsFrom(String... args) {
  return ContextedString.getArgsFrom(ARGUMENT_CREATOR_INDEXED, args);
  }

src/main/java/host/plas/bou/events/callbacks/CallbackManager.java

@@ -1,6 +1,5 @@
 package host.plas.bou.events.callbacks;
 
-import host.plas.bou.BetterPlugin;
 import host.plas.bou.BukkitOfUtils;
 import lombok.Getter;
 import lombok.Setter;

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/menus/TaskMenu.java

@@ -25,11 +25,11 @@ public static ManagedInventory buildTaskList() {
  try {
  AtomicInteger slot = new AtomicInteger(0);
  taskItems.forEach((key, value) -> {
- inventory.getSlots().put(slot.getAndIncrement(), value);
+ inventory.setItem(slot.getAndIncrement(), value);
  });
 
  asyncItems.forEach((key, value) -> {
- inventory.getSlots().put(slot.getAndIncrement(), value);
+ inventory.setItem(slot.getAndIncrement(), value);
  });
  } catch (Exception e) {
  BukkitOfUtils.getInstance().logWarning("Error while building task list: " + e.getMessage(), e);

src/main/java/host/plas/bou/instances/BaseManager.java

@@ -24,8 +24,9 @@
 import java.util.concurrent.ConcurrentSkipListMap;
 
 public class BaseManager {
- @Getter @Setter
- private static BukkitOfUtils baseInstance;
+ public static BukkitOfUtils getBaseInstance() {
+ return BukkitOfUtils.getInstance();
+ }
 
  @Setter
  private static BaseConfig baseConfig;
@@ -44,23 +45,22 @@ public static void init(BukkitOfUtils baseInstance) {
 
  CallbackManager.init();
 
- EntityUtils.init();
-
- mainListener = new MainListener();
-
  VersionTool.init();
  }
 
  public static void preInit(BukkitOfUtils baseInstance) {
- if (BukkitOfUtils.getInstance() == null) {
- BukkitOfUtils.setInstance(baseInstance);
- }
- setBaseInstance(baseInstance);
  ensureConfig();
 
  BetterPlugin.setScheduler(UniversalScheduler.getScheduler(baseInstance));
- new InventoryAPI(baseInstance).init();
+ }
+
+ public static void initOnEnabled() {
+ new InventoryAPI(getBaseInstance()).init();
+
+ mainListener = new MainListener();
  TaskManager.init();
+
+ EntityUtils.init();
  }
 
  public static void ensureConfig() {

src/main/java/host/plas/bou/items/ConvertableItemStack.java

@@ -40,14 +40,22 @@ public ConvertableItemStack() {
 
  public ConvertableItemStack convert() {
  if (itemStackOptional.isPresent() && itemStringOptional.isEmpty()) {
- itemStringOptional = Optional.of(ItemUtils.getItemNBT(itemStackOptional.get()));
+ itemStringOptional = Optional.of(ItemUtils.getItemNBTStrict(itemStackOptional.get()));
  } else if (itemStackOptional.isEmpty() && itemStringOptional.isPresent()) {
- itemStackOptional = ItemUtils.getItem(itemStringOptional.get());
+ if (isNbtStrict()) {
+ itemStackOptional = ItemUtils.getItemStrict(itemStringOptional.get());
+ } else {
+ itemStackOptional = ItemUtils.getItem(itemStringOptional.get());
+ }
  }
 
  return this;
  }
 
+ public boolean isNbtStrict() {
+ return itemStringOptional.isPresent() && ! itemStringOptional.get().startsWith("{") && ! itemStringOptional.get().endsWith("}");
+ }
+
  public ConvertableItemStack setItemStack(ItemStack itemStack) {
  this.itemStackOptional = Optional.ofNullable(itemStack);