Bump version to 4.1.3 for release

Add support for 3rd party plugins firing PlayerInteractEvent (#146 )
* Add support for InvUnload * generalize 3rd party plugins' event check
2020-07-15 23:23:03 -04:00 · 2020-07-15 22:38:38 -04:00 · 2020-07-08 20:44:15 -04:00 · 2020-06-25 19:40:07 -04:00
11 changed files with 23 additions and 19 deletions
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.1.2</version>
+    <version>4.1.3</version>
  </parent>

  <artifactId>openinvapi</artifactId>
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.1.2</version>
+    <version>4.1.3</version>
  </parent>

  <artifactId>openinvassembly</artifactId>
--- a/internal/pom.xml
+++ b/internal/pom.xml
@@ -20,7 +20,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.1.2</version>
+    <version>4.1.3</version>
  </parent>

  <artifactId>openinvinternal</artifactId>
--- a/internal/v1_15_R1/pom.xml
+++ b/internal/v1_15_R1/pom.xml
@@ -22,7 +22,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvinternal</artifactId>
-    <version>4.1.2</version>
+    <version>4.1.3</version>
  </parent>

  <artifactId>openinvadapter1_15_R1</artifactId>
@@ -38,7 +38,7 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvplugincore</artifactId>
-      <version>4.1.2</version>
+      <version>4.1.3</version>
    </dependency>
  </dependencies>

--- a/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/AnySilentContainer.java
+++ b/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/AnySilentContainer.java
@@ -33,7 +33,6 @@ import net.minecraft.server.v1_15_R1.ContainerChest;
 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.EnumChatFormat;
 import net.minecraft.server.v1_15_R1.EnumGamemode;
 import net.minecraft.server.v1_15_R1.IBlockData;
 import net.minecraft.server.v1_15_R1.IChatBaseComponent;
@@ -192,7 +191,7 @@ public class AnySilentContainer implements IAnySilentContainer {
            InventoryEnderChest enderChest = player.getEnderChest();
            enderChest.a((TileEntityEnderChest) tile);
            player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> {
-                Containers containers;
+                Containers<?> containers;
                int rows = enderChest.getSize() / 9;
                switch (rows) {
                    case 1:
@@ -251,8 +250,8 @@ public class AnySilentContainer implements IAnySilentContainer {
                            TileEntityChest rightChest = chestType == BlockPropertyChestType.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
                            TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);

-                            if (rightChest.lootTable != null || leftChest.lootTable != null) {
-                                player.a(new ChatMessage("Loot not generated! Please disable /silentcontainer.").a(EnumChatFormat.RED), true);
+                            if (silentchest && (rightChest.lootTable != null || leftChest.lootTable != null)) {
+                                OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
                                return false;
                            }

--- a/internal/v1_16_R1/pom.xml
+++ b/internal/v1_16_R1/pom.xml
@@ -22,7 +22,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvinternal</artifactId>
-    <version>4.1.2</version>
+    <version>4.1.3</version>
  </parent>

  <artifactId>openinvadapter1_16_R1</artifactId>
@@ -38,7 +38,7 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvplugincore</artifactId>
-      <version>4.1.2</version>
+      <version>4.1.3</version>
    </dependency>
  </dependencies>

--- a/internal/v1_16_R1/src/main/java/com/lishid/openinv/internal/v1_16_R1/AnySilentContainer.java
+++ b/internal/v1_16_R1/src/main/java/com/lishid/openinv/internal/v1_16_R1/AnySilentContainer.java
@@ -33,7 +33,6 @@ import net.minecraft.server.v1_16_R1.ContainerChest;
 import net.minecraft.server.v1_16_R1.Containers;
 import net.minecraft.server.v1_16_R1.EntityHuman;
 import net.minecraft.server.v1_16_R1.EntityPlayer;
-import net.minecraft.server.v1_16_R1.EnumChatFormat;
 import net.minecraft.server.v1_16_R1.EnumGamemode;
 import net.minecraft.server.v1_16_R1.IBlockData;
 import net.minecraft.server.v1_16_R1.IChatBaseComponent;
@@ -251,8 +250,8 @@ public class AnySilentContainer implements IAnySilentContainer {
                            TileEntityChest rightChest = chestType == BlockPropertyChestType.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
                            TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);

-                            if (rightChest.lootTable != null || leftChest.lootTable != null) {
-                                player.a(new ChatMessage("Loot not generated! Please disable /silentcontainer.").a(EnumChatFormat.RED), true);
+                            if (silentchest && (rightChest.lootTable != null || leftChest.lootTable != null)) {
+                                OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
                                return false;
                            }

--- a/internal/v1_8_R3/pom.xml
+++ b/internal/v1_8_R3/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvinternal</artifactId>
-    <version>4.1.2</version>
+    <version>4.1.3</version>
  </parent>

  <artifactId>openinvadapter1_8_R3</artifactId>
@@ -37,7 +37,7 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvplugincore</artifactId>
-      <version>4.1.2</version>
+      <version>4.1.3</version>
    </dependency>
  </dependencies>

--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.1.2</version>
+    <version>4.1.3</version>
  </parent>

  <artifactId>openinvplugincore</artifactId>
@@ -31,7 +31,7 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvapi</artifactId>
-      <version>4.1.2</version>
+      <version>4.1.3</version>
    </dependency>
    <dependency>
      <groupId>org.spigotmc</groupId>
--- a/plugin/src/main/java/com/lishid/openinv/listeners/PlayerListener.java
+++ b/plugin/src/main/java/com/lishid/openinv/listeners/PlayerListener.java
@@ -54,6 +54,12 @@ public class PlayerListener implements Listener {

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onPlayerInteract(PlayerInteractEvent event) {
+
+        // Do not cancel 3rd party plugins' custom events
+        if (!PlayerInteractEvent.class.equals(event.getClass())) {
+            return;
+        }
+
        if (event.getAction() != Action.RIGHT_CLICK_BLOCK || event.getPlayer().isSneaking()
                || event.useInteractedBlock() == Result.DENY || event.getClickedBlock() == null
                || !plugin.getAnySilentContainer().isAnySilentContainer(event.getClickedBlock())) {
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
  <artifactId>openinvparent</artifactId>
  <name>OpenInvParent</name>
  <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.1.2</version>
+  <version>4.1.3</version>

  <packaging>pom</packaging>
Author	SHA1	Message	Date
Jikoo	7c1f15974c	Bump version to 4.1.3 for release	2020-07-15 23:23:03 -04:00
mfnalex	d992237766	Add support for 3rd party plugins firing PlayerInteractEvent (#146 ) * Add support for InvUnload * generalize 3rd party plugins' event check	2020-07-15 22:38:38 -04:00
Jikoo	c93464e643	Fix double chest loot generation with AnyContainer (#142 )	2020-07-08 20:44:15 -04:00
Jikoo	56afefc82b	Bump version to 4.1.3-SNAPSHOT for development	2020-06-25 19:40:07 -04:00