diff --git a/.gitignore b/.gitignore
index 8383394b..ac933711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ target/
 release/
 bin/
 .vs/
+.idea/
 deps/craftbukkit.jar
 *~
 *.lock
@@ -12,3 +13,4 @@ deps/craftbukkit.jar
 *.swp
 *.out
 !*.elt
+*.iml
diff --git a/jsonapi b/jsonapi
index 165c6dba..eef4c0c1 100755
--- a/jsonapi
+++ b/jsonapi
@@ -42,6 +42,7 @@ versions = {}
 # versions['1.10.2'] = package: 'v1_10_R1', cb_version: '1.10.2-R0.1-SNAPSHOT'
 versions['1.11.2'] = package: 'v1_11_R1', cb_version: '1.11.2-R0.1-SNAPSHOT'
 versions['1.12'] = package: 'v1_12_R1', cb_version: '1.12-R0.1-SNAPSHOT'
+versions['1.14.3'] = package: 'v1_14_R1', cb_version: '1.14.3-R0.1-SNAPSHOT'
 
 # versions['1.4']   = versions['1.4.7']
 # versions['1.5']   = versions['1.5.2']
diff --git a/pom.xml b/pom.xml
index c29a871d..d73b65f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.alecgorge.minecraft.jsonapi</groupId>
-	<artifactId>JSONAPI</artifactId>
-	<packaging>jar</packaging>
-	<version>${jsonapiVersion}-mc${spigotVersion}</version>
-	<name>JSONAPI</name>
-	<url>http://github.com/alecgorge/jsonapi</url>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.alecgorge.minecraft.jsonapi</groupId>
+    <artifactId>JSONAPI</artifactId>
+    <packaging>jar</packaging>
+    <version>${jsonapiVersion}-mc${spigotVersion}</version>
+    <name>JSONAPI</name>
+    <url>http://github.com/alecgorge/jsonapi</url>
 
-	<organization>
-		<name>Alec Gorge</name>
-		<url>http://alecgorge.com</url>
-	</organization>
+    <organization>
+        <name>Alec Gorge</name>
+        <url>http://alecgorge.com</url>
+    </organization>
 
-	<scm>
-		<developerConnection>scm:git:git@github.com:alecgorge/jsonapi.git</developerConnection>
-		<connection>scm:git:git://github.com/alecgorge/jsonapi.git</connection>
-		<url>https://github.com/alecgorge/jsonapi/tree/master/</url>
-	</scm>
+    <scm>
+        <developerConnection>scm:git:git@github.com:alecgorge/jsonapi.git</developerConnection>
+        <connection>scm:git:git://github.com/alecgorge/jsonapi.git</connection>
+        <url>https://github.com/alecgorge/jsonapi/tree/master/</url>
+    </scm>
 
-	<profiles>
-		<profile>
-			<id>default</id>
-			<properties>
-				<jsonapiVersion>BLEEDING</jsonapiVersion>
-			</properties>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-		</profile>
-	</profiles>
+    <profiles>
+        <profile>
+            <id>default</id>
+            <properties>
+                <jsonapiVersion>BLEEDING</jsonapiVersion>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+    </profiles>
 
-	<properties>
-		<spigotVersion>1.12-R0.1-SNAPSHOT</spigotVersion>
-        <mcPackage>v1_12_R1</mcPackage>
+    <properties>
+        <spigotVersion>1.14.3-R0.1-SNAPSHOT</spigotVersion>
+        <mcPackage>v1_14_R1</mcPackage>
         <jsonapiDebug>no</jsonapiDebug>
-	</properties>
+    </properties>
 
-	<repositories>
-		<repository>
-			<id>spigot-repo</id>
-			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-		</repository>
-                <repository>
-                        <id>vault-repo</id>
-                        <url>http://nexus.hc.to/content/repositories/pub_releases</url>
-                </repository>
-		<repository>
-			<id>dmulloy2-repo</id>
-			<url>http://repo.dmulloy2.net/content/groups/public/</url>
-		</repository>
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>vault-repo</id>
+            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+        </repository>
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>http://repo.dmulloy2.net/nexus/repository/public/</url>
+        </repository>
         <repository>
             <id>ess-repo</id>
-            <url>http://repo.ess3.net/content/groups/essentials</url>
+            <url>https://ci.ender.zone/plugin/repository/everything/</url>
         </repository>
     </repositories>
 
@@ -63,79 +63,80 @@
             <version>${spigotVersion}</version>
         </dependency>
         <!-- You should have it in your local .m2 repository -->
