Merge branch 'development'

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
 variables:
   name: "SongodaCore"
   path: "/builds/$CI_PROJECT_PATH"
-  version: "2.2.12"
+  version: "2.3"
 
 build:
   stage: build

Core/pom.xml

@@ -114,10 +114,9 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>com.destroystokyo.papermc</groupId>
+            <groupId>org.spigotmc</groupId>
-            <artifactId>paper</artifactId>
+            <artifactId>spigot</artifactId>
-            <version>1.14.4</version>
+            <version>1.15</version>
-            <scope>provided</scope>
         </dependency>
         <!--dependency>
             <groupId>org.spigotmc</groupId>
@@ -210,6 +209,13 @@
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>SongodaCore-NMS-v1_15_R1</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
         <!-- End NMS -->
         <!-- Start Plugin Hooks -->
         <dependency>

Core/src/main/java/com/songoda/core/commands/CommandManager.java

@@ -315,7 +315,7 @@ public class CommandManager implements CommandExecutor, TabCompleter {
             // If we're on Paper 1.8, we need to register timings (spigot creates timings on init, paper creates it on register)
             // later versions of paper create timings if needed when the command is executed
             if (ServerProject.isServer(ServerProject.PAPER, ServerProject.TACO) && ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) {
-                commandObject.timings = co.aikar.timings.TimingsManager.getCommandTiming(plugin.getName().toLowerCase(), commandObject);
+            //    commandObject.timings = co.aikar.timings.TimingsManager.getCommandTiming(plugin.getName().toLowerCase(), commandObject);
             }
 
             // Set command action

Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java

@@ -30,6 +30,16 @@ public enum CompatibleMaterial {
      DARK_OAK_DOOR_ITEM(431),
     
 	 */
+
+	/* 1.15 */
+	BEE_SPAWN_EGG(),
+	BEE_NEST(),
+	BEEHIVE(),
+	HONEY_BLOCK(),
+	HONEY_BOTTLE(),
+	HONEYCOMB(),
+	HONEYCOMB_BLOCK(),
+
 	ACACIA_BOAT("BOAT_ACACIA"),
 	ACACIA_BUTTON(),
 	ACACIA_DOOR("ACACIA_DOOR_ITEM"),

Core/src/main/java/com/songoda/core/compatibility/CompatibleParticleHandler.java

@@ -1,17 +1,24 @@
 package com.songoda.core.compatibility;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
 import org.bukkit.Color;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Particle;
 import org.bukkit.block.BlockFace;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
 public class CompatibleParticleHandler {
 
     public static enum ParticleType {
+        /* 1.15 */
+        DRIPPING_HONEY,
+        FALLING_HONEY,
+        FALLING_NECTAR,
+        LANDING_HONEY,
+
         EXPLOSION_NORMAL(),
         EXPLOSION_LARGE,
         EXPLOSION_HUGE,

Core/src/main/java/com/songoda/core/compatibility/CompatibleSound.java

@@ -23,6 +23,29 @@ public enum CompatibleSound {
     // would using the raw strings be better?
     // 1.8 list:
     // 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,
+
     AMBIENT_CAVE(ServerVersion.V1_9, v("AMBIENCE_CAVE")),
     AMBIENT_UNDERWATER_ENTER,
     AMBIENT_UNDERWATER_EXIT,

Core/src/main/java/com/songoda/core/nms/NmsManager.java

@@ -40,6 +40,8 @@ public class NmsManager {
                 return new com.songoda.core.nms.v1_13_R2.NMS();
             case "v1_14_R1":
                 return new com.songoda.core.nms.v1_14_R1.NMS();
+            case "v1_15_R1":
+                return new com.songoda.core.nms.v1_15_R1.NMS();
         }
         Logger.getLogger(NmsManager.class.getName()).log(Level.SEVERE, "Failed to load NMS for this server version: version {0} not found", serverPackageVersion);
         return null;

Core/src/main/java/com/songoda/core/utils/ItemUtils.java

@@ -46,8 +46,6 @@ public class ItemUtils {
 	public static String getItemName(ItemStack it) {
 		if (it == null) {
 			return null;
-		} else if (can_getI18NDisplayName) {
-			return it.getI18NDisplayName();
 		} else {
 			return itemName(it.getType());
 		}

NMS/NMS-v1_15_R1/pom.xml

@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+
+    <parent>
+        <groupId>com.songoda</groupId>
+        <artifactId>SongodaCore-Modules</artifactId>
+        <version>maven-version-number</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <artifactId>SongodaCore-NMS-v1_15_R1</artifactId>
+
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>com.songoda</groupId>
+            <artifactId>SongodaCore-NMS-API</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/AnvilInventoryCustom.java

@@ -0,0 +1,22 @@
+package com.songoda.core.nms.v1_15_R1;
+
+import net.minecraft.server.v1_15_R1.ContainerAnvil;
+import net.minecraft.server.v1_15_R1.IInventory;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryAnvil;
+import org.bukkit.inventory.InventoryHolder;
+
+public class AnvilInventoryCustom extends CraftInventoryAnvil {
+
+    final InventoryHolder holder;
+
+    public AnvilInventoryCustom(InventoryHolder holder, Location location, IInventory inventory, IInventory resultInventory, ContainerAnvil container) {
+        super(location, inventory, resultInventory, container);
+        this.holder = holder;
+    }
+
+    @Override
+    public InventoryHolder getHolder() {
+        return holder;
+    }
+}

NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/AnvilView.java

@@ -0,0 +1,261 @@
+package com.songoda.core.nms.v1_15_R1;
+
+import com.songoda.core.nms.CustomAnvil;
+import com.songoda.core.nms.methods.AnvilTextChange;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.minecraft.server.v1_15_R1.BlockPosition;
+import net.minecraft.server.v1_15_R1.ChatMessage;
+import net.minecraft.server.v1_15_R1.Container;
+import net.minecraft.server.v1_15_R1.ContainerAccess;
+import net.minecraft.server.v1_15_R1.ContainerAnvil;
+import net.minecraft.server.v1_15_R1.ContainerProperty;
+import net.minecraft.server.v1_15_R1.Containers;
+import net.minecraft.server.v1_15_R1.EntityHuman;
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import net.minecraft.server.v1_15_R1.IInventory;
+import net.minecraft.server.v1_15_R1.PacketPlayOutOpenWindow;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryView;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+
+public class AnvilView extends ContainerAnvil implements CustomAnvil {
+
+    private final EntityPlayer entity;
+    private final Inventory inventory;
+    private String customTitle = "Repairing";
+    private int cost = -1;
+    private boolean canUse = true;
+    private AnvilTextChange textChange = null; 
+
+    // used for setting custom inventory
+    static Field mc_ContainerAnvil_repairInventory; // subcontainer with only the result
+    static Field mc_ContainerAnvil_resultInventory; // full inventory
+    static Field mc_ContainerAnvil_bukkitEntity;
+
+    static {
+        try {
+            mc_ContainerAnvil_repairInventory = ContainerAnvil.class.getDeclaredField("repairInventory");
+            mc_ContainerAnvil_repairInventory.setAccessible(true);
+            mc_ContainerAnvil_resultInventory = ContainerAnvil.class.getDeclaredField("resultInventory");
+            mc_ContainerAnvil_resultInventory.setAccessible(true);
+            mc_ContainerAnvil_bukkitEntity = ContainerAnvil.class.getDeclaredField("bukkitEntity");
+            mc_ContainerAnvil_bukkitEntity.setAccessible(true);
+        } catch (Exception ex) {
+            Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Setup Error", ex);
+        }
+    }
+
+    // 1.14.3 and 1.14.4 have different fields for levelCost
+    static boolean compat_mode = true;
+    static Method mc_ContainerProperty_set;
+    static Method mc_ContainerProperty_get;
+    // 1.14 also made this field private. Fun.
+    static Field mc_Container_windowId;
+    // 1.14 also introduced a title field, also private, which can only be set once and can't be checked
+    static Field mc_Container_title;
+
+    static {
+        try {
+            mc_Container_windowId = Container.class.getDeclaredField("windowId");
+            mc_Container_windowId.setAccessible(true);
+            mc_Container_title = Container.class.getDeclaredField("title");
+            mc_Container_title.setAccessible(true);
+        } catch (Exception ex) {
+            Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Setup Error", ex);
+        }
+        for (Method m : ContainerProperty.class.getMethods()) {
+            if (m.getName().equals("set")) {
+                compat_mode = false;
+                break;
+            }
+        }
+        if (compat_mode) {
+            try {
+                mc_ContainerProperty_set = ContainerProperty.class.getDeclaredMethod("a", int.class);
+                mc_ContainerProperty_get = ContainerProperty.class.getDeclaredMethod("b");
+            } catch (Exception ex) {
+                Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Setup Error", ex);
+            }
+        }
+    }
+
+    public AnvilView(int id, EntityPlayer entity, InventoryHolder holder) {
+        super(id, entity.inventory, ContainerAccess.at(entity.world, new BlockPosition(0, 0, 0)));
+        this.setTitle(new ChatMessage(customTitle != null ? customTitle : ""));
+        this.checkReachable = false;
+        this.entity = entity;
+        if(holder != null) {
+            this.inventory = getBukkitView(entity, holder).getTopInventory();
+        } else {
+            this.inventory = getBukkitView().getTopInventory();
+        }
+    }
+
+    public CraftInventoryView getBukkitView(EntityHuman player, InventoryHolder holder) {
+        try {
+            AnvilInventoryCustom craftInventory = new AnvilInventoryCustom(holder,
+                    new Location(entity.world.getWorld(), 0, 0, 0),
+                    (IInventory) mc_ContainerAnvil_repairInventory.get(this), 
+                    (IInventory) mc_ContainerAnvil_resultInventory.get(this), this);
+            CraftInventoryView view = new CraftInventoryView(player.getBukkitEntity(), craftInventory, this);
+            mc_ContainerAnvil_bukkitEntity.set(this, view);
+            return view;
+        } catch (Exception ex) {
+            Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Setup Error", ex);
+        }
+        return getBukkitView();
+    }
+
+    @Override
+    public boolean canUse(EntityHuman entityhuman) {
+        return canUse;
+    }
+
+    @Override
+    public void e() {
+        super.e();
+        if (cost >= 0) {
+            if (compat_mode) {
+                if (mc_ContainerProperty_set != null) {
+                    try {
+                        mc_ContainerProperty_set.invoke(this.levelCost, 0);
+                    } catch (Exception ex) {
+                        Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Error", ex);
+                        mc_ContainerProperty_set = null;
+                    }
+                }
+            } else {
+                this.levelCost.set(cost);
+            }
+        }
+        textChange.onChange();
+    }
+
+    @Override
+    public void update() {
+        e();
+    }
+
+    @Override
+    public String getRenameText() {
+        return this.renameText;
+    }
+
+    @Override
+    public void setRenameText(String text) {
+        this.a(text);
+    }
+
+    @Override
+    public void setOnChange(AnvilTextChange handler) {
+        textChange = handler;
+    }
+
+    @Override
+    public String getCustomTitle() {
+        return customTitle;
+    }
+
+    @Override
+    public void setCustomTitle(String title) {
+        this.customTitle = title;
+        try {
+            mc_Container_title.set(this, new ChatMessage(customTitle != null ? customTitle : ""));
+        } catch (Exception ex) {
+            Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Error", ex);
+        }
+    }
+
+    @Override
+    public void setLevelCost(int cost) {
+        this.cost = cost;
+    }
+
+    @Override
+    public int getLevelCost() {
+        if (cost >= 0) {
+            return cost;
+        } else if (compat_mode) {
+            if (mc_ContainerProperty_get != null) {
+                try {
+                    return (int) mc_ContainerProperty_get.invoke(this.levelCost);
+                } catch (Exception ex) {
+                    Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Error", ex);
+                    mc_ContainerProperty_get = null;
+                }
+            }
+        } else {
+            return this.levelCost.get();
+        }
+        return -1;
+    }
+
+    @Override
+    public void setCanUse(boolean bool) {
+        this.canUse = bool;
+    }
+
+    @Override
+    public ItemStack getLeftInput() {
+        return inventory.getItem(0);
+    }
+
+    @Override
+    public ItemStack getRightInput() {
+        return inventory.getItem(1);
+    }
+
+    @Override
+    public ItemStack getOutput() {
+        return inventory.getItem(2);
+    }
+
+    @Override
+    public void setLeftInput(ItemStack item) {
+        inventory.setItem(0, item);
+    }
+
+    @Override
+    public void setRightInput(ItemStack item) {
+        inventory.setItem(1, item);
+    }
+
+    @Override
+    public void setOutput(ItemStack item) {
+        inventory.setItem(2, item);
+    }
+
+    @Override
+    public Inventory getInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void open() {
+
+        // Counter stuff that the game uses to keep track of inventories
+        int id = entity.nextContainerCounter();
+
+        // Send the packet
+        entity.playerConnection.sendPacket(new PacketPlayOutOpenWindow(id, Containers.ANVIL, new ChatMessage(customTitle != null ? customTitle : "")));
+
+        // Set their active container to this anvil
+        entity.activeContainer = this;
+
+        try {
+            // Set their active container window id to that counter stuff
+            mc_Container_windowId.set(this, id);
+        } catch (Exception ex) {
+            Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Create Error", ex);
+        }
+
+        // Add the slot listener
+        entity.activeContainer.addSlotListener(entity);
+    }
+
+}

NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/NMS.java

@@ -0,0 +1,24 @@
+package com.songoda.core.nms.v1_15_R1;
+
+import com.songoda.core.nms.CoreNMS;
+import com.songoda.core.nms.CustomAnvil;
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryHolder;
+
+public class NMS implements CoreNMS {
+
+    @Override
+    public CustomAnvil createAnvil(Player player) {
+        EntityPlayer p = ((CraftPlayer) player).getHandle();
+        return new AnvilView(p.nextContainerCounter(), p, null);
+    }
+
+    @Override
+    public CustomAnvil createAnvil(Player player, InventoryHolder holder) {
+        EntityPlayer p = ((CraftPlayer) player).getHandle();
+        return new AnvilView(p.nextContainerCounter(), p, holder);
+    }
+
+}

pom.xml

@@ -20,6 +20,7 @@
         <module>NMS/NMS-v1_13_R1</module>
         <module>NMS/NMS-v1_13_R2</module>
         <module>NMS/NMS-v1_14_R1</module>
+        <module>NMS/NMS-v1_15_R1</module>
     </modules>
 
     <build>