Add LuckPerms Context.

TheNewEconomy · Dec 20, 2023 · e6f4955 · e6f4955
1 parent adacd36
commit e6f4955
Show file tree

Hide file tree

Showing 22 changed files with 79 additions and 32 deletions.
diff --git a/.changelog/0.1.2.1.md b/.changelog/0.1.2.1.md
@@ -14,5 +14,5 @@
 ## Proxies
 This release requires updating your proxy jars if you run them on your bungee/velocity instances.
 
-Velocity: https://github.com/TheNewEconomy/EconomyCore/releases/download/Velocity-0.1.2.6-Pre1/TNE-VelocityCore-0.1.2.6-Pre1.jar
-Bungee: https://github.com/TheNewEconomy/EconomyCore/releases/download/Bungee-0.1.2.6-Pre1/TNE-BungeeCore-0.1.2.6-Pre1.jar
+Velocity: https://github.com/TheNewEconomy/EconomyCore/releases/download/Velocity-0.1.2.6-Pre2/TNE-VelocityCore-0.1.2.6-Pre2.jar
+Bungee: https://github.com/TheNewEconomy/EconomyCore/releases/download/Bungee-0.1.2.6-Pre2/TNE-BungeeCore-0.1.2.6-Pre2.jar
diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
@@ -280,7 +280,7 @@
     <parent>
         <groupId>net.tnemc</groupId>
         <artifactId>TNE</artifactId>
-        <version>0.1.2.6-Pre1</version>
+        <version>0.1.2.6-Pre2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/Bukkit/src/net/tnemc/bukkit/command/CurrencyCommand.java b/Bukkit/src/net/tnemc/bukkit/command/CurrencyCommand.java
@@ -0,0 +1,27 @@
+package net.tnemc.bukkit.command;
+/*
+ * The New Economy
+ * Copyright (C) 2022 - 2023 Daniel "creatorfromhell" Vidmar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * CurrencyCommand
+ *
+ * @author creatorfromhell
+ * @since 0.1.2.0
+ */
+public class CurrencyCommand {
+}
diff --git a/Bukkit/src/net/tnemc/bukkit/hook/misc/LuckPermsHook.java b/Bukkit/src/net/tnemc/bukkit/hook/misc/LuckPermsHook.java
@@ -18,7 +18,7 @@
  */
 
 import net.luckperms.api.LuckPerms;
-import net.tnemc.bukkit.TNE;
+import org.bukkit.Bukkit;
 
 /**
  * LuckPermsHook
@@ -29,7 +29,7 @@
 public class LuckPermsHook {
 
   public static void register() {
-    final LuckPerms luckAPI = TNE.instance().getServer().getServicesManager().load(LuckPerms.class);
+    final LuckPerms luckAPI = Bukkit.getServer().getServicesManager().load(LuckPerms.class);
     if(luckAPI != null) {
       luckAPI.getContextManager().registerCalculator(new LuckBalanceContext());
     }

diff --git a/Bungee/pom.xml b/Bungee/pom.xml
@@ -110,6 +110,6 @@
     <parent>
         <groupId>net.tnemc</groupId>
         <artifactId>TNE</artifactId>
-        <version>0.1.2.6-Pre1</version>
+        <version>0.1.2.6-Pre2</version>
     </parent>
 </project>
diff --git a/Core/pom.xml b/Core/pom.xml
@@ -118,7 +118,7 @@
     <parent>
         <groupId>net.tnemc</groupId>
         <artifactId>TNE</artifactId>
-        <version>0.1.2.6-Pre1</version>
+        <version>0.1.2.6-Pre2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/Core/src/net/tnemc/core/command/CurrencyCommand.java b/Core/src/net/tnemc/core/command/CurrencyCommand.java
@@ -27,7 +27,20 @@
  */
 public class CurrencyCommand {
 
+  public static void onCreate(CmdSource<?> sender, final String name, final String type) {
+
+  }
+
   public static void onInstall(CmdSource<?> sender, final String template) {
 
   }
+
+
+  public static void onList(CmdSource<?> sender) {
+
+  }
+
+  public static void onSet(CmdSource<?> sender) {
+
+  }
 }
diff --git a/Core/src/net/tnemc/core/command/MoneyCommand.java b/Core/src/net/tnemc/core/command/MoneyCommand.java
@@ -33,6 +33,7 @@
 import net.tnemc.core.currency.Currency;
 import net.tnemc.core.currency.Note;
 import net.tnemc.core.currency.format.CurrencyFormatter;
+import net.tnemc.core.currency.item.ItemCurrency;
 import net.tnemc.core.currency.type.MixedType;
 import net.tnemc.core.io.message.MessageData;
 import net.tnemc.core.manager.TopManager;
