Update to SpongeAPI 7.0.0-Snapshot. Contributors: Zidane / Dockter.

build.gradle

@@ -11,7 +11,7 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 group 'me.flibio'
-version '1.7.0'
+version '1.8.0'
 
 defaultTasks 'licenseFormat', 'clean', 'build'
 
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    compile 'org.spongepowered:spongeapi:${project.apiVersion}'
+    compile "org.spongepowered:spongeapi:${project.apiVersion}"
     compile 'com.github.flibiostudio:utils:1.9.0'
 }
 

gradle.properties

@@ -1,5 +1,5 @@
 name=JobsLite
 owner=Flibio
-apiVersion=5.0.0-SNAPSHOT
+apiVersion=7.0.0-SNAPSHOT
 inceptionYear=2015
 currentYear=2017

src/main/java/me/flibio/jobslite/JobsLite.java

@@ -71,6 +71,7 @@
 import org.spongepowered.api.event.game.state.GameStartedServerEvent;
 import org.spongepowered.api.event.service.ChangeServiceProviderEvent;
 import org.spongepowered.api.plugin.Plugin;
+import org.spongepowered.api.plugin.PluginContainer;
 import org.spongepowered.api.service.economy.EconomyService;
 import org.spongepowered.api.text.serializer.TextSerializers;
 
