summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <ementalodev@gmx.co.uk>2015-04-09 00:29:59 +0100
committerementalo <ementalodev@gmx.co.uk>2015-04-09 00:29:59 +0100
commit7e1a36fb953fb122f90569c1d9efc6f43ed17c8f (patch)
tree9083d4e319333c9bddd95eb145c0daa7f54ba469
parenta97af4aa6fff7000a58fda5ac3e97a108fd50586 (diff)
downloadEssentials-7e1a36fb953fb122f90569c1d9efc6f43ed17c8f.tar
Essentials-7e1a36fb953fb122f90569c1d9efc6f43ed17c8f.tar.gz
Essentials-7e1a36fb953fb122f90569c1d9efc6f43ed17c8f.tar.lz
Essentials-7e1a36fb953fb122f90569c1d9efc6f43ed17c8f.tar.xz
Essentials-7e1a36fb953fb122f90569c1d9efc6f43ed17c8f.zip
Remove Lombok
-rw-r--r--Essentials/src/com/earth2me/essentials/PlayerExtension.java8
-rw-r--r--Essentials/src/com/earth2me/essentials/settings/Jails.java27
-rw-r--r--Essentials/src/com/earth2me/essentials/settings/Spawns.java28
-rw-r--r--pom.xml5
4 files changed, 46 insertions, 22 deletions
diff --git a/Essentials/src/com/earth2me/essentials/PlayerExtension.java b/Essentials/src/com/earth2me/essentials/PlayerExtension.java
index 36c2289e3..e724de0e5 100644
--- a/Essentials/src/com/earth2me/essentials/PlayerExtension.java
+++ b/Essentials/src/com/earth2me/essentials/PlayerExtension.java
@@ -1,17 +1,9 @@
package com.earth2me.essentials;
-import lombok.Delegate;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permissible;
-import org.bukkit.permissions.ServerOperator;
public class PlayerExtension
diff --git a/Essentials/src/com/earth2me/essentials/settings/Jails.java b/Essentials/src/com/earth2me/essentials/settings/Jails.java
index 4f9b79197..60290fa92 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Jails.java
+++ b/Essentials/src/com/earth2me/essentials/settings/Jails.java
@@ -4,15 +4,34 @@ import com.earth2me.essentials.storage.MapValueType;
import com.earth2me.essentials.storage.StorageObject;
import java.util.HashMap;
import java.util.Map;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
import org.bukkit.Location;
-@Data
-@EqualsAndHashCode(callSuper = false)
public class Jails implements StorageObject
{
@MapValueType(Location.class)
private Map<String, Location> jails = new HashMap<String, Location>();
+
+ public Map<String,Location> getJails()
+ {
+ return jails;
+ }
+
+ public void setJails(Map<String, Location> jails)
+ {
+ this.jails = jails;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ Jails jails1 = (Jails) o;
+ return !(jails != null ? !jails.equals(jails1.jails) : jails1.jails != null);
+ }
+
+ @Override
+ public int hashCode() {
+ return jails != null ? jails.hashCode() : 0;
+ }
}
diff --git a/Essentials/src/com/earth2me/essentials/settings/Spawns.java b/Essentials/src/com/earth2me/essentials/settings/Spawns.java
index a0afa450c..e4a52d8ce 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Spawns.java
+++ b/Essentials/src/com/earth2me/essentials/settings/Spawns.java
@@ -4,15 +4,33 @@ import com.earth2me.essentials.storage.MapValueType;
import com.earth2me.essentials.storage.StorageObject;
import java.util.HashMap;
import java.util.Map;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
import org.bukkit.Location;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
public class Spawns implements StorageObject
{
@MapValueType(Location.class)
private Map<String, Location> spawns = new HashMap<String, Location>();
+
+ public Map<String,Location> getSpawns()
+ {
+ return spawns;
+ }
+
+ public void setSpawns(Map<String, Location> spawns)
+ {
+ this.spawns = spawns;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ Spawns spawns1 = (Spawns) o;
+ return !(spawns != null ? !spawns.equals(spawns1.spawns) : spawns1.spawns != null);
+ }
+
+ @Override
+ public int hashCode() {
+ return spawns != null ? spawns.hashCode() : 0;
+ }
}
diff --git a/pom.xml b/pom.xml
index 0f4fc10d3..86d470c9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,11 +81,6 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.12.2</version>
- </dependency>
</dependencies>
<build>