1.14 Support

pom.xml

@@ -173,7 +173,7 @@
 			<!-- GPL -->
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.13.1-R0.1-SNAPSHOT</version>
+			<version>1.14-R0.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Used for storing and retreiving Constructs in a storage transparent medium: JSONs -->

src/main/java/com/laytonsmith/abstraction/MCItemMeta.java

@@ -110,4 +110,10 @@ public interface MCItemMeta extends AbstractionObject {
 	int getDamage();
 
 	void setDamage(int damage);
+
+	boolean hasCustomModelData();
+
+	int getCustomModelData();
+
+	void setCustomModelData(int id);
 }

src/main/java/com/laytonsmith/abstraction/MCLivingEntity.java

@@ -110,6 +110,8 @@ public interface MCLivingEntity extends MCEntity, MCProjectileSource {
 	 */
 	void kill();
 
+	boolean isTameable();
+
 	class MCEffect {
 
 		private MCPotionEffectType type;

src/main/java/com/laytonsmith/abstraction/MCProjectileSource.java

@@ -2,11 +2,11 @@
 
 import com.laytonsmith.PureUtilities.Vector3D;
 import com.laytonsmith.abstraction.entities.MCProjectile;
-import com.laytonsmith.abstraction.enums.MCProjectileType;
+import com.laytonsmith.abstraction.enums.MCEntityType;
 
 public interface MCProjectileSource extends AbstractionObject {
 
-	MCProjectile launchProjectile(MCProjectileType projectile);
+	MCProjectile launchProjectile(MCEntityType projectile);
 
-	MCProjectile launchProjectile(MCProjectileType projectile, Vector3D init);
+	MCProjectile launchProjectile(MCEntityType projectile, Vector3D init);
 }

src/main/java/com/laytonsmith/abstraction/MCTravelAgent.java

@@ -1,22 +1,11 @@
 package com.laytonsmith.abstraction;
 
 public interface MCTravelAgent extends AbstractionObject {
-
-	boolean createPortal(MCLocation location);
-
-	MCLocation findOrCreate(MCLocation location);
-
-	MCLocation findPortal(MCLocation location);
-
-	boolean getCanCreatePortal();
-
-	void setCanCreatePortal(boolean create);
-
 	int getCreationRadius();
 
-	MCTravelAgent setCreationRadius(int radius);
+	void setCreationRadius(int radius);
 
 	int getSearchRadius();
 
-	MCTravelAgent setSearchRadius(int radius);
+	void setSearchRadius(int radius);
 }

src/main/java/com/laytonsmith/abstraction/MCWorld.java

@@ -154,4 +154,6 @@ public interface MCWorld extends MCMetadatable {
 	boolean exists();
 
 	void save();
+
+	void setKeepSpawnInMemory(boolean keepLoaded);
 }

src/main/java/com/laytonsmith/abstraction/blocks/MCBeacon.java

@@ -2,14 +2,10 @@
 
 import java.util.Collection;
 
-import com.laytonsmith.abstraction.MCBeaconInventory;
-import com.laytonsmith.abstraction.MCInventoryHolder;
 import com.laytonsmith.abstraction.MCLivingEntity;
 
-public interface MCBeacon extends MCBlockState, MCInventoryHolder {
+public interface MCBeacon extends MCBlockState {
 	Collection<MCLivingEntity> getEntitiesInRange();
-	@Override
-	MCBeaconInventory getInventory();
 //	MCPotionEffect getPrimaryEffect();
 //	MCPotionEffect getSecondaryEffect();
 	int getTier();

src/main/java/com/laytonsmith/abstraction/blocks/MCBlock.java

@@ -71,6 +71,8 @@ public interface MCBlock extends MCMetadatable {
 
 	boolean isBurnable();
 
+	boolean isPassable();
+
 	Collection<MCItemStack> getDrops();
 
 	Collection<MCItemStack> getDrops(MCItemStack tool);
@@ -79,6 +81,10 @@ public interface MCBlock extends MCMetadatable {
 
 	int getLightLevel();
 
+	int getLightFromSky();
+
+	int getLightFromBlocks();
+
 	int getBlockPower();
 
 	boolean isBlockPowered();

src/main/java/com/laytonsmith/abstraction/blocks/MCChest.java → src/main/java/com/laytonsmith/abstraction/blocks/MCContainer.java

@@ -2,5 +2,5 @@
 
 import com.laytonsmith.abstraction.MCInventoryHolder;
 
-public interface MCChest extends MCBlockState, MCInventoryHolder {
+public interface MCContainer extends MCBlockState, MCInventoryHolder {
 }

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitConvertor.java

@@ -32,13 +32,11 @@
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCBeacon;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCBlockState;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCBrewingStand;
-import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCChest;
+import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCContainer;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCDispenser;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCDropper;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCFurnace;
-import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCHopper;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCMaterial;
-import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCShulkerBox;
 import com.laytonsmith.abstraction.bukkit.entities.BukkitMCAgeable;
 import com.laytonsmith.abstraction.bukkit.entities.BukkitMCCommandMinecart;
 import com.laytonsmith.abstraction.bukkit.entities.BukkitMCComplexEntityPart;
@@ -91,13 +89,11 @@
 import org.bukkit.block.Beacon;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.BrewingStand;
-import org.bukkit.block.Chest;
+import org.bukkit.block.Container;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.block.Dispenser;
 import org.bukkit.block.Dropper;
 import org.bukkit.block.Furnace;
-import org.bukkit.block.Hopper;
-import org.bukkit.block.ShulkerBox;
 import org.bukkit.block.banner.Pattern;
 import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
@@ -222,7 +218,7 @@ public MCMaterial GetMaterial(String name) {
 			return new BukkitMCMaterial(match);
 		}
 		// Try legacy
-		match = Material.getMaterial(name, true);
+		match = BukkitMCLegacyMaterial.getMaterial(name);
 		if(match != null) {
 			return new BukkitMCMaterial(match);
 		}
@@ -238,7 +234,7 @@ public MCItemStack GetItemStack(MCMaterial type, int qty) {
 	public MCItemStack GetItemStack(String type, int qty) {
 		Material mat = Material.getMaterial(type);
 		if(mat == null) {
-			mat = Material.getMaterial(type, true);
+			mat = BukkitMCLegacyMaterial.getMaterial(type);
 		}
 		if(mat == null) {
 			return null;
@@ -455,9 +451,6 @@ public List<MCEntity> GetEntitiesAt(MCLocation location, double radius) {
 	}
 
 	public static MCBlockState BukkitGetCorrectBlockState(BlockState bs) {
-		if(bs instanceof ShulkerBox) {
-			return new BukkitMCShulkerBox((ShulkerBox) bs);
-		}
 		if(bs instanceof Banner) {
 			return new BukkitMCBanner((Banner) bs);
 		}
@@ -470,9 +463,6 @@ public static MCBlockState BukkitGetCorrectBlockState(BlockState bs) {
 		if(bs instanceof BrewingStand) {
 			return new BukkitMCBrewingStand((BrewingStand) bs);
 		}
-		if(bs instanceof Chest) {
-			return new BukkitMCChest((Chest) bs);
-		}
 		if(bs instanceof Dispenser) {
 			return new BukkitMCDispenser((Dispenser) bs);
 		}
@@ -482,8 +472,8 @@ public static MCBlockState BukkitGetCorrectBlockState(BlockState bs) {
 		if(bs instanceof Furnace) {
 			return new BukkitMCFurnace((Furnace) bs);
 		}
-		if(bs instanceof Hopper) {
-			return new BukkitMCHopper((Hopper) bs);
+		if(bs instanceof Container) { // needs to be after all specific containers
+			return new BukkitMCContainer((Container) bs);
 		}
 		return new BukkitMCBlockState(bs);
 	}

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCInventory.java

@@ -13,6 +13,7 @@
 import com.laytonsmith.core.constructs.Target;
 import com.laytonsmith.core.exceptions.CRE.CRERangeException;
 import com.laytonsmith.core.functions.InventoryManagement;
+import org.bukkit.Nameable;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.DoubleChest;
 import org.bukkit.entity.Entity;
@@ -161,6 +162,6 @@ public MCInventoryHolder getHolder() {
 
 	@Override
 	public String getTitle() {
-		return i.getTitle();
+		return ((Nameable) i.getHolder()).getCustomName();
 	}
 }

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCItemMeta.java

@@ -165,4 +165,19 @@ public int getDamage() {
 	public void setDamage(int damage) {
 		((Damageable) im).setDamage(damage);
 	}
+
+	@Override
+	public boolean hasCustomModelData() {
+		return im.hasCustomModelData();
+	}
+
+	@Override
+	public int getCustomModelData() {
+		return im.getCustomModelData();
+	}
+
+	@Override
+	public void setCustomModelData(int id) {
+		im.setCustomModelData(id);
+	}
 }

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCServer.java

@@ -394,7 +394,10 @@ public String getWorldContainer() {
 
 	@Override
 	public String getServerName() {
-		return s.getServerName();
+		if(Static.getServer().getMinecraftVersion().lt(MCVersion.MC1_14)) {
+			return (String) ReflectionUtils.invokeMethod(Server.class, s, "getServerName");
+		}
+		return "";
 	}
 
 	@Override

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCTravelAgent.java

@@ -1,22 +1,16 @@
 package com.laytonsmith.abstraction.bukkit;
 
-import com.laytonsmith.abstraction.AbstractionObject;
-import com.laytonsmith.abstraction.MCLocation;
+import com.laytonsmith.PureUtilities.Common.ReflectionUtils;
 import com.laytonsmith.abstraction.MCTravelAgent;
-import org.bukkit.TravelAgent;
 
 public class BukkitMCTravelAgent implements MCTravelAgent {
 
-	TravelAgent a;
+	Object a;
 
-	public BukkitMCTravelAgent(TravelAgent a) {
+	public BukkitMCTravelAgent(Object a) {
 		this.a = a;
 	}
 
-	public BukkitMCTravelAgent(AbstractionObject o) {
-		a = (TravelAgent) o;
-	}
-
 	@Override
 	public String toString() {
 		return a.toString();
@@ -33,49 +27,24 @@ public int hashCode() {
 		return a.hashCode();
 	}
 
-	@Override
-	public boolean createPortal(MCLocation location) {
-		return a.createPortal(((BukkitMCLocation) location).asLocation());
-	}
-
-	@Override
-	public MCLocation findOrCreate(MCLocation location) {
-		return new BukkitMCLocation(a.findOrCreate(((BukkitMCLocation) location).asLocation()));
-	}
-
-	@Override
-	public MCLocation findPortal(MCLocation location) {
-		return new BukkitMCLocation(a.findPortal(((BukkitMCLocation) location).asLocation()));
-	}
-
-	@Override
-	public boolean getCanCreatePortal() {
-		return a.getCanCreatePortal();
-	}
-
-	@Override
-	public void setCanCreatePortal(boolean create) {
-		a.setCanCreatePortal(create);
-	}
-
 	@Override
 	public int getCreationRadius() {
-		return a.getCreationRadius();
+		return (int) ReflectionUtils.invokeMethod(a, "getCreationRadius");
 	}
 
 	@Override
-	public MCTravelAgent setCreationRadius(int radius) {
-		return new BukkitMCTravelAgent(a.setCreationRadius(radius));
+	public void setCreationRadius(int radius) {
+		ReflectionUtils.invokeMethod(a, "setCreationRadius", new Class[]{int.class}, new Object[]{radius});
 	}
 
 	@Override
 	public int getSearchRadius() {
-		return a.getSearchRadius();
+		return (int) ReflectionUtils.invokeMethod(a, "getSearchRadius");
 	}
 
 	@Override
-	public MCTravelAgent setSearchRadius(int radius) {
-		return new BukkitMCTravelAgent(a.setSearchRadius(radius));
+	public void setSearchRadius(int radius) {
+		ReflectionUtils.invokeMethod(a, "setSearchRadius", new Class[]{int.class}, new int[]{radius});
 	}
 
 	@Override