-		<!-- This can be done using BuildTools from spigotmc.org -->
-		<dependency>
-			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot</artifactId>
-			<version>${spigotVersion}</version>
-			<!-- <scope>system</scope>
-			<systemPath>${project.basedir}/test/spigot-latest.jar</systemPath> -->
-		</dependency>
-		<dependency>
-			<groupId>net.ess3</groupId>
-			<artifactId>Essentials</artifactId>
-			<version>2.14-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>com.igormaznitsa</groupId>
-			<artifactId>jcp</artifactId>
-			<version>5.3.2</version>
-		</dependency>
-		<dependency>
-			<groupId>net.milkbowl.vault</groupId>
-			<artifactId>Vault</artifactId>
-			<version>1.6.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.comphenix.protocol</groupId>
-			<artifactId>ProtocolLib</artifactId>
-			<version>4.3.0</version>
-		</dependency>
-	</dependencies>
+        <!-- This can be done using BuildTools from spigotmc.org -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>${spigotVersion}</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/test/spigot-1.14.3-R0.1-SNAPSHOT.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.16.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.igormaznitsa</groupId>
+            <artifactId>jcp</artifactId>
+            <version>5.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>Vault</artifactId>
+            <version>1.7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib-API</artifactId>
+            <version>4.4.0</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<finalName>JSONAPI</finalName>
-		<sourceDirectory>src/main/java</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>src/resources</directory>
-				<includes>
-					<include>plugin.yml</include>
-					<include>permission_nodes.yml</include>
-					<include>groups.json</include>
-					<include>users.yml</include>
-					<include>groups.yml</include>
-					<include>config.yml</include>
-					<include>config_rtk.yml</include>
-					<include>methods.json</include>
-					<include>methods/*</include>
-					<include>jsonapi4/methods/*</include>
-				</includes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>com.igormaznitsa</groupId>
-				<artifactId>jcp</artifactId>
-				<version>6.0.1</version>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>preprocess</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<globalVars>
+    <build>
+        <finalName>JSONAPI</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/resources</directory>
+                <includes>
+                    <include>plugin.yml</include>
+                    <include>permission_nodes.yml</include>
+                    <include>groups.json</include>
+                    <include>users.yml</include>
+                    <include>groups.yml</include>
+                    <include>config.yml</include>
+                    <include>config_rtk.yml</include>
+                    <include>methods.json</include>
+                    <include>methods/*</include>
+                    <include>jsonapi4/methods/*</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>com.igormaznitsa</groupId>
+                <artifactId>jcp</artifactId>
+                <version>6.0.1</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>preprocess</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <globalVars>
                         <property>
                             <name>mcversion</name>
                             <value>${mcPackage}</value>
                         </property>
-						<property>
-							<name>mc1120rNewer</name>
-							<value>${mc1120rNewer}</value>
-						</property>
+                        <property>
+                            <name>mc1120rNewer</name>
+                            <value>${mc1120rNewer}</value>
+                        </property>
                         <!-- <property>
                             <name>mc16OrNewer</name>
                             <value>${mc16OrNewer}</value>
@@ -160,8 +161,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.5</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <encoding>UTF-8</encoding>
                     <debug>true</debug>
                     <debuglevel>lines,vars,source</debuglevel>
@@ -287,4 +288,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/JSONAPI.java b/src/main/java/com/alecgorge/minecraft/jsonapi/JSONAPI.java
index 494ca76a..c0f2b6d4 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/JSONAPI.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/JSONAPI.java
@@ -432,7 +432,7 @@ public void onEnable() {
 				startupDelay = yamlConfig.getInt("options.startup-delay", 2000);
 				anyoneCanUseCallAdmin = yamlConfig.getBoolean("options.anyone-can-use-calladmin", false);
 				allowSendingOldStreamMessages = yamlConfig.getBoolean("options.send-previous-stream-messages", true);
-				serverName = getServer().getServerName();
+				serverName = getServer().getName();
 				adminiumEnabled = yamlConfig.getBoolean("options.adminium-push-enabled", true);
 				if(yamlConfig.contains("options.use-new-api")) {
 					useGroups = yamlConfig.getBoolean("options.use-new-api", false);
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/adminium/Adminium3.java b/src/main/java/com/alecgorge/minecraft/jsonapi/adminium/Adminium3.java
index dc7e1a00..a988ff4e 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/adminium/Adminium3.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/adminium/Adminium3.java
@@ -226,7 +226,7 @@ public String getPushNotification() {
 
 			String messager = getMessage();
 			if (api.serverName != null && !api.serverName.isEmpty()) {
-				messager = (api.serverName.equals("default") ? api.getServer().getServerName() : api.serverName) + ": " + messager;
+				messager = (api.serverName.equals("default") ? api.getServer().getName() : api.serverName) + ": " + messager;
 			}
 
 			return messager.length() > 210 ? messager.substring(0, 208) + "\u2026" : messager;
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/adminium/PushNotificationDaemon.java b/src/main/java/com/alecgorge/minecraft/jsonapi/adminium/PushNotificationDaemon.java
index 4485a0b4..9dcf34cb 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/adminium/PushNotificationDaemon.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/adminium/PushNotificationDaemon.java
@@ -63,7 +63,7 @@ public String getPushNotification() {
 			
 			String messager = getMessage();
 			if (api.serverName != null && !api.serverName.isEmpty()) {
-				messager = (api.serverName.equals("default") ? api.getServer().getServerName() : api.serverName) + ": " + messager;
+				messager = (api.serverName.equals("default") ? api.getServer().getName() : api.serverName) + ": " + messager;
 			}
 
 			return messager.length() > 210 ? messager.substring(0, 208) + "\u2026" : messager;
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/api/StreamPusher.java b/src/main/java/com/alecgorge/minecraft/jsonapi/api/StreamPusher.java
index 76ee4f01..45e39dd4 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/api/StreamPusher.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/api/StreamPusher.java
@@ -134,7 +134,7 @@ public void run() {
 
 						r.addPostValue("source", streamName);
 						r.addPostValue("count", messages.size());
-						r.addPostValue("server-name", JSONAPI.instance.getServer().getServerName());
+						r.addPostValue("server-name", JSONAPI.instance.getServer().getName());
 						
 						if(getPushTag() != null) {
 							r.addPostValue("tag", getPushTag());
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/chat/BukkitRealisticChat.java b/src/main/java/com/alecgorge/minecraft/jsonapi/chat/BukkitRealisticChat.java
index 6c06f307..8934ef4e 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/chat/BukkitRealisticChat.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/chat/BukkitRealisticChat.java
@@ -7,7 +7,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.entity.*;
-import org.bukkit.entity.Entity;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerChatEvent;
 
@@ -20,11 +19,11 @@
 //$import org.bukkit.craftbukkit./*$mcversion$*/.entity.*;
 //$import org.bukkit.craftbukkit./*$mcversion$*/.util.*;
 //#else
-import net.minecraft.server.v1_12_R1.*;
+import net.minecraft.server.v1_14_R1.*;
 
-import org.bukkit.craftbukkit.v1_12_R1.*;
-import org.bukkit.craftbukkit.v1_12_R1.entity.*;
-import org.bukkit.craftbukkit.v1_12_R1.util.*;
+import org.bukkit.craftbukkit.v1_14_R1.*;
+import org.bukkit.craftbukkit.v1_14_R1.entity.*;
+import org.bukkit.craftbukkit.v1_14_R1.util.*;
 //#endif
 
 @SuppressWarnings("deprecation")
@@ -68,105 +67,6 @@ public UUID getUniqueId() {
 			}
 			return super.getUniqueId();
 		}
