Moved Votifier reward here, fixes

Checking if Towny or Votifier is present
2019-03-01 17:52:45 +01:00 · 2019-03-01 17:52:45 +01:00 · fab2b5819d
commit fab2b5819d
parent 0cdfcb9ff4
14 changed files with 101 additions and 16 deletions
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@ -12,7 +12,7 @@
      </profile>
    </annotationProcessing>
    <bytecodeTargetLevel>
-      <module name="BuildConfigUpdater" target="1.5" />
+      <module name="BuildConfigUpdater" target="1.8" />
      <module name="ButtonCore" target="1.5" />
      <module name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" target="1.8" />
      <module name="ButtonProcessor" target="1.8" />
--- a/BuildConfigUpdater/BuildConfigUpdater.iml
+++ b/BuildConfigUpdater/BuildConfigUpdater.iml
@ -13,7 +13,6 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
    <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
-    <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.10" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
--- a/(com.github.TBMCPlugins.ButtonCore).iml
+++ b/(com.github.TBMCPlugins.ButtonCore).iml
@ -32,6 +32,7 @@
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.16" level="project" />
    <orderEntry type="module" module-name="ButtonProcessor" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.vexsoftware:nuvotifier-universal:2.3.4" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
  </component>
 </module>
--- a/ButtonCore/pom.xml
+++ b/ButtonCore/pom.xml
@ -113,6 +113,10 @@
 			<id>ess-repo</id>
 			<url>http://repo.ess3.net/content/repositories/essrel/</url>
 		</repository>
+        <repository>
+            <id>Votifier</id>
+            <url>https://dl.bintray.com/nuvotifier/maven/</url>
+        </repository>
 	</repositories>
 	<dependencies>
 		<dependency>
@ -177,6 +181,12 @@
 			<version>2.13.1</version>
 			<scope>provided</scope>
 		</dependency>
+        <dependency>
+            <groupId>com.vexsoftware</groupId>
+            <artifactId>nuvotifier-universal</artifactId>
+            <version>2.3.4</version>
+            <scope>provided</scope>
+        </dependency>
 	</dependencies>
 	<organization>
 		<name>TBMCPlugins</name>
--- a/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
@ -9,6 +9,7 @@ import buttondevteam.core.component.restart.RestartComponent;
 import buttondevteam.core.component.towny.TownyComponent;
 import buttondevteam.core.component.updater.PluginUpdater;
 import buttondevteam.core.component.updater.PluginUpdaterComponent;
+import buttondevteam.core.component.votifier.VotifierComponent;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.architecture.ButtonPlugin;
 import buttondevteam.lib.architecture.Component;
@ -19,6 +20,7 @@ import buttondevteam.lib.player.ChromaGamerBase;
 import buttondevteam.lib.player.TBMCPlayer;
 import buttondevteam.lib.player.TBMCPlayerBase;
 import com.earth2me.essentials.Essentials;
+import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;
 import org.bukkit.Bukkit;
 import org.bukkit.command.BlockCommandSender;
@ -29,6 +31,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.RegisteredServiceProvider;

