Initial 1.15 support

pom.xml

@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.14.4-R0.1-SNAPSHOT</version>
+			<version>1.15-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- MyPet -->
@@ -184,14 +184,14 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-<!-- 			<plugin> -->
+			<plugin>
-<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
+				<groupId>org.apache.maven.plugins</groupId>
-<!-- 				<artifactId>maven-jar-plugin</artifactId> -->
+				<artifactId>maven-jar-plugin</artifactId>
-<!-- 				<version>2.3.1</version> -->
+				<version>2.3.1</version>
-<!-- 				<configuration> -->
+				<configuration>
-<!-- 					<outputDirectory>C:\Users\Arte\Desktop\Server 1.14\plugins\</outputDirectory> -->
+					<outputDirectory>C:\Users\Arte\Desktop\Server 1.15\plugins\</outputDirectory>
-<!-- 				</configuration> -->
+				</configuration>
-<!-- 			</plugin> -->
+			</plugin>
 		</plugins>
 	</build>
 </project>

src/main/java/com/gamingmesh/jobs/CMILib/CMIEntityType.java

@@ -122,9 +122,6 @@ public enum CMIEntityType {
 	"ZGZiNjc1Y2I1YTdlM2ZkMjVlMjlkYTgyNThmMjRmYzAyMGIzZmE5NTAzNjJiOGJjOGViMjUyZTU2ZTc0In19fQ==")),
     SHULKER(69, "Shulker", Arrays.asList(
 	"MWU3MzgzMmUyNzJmODg0NGM0NzY4NDZiYzQyNGEzNDMyZmI2OThjNThlNmVmMmE5ODcxYzdkMjlhZWVhNyJ9fX0=")),
-    CAT(75, "Cat", Arrays.asList(
-	"N2M5Yjc0MDllN2I1MzgzYzE5YjM2MmIyYTBjYjQzZDUwOTNiMTNlMmIyMzRlOGExODkxNTYzZTU1ZWFlOWQ2OCJ9fX0=",
-	"NTg4MDNmMDI3MGY4Y2RmNGUwZmU5NzMyZDQ5NjdjY2NjMGEyZjRmY2QxMThjZDE1MDAwOTc5YjE4ODg1MTQ0ZiJ9fX0=")),
     PIG(90, "Pig", Arrays.asList(
 	"NjIxNjY4ZWY3Y2I3OWRkOWMyMmNlM2QxZjNmNGNiNmUyNTU5ODkzYjZkZjRhNDY5NTE0ZTY2N2MxNmFhNCJ9fX0=",
 	"YzNhYmQ0NGFlNjdkOWM5MjU0ZDE3N2U5NjU4ZGE4NDg0MzM4OWQ1ZTFmZmQyYWYxZmI1MTIxN2M3NWMyOTgifX19")),
@@ -189,16 +186,8 @@ public enum CMIEntityType {
 	"ZjBiZmE4NTBmNWRlNGIyOTgxY2NlNzhmNTJmYzJjYzdjZDdiNWM2MmNhZWZlZGRlYjljZjMxMWU4M2Q5MDk3In19fQ==",
 	"ZjhhODJjOGI3NWRkMWMyY2U4MTMzYzBiYTkzOWI4YzUyZTQ3ZDNlYzM3NDk1MGY0N2RkZGJiZTM0NWUyMCJ9fX0=",
 	"YWNhNTgwYjA1MWM2M2JlMjlkYTU0NWE5YWE3ZmY3ZTEzNmRmNzdhODFjNjdkYzFlZTllNjE3MGMxNGZiMzEwIn19fQ==")),
-    PANDA(113, "Panda", Arrays.asList(
-	"ZDE4OGM5ODBhYWNmYTk0Y2YzMzA4ODUxMmIxYjk1MTdiYTgyNmIxNTRkNGNhZmMyNjJhZmY2OTc3YmU4YSJ9fX0=")),
-    PILLAGER(114, "Pillager", Arrays.asList(
-	"NGFlZTZiYjM3Y2JmYzkyYjBkODZkYjVhZGE0NzkwYzY0ZmY0NDY4ZDY4Yjg0OTQyZmRlMDQ0MDVlOGVmNTMzMyJ9fX0=")),
     VILLAGER(120, "Villager", Arrays.asList(
 	"ODIyZDhlNzUxYzhmMmZkNGM4OTQyYzQ0YmRiMmY1Y2E0ZDhhZThlNTc1ZWQzZWIzNGMxOGE4NmU5M2IifX19")),
