minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Compare commits

base: minster586:4.0.1
Branches Tags
minster586:master minster586:feature/cursorcrafting minster586:uuid-rework
minster586:4.1.8 minster586:4.1.7 minster586:4.1.6 minster586:4.1.5 minster586:4.1.4 minster586:4.1.3 minster586:4.1.2 minster586:4.1.1 minster586:4.1.0 minster586:4.0.8 minster586:4.0.7 minster586:4.0.6 minster586:4.0.5 minster586:4.0.4 minster586:4.0.3 minster586:4.0.2 minster586:4.0.1 minster586:4.0.0 minster586:3.3.7 minster586:3.3.6 minster586:3.3.5 minster586:3.3.4 minster586:3.3.4-A1 minster586:3.3.3 minster586:3.3.2 minster586:3.3.1 minster586:3.3.0 minster586:3.2.1 minster586:3.2.0 minster586:3.1.2 minster586:3.1.1 minster586:3.1.0 minster586:3.0.6 minster586:3.0.5 minster586:3.0.4 minster586:3.0.3 minster586:3.0.2 minster586:3.0.1 minster586:3.0.0 minster586:2.5.3 minster586:2.5.3-alpha-1 minster586:2.5.2 minster586:2.5.1 minster586:2.5.0 minster586:2.4.9 minster586:2.4.8 minster586:2.4.7 minster586:2.4.5 minster586:2.4.4 minster586:2.4.3 minster586:2.4.2 minster586:2.4.1 minster586:2.4.0 minster586:2.3.0 minster586:2.2.10 minster586:2.2.9 minster586:2.2.8 minster586:2.2.7 minster586:2.2.6 minster586:2.2.5
..
compare: minster586:4.0.2
Branches Tags
minster586:master minster586:feature/cursorcrafting minster586:uuid-rework
minster586:4.1.8 minster586:4.1.7 minster586:4.1.6 minster586:4.1.5 minster586:4.1.4 minster586:4.1.3 minster586:4.1.2 minster586:4.1.1 minster586:4.1.0 minster586:4.0.8 minster586:4.0.7 minster586:4.0.6 minster586:4.0.5 minster586:4.0.4 minster586:4.0.3 minster586:4.0.2 minster586:4.0.1 minster586:4.0.0 minster586:3.3.7 minster586:3.3.6 minster586:3.3.5 minster586:3.3.4 minster586:3.3.4-A1 minster586:3.3.3 minster586:3.3.2 minster586:3.3.1 minster586:3.3.0 minster586:3.2.1 minster586:3.2.0 minster586:3.1.2 minster586:3.1.1 minster586:3.1.0 minster586:3.0.6 minster586:3.0.5 minster586:3.0.4 minster586:3.0.3 minster586:3.0.2 minster586:3.0.1 minster586:3.0.0 minster586:2.5.3 minster586:2.5.3-alpha-1 minster586:2.5.2 minster586:2.5.1 minster586:2.5.0 minster586:2.4.9 minster586:2.4.8 minster586:2.4.7 minster586:2.4.5 minster586:2.4.4 minster586:2.4.3 minster586:2.4.2 minster586:2.4.1 minster586:2.4.0 minster586:2.3.0 minster586:2.2.10 minster586:2.2.9 minster586:2.2.8 minster586:2.2.7 minster586:2.2.6 minster586:2.2.5

6 Commits
4.0.1 ... 4.0.2

Author SHA1 Message Date
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
12 changed files with 209 additions and 18 deletions
Expand all files Collapse all files

33
api/pom.xml
View File

@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</parent> </parent>
<artifactId>openinvapi</artifactId> <artifactId>openinvapi</artifactId>
@@ -37,7 +37,38 @@
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version> <version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </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> </project>

4
api/src/main/java/com/lishid/openinv/util/StringMetric.java
View File

@@ -36,14 +36,14 @@ public class StringMetric {
public static float compareJaroWinkler(String a, String b) { public static float compareJaroWinkler(String a, String b) {
final float jaroScore = compareJaro(a, b); final float jaroScore = compareJaro(a, b);
if (jaroScore < (float) 0.1) { if (jaroScore < (float) 0.7) {
return jaroScore; return jaroScore;
} }
String prefix = commonPrefix(a, b); String prefix = commonPrefix(a, b);
int prefixLength = Math.min(prefix.codePointCount(0, prefix.length()), 4); 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));
} }

2
assembly/pom.xml
View File

@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</parent> </parent>
<artifactId>openinvassembly</artifactId> <artifactId>openinvassembly</artifactId>

40
common/pom.xml
View File

@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</parent> </parent>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
@@ -31,8 +31,44 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvapi</artifactId> <artifactId>openinvapi</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </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> </project>

2
internal/pom.xml
View File

@@ -20,7 +20,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</parent> </parent>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>

34
internal/v1_13_R2/pom.xml
View File

@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</parent> </parent>
<artifactId>openinvadapter1_13_R2</artifactId> <artifactId>openinvadapter1_13_R2</artifactId>
@@ -37,8 +37,38 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</dependency> </dependency>
</dependencies> </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> </project>

36
internal/v1_14_R1/pom.xml
View File

@@ -22,7 +22,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</parent> </parent>
<artifactId>openinvadapter1_14_R1</artifactId> <artifactId>openinvadapter1_14_R1</artifactId>
@@ -32,14 +32,44 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.14.1-R0.1-SNAPSHOT</version> <version>1.14.2-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</dependency> </dependency>
</dependencies> </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> </project>

2
internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java
View File

@@ -137,7 +137,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
EnumDirection enumDirection = blockData.get(BlockShulkerBox.a); 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() AxisAlignedBB axisAlignedBB = VoxelShapes.b().getBoundingBox()
.b(0.5F * enumDirection.getAdjacentX(), 0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ()) .b(0.5F * enumDirection.getAdjacentX(), 0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
.a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(), enumDirection.getAdjacentZ()); .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(), enumDirection.getAdjacentZ());

34
internal/v1_8_R3/pom.xml
View File

@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</parent> </parent>
<artifactId>openinvadapter1_8_R3</artifactId> <artifactId>openinvadapter1_8_R3</artifactId>
@@ -37,8 +37,38 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</dependency> </dependency>
</dependencies> </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> </project>

37
plugin/pom.xml
View File

@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</parent> </parent>
<artifactId>openinvplugincore</artifactId> <artifactId>openinvplugincore</artifactId>
@@ -31,7 +31,13 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>4.0.1</version> <version>4.0.2</version>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -42,6 +48,33 @@
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</resources> </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> </build>
</project> </project>

1
plugin/src/main/resources/plugin.yml
View File

@@ -5,6 +5,7 @@ author: lishid
authors: [Jikoo, ShadowRanger] authors: [Jikoo, ShadowRanger]
description: > description: >
This plugin allows you to open a player's inventory as a chest and interact with it in real time. This plugin allows you to open a player's inventory as a chest and interact with it in real time.
api-version: "1.8"
permissions: permissions:
OpenInv.any.default: OpenInv.any.default:

2
pom.xml
View File

@@ -21,7 +21,7 @@
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<name>OpenInvParent</name> <name>OpenInvParent</name>
<url>http://dev.bukkit.org/bukkit-plugins/openinv/</url> <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
<version>4.0.1</version> <version>4.0.2</version>
<packaging>pom</packaging> <packaging>pom</packaging>