+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@ -45,6 +48,8 @@ public class MainPlugin extends ButtonPlugin {
    public static Essentials ess;

 	private Logger logger;
+	@Nullable
+	private Economy economy;

 	private ConfigData<Boolean> writePluginList() {
 		return getIConfig().getData("writePluginList", false);
@ -58,14 +63,20 @@ public class MainPlugin extends ButtonPlugin {
 		logger = getLogger();
 		if (!setupPermissions())
 			throw new NullPointerException("No permission plugin found!");
+		if (!setupEconomy()) //Though Essentials always provides economy so this shouldn't happen
+			getLogger().warning("No economy plugin found! Components using economy will not be registered.");
 		Test = getConfig().getBoolean("test", true);
 		saveConfig();
 		Component.registerComponent(this, new PluginUpdaterComponent());
 		Component.registerComponent(this, new RestartComponent());
+		//noinspection unchecked - needed for testing
 		Component.registerComponent(this, new ChannelComponent());
 		Component.registerComponent(this, new RandomTPComponent());
 		Component.registerComponent(this, new MemberComponent());
+		if (Bukkit.getPluginManager().isPluginEnabled("Towny")) //It fails to load the component class otherwise
 			Component.registerComponent(this, new TownyComponent());
+		if (Bukkit.getPluginManager().isPluginEnabled("Votifier") && economy != null)
+			Component.registerComponent(this, new VotifierComponent(economy));
 		ComponentManager.enableComponents();
 		getCommand2MC().registerCommand(new ComponentCommand());
 		TBMCCoreAPI.RegisterEventsForExceptions(new PlayerListener(), this);
@ -74,7 +85,7 @@ public class MainPlugin extends ButtonPlugin {
 		ChromaGamerBase.addConverter(sender -> Optional.ofNullable(sender instanceof Player
 				? TBMCPlayer.getPlayer(((Player) sender).getUniqueId(), TBMCPlayer.class) : null)); //Players, has higher priority
 		TBMCCoreAPI.RegisterUserClass(TBMCPlayerBase.class);
-		TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fOOC§f", Color.White, "g", null)); //The /ooc ID has moved to the config
+		TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fg§f", Color.White, "g", null)); //The /ooc ID has moved to the config
 		TBMCChatAPI.RegisterChatChannel(
 				Channel.AdminChat = new Channel("§cADMIN§f", Color.Red, "a", Channel.inGroupFilter(null)));
 		TBMCChatAPI.RegisterChatChannel(
@ -120,14 +131,23 @@ public class MainPlugin extends ButtonPlugin {
 	}

 	private boolean setupPermissions() {
-		RegisteredServiceProvider<Permission> permissionProvider = getServer().getServicesManager()
-				.getRegistration(Permission.class);
-		if (permissionProvider != null) {
-			permission = permissionProvider.getProvider();
-		}
+		permission = setupProvider(Permission.class);
 		return (permission != null);
 	}

+	private boolean setupEconomy() {
+		economy = setupProvider(Economy.class);
+		return (economy != null);
+	}
+
+	private <T> T setupProvider(Class<T> cl) {
+		RegisteredServiceProvider<T> provider = getServer().getServicesManager()
+			.getRegistration(cl);
+		if (provider != null)
+			return provider.getProvider();
+		return null;
+	}
+
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 		if (command.getName().equals("dontrunthiscmd")) return true; //Used in chat preprocess for console
--- a/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java
@ -41,6 +41,7 @@ public class TestPrepare {
 				return cl.isAssignableFrom(invocation.getMethod().getReturnType());
 			}
 		}));
+		//noinspection unchecked
 		Component.registerComponent(Mockito.mock(JavaPlugin.class), new ChannelComponent());
 		TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fg§f", Color.White, "g", null));
 	}
--- a/ButtonCore/src/main/java/buttondevteam/core/component/members/MemberComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/members/MemberComponent.java
@ -14,7 +14,7 @@ import java.util.Date;

 import static buttondevteam.core.MainPlugin.permission;

-public class MemberComponent extends Component implements Listener {
+public class MemberComponent extends Component<MainPlugin> implements Listener {
 	ConfigData<String> memberGroup() {
 		return getConfig().getData("memberGroup", "member");
 	}
--- a/ButtonCore/src/main/java/buttondevteam/core/component/randomtp/RandomTPComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/randomtp/RandomTPComponent.java
@ -1,8 +1,9 @@
 package buttondevteam.core.component.randomtp;

+import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.architecture.Component;

-public class RandomTPComponent extends Component {
+public class RandomTPComponent extends Component<MainPlugin> {
 	@Override
 	protected void enable() {
 		new RandomTP().onEnable(this); //It registers it's command
--- a/ButtonCore/src/main/java/buttondevteam/core/component/restart/RestartComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/restart/RestartComponent.java
@ -1,5 +1,6 @@
 package buttondevteam.core.component.restart;

+import buttondevteam.core.MainPlugin;
 import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.TBMCSystemChatEvent;
 import buttondevteam.lib.architecture.Component;
@ -12,7 +13,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;

-public class RestartComponent extends Component implements Listener {
+public class RestartComponent extends Component<MainPlugin> implements Listener {
 	@Override
 	public void enable() {
 		//TODO: Permissions for the commands
--- a/ButtonCore/src/main/java/buttondevteam/core/component/towny/TownyComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/towny/TownyComponent.java
@ -1,6 +1,7 @@
 package buttondevteam.core.component.towny;

 import buttondevteam.core.ComponentManager;
+import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.architecture.Component;
 import com.palmergames.bukkit.towny.Towny;
@ -10,7 +11,7 @@ import com.palmergames.bukkit.towny.object.Resident;
 import com.palmergames.bukkit.towny.object.TownyUniverse;
 import org.bukkit.Bukkit;

-public class TownyComponent extends Component {
+public class TownyComponent extends Component<MainPlugin> {
 	@Override
 	protected void enable() {
 	}
--- a/ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdaterComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdaterComponent.java
@ -1,9 +1,10 @@
 package buttondevteam.core.component.updater;

+import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.TBMCChatAPI;

-public class PluginUpdaterComponent extends Component {
+public class PluginUpdaterComponent extends Component<MainPlugin> {
 	@Override
 	public void enable() {
 		TBMCChatAPI.AddCommand(this, new UpdatePluginCommand());
--- a/ButtonCore/src/main/java/buttondevteam/core/component/votifier/VotifierComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/votifier/VotifierComponent.java
@ -0,0 +1,46 @@
+package buttondevteam.core.component.votifier;
+
+import buttondevteam.core.MainPlugin;
+import buttondevteam.lib.architecture.Component;
+import buttondevteam.lib.architecture.ConfigData;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.model.VotifierEvent;
+import lombok.RequiredArgsConstructor;
+import net.milkbowl.vault.economy.Economy;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+@RequiredArgsConstructor
+public class VotifierComponent extends Component<MainPlugin> {
+	private final Economy economy;
+
+	private ConfigData<Double> rewardAmount() {
+		return getConfig().getData("rewardAmount", 50.0);
+	}
+
+	@Override
+	protected void enable() {
+
+	}
+
+	@Override
+	protected void disable() {
+
+	}
+
+	@EventHandler
+	@SuppressWarnings("deprecation")
+	public void onVotifierEvent(VotifierEvent event) {
+		Vote vote = event.getVote();
+		getPlugin().getLogger().info("Vote: " + vote);
+		org.bukkit.OfflinePlayer op = Bukkit.getOfflinePlayer(vote.getUsername());
+		Player p = Bukkit.getPlayer(vote.getUsername());
+		if (op != null) {
+			economy.depositPlayer(op, rewardAmount().get());
+		}
+		if (p != null) {
+			p.sendMessage("§bThanks for voting! $50 was added to your account.");
+		}
+	}
+}
--- a/ButtonCore/src/main/resources/plugin.yml
+++ b/ButtonCore/src/main/resources/plugin.yml
@ -16,3 +16,8 @@ commands:
  component:
    description: Enable or disable or list components
  dontrunthiscmd:
+depend:
+  - Vault
+softdepend:
+  - Towny
+  - Votifier
--- a/ButtonProcessor/ButtonProcessor.iml
+++ b/ButtonProcessor/ButtonProcessor.iml
@ -13,7 +13,6 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.21" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.21" level="project" />
    <orderEntry type="library" name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />