Add reading assistant

.github/workflows/ci.yml

@@ -1,76 +0,0 @@
-name: OpenInv CI
-
-on:
-  push:
-  pull_request_target:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-
-      - name: Set Up Java
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-
-      # Use cache to speed up build
-      - name: Cache Maven Repo
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-
-      # Install Spigot dependencies.
-      # This script uses Maven to check all required installations and ensure that they are present.
-      - name: Install Spigot Dependencies
-        run: . scripts/install_spigot_dependencies.sh
-
-      - name: Build With Maven
-        run: mvn -e clean package -am -P all
-
-      # Upload artifacts
-      - name: Upload Distributable Jar
-        id: upload-final
-        uses: actions/upload-artifact@v2
-        with:
-          name: dist
-          path: ./target/OpenInv.jar
-      - name: Upload API Jar
-        id: upload-api
-        uses: actions/upload-artifact@v2
-        with:
-          name: api
-          path: ./api/target/openinvapi*.jar
-
-  release:
-    name: Create Github Release
-    needs: [ build ]
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set Release Variables
-        run: bash ./scripts/set_release_env.sh
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-
-      - name: Create Release
-        id: create-release
-        uses: softprops/action-gh-release@v0.1.5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          name: ${{ env.VERSIONED_NAME }}
-          body: ${{ env.GENERATED_CHANGELOG }}
-          draft: true
-          prerelease: false
-          files: ./dist/OpenInv.jar

.github/workflows/close-issue.yml

@@ -0,0 +1,13 @@
+name: Close Issue
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/close-issue@v1.0.3
+        with:
+          comment: "Per the notice in the readme, OpenInv is now being maintained at [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv)."

.github/workflows/close-pr.yml

@@ -0,0 +1,13 @@
+name: Close Pull Request
+
+on:
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: superbrothers/close-pull-request@v3.1.0
+        with:
+          comment: "Per the notice in the readme, OpenInv is now being maintained at [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv)."

.github/workflows/release.yml

@@ -1,36 +0,0 @@
-name: Release to CurseForge
-
-on:
-  release:
-    types: [ released ]
-
-jobs:
-  curseforge_release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set CurseForge Variables
-        run: . scripts/set_curseforge_env.sh
-
-      - name: Fetch Github Release Asset
-        uses: dsaltares/fetch-gh-release-asset@0.0.5
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          version: ${{ github.event.release.id }}
-          file: OpenInv.jar
-
-      - name: Create CurseForge Release
-        uses: itsmeow/curseforge-upload@v3
-        with:
-          token: ${{ secrets.CURSEFORGE_TOKEN }}
-          project_id: 31432
-          game_endpoint: minecraft
-          file_path: ./OpenInv.jar
-          changelog: ${{ github.event.release.body }}
-          display_name: ${{ github.event.release.name }}
-          game_versions: ${{ env.CURSEFORGE_MINECRAFT_VERSIONS }}
-          release_type: release

README.MD

@@ -1,3 +1,6 @@
+## Notice
+I am now maintaining OpenInv over at [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv) because I needed higher levels of access to add secrets to the repository for Github Actions. It feels ruder to send an email saying what amounts to "pls op" than to redirect people to my fork, though neither option is polite. Existing issues will remain open here until resolved (you can't transfer issues across organizations/users), but any new issues in this repo will be closed without resolution.
+
 ## About
 OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) which allows users to open and edit anyone's inventory or ender chest - online or not!
 
@@ -15,7 +18,48 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
 - **AnyContainer**: Open containers, even if blocked by ocelots or blocks.
 
 ## Commands