-    FOX(121, "Fox", Arrays.asList(
-	"YjZmZWI3NjFiMmY1OWZhYmU1Y2MzY2M4MmE5MzRiNTM0ZWE5OWVkYjkxMzJjY2RhOWY0ODRiZDU5ODZkNyJ9fX0=",
-	"MjRhMDM0NzQzNjQzNGViMTNkNTM3YjllYjZiNDViNmVmNGM1YTc4Zjg2ZTkxODYzZWY2MWQyYjhhNTNiODIifX19",
-	"MTZkYjdkNTA3Mzg5YTE0YmJlYzM5ZGU2OTIyMTY1YjMyZDQzNjU3YmNiNmFhZjRiNTE4MjgyNWIyMmI0In19fQ==")),
     ENDER_CRYSTAL(200, "End Crystal"),
     TURTLE(901, "Turtle", Arrays.asList(
 	"MGE0MDUwZTdhYWNjNDUzOTIwMjY1OGZkYzMzOWRkMTgyZDdlMzIyZjlmYmNjNGQ1Zjk5YjU3MThhIn19fQ==")),
@@ -231,15 +220,31 @@ public enum CMIEntityType {
     COMPLEX_PART(915, "Complex Part"),
     TIPPED_ARROW(916, "Tipped Arrow"),
 
-    RAVAGER(917, "Ravager", Arrays.asList(
+    PANDA(917, "Panda", Arrays.asList(
+	"ZDE4OGM5ODBhYWNmYTk0Y2YzMzA4ODUxMmIxYjk1MTdiYTgyNmIxNTRkNGNhZmMyNjJhZmY2OTc3YmU4YSJ9fX0=")),
+    PILLAGER(918, "Pillager", Arrays.asList(
+	"NGFlZTZiYjM3Y2JmYzkyYjBkODZkYjVhZGE0NzkwYzY0ZmY0NDY4ZDY4Yjg0OTQyZmRlMDQ0MDVlOGVmNTMzMyJ9fX0=")),
+    RAVAGER(919, "Ravager", Arrays.asList(
 	"MWNiOWYxMzlmOTQ4OWQ4NmU0MTBhMDZkOGNiYzY3MGM4MDI4MTM3NTA4ZTNlNGJlZjYxMmZlMzJlZGQ2MDE5MyJ9fX0=",
 	"M2I2MjUwMWNkMWI4N2IzN2Y2MjgwMTgyMTBlYzU0MDBjYjY1YTRkMWFhYjc0ZTZhM2Y3ZjYyYWE4NWRiOTdlZSJ9fX0=")),
-    TRADER_LLAMA(918, "Trader Llama", Arrays.asList(
+    TRADER_LLAMA(920, "Trader Llama", Arrays.asList(
 	"ODQyNDc4MGIzYzVjNTM1MWNmNDlmYjViZjQxZmNiMjg5NDkxZGY2YzQzMDY4M2M4NGQ3ODQ2MTg4ZGI0Zjg0ZCJ9fX0=",
 	"NzA4N2E1NTZkNGZmYTk1ZWNkMjg0NGYzNTBkYzQzZTI1NGU1ZDUzNWZhNTk2ZjU0MGQ3ZTc3ZmE2N2RmNDY5NiJ9fX0=",
 	"YmU0ZDhhMGJjMTVmMjM5OTIxZWZkOGJlMzQ4MGJhNzdhOThlZTdkOWNlMDA3MjhjMGQ3MzNmMGEyZDYxNGQxNiJ9fX0=")),
-    WANDERING_TRADER(919, "Wandering Trader", Arrays.asList(
+    WANDERING_TRADER(921, "Wandering Trader", Arrays.asList(
 	"NWYxMzc5YTgyMjkwZDdhYmUxZWZhYWJiYzcwNzEwZmYyZWMwMmRkMzRhZGUzODZiYzAwYzkzMGM0NjFjZjkzMiJ9fX0=")),
+    FOX(922, "Fox", Arrays.asList(
+	"YjZmZWI3NjFiMmY1OWZhYmU1Y2MzY2M4MmE5MzRiNTM0ZWE5OWVkYjkxMzJjY2RhOWY0ODRiZDU5ODZkNyJ9fX0=",
+	"MjRhMDM0NzQzNjQzNGViMTNkNTM3YjllYjZiNDViNmVmNGM1YTc4Zjg2ZTkxODYzZWY2MWQyYjhhNTNiODIifX19",
+	"MTZkYjdkNTA3Mzg5YTE0YmJlYzM5ZGU2OTIyMTY1YjMyZDQzNjU3YmNiNmFhZjRiNTE4MjgyNWIyMmI0In19fQ==")),
+    CAT(923, "Cat", Arrays.asList(
+	"N2M5Yjc0MDllN2I1MzgzYzE5YjM2MmIyYTBjYjQzZDUwOTNiMTNlMmIyMzRlOGExODkxNTYzZTU1ZWFlOWQ2OCJ9fX0=",
+	"NTg4MDNmMDI3MGY4Y2RmNGUwZmU5NzMyZDQ5NjdjY2NjMGEyZjRmY2QxMThjZDE1MDAwOTc5YjE4ODg1MTQ0ZiJ9fX0=")),
+    BEE(924, "Bee", Arrays.asList(
+	"OTQ3MzIyZjgzMWUzYzE2OGNmYmQzZTI4ZmU5MjUxNDRiMjYxZTc5ZWIzOWM3NzEzNDlmYWM1NWE4MTI2NDczIn19fQ==",
+	"OTlkYzNmMDBlY2FiMjI0OWJiNmExNmM4YzUxMTVjZWI5ZjIzMjA1YTBkNTVjYzBlOWJhYmQyNTYyZjc5NTljNCJ9fX0==",
+	"ZTZiNzRlMDUyYjc0Mjg4Nzk5YmE2ZDlmMzVjNWQwMjIxY2Y4YjA0MzMxNTQ3ZWMyZjY4ZDczNTk3YWUyYzliIn19fQ==",
+	"YmIxNzc3NDY2MjUxMmQ3ODdlZjc3YjFhNDZhMDRlMmM2ZmQ2Nzc5NGJmN2Y3Nzk1NjZlYjIxYzgxNDNhYWQ5ZSJ9fX0=")),
     // if possible we can remove this string for each texture to save up some space
     // eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUv
     UNKNOWN(999, "Unknown");
@@ -435,8 +440,7 @@ public enum CMIEntityType {
     }
 
     public CMIMaterial getSpawnEggMaterial() {
-	CMIMaterial m = CMIMaterial.get((this.equals(CMIEntityType.MUSHROOM_COW) ?
+	CMIMaterial m = CMIMaterial.get((this.equals(CMIEntityType.MUSHROOM_COW) ? "Mooshroom".toLowerCase() : this.toString().toLowerCase()) + "_spawn_egg");
-			"Mooshroom".toLowerCase() : this.toString().toLowerCase()) + "_spawn_egg");
 	return m != null && m.isMonsterEgg() ? m : null;
     }
 }

src/main/java/com/gamingmesh/jobs/CMILib/CMIMaterial.java

@@ -991,6 +991,15 @@ public enum CMIMaterial {
     YELLOW_DYE(null, null, 5952, "Yellow Dye"),
     COMPOSTER(null, null, -4, "Composter"),
 
+    //1.15    
+    BEEHIVE("Beehive"),
+    BEE_NEST("Bee Nest"),
+    BEE_SPAWN_EGG("Bee Spawn Egg"),
+    HONEYCOMB("Honeycomb"),
+    HONEYCOMB_BLOCK("Honeycomb Block"),
+    HONEY_BLOCK("Honey Block"),
+    HONEY_BOTTLE("Honey Bottle"),
+
     // Legacy
     LEGACY_STATIONARY_WATER(9, 0, null, "Stationary Water"),
     LEGACY_STATIONARY_LAVA(11, 0, null, "Stationary Lava"),
@@ -1042,12 +1051,16 @@ public enum CMIMaterial {
 	this(legacyId, legacyData, id, name, "");
     }
 
+    CMIMaterial(String name, String... legacyName) {
+	this(null, null, null, name, legacyName);
+    }
+
     CMIMaterial(Integer legacyId, Integer legacyData, Integer id, String name, String... legacyName) {
 	this.legacyId = legacyId;
 	this.legacyData = legacyData;
 	this.id = id;
 	this.name = name;
-	if (legacyName != null && !legacyName[0].isEmpty())
+	if (legacyName != null && legacyName.length > 0 && !legacyName[0].isEmpty())
 	    this.legacyName = Arrays.asList(legacyName);
     }
 

src/main/java/com/gamingmesh/jobs/nmsUtil/v1_15.java

@@ -0,0 +1,49 @@
+package com.gamingmesh.jobs.nmsUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.attribute.Attribute;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.Damageable;
+
+import com.gamingmesh.jobs.NMS;
+
+public class v1_15 implements NMS {
+    @Override
+    public List<Block> getPistonRetractBlocks(BlockPistonRetractEvent event) {
+	List<Block> blocks = new ArrayList<>();
+	blocks.addAll(event.getBlocks());
+	return blocks;
+    }
+
+    @Override
+    public String getRealType(Entity entity) {
+	return entity.getType().name();
+    }
+
+    @Override
+    public ItemStack getItemInMainHand(Player player) {
+	return player.getInventory().getItemInMainHand();
+    }
+
+    @Override
+    public void setItemInMainHand(Player player, ItemStack item) {
+	player.getInventory().setItemInMainHand(item);
+    }
+
+    @Override
+    public double getMaxHealth(LivingEntity entity) {
+	return entity.getAttribute(Attribute.GENERIC_MAX_HEALTH).getBaseValue();
+    }
+
+    @Override
+    public short getDurability(ItemStack item) {
+	return (short) ((Damageable) item.getItemMeta()).getDamage();
+    }
+}