From cae75c423e139701113d69d4930bdb4974750dfe Mon Sep 17 00:00:00 2001
From: jascotty2 <jascottytechie@gmail.com>
Date: Sun, 2 Feb 2020 15:28:24 -0600
Subject: [PATCH] add 1.15 material analouges

---
 .../core/compatibility/CompatibleSound.java   | 41 ++++++++++---------
 .../compatibility/LegacyMaterialAnalouge.java |  9 ++++
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/Core/src/main/java/com/songoda/core/compatibility/CompatibleSound.java b/Core/src/main/java/com/songoda/core/compatibility/CompatibleSound.java
index 0cb6762a..76f36597 100644
--- a/Core/src/main/java/com/songoda/core/compatibility/CompatibleSound.java
+++ b/Core/src/main/java/com/songoda/core/compatibility/CompatibleSound.java
@@ -25,26 +25,27 @@ public enum CompatibleSound {
     // https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/mapping-and-modding-tutorials/2213619-1-8-all-playsound-sound-arguments
 
     /* 1.15 */
-    BLOCK_BEEHIVE_DRIP,
-    BLOCK_BEEHIVE_ENTER,
-    BLOCK_BEEHIVE_EXIT,
-    BLOCK_BEEHIVE_SHEAR,
-    BLOCK_BEEHIVE_WORK,
-    BLOCK_HONEY_BLOCK_BREAK,
-    BLOCK_HONEY_BLOCK_FALL,
-    BLOCK_HONEY_BLOCK_HIT,
-    BLOCK_HONEY_BLOCK_PLACE,
-    BLOCK_HONEY_BLOCK_SLIDE,
-    BLOCK_HONEY_BLOCK_STEP,
-    ENTITY_BEE_DEATH,
-    ENTITY_BEE_HURT,
-    ENTITY_BEE_LOOP,
-    ENTITY_BEE_LOOP_AGGRESSIVE,
-    ENTITY_BEE_POLLINATE,
-    ENTITY_BEE_STING,
-    ENTITY_IRON_GOLEM_DAMAGE,
-    ENTITY_IRON_GOLEM_REPAIR,
-    ITEM_HONEY_BOTTLE_DRINK,
+	// TODO: add similar sounds for older versions
+    BLOCK_BEEHIVE_DRIP(ServerVersion.V1_15, v(null, true)),
+    BLOCK_BEEHIVE_ENTER(ServerVersion.V1_15, v(null, true)),
+    BLOCK_BEEHIVE_EXIT(ServerVersion.V1_15, v(null, true)),
+    BLOCK_BEEHIVE_SHEAR(ServerVersion.V1_15, v(null, true)),
+    BLOCK_BEEHIVE_WORK(ServerVersion.V1_15, v(null, true)),
+    BLOCK_HONEY_BLOCK_BREAK(ServerVersion.V1_15, v(null, true)),
+    BLOCK_HONEY_BLOCK_FALL(ServerVersion.V1_15, v(null, true)),
+    BLOCK_HONEY_BLOCK_HIT(ServerVersion.V1_15, v(null, true)),
+    BLOCK_HONEY_BLOCK_PLACE(ServerVersion.V1_15, v(null, true)),
+    BLOCK_HONEY_BLOCK_SLIDE(ServerVersion.V1_15, v(null, true)),
+    BLOCK_HONEY_BLOCK_STEP(ServerVersion.V1_15, v(null, true)),
+    ENTITY_BEE_DEATH(ServerVersion.V1_15, v(null, true)),
+    ENTITY_BEE_HURT(ServerVersion.V1_15, v(null, true)),
+    ENTITY_BEE_LOOP(ServerVersion.V1_15, v(null, true)),
+    ENTITY_BEE_LOOP_AGGRESSIVE(ServerVersion.V1_15, v(null, true)),
+    ENTITY_BEE_POLLINATE(ServerVersion.V1_15, v(null, true)),
+    ENTITY_BEE_STING(ServerVersion.V1_15, v(null, true)),
+    ENTITY_IRON_GOLEM_DAMAGE(ServerVersion.V1_15, v(null, true)),
+    ENTITY_IRON_GOLEM_REPAIR(ServerVersion.V1_15, v(null, true)),
+    ITEM_HONEY_BOTTLE_DRINK(ServerVersion.V1_15, v(null, true)),
 
     AMBIENT_CAVE(ServerVersion.V1_9, v("AMBIENCE_CAVE")),
     AMBIENT_UNDERWATER_ENTER,
diff --git a/Core/src/main/java/com/songoda/core/compatibility/LegacyMaterialAnalouge.java b/Core/src/main/java/com/songoda/core/compatibility/LegacyMaterialAnalouge.java
index b457b954..12377773 100644
--- a/Core/src/main/java/com/songoda/core/compatibility/LegacyMaterialAnalouge.java
+++ b/Core/src/main/java/com/songoda/core/compatibility/LegacyMaterialAnalouge.java
@@ -12,6 +12,15 @@ import org.bukkit.inventory.ItemStack;
  */
 public enum LegacyMaterialAnalouge {
 
+	/* 1.15 */
+	BEE_SPAWN_EGG(ServerVersion.V1_15, "PARROT_SPAWN_EGG", ServerVersion.V1_12, "MONSTER_EGG", (byte) 65),
+	BEE_NEST(ServerVersion.V1_15, "BIRCH_LOG", "LOG", (byte) 2),
+	BEEHIVE(ServerVersion.V1_15, "SLIME_BLOCK", ServerVersion.V1_8, "WOOL", (byte) 4),
+	HONEY_BLOCK(ServerVersion.V1_15, "SLIME_BLOCK", ServerVersion.V1_8, "WOOL", (byte) 4),
+	HONEY_BOTTLE(ServerVersion.V1_15, "DRAGON_BREATH", ServerVersion.V1_9, "POTION", (byte) 0),
+	HONEYCOMB(ServerVersion.V1_15, "SUNFLOWER", "DOUBLE_PLANT", (byte) 0),
+	HONEYCOMB_BLOCK(ServerVersion.V1_15, "SLIME_BLOCK", ServerVersion.V1_8, "WOOL", (byte) 4),
+
     ACACIA_BOAT(ServerVersion.V1_9, "BOAT"),
     ACACIA_BUTTON(ServerVersion.V1_13, "WOOD_BUTTON"),
     ACACIA_DOOR(ServerVersion.V1_8, "WOOD_DOOR"), // TODO? ACACIA_DOOR & WOODEN_DOOR are the legacy block variants