Update with 7.0.7 + forge update + fix capture condition + add disabledPokemons config

.gitignore

@@ -0,0 +1,9 @@
+/.gradle/
+/bin/
+/.settings/
+/build/
+/libs/
+.classpath
+.project
+bin
+libs

build.gradle

@@ -13,14 +13,14 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 
 
 group 'io.github.teitss'
-version '1.12.2-3.0.2'
+version '1.12.2-3.0.3'
 archivesBaseName = "PixelMoney"
 
 sourceCompatibility = targetCompatibility = "1.8" // Need this here so eclipse task generates correctly.
 compileJava.options.encoding = "UTF-8"
 
 minecraft {
-    version = "1.12.2-14.23.5.2768"
+    version = "1.12.2-14.23.5.2809"
     runDir = "run"
     mappings = "stable_39"
 }
@@ -35,6 +35,7 @@ repositories {
 
 dependencies {
     compile 'org.spongepowered:spongeapi:7.1.0'
+    compile fileTree(dir: 'libs', include: '*.jar')
 }
 
 processResources {

src/main/java/io/github/teitss/pixelmoney/PixelMoney.java

@@ -40,9 +40,9 @@
 public class PixelMoney {
 
 	public static final String NAME = "PixelMoney";
-    public static final String VERSION = "3.0.2";
+    public static final String VERSION = "3.0.3";
 	public static final String AUTHOR = "Teits";
-	public static final String DESC = "Adds configurable Sponge money rewards for defeating Pokémons and NPC trainers.";
+	public static final String DESC = "Adds configurable Sponge money rewards for defeating Pok�mons and NPC trainers.";
 
 	@Inject
 	private Logger logger;

src/main/java/io/github/teitss/pixelmoney/config/Group.java

@@ -21,11 +21,13 @@ public class Group {
     private boolean rewardMultiplierEnabled;
     private boolean extendedMultiplierEnabled;
     private boolean pixelmonWinMoneyDisabled;
+    private List<String> disabledPokemons;
 
     public Group(String normalPokemonDefeatReward, String bossPokemonDefeatReward, String normalNPCDefeatReward,
                  String bossNPCDefeatReward, String captureReward, List<Integer> dimensions, String captureMessage,
                  String defeatMessage, String chatType, String turnOnMessageLog, String turnOffMessageLog,
-                 boolean rewardMultiplierEnabled, boolean extendedMultiplierEnabled, boolean pixelmonWinMoneyDisabled) {
+                 boolean rewardMultiplierEnabled, boolean extendedMultiplierEnabled, boolean pixelmonWinMoneyDisabled,
+                 List<String> disabledPokemons) {
         this.normalPokemonDefeatReward = normalPokemonDefeatReward;
         this.bossPokemonDefeatReward = bossPokemonDefeatReward;
         this.normalNPCDefeatReward = normalNPCDefeatReward;
@@ -40,6 +42,7 @@ public Group(String normalPokemonDefeatReward, String bossPokemonDefeatReward, S
         this.rewardMultiplierEnabled = rewardMultiplierEnabled;
         this.extendedMultiplierEnabled = extendedMultiplierEnabled;
         this.pixelmonWinMoneyDisabled = pixelmonWinMoneyDisabled;
+        this.disabledPokemons = disabledPokemons;
     }
 
     public String getNormalPokemonDefeatReward() {
@@ -94,6 +97,10 @@ public boolean isPixelmonWinMoneyDisabled() {
         return pixelmonWinMoneyDisabled;
     }
 
+    public List<String> getDisabledPokemons() {
+        return disabledPokemons;
+    }
+
     public ChatType getChatType() {
         switch (chatType) {
             case "SYSTEM":

src/main/java/io/github/teitss/pixelmoney/config/GroupSerializer.java

@@ -24,7 +24,8 @@ public static Map.Entry<String, Group> deserialize(ConfigurationNode configurati
                 configurationNode.getNode("turnOffMessageLog").getString(),
                 configurationNode.getNode("enableRewardMultiplier").getBoolean(),
                 configurationNode.getNode("enableExtendedRewardMultiplier").getBoolean(),
-                configurationNode.getNode("disablePixelmonWinMoney").getBoolean()
+                configurationNode.getNode("disablePixelmonWinMoney").getBoolean(),
+                configurationNode.getNode("disabledPokemons").getList(TypeToken.of(String.class))
         ));
     }
 }

src/main/java/io/github/teitss/pixelmoney/listeners/BeatWildPixelmonListener.java

@@ -1,13 +1,16 @@
 package io.github.teitss.pixelmoney.listeners;
 
+import com.google.common.reflect.TypeToken;
 import com.pixelmonmod.pixelmon.api.events.BeatWildPixelmonEvent;
 import com.pixelmonmod.pixelmon.battles.BattleRegistry;
 import com.pixelmonmod.pixelmon.battles.controller.participants.PixelmonWrapper;
 import com.pixelmonmod.pixelmon.entities.pixelmon.EntityPixelmon;
+
 import io.github.teitss.pixelmoney.PixelMoney;
 import io.github.teitss.pixelmoney.config.Config;
 import io.github.teitss.pixelmoney.config.Group;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
 import org.apache.commons.lang3.StringUtils;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.living.player.Player;
@@ -17,6 +20,7 @@
 import org.spongepowered.api.text.serializer.TextSerializers;
 
 import javax.script.ScriptException;
+
 import java.math.BigDecimal;
 
 public class BeatWildPixelmonListener {
@@ -37,6 +41,9 @@ public void defeatWild(BeatWildPixelmonEvent event) {
             if (!group.getDimensions().contains(event.player.dimension))
                 return;
 
+            if (group.getDisabledPokemons().contains(((EntityPixelmon)event.wpp.getEntity()).getSpecies().name))
+            	return;
+
             String normalReward = group.getNormalPokemonDefeatReward();
             String bossReward = group.getBossPokemonDefeatReward();
 

src/main/java/io/github/teitss/pixelmoney/listeners/CaptureListener.java

@@ -31,9 +31,12 @@ public void onSuccessfulCapture(CaptureEvent.SuccessfulCapture event) {
                 return;
             }
 
-            if (group.getDimensions().contains(event.player.dimension))
+            if (!group.getDimensions().contains(event.player.dimension))
                 return;
 
+            if (group.getDisabledPokemons().contains(event.getPokemon().getSpecies().name))
+                return;
+
             String captureReward = group.getCaptureReward();
 
             if (captureReward.isEmpty())

src/main/resources/assets/pixelmoney/pixelmoney.conf

@@ -42,5 +42,10 @@ groups = [
     enableExtendedRewardMultiplier = false
     # Disables Pokédollars received from npc trainers.
     disablePixelmonWinMoney = true
+    # Disabled pokemons.
+    disabledPokemons = [
+      Pikachu
+      Bidoof
+    ]
   }
-]
+]