change java version

yshop-pl · Nov 6, 2024 · d553bbb · d553bbb
1 parent 91fa93c
commit d553bbb
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 17 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -17,7 +17,7 @@ publishing {
         create<MavenPublication>("maven") {
             groupId = "pl.yshop.plugin"
             artifactId = "api"
-            version = "4.0.2"
+            version = "4.0.4"
             from(components["java"])
         }
     }

diff --git a/api/src/main/java/pl/yshop/plugin/api/Platform.java b/api/src/main/java/pl/yshop/plugin/api/Platform.java
@@ -17,5 +17,7 @@ public interface Platform {
     Configuration getConfiguration();
     Requester getRequester();
 
+    Object plugin();
+
     PlatformLogger logger();
 }
diff --git a/api/src/main/java/pl/yshop/plugin/api/utils/Base64Utils.java b/api/src/main/java/pl/yshop/plugin/api/utils/Base64Utils.java
@@ -0,0 +1,10 @@
+package pl.yshop.plugin.api.utils;
+
+import java.util.Base64;
+
+public class Base64Utils {
+    public static String decode(String input) {
+        byte[] decodedBytes = Base64.getDecoder().decode(input);
+        return new String(decodedBytes);
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,10 +19,14 @@ allprojects {
     group = "pl.yshop.plugin"
     version = "4.0.0"
 
+    java.sourceCompatibility = JavaVersion.VERSION_16
+    java.targetCompatibility = JavaVersion.VERSION_16
+
     repositories {
         mavenCentral()
         maven("https://oss.sonatype.org/content/groups/public/")
         maven("https://repo.panda-lang.org/releases")
+        maven("https://repo.xenondevs.xyz/releases")
     }
 
     tasks {
@@ -38,4 +42,5 @@ dependencies {
     implementation(project(":bukkit"))
     implementation(project(":bungee"))
     implementation(project(":velocity"))
+    implementation("xyz.xenondevs.invui:invui:1.39")
 }
diff --git a/bukkit/src/main/java/pl/yshop/plugin/bukkit/BukkitPlatform.java b/bukkit/src/main/java/pl/yshop/plugin/bukkit/BukkitPlatform.java
@@ -79,4 +79,9 @@ public PlatformLogger logger() {
     public Requester getRequester() {
         return new YShopRequest(this);
     }
+
+    @Override
+    public Object plugin() {
+        return this.plugin;
+    }
 }
diff --git a/bungee/src/main/java/pl/yshop/plugin/bungee/BungeePlatform.java b/bungee/src/main/java/pl/yshop/plugin/bungee/BungeePlatform.java
@@ -2,23 +2,28 @@
 
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Plugin;
 import pl.yshop.plugin.api.Configuration;
 import pl.yshop.plugin.api.Platform;
 import pl.yshop.plugin.api.PlatformLogger;
+import pl.yshop.plugin.api.commands.PlatformCommand;
 import pl.yshop.plugin.api.request.Requester;
 import pl.yshop.plugin.bungee.configuration.BungeeConfigurationManager;
 import pl.yshop.plugin.bungee.configuration.BungeeConfiguration;
+import pl.yshop.plugin.shared.PlatformCommandManager;
 import pl.yshop.plugin.shared.configuration.ConfigProperties;
 import pl.yshop.plugin.shared.request.YShopRequest;
 
 public class BungeePlatform implements Platform {
     private final Plugin plugin;
     private final BungeeAudiences audiences;
+    private final PlatformCommandManager<CommandSender> commandManager;
 
-    public BungeePlatform(Plugin plugin) {
+    public BungeePlatform(Plugin plugin, PlatformCommandManager<CommandSender> commandManager) {
         this.plugin = plugin;
         this.audiences = BungeeAudiences.create(plugin);
+        this.commandManager = commandManager;
     }
 
     @Override
@@ -53,6 +58,11 @@ public void announce(String message) {
         });
     }
 
+    @Override
+    public void registerCommand(PlatformCommand command) {
+        this.commandManager.register(command);
+    }
+
     @Override
     public Configuration getConfiguration() {
         BungeeConfigurationManager configManager = new BungeeConfigurationManager(this.plugin);
@@ -72,6 +82,11 @@ public Requester getRequester() {
         return new YShopRequest(this);
     }
 
+    @Override
+    public Object plugin() {
+        return this.plugin;
+    }
+
     @Override
     public PlatformLogger logger() {
         return new BungeeLogger(this.plugin.getLogger());

diff --git a/bungee/src/main/java/pl/yshop/plugin/bungee/BungeePlugin.java b/bungee/src/main/java/pl/yshop/plugin/bungee/BungeePlugin.java
@@ -1,10 +1,12 @@
 package pl.yshop.plugin.bungee;
 
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Plugin;
 import pl.yshop.plugin.api.Platform;
 import pl.yshop.plugin.bungee.commands.BungeeCommandManager;
 import pl.yshop.plugin.shared.Bootstrap;
+import pl.yshop.plugin.shared.PlatformCommandManager;
 import pl.yshop.plugin.shared.tasks.ExecuteCommandsTask;
 
 import java.util.concurrent.TimeUnit;
@@ -16,9 +18,10 @@ public class BungeePlugin extends Plugin {
     @Override
     public void onEnable() {
         audiences = BungeeAudiences.create(this);
-        Platform platform = new BungeePlatform(this);
+        PlatformCommandManager<CommandSender> commandManager = new BungeeCommandManager(this);
+        Platform platform = new BungeePlatform(this, commandManager);
         this.bootstrap = new Bootstrap(platform)
-                .withCommandManager(new BungeeCommandManager(this))
+                .withCommandManager(commandManager)
                 .enableExtensions(this.getDataFolder())
                 .start();
 

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -15,7 +15,3 @@ dependencies {
     api("com.squareup.okhttp3:okhttp:4.10.0")
     compileOnly("com.google.code.gson:gson:2.8.6")
 }
-
-tasks.test {
-    useJUnitPlatform()
-}
diff --git a/velocity/src/main/java/pl/yshop/plugin/velocity/VelocityPlatform.java b/velocity/src/main/java/pl/yshop/plugin/velocity/VelocityPlatform.java
@@ -7,6 +7,7 @@
 import pl.yshop.plugin.api.Configuration;
 import pl.yshop.plugin.api.Platform;
 import pl.yshop.plugin.api.PlatformLogger;
+import pl.yshop.plugin.api.commands.PlatformCommand;
 import pl.yshop.plugin.api.request.Requester;
 import pl.yshop.plugin.shared.configuration.ConfigProperties;
 import pl.yshop.plugin.shared.request.YShopRequest;
@@ -24,12 +25,12 @@ public VelocityPlatform(final ProxyServer server, Logger logger, ConfigurationNo
 
     @Override
     public String version() {
-        return "";
+        return "1.2";
     }
 
     @Override
     public String engine() {
-        return "";
+        return "Velocity";
     }
 
     @Override
@@ -54,6 +55,11 @@ public void announce(String message) {
         });
     }
 
+    @Override
+    public void registerCommand(PlatformCommand command) {
+
+    }
+
     @Override
     public Configuration getConfiguration() {
         ConfigProperties properties = new VelocityConfiguration(this.configurationNode);
@@ -71,6 +77,11 @@ public Requester getRequester() {
         return new YShopRequest(this);
     }
 
+    @Override
+    public Object plugin() {
+        return null;
+    }
+
     @Override
     public PlatformLogger logger() {
         return new VelocityLogger(this.logger);

diff --git a/velocity/src/main/java/pl/yshop/plugin/velocity/VelocityPlugin.java b/velocity/src/main/java/pl/yshop/plugin/velocity/VelocityPlugin.java
@@ -38,9 +38,6 @@ public class VelocityPlugin {
     @Subscribe
     public void onProxyInitialization(ProxyInitializeEvent event) {
         ConfigurationNode node = this.getConfiguration();
-        this.logger.error("=================");
-        this.logger.error(node.getNode("apiKey").getString());
-        this.logger.error("=================");
         Platform platform = new VelocityPlatform(this.proxy, this.logger, node);
 
         this.bootstrap = new Bootstrap(platform)

diff --git a/velocity/src/main/java/pl/yshop/plugin/velocity/configuration/VelocityConfiguration.java b/velocity/src/main/java/pl/yshop/plugin/velocity/configuration/VelocityConfiguration.java
@@ -11,11 +11,11 @@ public VelocityConfiguration(ConfigurationNode root) {
 
     @Override
     public String getString(String key) {
-        return this.root.getString(key);
+        return this.root.getNode(key).getString();
     }
 
     @Override
     public boolean getBoolean(String key) {
-        return Boolean.getBoolean(this.root.getString(key));
+        return this.root.getNode(key).getBoolean();
     }
 }