diff --git a/.gitignore b/.gitignore
index 8e9f9af8..5f81d0c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
# TFM excludes
-/lib
build.properties
git.properties
diff --git a/lib/CoreProtect_2.14.2.jar b/lib/CoreProtect_2.14.2.jar
new file mode 100644
index 00000000..556b2686
Binary files /dev/null and b/lib/CoreProtect_2.14.2.jar differ
diff --git a/pom.xml b/pom.xml
index 02e95706..cf5b668c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
-
+
4.0.0
me.totalfreedom
@@ -16,7 +17,8 @@
${buildAuthor}
${buildHead}
${project.name}
- dd/MM/yyyy hh:mm aa
+ ${maven.build.timestamp}
+ MM/dd/yyyy HH:mm
TotalFreedomMod
@@ -36,9 +38,9 @@
- scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git
- scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git
- git@github.com:TotalFreedom/TotalFreedomMod.git
+ scm:git:git@github.com:TFPatches/TotalFreedomMod.git
+ scm:git:git@github.com:TFPatches/TotalFreedomMod.git
+ git@github.com:TotalFreedom/TFPatches.git
@@ -50,48 +52,64 @@
jitpack.io
https://jitpack.io
+
spigot-repo
https://hub.spigotmc.org/nexus/content/repositories/snapshots/
+
+
+ elmakers-repo
+ http://maven.elmakers.com/repository/
+
+
+
+ sk89q-snapshots
+ http://maven.sk89q.com/artifactory/repo
+
+
+
+ jcenter
+ jcenter-bintray
+ http://jcenter.bintray.com
+
+
+
+ md_5-public
+ http://repo.md-5.net/content/groups/public/
+
+
+
+ dmulloy2-repo
+ http://repo.dmulloy2.net/nexus/repository/public/
+
+
sk89q-repo
http://maven.sk89q.com/repo/
-
- sk89q-snapshots
- http://maven.sk89q.com/artifactory/repo/
-
-
- org.apache.commons
- commons-lang3
- 3.6
- provided
-
-
-
- commons-io
- commons-io
- 2.5
- provided
-
-
org.projectlombok
lombok
- 1.16.20
+ 1.18.0
+ provided
+
+
+
+ org.spigotmc
+ spigot
+ 1.13-pre7-R0.1-SNAPSHOT
provided
com.github.Pravian
Aero
- 2.1-SNAPSHOT
- system
- ${project.basedir}/lib/aero-2.1-SNAPSHOT.jar
+ 5f82926
+ provided
@@ -101,6 +119,20 @@
provided
+
+ com.github.Telesphoreo
+ TF-LibsDisguises
+ c213295f95
+ provided
+
+
+
+ com.github.Telesphoreo.TF-WorldEdit
+ worldedit-bukkit
+ 2e79570525
+ provided
+
+
net.ess3
Essentials
@@ -109,19 +141,16 @@
- com.sk89q
- worldguard
- 6.2
- system
- ${project.basedir}/lib/worldguard-6.2.jar
+ org.bukkit
+ craftbukkit
+ 1.13-pre7-R0.1-SNAPSHOT
+ provided
- com.github.TotalFreedom.TF-WorldEdit
- worldedit-bukkit
- 6.1.0-TF
- system
- ${project.basedir}/lib/TF-WorldEdit.jar
+ net.dv8tion
+ JDA
+ 3.7.1_385
@@ -133,29 +162,11 @@
- me.libraryaddict
- LibsDisguises
- system
- 9.4.0-SNAPSHOT
- ${project.basedir}/lib/LibsDisguises.jar
+ com.sk89q.worldguard
+ worldguard-legacy
+ 6.2
+ provided
-
-
- org.spigot
- spigot
- 1.13
- system
- ${project.basedir}/lib/spigot-1.13.jar
-
-
-
- net.dv8tion
- JDA
- JDA-3.6.0_354-withDependencies
- system
- ${project.basedir}/lib/JDA-3.6.0_354-withDependencies.jar
-
-
@@ -167,13 +178,12 @@
-
org.apache.maven.plugins
maven-compiler-plugin
- 3.3
+ 3.7.0
TotalFreedomMod.jar
1.8
@@ -192,11 +202,13 @@
initialize
-
-
-
-
-
+
+
+
+
+
+
@@ -205,7 +217,6 @@
-
@@ -276,7 +287,8 @@
yyyy-MM-dd HH:mm:ss
false
true
- ${basedir}/src/main/resources/git.properties
+ ${basedir}/src/main/resources/git.properties
+
properties
false
false
@@ -311,7 +323,8 @@
maven.buildnumber
- ${basedir}/src/main/resources/build.properties
+ ${basedir}/src/main/resources/build.properties
+
{0,number,#}
- buildNumber
@@ -343,4 +356,4 @@
-
+
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
index ac7b8584..eb99276e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
@@ -268,4 +268,14 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
{
this.loginMessage = loginMessage;
}
+
+ public String getDiscordID()
+ {
+ return this.discordID;
+ }
+
+ public void setDiscordID(String discordID)
+ {
+ this.discordID = discordID;
+ }
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java
index 307bdc05..e474afd8 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java
@@ -1,13 +1,13 @@
package me.totalfreedom.totalfreedommod.bridge;
-import me.libraryaddict.disguise.DisallowedDisguises;
import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.LibsDisguises;
+import me.totalfreedom.libsdisguise.DisallowedDisguises;
+import me.totalfreedom.libsdisguise.TF_DisguiseAPI;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.util.FLog;
import org.bukkit.entity.Player;
-import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
public class LibsDisguisesBridge extends FreedomService
@@ -111,11 +111,11 @@ public class LibsDisguisesBridge extends FreedomService
if (state)
{
- DisguiseAPI.enableDisguises();
+ TF_DisguiseAPI.enableDisguises();
}
else
{
- DisguiseAPI.disableDisguises();
+ TF_DisguiseAPI.disableDisguises();
}
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java
index 710776cc..481e148b 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java
@@ -2,16 +2,8 @@ package me.totalfreedom.totalfreedommod.bridge;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.util.FUtil;
-// These imports are not in the latest releases of WorldEdit, and the new versions of WorldEdit do not build properly. This will need to be reverted once the new WorldEdit builds are building properly.
-//
-//import me.totalfreedom.worldedit.LimitChangedEvent;
-//import me.totalfreedom.worldedit.SelectionChangedEvent;
-//
-//The following two imports are a temporary measure as mentioned above.
-//
-import me.StevenLawson.worldedit.LimitChangedEvent;
-import me.StevenLawson.worldedit.SelectionChangedEvent;
-//
+import me.totalfreedom.worldedit.LimitChangedEvent;
+import me.totalfreedom.worldedit.SelectionChangedEvent;
import net.pravian.aero.component.PluginListener;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
index ba14f785..8e5821dd 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
@@ -1,11 +1,10 @@
package me.totalfreedom.totalfreedommod.command;
-//import me.libraryaddict.disguise.DisallowedDisguises;
-import me.libraryaddict.disguise.DisallowedDisguises;
+import me.totalfreedom.libsdisguise.DisallowedDisguises;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.command.Command;
import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -23,8 +22,8 @@ public class Command_disguisetoggle extends FreedomCommand
return true;
}
- FUtil.adminAction(sender.getName(), (DisallowedDisguises.disabled ? "Enabling" : "Disabling") + " " +
- "disguises.", false);
+ FUtil.adminAction(sender.getName(), (DisallowedDisguises.disabled ? "Enabling" : "Disabling")
+ + " disguises", false);
if (plugin.ldb.isDisguisesEnabled())
{
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_releaseparrots.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_releaseparrots.java
index dffb683d..93a3414a 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_releaseparrots.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_releaseparrots.java
@@ -8,7 +8,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Release parrots from your shoulders.", usage = "/", aliases="removeparrots")
+@CommandParameters(description = "Release parrots from your shoulders.", usage = "/", aliases = "removeparrots")
public class Command_releaseparrots extends FreedomCommand
{
@@ -17,6 +17,13 @@ public class Command_releaseparrots extends FreedomCommand
{
Entity leftShoulderEntity = playerSender.getShoulderEntityLeft();
Entity rightShoulderEntity = playerSender.getShoulderEntityRight();
+
+ if (rightShoulderEntity == null && leftShoulderEntity == null)
+ {
+ msg("No parrots were detected on either of your shoulders.");
+ return true;
+ }
+
if (leftShoulderEntity != null && leftShoulderEntity.getType().equals(EntityType.PARROT))
{
playerSender.setShoulderEntityLeft(null);
@@ -28,7 +35,6 @@ public class Command_releaseparrots extends FreedomCommand
playerSender.setShoulderEntityRight(null);
msg("Removed the parrot on your right shoulder.");
}
-
return true;
}
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java
index 41e2889b..dc20cb22 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java
@@ -1,7 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
-//import me.libraryaddict.disguise.DisallowedDisguises;
-import me.libraryaddict.disguise.DisallowedDisguises;
+import me.totalfreedom.libsdisguise.DisallowedDisguises;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.command.Command;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java
index 75a9ba7d..d7419751 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java
@@ -27,11 +27,11 @@ public class Command_unlinkdiscord extends FreedomCommand
Admin admin = plugin.al.getAdmin(playerSender);
if (admin.getDiscordID() == null)
{
- msg("Your minecraft account is not linked to a discord account.", ChatColor.RED);
+ msg("Your Minecraft account is not linked to a discord account.", ChatColor.RED);
return true;
}
admin.setDiscordID(null);
- msg("Your minecraft account has been successfully unlinked from the discord account.", ChatColor.GREEN);
+ msg("Your Minecraft account has been successfully unlinked from the discord account.", ChatColor.GREEN);
return true;
}
else
@@ -39,12 +39,12 @@ public class Command_unlinkdiscord extends FreedomCommand
VPlayer data = plugin.pv.getVerificationPlayer(playerSender);
if (data.getDiscordId() == null)
{
- msg("Your minecraft account is not linked to a discord account.", ChatColor.RED);
+ msg("Your Minecraft account is not linked to a discord account.", ChatColor.RED);
return true;
}
data.setDiscordId(null);
data.setDiscordEnabled(false);
- msg("Your minecraft account has been successfully unlinked from the discord account.", ChatColor.GREEN);
+ msg("Your Minecraft account has been successfully unlinked from the discord account.", ChatColor.GREEN);
return true;
}
}
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
index f7734da1..7da0a34a 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
@@ -131,6 +131,16 @@ public class FPlayer
return orbitStrength;
}
+ public boolean isInvSee()
+ {
+ return invSee;
+ }
+
+ public void setInvSee(boolean toggle)
+ {
+ this.invSee = toggle;
+ }
+
public boolean isFuckOff()
{
return fuckoffRadius > 0;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java b/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java
index f5a054d9..7787f12f 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java
@@ -88,4 +88,14 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable
return name != null
&& !ips.isEmpty();
}
+
+ public boolean getForumEnabled()
+ {
+ return this.forumEnabled;
+ }
+
+ public boolean getDiscordEnabled()
+ {
+ return this.discordEnabled;
+ }
}