@@ -97,6 +98,8 @@ public class JobsLite {
 
     @Inject public Game game;
 
+    @Inject public PluginContainer container;
+
     public String version = JobsLite.class.getAnnotation(Plugin.class).version();
 
     private static FileManager fileManager;
@@ -113,8 +116,8 @@ public class JobsLite {
     public void onPreInitialize(GamePreInitializationEvent event) {
         instance = this;
         // Register the custom data
-        Sponge.getDataManager().register(JobData.class, ImmutableJobData.class, new JobDataManipulatorBuilder());
-        Sponge.getDataManager().register(SignJobData.class, ImmutableSignJobData.class, new SignJobDataManipulatorBuilder());
+        Sponge.getDataManager().registerBuilder(JobData.class, new JobDataManipulatorBuilder());
+        Sponge.getDataManager().registerBuilder(SignJobData.class, new SignJobDataManipulatorBuilder());
         // Initialze basic plugin managers needed for further initialization
         if (new File(configDir.toString()).isAbsolute()) {
             fileManager = FileManager.createInstance(this, configDir.toString());

src/main/java/me/flibio/jobslite/data/JobData.java

@@ -24,6 +24,7 @@
  */
 package me.flibio.jobslite.data;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.collect.ComparisonChain;
 import org.spongepowered.api.Sponge;
@@ -139,7 +140,7 @@ public int compareTo(JobData o) {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .add("jobName", this.jobName)
                 .add("level", this.level)
                 .add("exp", this.exp)

src/main/java/me/flibio/jobslite/data/SignJobData.java

@@ -24,6 +24,7 @@
  */
 package me.flibio.jobslite.data;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.collect.ComparisonChain;
 import org.spongepowered.api.Sponge;
@@ -105,7 +106,7 @@ public int compareTo(SignJobData o) {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .add("jobName", this.jobName)
                 .toString();
     }

src/main/java/me/flibio/jobslite/listeners/MobDeathListener.java

@@ -24,6 +24,7 @@
  */
 package me.flibio.jobslite.listeners;
 
+import org.spongepowered.api.event.cause.EventContext;
 import org.spongepowered.api.service.economy.transaction.ResultType;
 
 import com.google.common.collect.ImmutableMap;
@@ -39,7 +40,6 @@
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.cause.Cause;
-import org.spongepowered.api.event.cause.NamedCause;
 import org.spongepowered.api.event.cause.entity.damage.source.EntityDamageSource;
 import org.spongepowered.api.event.entity.DestructEntityEvent;
 import org.spongepowered.api.event.filter.cause.First;
@@ -180,14 +180,14 @@ private void addFunds(double amount, Player player) {
         if (virt.equalsIgnoreCase("none")) {
             // Generate money
             account.deposit(JobsLite.getEconomyService().getDefaultCurrency(), BigDecimal.valueOf(amount),
-                    Cause.of(NamedCause.owner(JobsLite.getInstance())));
+                    Cause.of(EventContext.empty(),(JobsLite.getInstance().container)));
         } else {
             // Transfer money
             Optional<Account> aOpt = JobsLite.getEconomyService().getOrCreateAccount(virt);
             if (aOpt.isPresent()) {
                 if (!aOpt.get()
                         .transfer(account, JobsLite.getEconomyService().getDefaultCurrency(), BigDecimal.valueOf(amount),
-                                Cause.of(NamedCause.owner(JobsLite.getInstance()))).getResult().equals(ResultType.SUCCESS)) {
+                                Cause.of(EventContext.empty(),(JobsLite.getInstance().container))).getResult().equals(ResultType.SUCCESS)) {
                     // Transfer failed
                     if (!JobsLite.msgCache.contains(player.getUniqueId())) {
                         player.sendMessage(messageStorage.getMessage("working.nofunds"));

src/main/java/me/flibio/jobslite/listeners/PlayerBlockBreakListener.java

@@ -44,7 +44,7 @@
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.block.ChangeBlockEvent;
 import org.spongepowered.api.event.cause.Cause;
-import org.spongepowered.api.event.cause.NamedCause;
+import org.spongepowered.api.event.cause.EventContext;
 import org.spongepowered.api.event.filter.cause.First;
 import org.spongepowered.api.item.Enchantments;
 import org.spongepowered.api.item.inventory.ItemStack;
@@ -221,14 +221,14 @@ private void addFunds(double amount, Player player) {
         if (virt.equalsIgnoreCase("none")) {
             // Generate money
             account.deposit(JobsLite.getEconomyService().getDefaultCurrency(), BigDecimal.valueOf(amount),
-                    Cause.of(NamedCause.owner(JobsLite.getInstance())));
+                    Cause.of(EventContext.empty(), JobsLite.getInstance().container));
         } else {
             // Transfer money
             Optional<Account> aOpt = JobsLite.getEconomyService().getOrCreateAccount(virt);
             if (aOpt.isPresent()) {
                 if (!aOpt.get()
                         .transfer(account, JobsLite.getEconomyService().getDefaultCurrency(), BigDecimal.valueOf(amount),
-                                Cause.of(NamedCause.owner(JobsLite.getInstance()))).getResult().equals(ResultType.SUCCESS)) {
+                                Cause.of(EventContext.empty(), JobsLite.getInstance().container)).getResult().equals(ResultType.SUCCESS)) {
                     // Transfer failed
                     if (!JobsLite.msgCache.contains(player.getUniqueId())) {
                         player.sendMessage(messageStorage.getMessage("working.nofunds"));

src/main/java/me/flibio/jobslite/listeners/PlayerPlaceBlockListener.java

@@ -41,7 +41,7 @@
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.block.ChangeBlockEvent;
 import org.spongepowered.api.event.cause.Cause;
-import org.spongepowered.api.event.cause.NamedCause;
+import org.spongepowered.api.event.cause.EventContext;
 import org.spongepowered.api.event.filter.cause.First;
 import org.spongepowered.api.service.economy.account.Account;
 import org.spongepowered.api.service.economy.account.UniqueAccount;
@@ -198,14 +198,14 @@ private void addFunds(double amount, Player player) {
         if (virt.equalsIgnoreCase("none")) {
             // Generate money
             account.deposit(JobsLite.getEconomyService().getDefaultCurrency(), BigDecimal.valueOf(amount),
-                    Cause.of(NamedCause.owner(JobsLite.getInstance())));
+                    Cause.of(EventContext.empty(), JobsLite.getInstance().container));
         } else {
             // Transfer money
             Optional<Account> aOpt = JobsLite.getEconomyService().getOrCreateAccount(virt);
             if (aOpt.isPresent()) {
                 if (!aOpt.get()
                         .transfer(account, JobsLite.getEconomyService().getDefaultCurrency(), BigDecimal.valueOf(amount),
-                                Cause.of(NamedCause.owner(JobsLite.getInstance()))).getResult().equals(ResultType.SUCCESS)) {
+                                Cause.of(EventContext.empty(),JobsLite.getInstance().container)).getResult().equals(ResultType.SUCCESS)) {
                     // Transfer failed
                     if (!JobsLite.msgCache.contains(player.getUniqueId())) {
                         player.sendMessage(messageStorage.getMessage("working.nofunds"));