-See [the wiki](https://github.com/Jikoo/OpenInv/wiki/Commands).
+<table width=100%>
+  <tr>
+    <th width=175px>Command</th>
+    <th>Aliases</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>/openinv [player]</td>
+    <td>oi, inv, open</td>
+    <td>Open a player's inventory. If unspecified, will select last player opened or own if none opened previously.</td>
+  </tr>
+  <tr>
+    <td>/openender [player]</td>
+    <td>oe</td>
+    <td>Open a player's ender chest. If unspecified, will select last player opened or own if none opened previously.</td>
+  </tr>
+  <tr>
+    <td>/searchinv &ltitem&gt [minAmount]</td>
+    <td>si</td>
+    <td>Lists all online players that have a certain item in their inventory.</td>
+  </tr>
+  <tr>
+    <td>/searchender &ltitem&gt [minAmount]</td>
+    <td>se</td>
+    <td>Lists all online players that have a certain item in their ender chest.</td>
+  </tr>
+  <tr>
+    <td>/searchenchant &lt[enchantment] [MinLevel]&gt</td>
+    <td>searchenchants</td>
+    <td>Lists all online players with a specific enchantment.</td>
+  </tr>
+  <tr>
+    <td>/anycontainer [check]</td>
+    <td>ac, anychest</td>
+    <td>Check or toggle the AnyContainer function, allowing opening blocked containers.</td>
+  </tr>
+  <tr>
+    <td>/silentcontainer [check]</td>
+    <td>sc, silentchest</td>
+    <td>Check or toggle the SilentContainer function, allowing opening containers silently.</td>
+  </tr>
+</table>
 
 ## Permissions
 <table>
@@ -102,39 +146,8 @@ See [the wiki](https://github.com/Jikoo/OpenInv/wiki/Commands).
 </table>
 
 ## For Developers
-
-### As a Dependency
-The OpenInv API is available via [JitPack](https://jitpack.io/).
-```xml
-  <repositories>
-    <repository>
-      <id>jitpack.io</id>
-      <url>https://jitpack.io</url>
-    </repository>
-  </repositories>
-```
-```xml
-  <dependencies>
-    <dependency>
-      <groupId>com.github.jikoo.OpenInv</groupId>
-      <artifactId>openinvapi</artifactId>
-      <version>${openinv.version}</version>
-    </dependency>
-  </dependencies>
-```
-
-### Compilation
-To compile, the relevant Spigot jars must be installed in your local repository using the `install` plugin:
-```shell
-mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.8-R0.1-SNAPSHOT.jar \
-    -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.8-R0.1-SNAPSHOT
-```
-Note that BuildTools automatically installs produced files. If you use BuildTools to compile Spigot locally, you don't need to install it manually.  
-If you want to use Paper as a dependency, you can install it by executing PaperClip with the property `paperclip.install` set to true:
-```shell
-wget -O paperclip.jar https://papermc.io/api/v1/paper/1.16.5/latest/download
-java -jar -Dpaperclip.install=true paperclip.jar
-```
+To compile, the relevant Craftbukkit/Spigot jars must be installed in your local repository using the install plugin.
+Ex: `mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.8-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.8-R0.1-SNAPSHOT`
 
 To compile for a single version, specify the NMS revision you are targeting: `mvn -pl <NMS module> -am clean install`
 
@@ -143,3 +156,20 @@ To compile for a set of versions, you'll need to use a profile. The only provide
 For more information, check out the [official Maven guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html).
 
 The final file is `target/OpenInv.jar`
+
+## License
+```
+Copyright (C) 2011-2020 lishid. All rights reserved.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 3.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+```

api/pom.xml

@@ -19,9 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <version>4.1.7</version>
+    <artifactId>openinvparent</artifactId>
+    <version>4.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>
@@ -29,12 +29,15 @@
 
   <dependencies>
     <dependency>
-      <artifactId>annotations</artifactId>
       <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <version>17.0.0</version>
     </dependency>
     <dependency>
-      <artifactId>spigot-api</artifactId>
       <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.16.5-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 
@@ -42,6 +45,11 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
       </plugin>
     </plugins>
   </build>

api/src/main/java/com/lishid/openinv/IOpenInv.java

@@ -24,7 +24,6 @@ import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import com.lishid.openinv.util.InventoryAccess;
 import com.lishid.openinv.util.StringMetric;
 import java.util.UUID;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -154,7 +153,10 @@ public interface IOpenInv {
         if (Bukkit.getServer().isPrimaryThread()) {
             this.getLogger().warning("Call to OpenInv#matchPlayer made on the main thread!");
             this.getLogger().warning("This can cause the server to hang, potentially severely.");
-            this.getLogger().log(Level.WARNING, new Throwable("Current stack trace"), () -> "Current stack trace");
+            this.getLogger().warning("Trace:");
+            for (StackTraceElement element : new Throwable().fillInStackTrace().getStackTrace()) {
+                this.getLogger().warning(element.toString());
+            }
         }
 
         OfflinePlayer player;
@@ -170,6 +172,11 @@ public interface IOpenInv {
             // Not a UUID
         }
 
+        // Ensure name is valid if server is in online mode to avoid unnecessary searching
+        if (Bukkit.getServer().getOnlineMode() && !name.matches("[a-zA-Z0-9_]{3,16}")) {
+            return null;
+        }
+
         player = Bukkit.getServer().getPlayerExact(name);
 
         if (player != null) {
@@ -225,24 +232,16 @@ public interface IOpenInv {
      * when a container is activated with AnyChest.
      *
      * @return true unless configured otherwise
-     * @deprecated OpenInv uses action bar chat for notifications. Whether or not they show is based on language settings.
      */
-    @Deprecated
-    default boolean notifyAnyChest() {
-        return true;
-    }
+    boolean notifyAnyChest();
 
     /**
      * Check the configuration value for whether or not OpenInv displays a notification to the user
      * when a container is activated with SilentChest.
      *
      * @return true unless configured otherwise
-     * @deprecated OpenInv uses action bar chat for notifications. Whether or not they show is based on language settings.
      */
-    @Deprecated
-    default boolean notifySilentChest() {
-        return true;
-    }
+    boolean notifySilentChest();
 
     /**
      * Mark a Player as no longer in use by a Plugin to allow OpenInv to remove it from the cache

api/src/main/java/com/lishid/openinv/internal/ISpecialInventory.java

@@ -16,7 +16,6 @@
 
 package com.lishid.openinv.internal;
 
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
@@ -49,11 +48,4 @@ public interface ISpecialInventory {
      */
     boolean isInUse();
 
-    /**
-     * Gets the Player associated with this ISpecialInventory.
-     *
-     * @return the HumanEntity
-     */
-    @NotNull HumanEntity getPlayer();
-
 }

assembly/pom.xml

@@ -21,12 +21,11 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.1.7</version>
+    <version>4.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>
   <name>OpenInvAssembly</name>
-  <packaging>pom</packaging>
 
   <build>
     <directory>../target</directory>
@@ -35,6 +34,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>reactor-uberjar</id>

assembly/src/assembly/reactor-uberjar.xml

@@ -14,9 +14,9 @@
   ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
 
   <id>reactor-uberjar</id>
 
@@ -34,18 +34,8 @@
       <binaries>
         <outputDirectory>/</outputDirectory>
         <unpack>true</unpack>
-        <unpackOptions>
-          <excludes>
-            <!--
-              - Exclude existing meta - assembly will write its own manifest, and the rest is maven
-              - details that end users don't need. Ignoring it saves around 7KB after compression
-              - with a single internal module present.
-             -->
-            <exclude>META-INF/**</exclude>
-          </excludes>
-        </unpackOptions>
-        <!-- Exclude dependencies - shade plugin will handle their inclusion as necessary in individual jars. -->
-        <includeDependencies>false</includeDependencies>
+        <!-- unpackOptions must be present or build breaks. -->
+        <unpackOptions/>
       </binaries>
 
     </moduleSet>

internal/pom.xml

@@ -0,0 +1,42 @@
+<!--
+  ~ Copyright (C) 2011-2020 lishid. All rights reserved.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, version 3.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvparent</artifactId>
+    <version>4.1.6-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>openinvinternal</artifactId>
+  <name>OpenInvInternal</name>
+
+  <packaging>pom</packaging>
+
+  <profiles>
+
+    <profile>
+      <id>all</id>
+      <modules>
+        <module>v1_16_R3</module>
+      </modules>
+    </profile>
+
+  </profiles>
+
+</project>

internal/v1_16_R3/pom.xml

@@ -20,10 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <relativePath>../../pom.xml</relativePath>
-    <version>4.1.7</version>
+    <artifactId>openinvinternal</artifactId>
+    <version>4.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvadapter1_16_R3</artifactId>
@@ -31,32 +30,44 @@
 
   <dependencies>
     <dependency>
-      <artifactId>spigot</artifactId>
       <groupId>org.spigotmc</groupId>
-      <scope>provided</scope>
+      <artifactId>spigot</artifactId>
       <version>1.16.5-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <artifactId>openinvapi</artifactId>
       <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
       <artifactId>openinvplugincore</artifactId>
-      <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>annotations</artifactId>
-      <groupId>org.jetbrains</groupId>
+      <version>4.1.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.2</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>

internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/OpenPlayer.java

@@ -32,24 +32,15 @@ public class OpenPlayer extends CraftPlayer {
         super(server, entity);
     }
 
-    @Override
-    public void loadData() {
-        // See CraftPlayer#loadData
-        NBTTagCompound loaded = this.server.getHandle().playerFileData.load(this.getHandle());
-        if (loaded != null) {
-            readExtraData(loaded);
-        }
-    }
-
     @Override
     public void saveData() {
+        super.saveData();
         EntityPlayer player = this.getHandle();
         // See net.minecraft.server.WorldNBTStorage#save(EntityPlayer)
         try {
             WorldNBTStorage worldNBTStorage = player.server.getPlayerList().playerFileData;
 
             NBTTagCompound playerData = player.save(new NBTTagCompound());
-            setExtraData(playerData);
 
             if (!isOnline()) {
                 // Special case: save old vehicle data

internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/PlayerDataManager.java

@@ -57,7 +57,8 @@ public class PlayerDataManager implements IPlayerDataManager {
         }
     }
 
-    public static @NotNull EntityPlayer getHandle(final Player player) {
+    @NotNull
+    public static EntityPlayer getHandle(final Player player) {
         if (player instanceof CraftPlayer) {
             return ((CraftPlayer) player).getHandle();
         }
@@ -77,8 +78,9 @@ public class PlayerDataManager implements IPlayerDataManager {
         return nmsPlayer;
     }
 
+    @Nullable
     @Override
-    public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
+    public Player loadPlayer(@NotNull final OfflinePlayer offline) {
         // Ensure player has data
         if (!offline.hasPlayedBefore()) {
             return null;

internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialEnderChest.java

@@ -80,11 +80,6 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
         }
     }
 
-    @Override
-    public @NotNull Player getPlayer() {
-        return owner.getBukkitEntity();
-    }
-
     @Override
     public void update() {
         this.owner.getEnderChest().update();

internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialPlayerInventory.java

@@ -212,11 +212,6 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         this.playerOnline = false;
     }
 
-    @Override
-    public @NotNull HumanEntity getPlayer() {
-        return this.player.getBukkitEntity();
-    }
-
     @Override
     public ItemStack splitStack(int i, final int j) {
         List<ItemStack> list = this.items;

plugin/pom.xml

@@ -19,9 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <version>4.1.7</version>
+    <artifactId>openinvparent</artifactId>
+    <version>4.1.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvplugincore</artifactId>
@@ -29,16 +29,15 @@
 
   <dependencies>
     <dependency>
-      <artifactId>openinvapi</artifactId>
       <groupId>com.lishid</groupId>
+      <artifactId>openinvapi</artifactId>
+      <version>4.1.6-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <artifactId>annotations</artifactId>
-      <groupId>org.jetbrains</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>spigot-api</artifactId>
       <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>1.15.2-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 
@@ -49,13 +48,31 @@
         <filtering>true</filtering>
       </resource>
     </resources>
-
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.2</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>

plugin/src/main/java/com/lishid/openinv/OpenInv.java

@@ -334,6 +334,16 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
         }
     }
 
+    @Override
+    public boolean notifyAnyChest() {
+        return this.getConfig().getBoolean("notify.any-chest", true);
+    }
+
+    @Override
+    public boolean notifySilentChest() {
+        return this.getConfig().getBoolean("notify.silent-chest", true);
+    }
+
     @Override
     public void onDisable() {
 

plugin/src/main/java/com/lishid/openinv/internal/OpenInventoryView.java

@@ -62,7 +62,7 @@ public class OpenInventoryView extends InventoryView {
     @Override
     public @NotNull String getTitle() {
         if (title == null) {
-            HumanEntity owner = inventory.getPlayer();
+            HumanEntity owner = getPlayer();
 
             String localTitle = OpenInv.getPlugin(OpenInv.class)
                     .getLocalizedMessage(

plugin/src/main/java/com/lishid/openinv/listeners/InventoryListener.java

@@ -199,7 +199,7 @@ public class InventoryListener implements Listener {
         }
 
         // Only specially handle actions in the player's own inventory.
-        return !event.getWhoClicked().equals(playerInventory.getPlayer());
+        return !event.getWhoClicked().equals(event.getView().getTopInventory().getHolder());
     }
 
 }

plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java

@@ -84,7 +84,7 @@ public class InternalAccessor {
                 return "https://github.com/lishid/OpenInv/releases/tag/4.1.5";
             case "v1_16_R3":
             default:
-                return "https://github.com/Jikoo/OpenInv/releases";
+                return "https://github.com/lishid/OpenInv/releases";
         }
     }
 

pom.xml

@@ -19,40 +19,41 @@
 
   <groupId>com.lishid</groupId>
   <artifactId>openinvparent</artifactId>
-  <name>OpenInv</name>
+  <name>OpenInvParent</name>
   <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.1.7</version>
+  <version>4.1.6-SNAPSHOT</version>
 
   <packaging>pom</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
+  <modules>
+    <module>api</module>
+    <module>plugin</module>
+    <module>internal</module>
+    <module>assembly</module>
+  </modules>
+
   <profiles>
-    <profile>
-      <id>all</id>
-      <modules>
-        <module>api</module>
-        <module>plugin</module>
-        <module>internal/v1_16_R3</module>
-        <module>assembly</module>
-      </modules>
-    </profile>
+
+    <!--
+      ~ N.B.: All version-specific code is handled in submodules of the internal module.
+      ~
+      ~ Internal submodules built by each profile are handled in internal/pom.xml
+     -->
 
     <profile>
-      <id>default</id>
+      <id>all</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>all</name>
+          <value>true</value>
+        </property>
       </activation>
-      <modules>
-        <module>api</module>
-        <module>plugin</module>
-        <module>assembly</module>
-      </modules>
     </profile>
+
   </profiles>
 
   <repositories>
@@ -62,84 +63,42 @@
     </repository>
   </repositories>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <artifactId>annotations</artifactId>
-        <groupId>org.jetbrains</groupId>
-        <scope>provided</scope>
-        <version>21.0.1</version>
-      </dependency>
-      <dependency>
-        <artifactId>spigot-api</artifactId>
-        <groupId>org.spigotmc</groupId>
-        <scope>provided</scope>
-        <version>1.16.5-R0.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <artifactId>openinvapi</artifactId>
-        <groupId>com.lishid</groupId>
-        <scope>compile</scope>
-        <version>4.1.7</version>
-      </dependency>
-      <dependency>
-        <artifactId>openinvplugincore</artifactId>
-        <groupId>com.lishid</groupId>
-        <scope>compile</scope>
-        <version>4.1.7</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-shade-plugin</artifactId>
-          <configuration>
-            <filters>
-              <filter>
-                <!-- Always shade entirety of required modules. -->
-                <artifact>com.lishid:openinv*</artifact>
-                <includes>
-                  <include>**</include>
-                </includes>
-              </filter>
-              <filter>
-                <artifact>*:*</artifact>
-                <!-- Don't warn about file conflicts that'll be clobbered anyway. -->
-                <excludes>
-                  <exclude>META-INF/MANIFEST.MF</exclude>
-                </excludes>
-              </filter>
-            </filters>
-            <minimizeJar>true</minimizeJar>
-          </configuration>
-          <executions>
-            <execution>
-              <phase>package</phase>
-              <goals>
-                <goal>shade</goal>
-              </goals>
-            </execution>
-          </executions>
-          <groupId>org.apache.maven.plugins</groupId>
-          <version>3.2.4</version>
-        </plugin>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.2</version>
+        <configuration>
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <!-- Keep the file clean, don't include every single pom from all modules -->
+              <excludes>
+                <exclude>META-INF/maven/**</exclude>
+              </excludes>
+            </filter>
+          </filters>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <groupId>org.apache.maven.plugins</groupId>
-          <version>3.8.1</version>
-        </plugin>
-
-        <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <groupId>org.apache.maven.plugins</groupId>
-          <version>3.3.0</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+      <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>

scripts/generate_changelog.sh

@@ -15,12 +15,14 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
+# A script for generating a changelog from Git.
+#
 # Note that this script is designed for use in GitHub Actions, and is not
 # particularly robust nor configurable. Run from project parent directory.
 
 # Query GitHub for the username of the given email address.
 # Falls through to the given author name.
-function lookup_email_username() {
+lookup_email_username() {
   lookup=$(curl -G --data-urlencode "q=$1 in:email" https://api.github.com/search/users -H 'Accept: application/vnd.github.v3+json' | grep '"login":' | sed -e 's/^.*": "//g' -e 's/",.*$//g')
 
   if [[ $lookup ]]; then
@@ -30,25 +32,10 @@ function lookup_email_username() {
   fi
 }
 
-# Get a pretty list of supported Minecraft versions
-function get_minecraft_versions() {
-  versions=$(. ./scripts/get_spigot_versions.sh)
-
-  for version in "${versions[@]}"; do
-    # Append comma if variable is set, then append version
-    minecraft_versions="${minecraft_versions:+${minecraft_versions},}${version%%-R*}"
-  done
-
-  echo "${minecraft_versions}"
-}
-
-previous_tag=$(git describe --tags --abbrev=0 @^)
-
 # Use formatted log to pull authors list
-authors_raw=$(git log --pretty=format:"%ae|%an" "$previous_tag"..@)
+authors_raw=$(git log --pretty=format:"%ae|%an" "$(git describe --tags --abbrev=0 @^)"..@)
 readarray -t authors <<<"$authors_raw"
 
-# Use associative array to map email to author name
 declare -A author_data
 
 for author in "${authors[@]}"; do
@@ -68,7 +55,7 @@ for author in "${authors[@]}"; do
 done
 
 # Fetch actual formatted changelog
-changelog=$(git log --pretty=format:"* %s (%h) - %ae" "$previous_tag"..@)
+changelog=$(git log --pretty=format:"%s (%h) - %ae" "$(git describe --tags --abbrev=0 @^)"..@)
 
 for author_email in "${!author_data[@]}"; do
   # Ignore case when matching
@@ -77,6 +64,4 @@ for author_email in "${!author_data[@]}"; do
   changelog=${changelog//$author_email/${author_data[$author_email]}}
 done
 
-minecraft_versions=$(get_minecraft_versions)
-
-printf "## Supported Minecraft versions\n%s\n\n## Changelog\n%s" "${minecraft_versions}" "${changelog}"
+echo "GENERATED_CHANGELOG<<EOF${changelog}EOF" >> "$GITHUB_ENV"

scripts/get_spigot_versions.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2011-2021 lishid. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Note that this script is designed for use in GitHub Actions, and is not
-# particularly robust nor configurable. Run from project parent directory.
-
-# Use a nameref as a cache - maven evaluation is pretty slow.
-# Re-calling the script and relying on it to handle caching is way easier than passing around info.
-declare -a spigot_versions
-
-# We don't care about concatenation - either it's not null and we return or it's null and we instantiate.
-# shellcheck disable=SC2199
-if [[ ${spigot_versions[@]} ]]; then
-  for spigot_version in "${spigot_versions[@]}"; do
-    echo "$spigot_version"
-  done
-  return
-fi
-
-# Pull Spigot dependency information from Maven.
-# Since we only care about Spigot versions, only check modules in the folder internal.
-readarray -t modules <<< "$(mvn help:evaluate -Dexpression=project.modules -q -DforceStdout -P all | grep -oP '(?<=<string>)(internal/.*)(?=</string>)')"
-
-declare -n versions="spigot_versions"
-
-for module in "${modules[@]}"; do
-  # Get number of dependencies declared in pom of specified internal module.
-  max_index=$(mvn help:evaluate -Dexpression=project.dependencies -q -DforceStdout -P all -pl "$module" | grep -c "<dependency>")
-
-  for ((i=0; i < max_index; i++)); do
-    # Get artifactId of dependency.
-    artifact_id=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].artifactId -q -DforceStdout -P all -pl "$module")
-
-    # Ensure dependency is Spigot.
-    if [[ "$artifact_id" == spigot ]]; then
-      # Get Spigot version.
-      spigot_version=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].version -q -DforceStdout -P all -pl "$module")
-      versions+=("$spigot_version")
-      echo "$spigot_version"
-      break
-    fi
-  done
-done

scripts/install_spigot_dependencies.sh

@@ -15,12 +15,39 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Note that this script is designed for use in GitHub Actions, and is not
-# particularly robust nor configurable. Run from project parent directory.
+# A script for installing required Spigot versions.
+#
+# Note that this script is designed for use in GitHub Actions, and is
+# not particularly robust nor configurable.
+# In its current state, the script must be run from OpenInv's parent
+# project directory and will always install BuildTools to ~/buildtools.
 
 buildtools_dir=~/buildtools
 buildtools=$buildtools_dir/BuildTools.jar
 
+get_spigot_versions () {
+  # Get all submodules of internal module
+  modules=$(mvn help:evaluate -Dexpression=project.modules -q -DforceStdout -P all -pl internal | grep -oP '(?<=<string>)(.*)(?=<\/string>)')
+  for module in "${modules[@]}"; do
+
+    # Get number of dependencies declared in pom of specified internal module
+    max_index=$(mvn help:evaluate -Dexpression=project.dependencies -q -DforceStdout -P all -pl internal/"$module" | grep -c "<dependency>")
+
+    for ((i=0; i < max_index; i++)); do
+      # Get artifactId of dependency
+      artifact_id=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].artifactId -q -DforceStdout -P all -pl internal/"$module")
+
+      # Ensure dependency is spigot
+      if [[ "$artifact_id" == spigot ]]; then
+        # Get spigot version
+        spigot_version=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].version -q -DforceStdout -P all -pl internal/"$module")
+        echo "$spigot_version"
+        break
+      fi
+    done
+  done
+}
+
 get_buildtools () {
   if [[ -d $buildtools_dir && -f $buildtools ]]; then
     return
@@ -30,7 +57,7 @@ get_buildtools () {
   wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O $buildtools
 }
 
-versions=$(. ./scripts/get_spigot_versions.sh)
+versions=$(get_spigot_versions)
 echo Found Spigot dependencies: "$versions"
 
 for version in "${versions[@]}"; do
@@ -39,7 +66,7 @@ for version in "${versions[@]}"; do
   mvn dependency:get -Dartifact=org.spigotmc:spigot:"$version" -q -o || exit_code=$?
   if [ $exit_code -ne 0 ]; then
     echo Installing missing Spigot version "$version"
-    revision=${version%%-R*}
+    revision=$(echo "$version" | grep -oP '(\d+\.\d+(\.\d+)?)(?=-R[0-9\.]+-SNAPSHOT)')
     get_buildtools
     java -jar $buildtools -rev "$revision"
   else

scripts/set_curseforge_env.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2011-2021 lishid. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Note that this script is designed for use in GitHub Actions, and is not
-# particularly robust nor configurable. Run from project parent directory.
-
-# Parse Spigot dependency information into major Minecraft versions
-function get_curseforge_minecraft_versions() {
-  versions=$(. ./scripts/get_spigot_versions.sh)
-
-  for version in "${versions[@]}"; do
-    # Parse Minecraft major version
-    version="${version%[.-]"${version#*.*[.-]}"}"
-
-    # Skip already listed versions
-    if [[ "$minecraft_versions" =~ "$version"($|,) ]]; then
-      continue
-    fi
-
-    # Append comma if variable is set, then append version
-    minecraft_versions="${minecraft_versions:+${minecraft_versions},}Minecraft ${version}"
-  done
-
-  echo "${minecraft_versions}"
-}
-
-minecraft_versions=$(get_curseforge_minecraft_versions)
-echo "CURSEFORGE_MINECRAFT_VERSIONS=$minecraft_versions" >> "$GITHUB_ENV"

scripts/set_release_env.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2011-2021 lishid. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Note that this script is designed for use in GitHub Actions, and is not
-# particularly robust nor configurable. Run from project parent directory.
-
-# Get a pretty string of the project's name and version
-# Disable SC warning about variable expansion for this function - those are Maven variables.
-# shellcheck disable=SC2016
-function get_versioned_name() {
-  mvn -q -Dexec.executable=echo -Dexec.args='${project.name} ${project.version}' --non-recursive exec:exec
-}
-
-# Set GitHub environmental variables
-echo "VERSIONED_NAME=$(get_versioned_name)" >> "$GITHUB_ENV"
-
-changelog="$(. ./scripts/generate_changelog.sh)"
-printf "GENERATED_CHANGELOG<<EOF\n%s\nEOF\n" "$changelog" >> "$GITHUB_ENV"

scripts/tag_release.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2011-2021 lishid. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-if [[ ! $1 ]]; then
-  echo "Please provide a version string."
-  return
-fi
-
-version="$1"
-snapshot="${version%.*}.$((${version##*.} + 1))-SNAPSHOT"
-
-mvn versions:set -DnewVersion="$version"
-
-git add .
-git commit -S -m "Bump version to $version for release"
-git tag -s "$version" -m "Release $version"
-
-mvn clean package -am -P all
-
-mvn versions:set -DnewVersion="$snapshot"
-
-git add .
-git commit -S -m "Bump version to $snapshot for development"