From 134fda398c3ff1d6ea0c0257f3c6965546fbb7fd Mon Sep 17 00:00:00 2001 From: Stanislav Usenkov Date: Fri, 8 Jul 2016 09:39:36 +0600 Subject: [PATCH] Removed old Sponge API 2.0 dependency and code. I will not do it for latest API myself until 2017. --- pom.xml | 19 +-- .../Sponge/Commands/SpongeCommands.java | 28 ----- .../Sponge/SpongeEventListener.java | 6 - .../Sponge/SpongePermissionManager.java | 68 ---------- .../Sponge/SpongePluginConfiguration.java | 116 ------------------ .../rscPermissions/SpongePluginMain.java | 64 ---------- 6 files changed, 10 insertions(+), 291 deletions(-) delete mode 100644 src/main/java/ru/simsonic/rscPermissions/Sponge/Commands/SpongeCommands.java delete mode 100644 src/main/java/ru/simsonic/rscPermissions/Sponge/SpongeEventListener.java delete mode 100644 src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePermissionManager.java delete mode 100644 src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java delete mode 100644 src/main/java/ru/simsonic/rscPermissions/SpongePluginMain.java diff --git a/pom.xml b/pom.xml index 653f49a..3713a4b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,20 +11,16 @@ https://github.com/SimSonic/rscPermissions/ - + - methuselah-repo - http://maven.methuselah.ru/ + sponge-repo + http://repo.spongepowered.org/maven/ - + spigot-repo https://hub.spigotmc.org/nexus/content/groups/public/ - - sponge-repo - http://repo.spongepowered.org/maven/ - metrics-repo @@ -44,6 +40,11 @@ Residence http://ci.drtshock.net/plugin/repository/everything/ + + + methuselah-repo + http://maven.methuselah.ru/ + @@ -72,7 +73,7 @@ org.spongepowered spongeapi - 3.0.0 + 6.0.0-SNAPSHOT provided diff --git a/src/main/java/ru/simsonic/rscPermissions/Sponge/Commands/SpongeCommands.java b/src/main/java/ru/simsonic/rscPermissions/Sponge/Commands/SpongeCommands.java deleted file mode 100644 index 3233a8f..0000000 --- a/src/main/java/ru/simsonic/rscPermissions/Sponge/Commands/SpongeCommands.java +++ /dev/null @@ -1,28 +0,0 @@ -package ru.simsonic.rscPermissions.Sponge.Commands; - -import org.spongepowered.api.command.CommandException; -import org.spongepowered.api.command.CommandResult; -import org.spongepowered.api.command.CommandSource; -import org.spongepowered.api.command.args.CommandContext; -import org.spongepowered.api.command.spec.CommandExecutor; -import org.spongepowered.api.command.spec.CommandSpec; -import org.spongepowered.api.text.Text; - -public class SpongeCommands implements CommandExecutor -{ - private final CommandSpec commandHub = CommandSpec.builder() - .description(Text.of("Hello World Command")) - .permission("myplugin.command.helloworld") - .executor(this) - .build(); - public SpongeCommands() - { - // game.getCommandDispatcher().register(plugin, commandHub, "helloworld", "hello", "test"); - } - @Override - public CommandResult execute(CommandSource src, CommandContext context) throws CommandException - { - src.sendMessage(Text.of("Hello rscp's World!")); - return CommandResult.success(); - } -} diff --git a/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongeEventListener.java b/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongeEventListener.java deleted file mode 100644 index 8d1daae..0000000 --- a/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongeEventListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package ru.simsonic.rscPermissions.Sponge; - -public class SpongeEventListener -{ - -} diff --git a/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePermissionManager.java b/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePermissionManager.java deleted file mode 100644 index 2418672..0000000 --- a/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePermissionManager.java +++ /dev/null @@ -1,68 +0,0 @@ -package ru.simsonic.rscPermissions.Sponge; - -import java.util.Collection; -import java.util.Map; -import java.util.Optional; -import org.spongepowered.api.service.context.ContextCalculator; -import org.spongepowered.api.service.permission.PermissionDescription; -import org.spongepowered.api.service.permission.PermissionService; -import org.spongepowered.api.service.permission.Subject; -import org.spongepowered.api.service.permission.SubjectCollection; -import org.spongepowered.api.service.permission.SubjectData; -import ru.simsonic.rscPermissions.SpongePluginMain; - -public class SpongePermissionManager implements PermissionService -{ - private final SpongePluginMain rscp; - // private final Logger logger; - public SpongePermissionManager(SpongePluginMain plugin) - { - this.rscp = plugin; - // this.logger = rscp.getLogger(); - } - @Override - public SubjectCollection getUserSubjects() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public SubjectCollection getGroupSubjects() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public SubjectData getDefaultData() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public SubjectCollection getSubjects(String identifier) - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public Map getKnownSubjects() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public void registerContextCalculator(ContextCalculator cc) - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public Optional newDescriptionBuilder(Object o) - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public Optional getDescription(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public Collection getDescriptions() - { - throw new UnsupportedOperationException("Not supported yet."); - } -} diff --git a/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java b/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java deleted file mode 100644 index c0936d0..0000000 --- a/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java +++ /dev/null @@ -1,116 +0,0 @@ -package ru.simsonic.rscPermissions.Sponge; - -import java.util.Map; -import ru.simsonic.rscCommonsLibrary.ConnectionMySQL.ConnectionParams; -import ru.simsonic.rscPermissions.API.Settings; -import ru.simsonic.rscPermissions.API.TranslationProvider; -import ru.simsonic.rscPermissions.SpongePluginMain; - -public class SpongePluginConfiguration implements Settings -{ - private final SpongePluginMain rscp; - public SpongePluginConfiguration(SpongePluginMain plugin) - { - this.rscp = plugin; - } - @Override - public void onLoad() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public void onEnable() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public String getDefaultGroup() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public boolean isDefaultForever() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public boolean isAsteriskOP() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public boolean isUsingAncestorPrefixes() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public boolean isInMaintenance() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public String getMaintenanceMode() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public void setMaintenanceMode(String mode) - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public String getMaintenancePingMsg() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public String getMaintenanceKickMsg() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public String getMaintenanceJoinMsg() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public boolean isUseResidence() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public boolean isUseWorldGuard() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public long getRegionFinderGranularity() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public int getAutoReloadDelayTicks() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public boolean isUseMetrics() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public Map getSlotLimits() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public TranslationProvider getTranslationProvider() - { - throw new UnsupportedOperationException("Not supported yet."); - } - @Override - public ConnectionParams getConnectionParams() - { - throw new UnsupportedOperationException("Not supported yet."); - } -} diff --git a/src/main/java/ru/simsonic/rscPermissions/SpongePluginMain.java b/src/main/java/ru/simsonic/rscPermissions/SpongePluginMain.java deleted file mode 100644 index e3c88ac..0000000 --- a/src/main/java/ru/simsonic/rscPermissions/SpongePluginMain.java +++ /dev/null @@ -1,64 +0,0 @@ -package ru.simsonic.rscPermissions; - -import java.io.File; -import org.spongepowered.api.plugin.Plugin; -import ru.simsonic.rscPermissions.API.Settings; -import ru.simsonic.rscPermissions.Engine.Backends.BackendDatabase; -import ru.simsonic.rscPermissions.Engine.Backends.BackendJson; -import ru.simsonic.rscPermissions.Engine.InternalCache; -import ru.simsonic.rscPermissions.Sponge.SpongePermissionManager; -import ru.simsonic.rscPermissions.Sponge.SpongePluginConfiguration; - -// Documentation for Sponge: https://docs.spongepowered.org/ru/index.html - -@Plugin(id = "rscPermissions", name = "rscPermissions", version = "0.10.0b") -public class SpongePluginMain -{ - /* - private final Logger logger; - */ - private final Settings settings = new SpongePluginConfiguration(this); - private final SpongePermissionManager permissionManager = new SpongePermissionManager(this); - public final BackendJson localStorage = new BackendJson(new File("")); - public final BackendDatabase connection = new BackendDatabase(null); - public final InternalCache internalCache = new InternalCache(); - /* - @Inject - private Game game; - @Inject - public SpongePluginMain(Logger logger) - { - this.logger = logger; - logger.info("API VERSION IS " + game.getApiVersion()); - } - public Logger getLogger() - { - return logger; - } - @Subscribe - public void onServerStart(ServerAboutToStartEvent event) - { - logger.info("onServerStart"); - } - @Subscribe - public void onServerStarting(ServerStartingEvent event) - { - logger.info("onServerStarting"); - } - @Subscribe - public void onServerStarted(ServerStartedEvent event) - { - logger.info("onServerStarted"); - } - @Subscribe - public void onServerStopping(ServerStoppingEvent event) - { - logger.info("onServerStopping"); - } - @Subscribe - public void onServerStopped(ServerStoppedEvent event) - { - logger.info("onServerStopped"); - } - */ -}