-
-		/**
-		 * This method exists for legacy reasons to provide backwards
-		 * compatibility. It will not exist at runtime and should not be used
-		 * under any circumstances.
-		 *
-		 * @return damage taken since the last no damage ticks time period
-		 */
-		@Override
-		public int _INVALID_getLastDamage() {
-			return 0;
-		}
-
-		/**
-		 * This method exists for legacy reasons to provide backwards
-		 * compatibility. It will not exist at runtime and should not be used
-		 * under any circumstances.
-		 *
-		 * @param damage amount of damage
-		 */
-		@Override
-		public void _INVALID_setLastDamage(int damage) {
-
-		}
-
-		/**
-		 * This method exists for legacy reasons to provide backwards
-		 * compatibility. It will not exist at runtime and should not be used
-		 * under any circumstances.
-		 *
-		 * @param amount Amount of damage to deal
-		 */
-		@Override
-		public void _INVALID_damage(int amount) {
-
-		}
-
-		/**
-		 * This method exists for legacy reasons to provide backwards
-		 * compatibility. It will not exist at runtime and should not be used
-		 * under any circumstances.
-		 *
-		 * @param amount Amount of damage to deal
-		 * @param source Entity which to attribute this damage from
-		 */
-		@Override
-		public void _INVALID_damage(int amount, Entity source) {
-
-		}
-
-		/**
-		 * This method exists for legacy reasons to provide backwards
-		 * compatibility. It will not exist at runtime and should not be used
-		 * under any circumstances.
-		 *
-		 * @return Health represented from 0 to max
-		 */
-		@Override
-		public int _INVALID_getHealth() {
-			return 0;
-		}
-
-		/**
-		 * This method exists for legacy reasons to provide backwards
-		 * compatibility. It will not exist at runtime and should not be used
-		 * under any circumstances.
-		 *
-		 * @param health New health represented from 0 to max
-		 * @throws IllegalArgumentException Thrown if the health is {@literal < 0 or >}
-		 *                                  {@link #getMaxHealth()}
-		 */
-		@Override
-		public void _INVALID_setHealth(int health) {
-
-		}
-
-		/**
-		 * This method exists for legacy reasons to provide backwards
-		 * compatibility. It will not exist at runtime and should not be used
-		 * under any circumstances.
-		 *
-		 * @return Maximum health
-		 */
-		@Override
-		public int _INVALID_getMaxHealth() {
-			return 0;
-		}
-
-		/**
-		 * This method exists for legacy reasons to provide backwards
-		 * compatibility. It will not exist at runtime and should not be used
-		 * under any circumstances.
-		 *
-		 * @param health amount of health to set the maximum to
-		 */
-		@Override
-		public void _INVALID_setMaxHealth(int health) {
-
-		}
 	}
 	
 	public boolean chatWithNameForPlayer(String message, String name, String playerToExtend) {
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/dynamic/APIWrapperMethods.java b/src/main/java/com/alecgorge/minecraft/jsonapi/dynamic/APIWrapperMethods.java
index 4eb1363c..dd6a3b15 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/dynamic/APIWrapperMethods.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/dynamic/APIWrapperMethods.java
@@ -18,14 +18,8 @@
 import net.milkbowl.vault.chat.Chat;
 import net.milkbowl.vault.economy.Economy;
 
-import org.bukkit.BanList;
+import org.bukkit.*;
 import org.bukkit.BanList.Type;
-import org.bukkit.Bukkit;
-import org.bukkit.Difficulty;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Chest;
 import org.bukkit.block.Sign;
@@ -115,10 +109,10 @@ else if(o instanceof Collection<?>) {
 		return 0;
 	}
 
-	public HashMap<Integer, ItemStack> removePlayerInventoryItem(String playerName, int itemID) {
+	public HashMap<Integer, ItemStack> removePlayerInventoryItem(String playerName, String itemName) {
 		try {
 			Player p = getPlayerExact(playerName);
-			HashMap<Integer, ItemStack> c = p.getInventory().removeItem(new ItemStack(itemID, 64 * 64));
+			HashMap<Integer, ItemStack> c = p.getInventory().removeItem(new ItemStack(Material.valueOf(itemName.toUpperCase()), 64 * 64));
 			p.saveData();
 
 			return c;
@@ -153,6 +147,35 @@ public boolean setPlayerFoodLevel(String playerName, int health) {
 		return true;
 	}
 
+//	public boolean removeEnchantmentsByNameFromPlayerInventorySlot(String playerName, int slot, List<Object> enchantments) {
+//		try {
+//			Player p = getPlayerExact(playerName);
+//			PlayerInventory inv = p.getInventory();
+//			ItemStack it;
+//
+//			if (slot == inv.getHeldItemSlot())
+//				it = inv.getHelmet();
+//			else if (slot == 102)
+//				it = inv.getChestplate();
+//			else if (slot == 101)
+//				it = inv.getLeggings();
+//			else if (slot == 100)
+//				it = inv.getBoots();
+//			else
+//				it = inv.getItem(slot);
+//
+//			for (Object o : enchantments) {
+//				it.removeEnchantment(Enchantment.getByName(String.valueOf(o).toUpperCase()));
+//			}
+//
+//			p.saveData();
+//
+//			return true;
+//		} catch (NullPointerException e) {
+//			return false;
+//		}
+//	}
+
 	public boolean removeEnchantmentsFromPlayerInventorySlot(String playerName, int slot, List<Object> enchantments) {
 		try {
 			Player p = getPlayerExact(playerName);
@@ -171,7 +194,7 @@ else if (slot == 100)
 				it = inv.getItem(slot);
 
 			for (Object o : enchantments) {
-				it.removeEnchantment(Enchantment.getById(Integer.valueOf(o.toString())));
+				it.removeEnchantment(Enchantment.getByName(String.valueOf(o).toUpperCase()));
 			}
 
 			p.saveData();
@@ -182,7 +205,7 @@ else if (slot == 100)
 		}
 	}
 
-	public boolean addEnchantmentToPlayerInventorySlot(String playerName, int slot, int enchantmentID, int level) {
+	public boolean addEnchantmentToPlayerInventorySlot(String playerName, int slot, String enchantmentName, int level) {
 		try {
 			Player p = getPlayerExact(playerName);
 			PlayerInventory inv = p.getInventory();
@@ -199,7 +222,7 @@ else if (slot == 100)
 			else
 				it = inv.getItem(slot);
 
-			it.addEnchantment(Enchantment.getById(enchantmentID), level);
+			it.addEnchantment(Enchantment.getByName(enchantmentName.toUpperCase()), level);
 
 			p.saveData();
 
@@ -228,7 +251,7 @@ else if (slot == 100)
 
 			for (int i = 0; i < enchantments.size(); i++) {
 				JSONObject o = (JSONObject) enchantments.get(i);
-				it.addEnchantment(Enchantment.getById(Integer.valueOf(o.get("enchantment").toString())), Integer.valueOf(o.get("level").toString()));
+				it.addEnchantment(Enchantment.getByName(String.valueOf(o.get("enchantment")).toUpperCase()), Integer.valueOf(o.get("level").toString()));
 			}
 
 			p.saveData();
@@ -239,15 +262,15 @@ else if (slot == 100)
 		}
 	}
 
-	public boolean setPlayerInventorySlot(String playerName, int slot, int blockID, int quantity) {
+	public boolean setPlayerInventorySlot(String playerName, int slot, String blockName, int quantity) {
 		try {
-			if (blockID == 0) {
+			if (Material.valueOf(blockName.toUpperCase()) == null) {
 				return clearPlayerInventorySlot(playerName, slot);
 			}
 
 			Player p = getPlayerExact(playerName);
 			PlayerInventory inv = p.getInventory();
-			ItemStack it = new ItemStack(blockID, quantity);
+			ItemStack it = new ItemStack(Material.valueOf(blockName.toUpperCase()), quantity);
 
 			if (slot == 103)
 				inv.setHelmet(it);
@@ -268,15 +291,15 @@ else if (slot == 100)
 		}
 	}
 
-	public boolean setPlayerInventorySlotWithData(String playerName, int slot, int blockID, final int data, int quantity) {
+	public boolean setPlayerInventorySlotWithData(String playerName, int slot, String blockName, final int data, int quantity) {
 		try {
-			if (blockID == 0) {
+			if (Material.valueOf(blockName.toUpperCase()) == null) {
 				return clearPlayerInventorySlot(playerName, slot);
 			}
 
 			Player p = getPlayerExact(playerName);
 			PlayerInventory inv = p.getInventory();
-			ItemStack it = (new MaterialData(blockID, (byte) data)).toItemStack(quantity);
+			ItemStack it = (new MaterialData(Material.valueOf(blockName.toUpperCase()), (byte) data)).toItemStack(quantity);
 
 			if (slot == 103)
 				inv.setHelmet(it);
@@ -298,18 +321,18 @@ else if (slot == 100)
 
 	}
 
-	public boolean setPlayerInventorySlotWithDataAndDamage(String playerName, int slot, int blockID, final int data, int damage, int quantity) {
+	public boolean setPlayerInventorySlotWithDamage(String playerName, int slot, String blockName, int damage, int quantity) {
 		try {
-			if (blockID == 0) {
+			if (Material.valueOf(blockName.toUpperCase()) == null) {
 				return clearPlayerInventorySlot(playerName, slot);
 			}
 
 			Player p = getPlayerExact(playerName);
 			PlayerInventory inv = p.getInventory();
-			
-			ItemStack it = (new MaterialData(blockID, (byte) data)).toItemStack(quantity);
-			it.setDurability((short)data);
-			
+
+			ItemStack it = (new MaterialData(Material.valueOf(blockName.toUpperCase()))).toItemStack(quantity);
+			it.setDurability(Short.valueOf(String.valueOf(damage)).shortValue());
+
 			if (slot == 103)
 				inv.setHelmet(it);
 			else if (slot == 102)
@@ -330,20 +353,20 @@ else if (slot == 100)
 
 	}
 
-	public boolean setPlayerInventorySlotWithDataDamageAndEnchantments(String playerName, int slot, int blockID, final int data, int damage, int quantity, Object[] enchantments) {
+	public boolean setPlayerInventorySlotWithDataDamageAndEnchantments(String playerName, int slot, String blockName, final int data, int damage, int quantity, Object[] enchantments) {
 		try {
-			if (blockID == 0) {
+			if (Material.valueOf(blockName.toUpperCase()) == null) {
 				return clearPlayerInventorySlot(playerName, slot);
 			}
 
 			Player p = getPlayerExact(playerName);
 			PlayerInventory inv = p.getInventory();
-			ItemStack it = (new MaterialData(blockID, (byte) data)).toItemStack(quantity);
-			it.setDurability((short)data);
+			ItemStack it = (new MaterialData(Material.valueOf(blockName.toUpperCase()), (byte) data)).toItemStack(quantity);
+			it.setDurability((short)damage);
 
 			for (int i = 0; i < enchantments.length; i++) {
 				JSONObject o = (JSONObject) enchantments[i];
-				it.addEnchantment(Enchantment.getById(Integer.valueOf(o.get("enchantment").toString())), Integer.valueOf(o.get("level").toString()));
+				it.addEnchantment(Enchantment.getByName(String.valueOf(o.get("enchantment")).toUpperCase()), Integer.valueOf(o.get("level").toString()));
 			}
 
 			if (slot == 103)
@@ -366,15 +389,15 @@ else if (slot == 100)
 
 	}
 
-	public boolean setPlayerInventorySlot(String playerName, int slot, int blockID, int damage, int quantity) {
+	public boolean setPlayerInventorySlot(String playerName, int slot, String blockName, int damage, int quantity) {
 		try {
-			if (blockID == 0) {
+			if (Material.valueOf(blockName.toUpperCase()) == null) {
 				return clearPlayerInventorySlot(playerName, slot);
 			}
 
 			Player p = getPlayerExact(playerName);
 			PlayerInventory inv = p.getInventory();
-			ItemStack it = new ItemStack(blockID, quantity, Short.valueOf(String.valueOf(damage)).shortValue());
+			ItemStack it = new ItemStack(Material.valueOf(blockName.toUpperCase()), quantity, Short.valueOf(String.valueOf(damage)).shortValue());
 
 			if (slot == 103)
 				inv.setHelmet(it);
@@ -395,10 +418,17 @@ else if (slot == 100)
 		}
 	}
 
-	public void setPlayerGameMode(String playerName, int gameMode) throws Exception {
+	public void setPlayerGameModeById(String playerName, int gameMode) throws Exception {
 		Player p = getPlayerExact(playerName);
-		
-		p.setGameMode(GameMode.getByValue(gameMode));		
+
+		p.setGameMode(GameMode.getByValue(gameMode));
+		p.saveData();
+	}
+
+	public void setPlayerGameModeByName(String playerName, String gameMode) throws Exception {
+		Player p = getPlayerExact(playerName);
+
+		p.setGameMode(GameMode.valueOf(gameMode.toUpperCase()));
 		p.saveData();
 	}
 
@@ -519,6 +549,14 @@ public List<String> getWhitelist() throws APIException {
 		return a;
 	}
 
+	public List<String> getWhitelistByUUID() throws APIException {
+		List<String> a = new ArrayList<String>();
+		for (OfflinePlayer p : Server.getWhitelistedPlayers()) {
+			a.add(p.getUniqueId().toString());
+		}
+		return a;
+	}
+
 	public List<String> getBannedPlayers() throws APIException {
 		List<String> a = new ArrayList<String>();
 		for (OfflinePlayer p : Server.getBannedPlayers()) {
@@ -559,10 +597,13 @@ public boolean disablePlugin(String name) {
 		}
 	}
 
-	public boolean giveItem(String name, int id, int quant) {
+	public boolean giveItem(String name, String itemName, int quant) {
 		try {
+			if (Material.valueOf(itemName.toUpperCase()) == null)
+				return false;
+
 			Player p = getPlayerExact(name);
-			p.getInventory().addItem(new ItemStack(id, quant));
+			p.getInventory().addItem(new ItemStack(Material.valueOf(itemName.toUpperCase()), quant));
 			p.saveData();
 			return true;
 		} catch (NullPointerException e) {
@@ -570,11 +611,14 @@ public boolean giveItem(String name, int id, int quant) {
 		}
 	}
 
-	public boolean giveItem(String name, int id, int quant, int data) throws Exception {
+	public boolean giveItem(String name, String itemName, int quant, int data) throws Exception {
 		try {
+			if (Material.valueOf(itemName.toUpperCase()) == null)
+				return false;
+
             byte realData = Byte.valueOf(String.valueOf(data));
 			Player p = getPlayerExact(name);
-            MaterialData materialData = new MaterialData(id, realData);
+            MaterialData materialData = new MaterialData(Material.valueOf(itemName.toUpperCase()), realData);
 			p.getInventory().addItem(materialData.toItemStack(quant));
 			p.saveData();
 			return true;
@@ -583,21 +627,27 @@ public boolean giveItem(String name, int id, int quant, int data) throws Excepti
 		}
 	}
 
-	public boolean giveItemDrop(String name, int id, int quant) {
+	public boolean giveItemDrop(String name, String itemName, int quant) {
 		try {
+			if (Material.valueOf(itemName.toUpperCase()) == null)
+				return false;
+
 			Player p = getPlayerExact(name);
-			p.getWorld().dropItem(p.getLocation(), new ItemStack(id, quant));
+			p.getWorld().dropItem(p.getLocation(), new ItemStack(Material.valueOf(itemName.toUpperCase()), quant));
 			return true;
 		} catch (NullPointerException e) {
 			return false;
 		}
 	}
 
-	public boolean giveItemDrop(String name, int id, int quant, int data) throws Exception {
+	public boolean giveItemDrop(String name, String itemName, int quant, int data) throws Exception {
 		try {
+			if (Material.valueOf(itemName.toUpperCase()) == null)
+				return false;
+
 			Player p = getPlayerExact(name);
-			ItemStack stack = new ItemStack(id, quant);
-			stack.setData(new MaterialData(id, Byte.valueOf(String.valueOf(data)).byteValue()));
+			ItemStack stack = new ItemStack(Material.valueOf(itemName.toUpperCase()), quant);
+			stack.setData(new MaterialData(Material.valueOf(itemName.toUpperCase()), Byte.valueOf(String.valueOf(data)).byteValue()));
 			p.getWorld().dropItem(p.getLocation(), stack);
 			p.saveData();
 			return true;
@@ -922,7 +972,7 @@ public boolean setPlayerLevel(String player, int level) {
 		return true;
 	}
 
-	public boolean setPlayerExperience(String player, float level) {
+	public boolean setPlayerExperience(String player, int level) {
 		Player p = getPlayerExact(player);
 		p.setExp(level);
 		p.saveData();
@@ -1049,20 +1099,20 @@ public List<String> getSingleDirectory(String path) {
 		}
 	}
 
-	public void setBlockData(String w, int x, int y, int z, int data) {
-		Server.getWorld(w).getBlockAt(x, y, z).setData((byte) data);
-	}
+//	public void setBlockData(String w, int x, int y, int z, int data) {
+//		Server.getWorld(w).getBlockAt(x, y, z).setData((byte) data);
+//	}
 
-        public void explodeAtLocation(
-                String w,
-                double x,
-                double y,
-                double z,
-                double power,
-                boolean setFire,
-                boolean breakBlocks) {
+	public void explodeAtLocation(
+		String w,
+		double x,
+		double y,
+		double z,
+		double power,
+		boolean setFire,
+		boolean breakBlocks) {
 		Server.getWorld(w).createExplosion(x, y, z, (float)power, setFire, breakBlocks);
-        }
+	}
 
 	public boolean teleport(String player1, String player2) {
 		Player p = getPlayerExact(player1);
@@ -1217,6 +1267,10 @@ public boolean teleport(String playername, String world, int x, int y, int z) {
 		}
 	}
 
+	public void setBlockType(String worldName, int x, int y, int z, String blockName) {
+		Server.getWorld(worldName).getBlockAt(x, y, z).setType(Material.valueOf(blockName.toUpperCase()));
+	}
+
 	public String[] getSignText(String world, int x, int y, int z) throws Exception {
 		BlockState d = Server.getWorld(world).getBlockAt(x, y, z).getState();
 
@@ -1270,14 +1324,14 @@ public Inventory getChestContents(String world, int x, int y, int z) throws Exce
 		return null;
 	}
 
-	public boolean giveChestItem(String world, int x, int y, int z, int slot, int blockID, int quantity) {
+	public boolean giveChestItem(String world, int x, int y, int z, int slot, String blockName, int quantity) {
 		try {
-			if (blockID == 0) {
+			if (Material.valueOf(blockName) == null) {
 				return clearChestSlot(world, x, y, z, slot);
 			}
 
 			Inventory inv = ((Chest) Server.getWorld(world).getBlockAt(x, y, z).getState()).getInventory();
-			ItemStack it = new ItemStack(blockID, quantity);
+			ItemStack it = new ItemStack(Material.valueOf(blockName), quantity);
 			inv.setItem(slot, it);
 
 			return true;
@@ -1286,14 +1340,14 @@ public boolean giveChestItem(String world, int x, int y, int z, int slot, int bl
 		}
 	}
 
-	public boolean giveChestItem(String world, int x, int y, int z, int slot, int blockID, final int data, int quantity) {
+	public boolean giveChestItem(String world, int x, int y, int z, int slot, String blockName, final int data, int quantity) {
 		try {
-			if (blockID == 0) {
+			if (Material.valueOf(blockName) == null) {
 				return clearChestSlot(world, x, y, z, slot);
 			}
 
 			Inventory inv = ((Chest) Server.getWorld(world).getBlockAt(x, y, z).getState()).getInventory();
-			ItemStack it = (new MaterialData(blockID, (byte) data)).toItemStack(quantity);
+			ItemStack it = (new MaterialData(Material.valueOf(blockName), (byte) data)).toItemStack(quantity);
 			inv.setItem(slot, it);
 
 			return true;
@@ -1315,6 +1369,6 @@ public boolean clearChestSlot(String world, int x, int y, int z, int slot) {
 	}
 	
 	public boolean spawn(String world, double x, double y, double z, String mobName) {
-		return getServer().getWorld(world).spawnEntity(new Location(getServer().getWorld(world), x, y, z), EntityType.fromName(mobName)) != null;
+		return getServer().getWorld(world).spawnEntity(new Location(getServer().getWorld(world), x, y, z), EntityType.valueOf(mobName.toUpperCase())) != null;
 	}	
 }
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/dynamic/Call.java b/src/main/java/com/alecgorge/minecraft/jsonapi/dynamic/Call.java
index a3d8acd1..2f84b669 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/dynamic/Call.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/dynamic/Call.java
@@ -216,7 +216,7 @@ public void parseString(String input) {
 			} else if (v.equals("this")) {
 				stack.add(APIWrapperMethods.getInstance());
 			} else if (v.equals("Plugins")) { // handles
-												// Plugins.PLUGINNAME.pluginMethod(0,1,2)
+				// Plugins.PLUGINNAME.pluginMethod(0,1,2)
 				String v2 = parts[i + 1];
 				stack.add(Server.getPluginManager().getPlugin(v2));
 				i++;
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/event/JSONAPIAuthEvent.java b/src/main/java/com/alecgorge/minecraft/jsonapi/event/JSONAPIAuthEvent.java
index c64e1e2c..0754322b 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/event/JSONAPIAuthEvent.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/event/JSONAPIAuthEvent.java
@@ -21,6 +21,7 @@ public class JSONAPIAuthEvent extends Event {
 	boolean stream;
 
 	public JSONAPIAuthEvent(JSONAPIAuthResponse valid, String method, String hash, HashMap<String, String> logins, String username, boolean stream) {
+		super(true);
 		this.valid = valid;
 		this.method = method;
 		this.hash = hash;
@@ -30,6 +31,7 @@ public JSONAPIAuthEvent(JSONAPIAuthResponse valid, String method, String hash, H
 	}
 
 	public JSONAPIAuthEvent(JSONAPIAuthResponse valid, String method, String username, boolean stream) {
+		super(true);
 		this.valid = valid;
 		this.method = method;
 		this.username = username;
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/streams/console/ConsoleStubAppender.java b/src/main/java/com/alecgorge/minecraft/jsonapi/streams/console/ConsoleStubAppender.java
index 6153c346..dbbe06df 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/streams/console/ConsoleStubAppender.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/streams/console/ConsoleStubAppender.java
@@ -1,36 +1,26 @@
 package com.alecgorge.minecraft.jsonapi.streams.console;
 
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.appender.AbstractAppender;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.layout.PatternLayout;
-
-import com.alecgorge.minecraft.jsonapi.JSONServer;
+import org.apache.logging.log4j.core.appender.*;
+import org.apache.logging.log4j.core.config.plugins.*;
+import com.alecgorge.minecraft.jsonapi.*;
+import org.apache.logging.log4j.core.layout.*;
+import org.apache.logging.log4j.core.*;
 
 @Plugin(name = "ConsoleStub", category = "Core", elementType = "appender", printObject = true)
-
-public class ConsoleStubAppender
-extends AbstractAppender
+public class ConsoleStubAppender extends AbstractAppender
 {
 	JSONServer server;
-	
-	public ConsoleStubAppender(JSONServer server) {
-//#if mc1120rNewer=="yes"
-//$		super("JSONAPI", null, PatternLayout.newBuilder().withPattern("[%d{HH:mm:ss} %level]: %msg%n").build(), false);
-//#else		
-		super("JSONAPI", null, PatternLayout.createLayout("[%d{HH:mm:ss} %level]: %msg%n", null, null, null, null), false);
-//#endif
-		
+
+	public ConsoleStubAppender(final JSONServer server) {
+		super("JSONAPI", (Filter)null, (Layout)PatternLayout.newBuilder().withPattern("[%d{HH:mm:ss} %level]: %msg%n").build(), false);
 		this.server = server;
 	}
-	
-	@Override
+
 	public boolean isStarted() {
 		return true;
 	}
 
-	@Override
-	public void append(LogEvent e) {
-		server.logConsole(getLayout().toSerializable(e).toString());
+	public void append(final LogEvent e) {
+		this.server.logConsole(this.getLayout().toSerializable(e).toString());
 	}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/stringifier/BukkitStringifier.java b/src/main/java/com/alecgorge/minecraft/jsonapi/stringifier/BukkitStringifier.java
index b3bbef24..c66faaac 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/stringifier/BukkitStringifier.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/stringifier/BukkitStringifier.java
@@ -28,6 +28,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.BookMeta;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.json.simpleForBukkit.JSONArray;
@@ -102,7 +103,7 @@ public static Object handle(Object obj) {
 			Block b = (Block) obj;
 			JSONObject o = new JSONObject();
 
-			o.put("type", b.getTypeId());
+			o.put("type", b.getType().name());
 			o.put("data", b.getData());
 
 			return o;
@@ -117,7 +118,8 @@ public static Object handle(Object obj) {
 			o.put("foodLevel", p.getFoodLevel());
 			o.put("exhaustion", p.getExhaustion());
 			o.put("ip", p.getAddress() != null ? p.getAddress().toString() : "offline");
-			o.put("itemInHand", p.getItemInHand());
+			o.put("itemInMainHand", p.getInventory().getItemInMainHand());
+			o.put("itemInOffHand", p.getInventory().getItemInOffHand());
 			o.put("location", p.getLocation());
 			o.put("inventory", p.getInventory());
 			// o.put("enderchest", p.getEnderChest());
@@ -163,7 +165,7 @@ public static Object handle(Object obj) {
 			o.put("players", s.getOnlinePlayers());
 			o.put("port", s.getPort());
 			o.put("name", s.getName());
-			o.put("serverName", s.getServerName());
+			o.put("serverName", s.getName());
 			o.put("version", s.getVersion());
 			o.put("worlds", s.getWorlds());
 
@@ -186,7 +188,7 @@ public static Object handle(Object obj) {
 			
 			List<String> playerNames = new ArrayList<String>();
 			for(Player p : w.getPlayers()) {
-				if(!p.getName().equals("�fHerobrine")) {
+				if(!p.getName().equals("§fHerobrine")) {
 					playerNames.add(p.getName());
 				}
 			}
@@ -207,6 +209,9 @@ public static Object handle(Object obj) {
 			o.put("website", d.getWebsite() == null ? "" : d.getWebsite());
 			o.put("enabled", JSONAPI.instance.getServer().getPluginManager().isPluginEnabled(p));
 			o.put("commands", d.getCommands());
+			o.put("api-version", d.getAPIVersion());
+			o.put("depend", d.getDepend());
+			o.put("softdepend", d.getSoftDepend());
 
 			return o;
 		} else if (obj instanceof ItemStack) {
@@ -214,19 +219,31 @@ public static Object handle(Object obj) {
 
 			JSONObject o = new JSONObject();
 
-			o.put("type", i.getTypeId());
+			o.put("type", i.getType().name());
 			o.put("durability", i.getDurability());
 			o.put("dataValue", (int) i.getData().getData());
 			o.put("amount", i.getAmount());
+			o.put("maxStackSize", i.getMaxStackSize());
+			if (i.hasItemMeta()) {
+				JSONObject itemMeta = new JSONObject();
+				ItemMeta im = i.getItemMeta();
+
+				itemMeta.put("displayName", im.getDisplayName());
+				itemMeta.put("itemFlags", im.getItemFlags().toArray());
+				itemMeta.put("lores", im.getLore());
+				itemMeta.put("isUnbreakable", im.isUnbreakable());
+
+				o.put("itemMeta", itemMeta);
+			}
 
 			JSONObject enchantments = new JSONObject();
 			for (Map.Entry<Enchantment, Integer> enchantment : i.getEnchantments().entrySet()) {
-				enchantments.put(enchantment.getKey().getId(), enchantment.getValue());
+				enchantments.put(enchantment.getKey().getName(), enchantment.getValue());
 			}
 
 			o.put("enchantments", enchantments);
 			
-			if (((ItemStack) obj).getType().equals(Material.BOOK_AND_QUILL) || ((ItemStack) obj).getType().equals(Material.WRITTEN_BOOK)) {
+			if (((ItemStack) obj).getType().equals(Material.WRITABLE_BOOK) || ((ItemStack) obj).getType().equals(Material.WRITTEN_BOOK)) {
 				JSONObject book = new JSONObject();
 				
 				BookMeta bookObj = (BookMeta)((ItemStack)obj).getItemMeta();
@@ -251,7 +268,7 @@ public static Object handle(Object obj) {
 			armor.put("leggings", p.getLeggings());
 
 			o.put("armor", armor);
-			o.put("hand", p.getItemInHand());
+			o.put("hand", p.getItemInMainHand());
 			o.put("inventory", Arrays.asList(p.getContents()));
 
 			return o;
@@ -306,9 +323,9 @@ public static Object handle(Object obj) {
 			
 			return n.getName();			
 		} else if (obj instanceof GameMode) {
-			return ((GameMode) obj).getValue();
+			return ((GameMode) obj).name();
 		} else if (obj instanceof Enchantment) {
-			return ((Enchantment) obj).getId();
+			return ((Enchantment) obj).getKey().toString();
 		} else if (JSONAPI.instance.getServer().getPluginManager().getPlugin("Vault") != null && obj instanceof EconomyResponse) {
 			JSONObject o = new JSONObject();
 			EconomyResponse r = (EconomyResponse) obj;
diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/util/OfflinePlayerLoader.java b/src/main/java/com/alecgorge/minecraft/jsonapi/util/OfflinePlayerLoader.java
index f087a533..d83f2ff4 100644
--- a/src/main/java/com/alecgorge/minecraft/jsonapi/util/OfflinePlayerLoader.java
+++ b/src/main/java/com/alecgorge/minecraft/jsonapi/util/OfflinePlayerLoader.java
@@ -13,9 +13,9 @@
 //$import net.minecraft.server./*$mcversion$*/.*;
 //$import org.bukkit.craftbukkit./*$mcversion$*/.*;		
 //#else		
-import net.minecraft.server.v1_11_R1.EntityPlayer;		
-import net.minecraft.server.v1_11_R1.*;		
-import org.bukkit.craftbukkit.v1_11_R1.*;		
+import net.minecraft.server.v1_14_R1.EntityPlayer;
+import net.minecraft.server.v1_14_R1.*;
+import org.bukkit.craftbukkit.v1_14_R1.*;
 //#endif
 
 public class OfflinePlayerLoader {
@@ -51,7 +51,7 @@ public static Player loadFromOfflinePlayer(OfflinePlayer player) {
 		GameProfile profile = new GameProfile(player.getUniqueId(), player.getName());
 		MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 		// Create an entity to load the player data
-		EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+		EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(DimensionManager.OVERWORLD), profile, new PlayerInteractManager(server.getWorldServer(DimensionManager.OVERWORLD)));
 
 		// Get the bukkit entity
 		Player target = entity.getBukkitEntity();
diff --git a/src/main/java/org/json/simpleForBukkit/JSONValue.java b/src/main/java/org/json/simpleForBukkit/JSONValue.java
index c1bb76fa..37f87f99 100644
--- a/src/main/java/org/json/simpleForBukkit/JSONValue.java
+++ b/src/main/java/org/json/simpleForBukkit/JSONValue.java
@@ -92,7 +92,7 @@ public static Object parseWithException(String s) throws ParseException{
      * @see org.json.simpleForBukkit.JSONArray#writeJSONString(List, Writer)
      * 
      * @param value
-     * @param writer
+     * @param out
      */
 	@SuppressWarnings("unchecked")
 	public static void writeJSONString(Object value, Writer out) throws IOException {
diff --git a/src/resources/methods.json b/src/resources/methods.json
index 249eb6c2..c456dc28 100644
--- a/src/resources/methods.json
+++ b/src/resources/methods.json
@@ -60,7 +60,7 @@
 			"returns": ["boolean", "True if the item was given. False will be returned if the player is not on the server."],
 			"args": [
 				["String","Player's name"],
-				["int","Id of item to give"],
+				["String","Name of item to give"],
 				["int","Quantity of item to give"]
 			]
 		},
@@ -71,7 +71,7 @@
 			"returns": ["boolean", "True if the item was given. False will be returned if the player is not on the server. An exception could be throw for invalid data (data < 0 or data > 15)."],
 			"args": [
 				["String","Player's name"],
-				["int","Id of item to give"],
+				["String","Name of item to give"],
 				["int","Quantity of item to give"],
 				["int","Decimal representation of the data value."]
 			]
@@ -83,7 +83,7 @@
 			"call": "this.giveItemDrop(0, 1, 2)",
 			"args": [
 				["String", "Players' name"],
-				["int", "Id of item to drop"],
+				["String", "Name of item to drop"],
 				["int", "Quantity of item to drop"]
 			]
 		},
@@ -94,7 +94,7 @@
 			"returns": ["boolean", "True if the item was given. False will be returned if the player is not on the server. An exception could be throw for invalid data (data < 0 or data > 15)."],
 			"args": [
 				["String","Player's name"],
-				["int","Id of item to give"],
+				["String","Name of item to give"],
 				["int","Quantity of item to give"],
 				["int","Decimal representation of the data value."]
 			]
@@ -108,27 +108,26 @@
 		{
 			"name": "setPlayerInventorySlotWithDamage",
 			"desc": "Sets the specified slot in the specified player's inventory to the specified type with the specified quantity and damage.",
-			"call": "this.setPlayerInventorySlot(0, 1, 2, 3, 4)",
+			"call": "this.setPlayerInventorySlotWithDamage(0, 1, 2, 3, 4)",
 			"returns": ["boolean", "True if the item was given. False will be returned if the player is not on the server."],
 			"args": [
 				["String", "Player's name"],
 				["int", "Slot number"],
-				["int", "Id of block type to set"],
+				["String", "Name of block type to set"],
 				["int", "The damage of the item."],
 				["int", "Quantity to set"]
 			]
 		},
 		{
-			"name": "setPlayerInventorySlotWithDataAndDamage",
-			"desc": "Sets the specified slot in the specified player's inventory to the specified type with the specified data, quantity and damage.",
-			"call": "this.setPlayerInventorySlotWithDataAndDamage(0, 1, 2, 3, 4, 5)",
+			"name": "setPlayerInventorySlotWithData",
+			"desc": "Sets the specified slot in the specified player's inventory to the specified type with the specified data, quantity.",
+			"call": "this.setPlayerInventorySlotWithData(0, 1, 2, 3, 4)",
 			"returns": ["boolean", "True if the item was given. False will be returned if the player is not on the server."],
 			"args": [
 				["String", "Player's name"],
 				["int", "Slot number"],
-				["int", "Id of block type to set"],
+				["String", "Name of block type to set"],
 				["int", "The data of the item."],
-				["int", "The damage of the item."],
 				["int", "Quantity to set"]
 			]
 		},
@@ -140,7 +139,7 @@
 			"args": [
 				["String", "Player's name"],
 				["int", "Slot number"],
-				["int", "The enchantment ID (EID): http://www.minecraftwiki.net/wiki/Enchanting#Enchantment_Types"],
+				["String", "The enchantment Name: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/enchantments/Enchantment.html"],
 				["int", "The enchantment level"]
 			]
 		},
@@ -152,7 +151,7 @@
 			"args": [
 				["String", "Player's name"],
 				["int", "Slot number"],
-				["Object[]", "Array of {enchantment: 0, level: 1}-esque objects where enchantment is the EID-value from here: http://www.minecraftwiki.net/wiki/Enchanting#Enchantment_Types"]
+				["Object[]", "Array of {enchantment: LUCK, level: 1}-esque objects where enchantment is the Name from here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/enchantments/Enchantment.html"]
 			]
 		},
 		{
@@ -163,7 +162,7 @@
 			"args": [
 				["String", "Player's name"],
 				["int", "Slot number"],
-				["Object[]", "Array of EID-values from here: http://www.minecraftwiki.net/wiki/Enchanting#Enchantment_Types"]
+				["Object[]", "Array of names from here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/enchantments/Enchantment.html"]
 			]
 		},
 		{
@@ -174,11 +173,11 @@
 			"args": [
 				["String", "Player's name"],
 				["int", "Slot number"],
-				["int", "Id of block type to set"],
+				["String", "Name of block type to set"],
 				["int", "The data of the item."],
 				["int", "The damage of the item."],
 				["int", "Quantity to set"],
-				["Object[]", "Array of {enchantment: 0, level: 1}-esque objects where enchantment is the EID-value from here: http://www.minecraftwiki.net/wiki/Enchanting#Enchantment_Types"]
+				["Object[]", "Array of {enchantment: LUCK, level: 1}-esque objects where enchantment is name from here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/enchantments/Enchantment.html"]
 			]
 		},
 		{
@@ -189,7 +188,7 @@
 			"args": [
 				["String", "Player's name"],
 				["int", "Slot number"],
-				["int", "Id of block type to set"],
+				["String", "Name of block type to set"],
 				["int", "The data of the item."],
 				["int", "Quantity to set"]
 			]
@@ -223,7 +222,7 @@
 			"args": [
 				["String", "Player's name"],
 				["int", "Slot number"],
-				["int", "Id of block type to set"],
+				["String", "Name of block type to set"],
 				["int", "Quantity to set"]
 			]
 		},
@@ -234,7 +233,7 @@
 			"call": "this.removePlayerInventoryItem(0, 1)",
 			"args": [
 				["String", "Player's name"],
-				["int", "Id of block type to remove"]
+				["String", "Name of block type to remove"]
 			]
 		},
 		{
@@ -711,9 +710,9 @@
 		},
 		{
 			"name": "setPlayerGameMode",
-			"desc": "Sets the game mode for a player. 0 is creative. 1 is survivial.",
+			"desc": "Sets the game mode by id for a player. 1 is creative. 0 is survivial. 2 os adventure. 3 is spectator",
 			"returns": ["boolean", "True on succes, false if the player is not on the server."],
-			"call": "this.setPlayerGameMode(0, 1)",
+			"call": "this.setPlayerGameModeById(0, 1)",
 			"flags": [
 				"FALSE_ON_EXCEPTION"
 			],
@@ -722,6 +721,19 @@
 				["int", "The game mode."]
 			]
 		},
+		{
+			"name": "setPlayerGameModeByName",
+			"desc": "Sets the game mode for a player. Options: [CREATIVE, SURVIVAL, ADVENTURE, SPECTATOR]",
+			"returns": ["boolean", "True on succes, false if the player is not on the server."],
+			"call": "this.setPlayerGameModeByName(0, 1)",
+			"flags": [
+				"FALSE_ON_EXCEPTION"
+			],
+			"args": [
+				["String", "The player's name."],
+				["String", "The name of game mode."]
+			]
+		},
 		{
 			"name":"getStream",
 			"desc":"Returns all the messages in a stream with the given name.",
@@ -771,25 +783,13 @@
 		{
 			"name":"setBlockType",
 			"desc":"Set the type of the block in the specified world at the specified coordinate.",
-			"call":"Server.getWorld(0).getBlockAt(1, 2, 3).setTypeId(4)",
+			"call":"this.setBlockType(0, 1, 2, 3, 4)",
 			"args": [
 				["String", "The world name."],
 				["int", "The x-coord of the block."],
 				["int", "The y-coord of the block."],
 				["int", "The z-coord of the block."],
-				["int", "The type ID to change the block to."]
-			]
-		},
-		{
-			"name":"setBlockData",
-			"desc":"Set the data value of the block in the specified world at the specified coordinate.",
-			"call":"this.setBlockData(0,1,2,3,4)",
-			"args": [
-				["String", "The world name."],
-				["int", "The x-coord of the block."],
-				["int", "The y-coord of the block."],
-				["int", "The z-coord of the block."],
-				["int", "The decimal representation of the data value to set on the block."]
+				["String", "Change the block to a block named."]
 			]
 		},
 		{
@@ -811,10 +811,10 @@
 			"name":"getOnlinePlayerNamesInWorld",
 			"desc":"Retrieves an array of the names of all the players currently in the given world.",
 			"returns":["String[]", "The players' names."],
+			"call":"Server.getWorld(0).getPlayers()",
 			"args": [
 				["String", "The world name"]
-			],
-			"call":"Server.getWorld(0).getPlayers()"
+			]
 		},
 		{
 			"name":"getOfflinePlayers",
diff --git a/src/resources/methods/world.json b/src/resources/methods/world.json
index 8a0fa346..06ad2404 100644
--- a/src/resources/methods/world.json
+++ b/src/resources/methods/world.json
@@ -17,7 +17,7 @@
 				["int", "The z-pos of the sign."]
 			]
 		},
-        	{
+		{
 			"name": "getChestContents",
 			"desc": "Gets all the items in a chest.",
 			"returns": ["Object[]", "The chest's inventory."],
@@ -67,7 +67,7 @@
 				["int", "The y-pos of the chest."],
 				["int", "The z-pos of the chest."],
 				["int","Slot number"],
-				["int","Id of item to give"],
+				["String","Name of item to give"],
 				["int","Quantity of item to give"]
 			]
 		},
@@ -82,7 +82,7 @@
 				["int", "The y-pos of the chest."],
 				["int", "The z-pos of the chest."],
 				["int","Slot number"],
-				["int","Id of item to give"],
+				["String","Name of item to give"],
 				["int","Quantity of item to give"],
 				["int","Decimal representation of the data value."]
 			]
diff --git a/src/resources/plugin.yml b/src/resources/plugin.yml
index b939696f..6c7837d8 100644
--- a/src/resources/plugin.yml
+++ b/src/resources/plugin.yml
@@ -1,11 +1,12 @@
 name: JSONAPI
 main: com.alecgorge.minecraft.jsonapi.JSONAPI
-version: 5.7.0
+version: 5.8.0
 description: Control your server and fetch information from your server.
 website: http://mcjsonapi.com/
 author: Alec Gorge
 depend: [Vault, ProtocolLib]
 softdepend: [RemoteToolkitPlugin, dynmap]
+api-version: 1.14
 commands:
   reloadjsonapi:
     description: Reloads the API methods for JSONAPI.