From c27aeb1c484a3220e29fc11510a46593b1efe0d3 Mon Sep 17 00:00:00 2001 From: webadmin Date: Fri, 23 Jun 2023 10:09:24 +0200 Subject: [PATCH] update naar UltimateKingdom 1.7.x --- .idea/misc.xml | 3 ++ build.gradle | 2 +- .../me/map/example/command/TestCommand.java | 31 ++++++-------- .../me/map/example/listener/Luisteraar.java | 21 +++------- src/main/java/me/map/example/metadata.java | 40 ++++++++++++++----- 5 files changed, 51 insertions(+), 46 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 9860150..a0ceb9d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -14,4 +14,7 @@ + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 380eedf..e4c021c 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ repositories { dependencies { compileOnly "org.spigotmc:spigot:1.8-R0.1-SNAPSHOT" - compileOnly 'me.map:ultimatekingdom:1.3.6-ALPHA' + compileOnly 'me.map:ultimatekingdom:ALPHA-1.7.37' } diff --git a/src/main/java/me/map/example/command/TestCommand.java b/src/main/java/me/map/example/command/TestCommand.java index 4ba04c5..c100791 100644 --- a/src/main/java/me/map/example/command/TestCommand.java +++ b/src/main/java/me/map/example/command/TestCommand.java @@ -3,21 +3,17 @@ package me.map.example.command; import me.map.mojangbrigadier.Command; import me.map.mojangbrigadier.context.CommandContext; -import me.map.newbrigadier.API.CommandSource; -import me.map.newbrigadier.API.command.BrigadierCommand; - -import me.map.ultimatekingdom.API.KingdomSettings; import me.map.ultimatekingdom.API.UltimateKingdom; -import me.map.ultimatekingdom.API.commands.arguments.KingdomPlayerArgumentType; +import me.map.ultimatekingdom.API.cmd.AbstractCommand; -import me.map.ultimatekingdom.API.commands.arguments.exceptions.UnknownSetting; +import me.map.ultimatekingdom.API.cmd.CommandSource; +import me.map.ultimatekingdom.API.cmd.KingdomCommand; +import me.map.ultimatekingdom.API.cmd.args.plugin.KingdomPlayerArgumentType; import me.map.ultimatekingdom.API.objects.KingdomPlayer; -import me.map.ultimatekingdom.API.objects.PluginCommand; -import me.map.ultimatekingdom.API.settings.BooleanSetting; -import org.bukkit.entity.Player; -public class TestCommand extends PluginCommand { + +public class TestCommand extends AbstractCommand { public TestCommand() { @@ -31,19 +27,14 @@ public class TestCommand extends PluginCommand { @Override - protected void createCommand(BrigadierCommand command) { + protected void createCommand(KingdomCommand command) { command .then(argument("player", KingdomPlayerArgumentType.kingdomplayer()) .executes(c -> { final KingdomPlayer kingdomPlayer = c.getArgument("player",KingdomPlayer.class); - BooleanSetting setting = KingdomSettings.kingdomplayer_is_mod; - setting.setValue(Boolean.TRUE); - try { - kingdomPlayer.setSetting(setting); - } catch (UnknownSetting e) { - e.printStackTrace(); - } + + return Command.SINGLE_SUCCESS; }) @@ -53,6 +44,8 @@ public class TestCommand extends PluginCommand { @Override public void onCommandComplete(CommandContext commandContext, boolean b, int i) { - //hier kan je nog wat doen na het uitvoeren van createCommand + } + + } diff --git a/src/main/java/me/map/example/listener/Luisteraar.java b/src/main/java/me/map/example/listener/Luisteraar.java index 3ed8c77..3b032dc 100644 --- a/src/main/java/me/map/example/listener/Luisteraar.java +++ b/src/main/java/me/map/example/listener/Luisteraar.java @@ -1,10 +1,8 @@ package me.map.example.listener; -import me.map.ultimatekingdom.API.KingdomSettings; -import me.map.ultimatekingdom.API.events.KingdomPlayerLoadEvent; -import me.map.ultimatekingdom.API.objects.KingdomPlayer; -import me.map.ultimatekingdom.API.settings.BooleanSetting; +import me.map.ultimatekingdom.gameplay.KingdomAction; +import me.map.ultimatekingdom.gameplay.events.actions.KingdomBuildEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -12,18 +10,9 @@ import org.bukkit.event.Listener; public class Luisteraar implements Listener { @EventHandler(priority = EventPriority.LOWEST) - public void onJoin(KingdomPlayerLoadEvent event) { + public void onJoin(KingdomBuildEvent event) { - BooleanSetting setting = KingdomSettings.kingdomplayer_is_mod; - KingdomPlayer user = event.getKingdomPlayer(); - - if (user.hasSetting(setting)) { - BooleanSetting userSetting = (BooleanSetting) user.getSetting(setting); - System.out.println(userSetting.getDisplayValue()); - } - - if (user.getKingdom() != null) { - System.out.println(user.getKingdom().getPrefixedName()); - } } + + } diff --git a/src/main/java/me/map/example/metadata.java b/src/main/java/me/map/example/metadata.java index 95da441..08cbe2a 100644 --- a/src/main/java/me/map/example/metadata.java +++ b/src/main/java/me/map/example/metadata.java @@ -1,7 +1,7 @@ package me.map.example; - import me.map.ultimatekingdom.API.objects.Kingdom; -import me.map.ultimatekingdom.API.objects.data.*; +import me.map.ultimatekingdom.Shared.metadata.*; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -17,7 +17,7 @@ public class metadata { //check for existing data if (kingdom.hasMeta("customMetaName")) { - MetaData data = kingdom.getMetadata("customMetaName"); + MetaData data = kingdom.getMetaData("customMetaName"); //get value (List) metaArrayList = (List) data.getValue(); @@ -26,7 +26,7 @@ public class metadata { String label = data.getLabel(); //or just use this one - metaArrayList = (List) kingdom.getMetadata("customMetaName").getValue(); + metaArrayList = (List) kingdom.getMetaData("customMetaName").getValue(); } @@ -38,7 +38,14 @@ public class metadata { //or save with a extra label, MetaData myMetaData2 = new ListField("customMetaName", metaArrayList,"ExtraLabel" ); //savedata - kingdom.addMetaData(myMetaData); + + kingdom.addMetaData(myMetaData,(result) -> { + if (result.isOk()) { + //do something + } else { + // get result.toString(); + } + }); } @@ -47,7 +54,7 @@ public class metadata { List metaArrayList = new ArrayList<>(); if (kingdom.hasMeta("customMetaName")) { - metaArrayList = (List) kingdom.getMetadata("customMetaName").getValue(); + metaArrayList = (List) kingdom.getMetaData("customMetaName").getValue(); } //remove value @@ -58,16 +65,29 @@ public class metadata { // convert with a label. MetaData myMetaData2 = new ListField("customMetaName", metaArrayList,"ExtraLabel" ); - kingdom.addMetaData(myMetaData); + kingdom.addMetaData(myMetaData, (result) ->{ + if (result.isOk()) { + //do somehting + } else { + System.err.println(result.toString());//print error + } + + + }); + //remove all values - kingdom.removeMetaData(myMetaData); + kingdom.removeMetaData(myMetaData,(result) ->{ + if (result.isOk()) { + + } else { + System.err.println(result.toString()); + } + }); } - - public void test () { //boolean