@@ -358,11 +359,19 @@ public static void onOther(CmdSource<?> sender, Account account, String region,
         amount = amount.add(entry.getAmount());
 
         if(entry.getHandler().asID().equalsIgnoreCase(EconomyManager.INVENTORY_ONLY.asID())) {
-          entryMSG.addReplacement("$inventory", CurrencyFormatter.format(account, entry));
+          if(currency.type().supportsItems()) {
+            entryMSG.addReplacement("$inventory", CurrencyFormatter.format(account, entry));
+          } else {
+            entryMSG.addReplacement("$inventory", "0");
+          }
         }
 
         if(entry.getHandler().asID().equalsIgnoreCase(EconomyManager.E_CHEST.asID())) {
-          entryMSG.addReplacement("$ender", CurrencyFormatter.format(account, entry));
+          if(currency.type().supportsItems()) {
+            entryMSG.addReplacement("$ender", CurrencyFormatter.format(account, entry));
+          } else {
+            entryMSG.addReplacement("$ender", "0");
+          }
         }
 
         if(entry.getHandler().asID().equalsIgnoreCase(EconomyManager.VIRTUAL.asID())) {

diff --git a/Core/src/net/tnemc/core/currency/format/impl/MinorNameRule.java b/Core/src/net/tnemc/core/currency/format/impl/MinorNameRule.java
@@ -42,12 +42,12 @@ public String format(@Nullable Account account, HoldingsEntry entry, String form
     /*
     [15:52:47 WARN]: java.lang.NullPointerException: Cannot invoke "java.lang.CharSequence.toString()" because "replacement" is null
 [15:52:47 WARN]:        at java.base/java.lang.String.replace(String.java:2956)
-[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre1.jar//net.tnemc.core.currency.format.impl.MinorNameRule.lambda$format$0(MinorNameRule.java:42)
+[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre2.jar//net.tnemc.core.currency.format.impl.MinorNameRule.lambda$format$0(MinorNameRule.java:42)
 [15:52:47 WARN]:        at java.base/java.util.Optional.map(Optional.java:260)
-[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre1.jar//net.tnemc.core.currency.format.impl.MinorNameRule.format(MinorNameRule.java:42)
-[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre1.jar//net.tnemc.core.currency.format.CurrencyFormatter.format(CurrencyFormatter.java:77)
-[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre1.jar//net.tnemc.core.command.MoneyCommand.onSet(MoneyCommand.java:299)
-[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre1.jar//net.tnemc.bukkit.command.MoneyCommand.onSet(MoneyCom
+[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre2.jar//net.tnemc.core.currency.format.impl.MinorNameRule.format(MinorNameRule.java:42)
+[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre2.jar//net.tnemc.core.currency.format.CurrencyFormatter.format(CurrencyFormatter.java:77)
+[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre2.jar//net.tnemc.core.command.MoneyCommand.onSet(MoneyCommand.java:299)
+[15:52:47 WARN]:        at BukkitCore-0.1.2.6-Pre2.jar//net.tnemc.bukkit.command.MoneyCommand.onSet(MoneyCom
      */
 
     final Optional<Currency> currency = entry.currency();

diff --git a/Core/src/net/tnemc/core/io/storage/engine/sql/SQLite.java b/Core/src/net/tnemc/core/io/storage/engine/sql/SQLite.java
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import net.tnemc.core.config.DataConfig;
 import net.tnemc.core.io.storage.Dialect;
 import net.tnemc.core.io.storage.SQLEngine;
 import net.tnemc.core.io.storage.engine.StandardSQL;

diff --git a/Currency Templates/pom.xml b/Currency Templates/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.tnemc</groupId>
         <artifactId>TNE</artifactId>
-        <version>0.1.2.6-Pre1</version>
+        <version>0.1.2.6-Pre2</version>
     </parent>
 
     <artifactId>TNETemplates</artifactId>

diff --git a/FabricCore/build.gradle b/FabricCore/build.gradle
@@ -32,7 +32,7 @@ dependencies {
 
 	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
 
-	compileOnly(group:'net.tnemc', name: 'EconomyCore', version: '0.1.2.6-Pre1')
+	compileOnly(group:'net.tnemc', name: 'EconomyCore', version: '0.1.2.6-Pre2')
 	compileOnly(group:'net.tnemc', name: 'TNML-CORE', version: '1.0-SNAPSHOT-18')
 }
 

diff --git a/FabricCore/gradle.properties b/FabricCore/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.parallel=true
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
 	minecraft_version=1.19.4
-    tne_version=0.1.2.6-Pre1
+    tne_version=0.1.2.6-Pre2
 	yarn_mappings=1.19.4+build.2
 	loader_version=0.14.19
 

diff --git a/Folia/pom.xml b/Folia/pom.xml
@@ -174,7 +174,7 @@
         <dependency>
             <groupId>net.tnemc</groupId>
             <artifactId>EconomyCore</artifactId>
-            <version>0.1.2.6-Pre1</version>
+            <version>0.1.2.6-Pre2</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -186,7 +186,7 @@
         <dependency>
             <groupId>net.tnemc</groupId>
             <artifactId>BukkitCore</artifactId>
-            <version>0.1.2.6-Pre1</version>
+            <version>0.1.2.6-Pre2</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -220,7 +220,7 @@
     <parent>
         <groupId>net.tnemc</groupId>
         <artifactId>TNE</artifactId>
-        <version>0.1.2.6-Pre1</version>
+        <version>0.1.2.6-Pre2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/PaperCore/pom.xml b/PaperCore/pom.xml
@@ -207,7 +207,7 @@
         <dependency>
             <groupId>net.tnemc</groupId>
             <artifactId>EconomyCore</artifactId>
-            <version>0.1.2.6-Pre1</version>
+            <version>0.1.2.6-Pre2</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -282,7 +282,7 @@
     <parent>
         <groupId>net.tnemc</groupId>
         <artifactId>TNE</artifactId>
-        <version>0.1.2.6-Pre1</version>
+        <version>0.1.2.6-Pre2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/PaperCore/src/net/tnemc/paper/hook/misc/LuckPermsHook.java b/PaperCore/src/net/tnemc/paper/hook/misc/LuckPermsHook.java
@@ -18,6 +18,7 @@
  */
 
 import net.luckperms.api.LuckPerms;
+import org.bukkit.Bukkit;
 
 /**
  * LuckPermsHook
@@ -28,7 +29,7 @@
 public class LuckPermsHook {
 
   public static void register() {
-    final LuckPerms luckAPI = TNE.instance().getServer().getServicesManager().load(LuckPerms.class);
+    final LuckPerms luckAPI = Bukkit.getServer().getServicesManager().load(LuckPerms.class);
     if(luckAPI != null) {
       luckAPI.getContextManager().registerCalculator(new LuckBalanceContext());
     }

diff --git a/Sponge/pom.xml b/Sponge/pom.xml
@@ -196,7 +196,7 @@
     <parent>
         <groupId>net.tnemc</groupId>
         <artifactId>TNE</artifactId>
-        <version>0.1.2.6-Pre1</version>
+        <version>0.1.2.6-Pre2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/Sponge/resources/META-INF/sponge_plugins.json b/Sponge/resources/META-INF/sponge_plugins.json
@@ -5,7 +5,7 @@
   },
   "license": "AGPL",
   "global": {
-    "version": "0.1.2.6-Pre1",
+    "version": "0.1.2.6-Pre2",
     "links": {
       "homepage": "https://tnemc.net",
       "source": "https://github.com/TheNewEconomy/EconomyCore",

diff --git a/Sponge8/pom.xml b/Sponge8/pom.xml
@@ -232,7 +232,7 @@
     <parent>
         <groupId>net.tnemc</groupId>
         <artifactId>TNE</artifactId>
-        <version>0.1.2.6-Pre1</version>
+        <version>0.1.2.6-Pre2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/Sponge8/src/net/tnemc/sponge/command/ModuleCommand.java b/Sponge8/src/net/tnemc/sponge/command/ModuleCommand.java
@@ -17,10 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import net.tnemc.core.TNECore;
 import net.tnemc.sponge.impl.SpongeCMDSource;
 import revxrsal.commands.annotation.Command;
-import revxrsal.commands.annotation.Default;
 import revxrsal.commands.annotation.DefaultFor;
 import revxrsal.commands.annotation.Description;
 import revxrsal.commands.annotation.Subcommand;

diff --git a/Velocity/pom.xml b/Velocity/pom.xml
@@ -105,14 +105,14 @@
         <dependency>
             <groupId>net.tnemc</groupId>
             <artifactId>BungeeCore</artifactId>
-            <version>0.1.2.6-Pre1</version>
+            <version>0.1.2.6-Pre2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
 
     <parent>
         <groupId>net.tnemc</groupId>
         <artifactId>TNE</artifactId>
-        <version>0.1.2.6-Pre1</version>
+        <version>0.1.2.6-Pre2</version>
     </parent>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.tnemc</groupId>
     <artifactId>TNE</artifactId>
-    <version>0.1.2.6-Pre1</version>
+    <version>0.1.2.6-Pre2</version>
     <packaging>pom</packaging>
     <name>The New Economy</name>