Bump version to 4.0.4 for release

Add silent barrels - fixes #106
Correct item order - fixes #107
2019-07-19 07:21:16 -04:00 · 2019-07-19 07:18:23 -04:00 · 2019-07-19 07:13:11 -04:00 · 2019-05-27 20:53:44 -04:00 · 2019-05-27 20:53:02 -04:00 · 2019-05-27 20:52:49 -04:00
12 changed files with 236 additions and 23 deletions
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.4</version>
  </parent>

  <artifactId>openinvapi</artifactId>
@@ -37,7 +37,38 @@
      <groupId>org.spigotmc</groupId>
      <artifactId>spigot-api</artifactId>
      <version>1.8.8-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
    </dependency>
  </dependencies>

+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
--- a/api/src/main/java/com/lishid/openinv/util/StringMetric.java
+++ b/api/src/main/java/com/lishid/openinv/util/StringMetric.java
@@ -36,14 +36,14 @@ public class StringMetric {
    public static float compareJaroWinkler(String a, String b) {
        final float jaroScore = compareJaro(a, b);

-        if (jaroScore < (float) 0.1) {
+        if (jaroScore < (float) 0.7) {
            return jaroScore;
        }

        String prefix = commonPrefix(a, b);
        int prefixLength = Math.min(prefix.codePointCount(0, prefix.length()), 4);

-        return jaroScore + (prefixLength * (float) 0.7 * (1.0f - jaroScore));
+        return jaroScore + (prefixLength * (float) 0.1 * (1.0f - jaroScore));

    }

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

  <artifactId>openinvassembly</artifactId>
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.4</version>
  </parent>

  <artifactId>openinvcommon</artifactId>
@@ -31,8 +31,44 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvapi</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.8.8-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
    </dependency>
  </dependencies>

+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
--- a/internal/pom.xml
+++ b/internal/pom.xml
@@ -20,7 +20,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.4</version>
  </parent>

  <artifactId>openinvinternal</artifactId>
--- a/internal/v1_13_R2/pom.xml
+++ b/internal/v1_13_R2/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvinternal</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.4</version>
  </parent>

  <artifactId>openinvadapter1_13_R2</artifactId>
@@ -37,8 +37,38 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvcommon</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.4</version>
    </dependency>
  </dependencies>

+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
--- a/internal/v1_14_R1/pom.xml
+++ b/internal/v1_14_R1/pom.xml
@@ -22,7 +22,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvinternal</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.4</version>
  </parent>

  <artifactId>openinvadapter1_14_R1</artifactId>
@@ -32,14 +32,44 @@
    <dependency>
      <groupId>org.spigotmc</groupId>
      <artifactId>spigot</artifactId>
-      <version>1.14.1-R0.1-SNAPSHOT</version>
+      <version>1.14.3-R0.1-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvcommon</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.4</version>
    </dependency>
  </dependencies>

+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
--- a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java
+++ b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Field;
 import javax.annotation.Nullable;
 import net.minecraft.server.v1_14_R1.AxisAlignedBB;
 import net.minecraft.server.v1_14_R1.Block;
+import net.minecraft.server.v1_14_R1.BlockBarrel;
 import net.minecraft.server.v1_14_R1.BlockChest;
 import net.minecraft.server.v1_14_R1.BlockChestTrapped;
 import net.minecraft.server.v1_14_R1.BlockEnderChest;
@@ -78,7 +79,8 @@ public class AnySilentContainer implements IAnySilentContainer {
        }
        BlockState state = bukkitBlock.getState();
        return state instanceof org.bukkit.block.Chest
-                || state instanceof org.bukkit.block.ShulkerBox;
+                || state instanceof org.bukkit.block.ShulkerBox
+                || state instanceof org.bukkit.block.Barrel;
    }

    @Override
@@ -137,7 +139,7 @@ public class AnySilentContainer implements IAnySilentContainer {
        }

        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
-        if (((TileEntityShulkerBox) tile).t() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
+        if (((TileEntityShulkerBox) tile).s() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
            AxisAlignedBB axisAlignedBB = VoxelShapes.b().getBoundingBox()
                    .b(0.5F * enumDirection.getAdjacentX(), 0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(), enumDirection.getAdjacentZ());
@@ -258,6 +260,10 @@ public class AnySilentContainer implements IAnySilentContainer {
            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
        }

+        if (block instanceof BlockBarrel) {
+            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
+        }
+
        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
            player.openContainer(tileInventory);
@@ -284,9 +290,10 @@ public class AnySilentContainer implements IAnySilentContainer {

        InventoryView view = bukkitPlayer.getOpenInventory();
        switch (view.getType()) {
-        case CHEST:
-        case ENDER_CHEST:
-        case SHULKER_BOX:
+            case CHEST:
+            case ENDER_CHEST:
+            case SHULKER_BOX:
+            case BARREL:
            break;
        default:
            return;
--- a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialPlayerInventory.java
+++ b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialPlayerInventory.java
@@ -76,7 +76,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
            EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
            entityPlayer.inventory.transaction.addAll(this.transaction);
            this.player = entityPlayer;
-            this.player.inventory.a(this);
+            for (int i = 0; i < getSize(); ++i) {
+                this.player.inventory.setItem(i, getRawItem(i));
+            }
+            this.player.inventory.itemInHandIndex = this.itemInHandIndex;
            this.items = this.player.inventory.items;
            this.armor = this.player.inventory.armor;
            this.extraSlots = this.player.inventory.extraSlots;
@@ -119,6 +122,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return list.get(i);
    }

+    private ItemStack getRawItem(int i) {
+        NonNullList<ItemStack> list = null;
+        for (NonNullList<ItemStack> next : this.f) {
+            if (i < next.size()) {
+                list = next;
+                break;
+            }
+            i -= next.size();
+        }
+
+        return list == null ? ItemStack.a : list.get(i);
+    }
+
    @Override
    public IChatBaseComponent getDisplayName() {
        return new ChatMessage(this.player.getName());
--- 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.0.1</version>
+    <version>4.0.4</version>
  </parent>

  <artifactId>openinvadapter1_8_R3</artifactId>
@@ -37,8 +37,38 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvcommon</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.4</version>
    </dependency>
  </dependencies>

+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.4</version>
  </parent>

  <artifactId>openinvplugincore</artifactId>
@@ -31,7 +31,13 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvcommon</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.8.8-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
    </dependency>
  </dependencies>

@@ -42,6 +48,33 @@
        <filtering>true</filtering>
      </resource>
    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
  </build>

 </project>
--- 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.0.1</version>
+  <version>4.0.4</version>

  <packaging>pom</packaging>
Author	SHA1	Message	Date
Jikoo	a4a462a1fa	Bump version to 4.0.4 for release	2019-07-19 07:21:16 -04:00
Jikoo	b9f901af66	Add silent barrels - fixes #106	2019-07-19 07:18:23 -04:00
Jikoo	1333056613	Correct item order - fixes #107	2019-07-19 07:13:11 -04:00
Jikoo	fb23df313a	Bump version to 4.0.4-SNAPSHOT for development	2019-05-27 20:53:44 -04:00
Jikoo	96dc400c83	Bump version to 4.0.3 for release	2019-05-27 20:53:02 -04:00
Jikoo	b801d36f12	Turns out api-version below 1.13 is unsupported. Compiling for 1.8, no api-version.	2019-05-27 20:52:49 -04:00
Jikoo	4c27599dd9	Bump version to 4.0.3-SNAPSHOT for development	2019-05-27 20:23:16 -04:00
Jikoo	64ad0a5267	Bump version to 4.0.2 for release	2019-05-27 20:22:50 -04:00
Jikoo	cba7f44192	Include api-version in plugin.yml (Closes #102 )	2019-05-27 20:22:02 -04:00
Jikoo	e8ace6bd06	Update to 1.14.2	2019-05-27 20:12:39 -04:00
Jikoo	fd70f260ba	Fix mistake in string comparison utility	2019-05-27 20:05:58 -04:00
Jikoo	be9874ba1d	Fix pom changes causing Spigot API to be shaded into final jar	2019-05-27 20:05:06 -04:00
Jikoo	096faef161	Bump version to 4.0.2-SNAPSHOT for development	2019-05-15 19:20:50 -04:00