Cursor/crafting progress

Practically should make it 2020 at this rate, whoops

.gitignore

@@ -3,7 +3,7 @@
 **/.project
 **/.classpath
 **/.idea
-**/.iml
+**.iml
 **/target
 **/bin
 **/out

README.MD

@@ -132,15 +132,19 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi
 
 ## For Developers
 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.11-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.11-R0.1-SNAPSHOT`
+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 specific version or set of versions, you'll need to use a profile. Provided profiles are `latest`, `recent` (last 2 major Minecraft versions), and `all`. Select an existing profile using the `-P` argument (ex: `mvn clean package -am -P all`) or make your own. For more information, check out the [official guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html).
+To compile for a single version, specify the NMS revision you are targeting: `mvn -pl <NMS module> -am clean install`
 
-The final file is target/OpenInv.jar
+To compile for a set of versions, you'll need to use a profile. The only provided profile is `all`. Select a profile using the `-P` argument: `mvn clean package -am -P all`
+
+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-2018 lishid. All rights reserved.
+Copyright (C) 2011-2019 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

api/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.0.6</version>
+    <version>4.0.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

api/src/main/java/com/lishid/openinv/util/StringMetric.java

@@ -12,21 +12,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * *
- * Copyright (C) 2014 - 2018 Simmetrics Authors
- * Copyright (C) 2010 The Guava Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
 package com.lishid.openinv.util;

assembly/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.0.6</version>
+    <version>4.0.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>

assembly/src/assembly/reactor-uberjar.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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

common/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.0.6</version>
+    <version>4.0.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvcommon</artifactId>
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvapi</artifactId>
-      <version>4.0.6</version>
+      <version>4.0.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>

common/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

common/src/main/java/com/lishid/openinv/util/Cache.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
@@ -19,11 +19,11 @@ package com.lishid.openinv.util;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
@@ -45,20 +45,9 @@ public class Cache<K, V> {
      * @param postRemoval Function used to perform any operations required when a key is invalidated
      */
     public Cache(final long retention, final Function<V> inUseCheck, final Function<V> postRemoval) {
-        this.internal = new HashMap<K, V>();
+        this.internal = new HashMap<>();
 
-        this.expiry = TreeMultimap.create(new Comparator<Long>() {
+        this.expiry = TreeMultimap.create(Long::compareTo, (k1, k2) -> Objects.equals(k1, k2) ? 0 : 1);
-                    @Override
-                    public int compare(final Long long1, final Long long2) {
-                        return long1.compareTo(long2);
-                    }
-                },
-                new Comparator<K>() {
-                    @Override
-                    public int compare(final K k1, final K k2) {
-                        return k1 == k2 || k1 != null && k1.equals(k2) ? 0 : 1;
-                    }
-                });
 
         this.retention = retention;
         this.inUseCheck = inUseCheck;
@@ -160,7 +149,7 @@ public class Cache<K, V> {
     private void lazyCheck() {
         long now = System.currentTimeMillis();
         synchronized (this.internal) {
-            List<K> inUse = new ArrayList<K>();
+            List<K> inUse = new ArrayList<>();
             for (Iterator<Map.Entry<Long, K>> iterator = this.expiry.entries().iterator(); iterator
                     .hasNext();) {
                 Map.Entry<Long, K> entry = iterator.next();

common/src/main/java/com/lishid/openinv/util/Function.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

common/src/main/java/com/lishid/openinv/util/Pair.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011-2019 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/>.
+ */
+
+package com.lishid.openinv.util;
+
+/**
+ * Simple tuple.
+ *
+ * @param <L> the left value
+ * @param <R> the right value
+ *
+ * @author Jikoo
+ */
+public class Pair<L, R> {
+
+    private L left;
+    private R right;
+
+    public Pair(L left, R right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    public L getLeft() {
+        return left;
+    }
+
+    public void setLeft(L left) {
+        this.left = left;
+    }
+
+    public R getRight() {
+        return right;
+    }
+
+    public void setRight(R right) {
+        this.right = right;
+    }
+
+}

common/src/main/java/com/lishid/openinv/util/Permissions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

common/src/main/java/com/lishid/openinv/util/SingleFieldList.java

@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2011-2019 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/>.
+ */
+
+package com.lishid.openinv.util;
+
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A List implementation intended for wrapping a single field.
+ *
+ * @param <V> the type of the field
+ *
+ * @author Jikoo
+ */
+public class SingleFieldList<V> extends AbstractCollection<V> implements List<V> {
+
+    private final Supplier<V> fieldGetter;
+    private final Consumer<V> fieldSetter;
+
+    public SingleFieldList(@NotNull Supplier<V> fieldGetter, @NotNull Consumer<V> fieldSetter) {
+        this.fieldGetter = fieldGetter;
+        this.fieldSetter = fieldSetter;
+    }
+
+    @Override
+    public int size() {
+        return 1;
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return Objects.equals(o, fieldGetter.get());
+    }
+
+    @NotNull
+    @Override
+    public Iterator<V> iterator() {
+        return listIterator();
+    }
+
+    @Override
+    public boolean addAll(int index, @NotNull Collection<? extends V> c) {
+        return super.addAll(c);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return o instanceof SingleFieldList
+                && fieldGetter.equals(((SingleFieldList) o).fieldGetter)
+                && fieldSetter.equals(((SingleFieldList) o).fieldSetter);
+    }
+
+    @Override
+    public int hashCode() {
+        return fieldSetter.hashCode() * 17 * fieldGetter.hashCode();
+    }
+
+    @Override
+    public V get(int index) {
+        if (index != 0) {
+            throw new IndexOutOfBoundsException();
+        }
+        return fieldGetter.get();
+    }
+
+    @Override
+    public V set(int index, V element) {
+        if (index != 0) {
+            throw new IndexOutOfBoundsException();
+        }
+
+        V old = fieldGetter.get();
+        fieldSetter.accept(element);
+
+        return old;
+    }
+
+    @Override
+    public void add(int index, V element) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public V remove(int index) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int indexOf(Object o) {
+        return fieldGetter.get().equals(o) ? 0 : -1;
+    }
+
+    @Override
+    public int lastIndexOf(Object o) {
+        return indexOf(o);
+    }
+
+    @NotNull
+    @Override
+    public ListIterator<V> listIterator() {
+        return new ListIterator<V>() {
+            private boolean hasNext = true;
+
+            @Override
+            public boolean hasNext() {
+                return hasNext;
+            }
+
+            @Override
+            public V next() {
+                if (!hasNext) {
+                    throw new NoSuchElementException();
+                }
+                return fieldGetter.get();
+            }
+
+            @Override
+            public boolean hasPrevious() {
+                return !hasNext;
+            }
+
+            @Override
+            public V previous() {
+                if (hasNext) {
+                    throw new NoSuchElementException();
+                }
+                return fieldGetter.get();
+            }
+
+            @Override
+            public int nextIndex() {
+                return hasNext ? 0 : 1;
+            }
+
+            @Override
+            public int previousIndex() {
+                return hasNext ? -1 : 0;
+            }
+
+            @Override
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void set(V v) {
+                fieldSetter.accept(v);
+            }
+
+            @Override
+            public void add(V v) {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    @NotNull
+    @Override
+    public ListIterator<V> listIterator(int index) {
+        if (index != 0) {
+            throw new IndexOutOfBoundsException();
+        }
+        return listIterator();
+    }
+
+    @NotNull
+    @Override
+    public List<V> subList(int fromIndex, int toIndex) {
+        if (fromIndex != 0 || toIndex != 1) {
+            throw new IndexOutOfBoundsException();
+        }
+
+        return this;
+    }
+
+    @Override
+    public void clear() {}
+
+}

internal/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.0.6</version>
+    <version>4.0.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvinternal</artifactId>
@@ -30,22 +30,6 @@
 
   <profiles>
 
-    <profile>
-      <id>latest</id>
-      <modules>
-        <module>v1_14_R1</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>recent</id>
-      <!-- The recent profile is for the most recent 2 versions. -->
-      <modules>
-        <module>v1_13_R2</module>
-        <module>v1_14_R1</module>
-      </modules>
-    </profile>
-
     <profile>
       <id>all</id>
       <modules>

internal/v1_13_R2/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>4.0.6</version>
+    <version>4.0.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvadapter1_13_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>4.0.6</version>
+      <version>4.0.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

internal/v1_14_R1/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>4.0.6</version>
+    <version>4.0.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvadapter1_14_R1</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>4.0.6</version>
+      <version>4.0.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

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

@@ -100,6 +100,7 @@ public class PlayerDataManager implements IPlayerDataManager {
         String title;
         if (inventory instanceof SpecialEnderChest) {
             HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
+            //noinspection ConstantConditions // Owner name can be null when loaded under certain conditions.
             title = (owner.getName() != null ? owner.getName() : owner.getUniqueId().toString()) + "'s Ender Chest";
         } else if (inventory instanceof SpecialPlayerInventory) {
             EntityHuman owner = ((PlayerInventory) inventory).player;
@@ -132,7 +133,22 @@ public class PlayerDataManager implements IPlayerDataManager {
         }, nmsPlayer, nmsPlayer.nextContainerCounter()) {
             @Override
             public Containers<?> getType() {
-                return inventory instanceof SpecialEnderChest ? Containers.GENERIC_9X3 : Containers.GENERIC_9X5;
+                switch (inventory.getBukkitInventory().getSize()) {
+                    case 9:
+                        return Containers.GENERIC_9X1;
+                    case 18:
+                        return Containers.GENERIC_9X2;
+                    case 27:
+                    default:
+                        return Containers.GENERIC_9X3;
+                    case 36:
+                        return Containers.GENERIC_9X4;
+                    case 45:
+                        return Containers.GENERIC_9X5;
+                    case 41: // PLAYER
+                    case 54:
+                        return Containers.GENERIC_9X6;
+                }
             }
         };
 

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

@@ -18,6 +18,8 @@ package com.lishid.openinv.internal.v1_14_R1;
 
 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.util.Pair;
+import com.lishid.openinv.util.SingleFieldList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Predicate;
@@ -32,12 +34,12 @@ import net.minecraft.server.v1_14_R1.EntityPlayer;
 import net.minecraft.server.v1_14_R1.EnumItemSlot;
 import net.minecraft.server.v1_14_R1.IBlockData;
 import net.minecraft.server.v1_14_R1.IChatBaseComponent;
+import net.minecraft.server.v1_14_R1.IInventory;
 import net.minecraft.server.v1_14_R1.Item;
 import net.minecraft.server.v1_14_R1.ItemArmor;
 import net.minecraft.server.v1_14_R1.ItemStack;
 import net.minecraft.server.v1_14_R1.NBTTagCompound;
 import net.minecraft.server.v1_14_R1.NBTTagList;
-import net.minecraft.server.v1_14_R1.NonNullList;
 import net.minecraft.server.v1_14_R1.PacketPlayOutSetSlot;
 import net.minecraft.server.v1_14_R1.PlayerInventory;
 import net.minecraft.server.v1_14_R1.ReportedException;
@@ -45,6 +47,7 @@ import net.minecraft.server.v1_14_R1.World;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryCrafting;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryHolder;
@@ -56,8 +59,11 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     private final CraftInventory inventory;
     private boolean playerOnline;
     private EntityHuman player;
-    private NonNullList<ItemStack> items, armor, extraSlots;
+    private List<ItemStack> items, armor, extraSlots, crafting;
-    private List<NonNullList<ItemStack>> f;
+    @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") // Backing field is mutable.
+    // TODO: cursor requires an additional slot listener
+    private final List<ItemStack> cursor = new SingleFieldList<>(this::getCarried, this::setCarried);
+    private List<List<ItemStack>> f;
 
     public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
         super(PlayerDataManager.getHandle(bukkitPlayer));
@@ -67,7 +73,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         this.items = this.player.inventory.items;
         this.armor = this.player.inventory.armor;
         this.extraSlots = this.player.inventory.extraSlots;
-        this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
+        this.crafting = this.getCrafting().getContents();
+        this.f = ImmutableList.of(this.items, this.armor, this.extraSlots, this.crafting, this.cursor);
+    }
+
+    private IInventory getCrafting() {
+        return ((CraftInventoryCrafting) this.player.defaultContainer.getBukkitView().getTopInventory()).getInventory();
     }
 
     @Override
@@ -79,11 +90,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             for (int i = 0; i < getSize(); ++i) {
                 this.player.inventory.setItem(i, getRawItem(i));
             }
+            // Crafting/cursor are not insertable while player is offline and do not need special treatment.
             this.player.inventory.itemInHandIndex = this.itemInHandIndex;
             this.items = this.player.inventory.items;
             this.armor = this.player.inventory.armor;
             this.extraSlots = this.player.inventory.extraSlots;
-            this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
+            this.crafting = this.getCrafting().getContents();
+            this.f = ImmutableList.of(this.items, this.armor, this.extraSlots, this.crafting, this.cursor);
             this.playerOnline = true;
         }
     }
@@ -124,8 +137,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     private ItemStack getRawItem(int i) {
-        NonNullList<ItemStack> list = null;
+        List<ItemStack> list = null;
-        for (NonNullList<ItemStack> next : this.f) {
+        for (List<ItemStack> next : this.f) {
             if (i < next.size()) {
                 list = next;
                 break;
@@ -171,7 +184,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public int getSize() {
-        return 45;
+        return 54;
     }
 
     @Override
@@ -179,30 +192,35 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return !this.getViewers().isEmpty();
     }
 
-    @Override
+    private Pair<List<ItemStack>, Integer> getLocalizedIndex(int i) {
-    public void setItem(int i, final ItemStack itemstack) {
+        List<ItemStack> localList = null;
-        List<ItemStack> list = this.items;
+        for (List<ItemStack> list : this.f) {
-
+            if (i < list.size()) {
-        if (i >= list.size()) {
+                localList = list;
+                break;
+            }
             i -= list.size();
-            list = this.armor;
+        }
-        } else {
+
+        if (localList == this.armor) {
+            i = this.getReversedArmorSlotNum(i);
+        } else if (localList == this.items) {
             i = this.getReversedItemSlotNum(i);
         }
 
-        if (i >= list.size()) {
+        return new Pair<>(localList, i);
-            i -= list.size();
+    }
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
 
-        if (i >= list.size()) {
+    @Override
+    public void setItem(int i, final ItemStack itemstack) {
+        Pair<List<ItemStack>, Integer> localizedIndex = getLocalizedIndex(i);
+        if (localizedIndex.getLeft() == null
+                // TODO: should this be a constant instead of comparing to transient slot containers?
+                || !playerOnline && (localizedIndex.getLeft() == crafting || localizedIndex.getLeft() == cursor)) {
             this.player.drop(itemstack, true);
-            return;
+        } else {
+            localizedIndex.getLeft().set(localizedIndex.getRight(), itemstack);
         }
-
-        list.set(i, itemstack);
     }
 
     @Override
@@ -212,51 +230,26 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public ItemStack splitStack(int i, final int j) {
-        List<ItemStack> list = this.items;
+        Pair<List<ItemStack>, Integer> localizedIndex = getLocalizedIndex(i);
 
-        if (i >= list.size()) {
+        if (localizedIndex.getLeft() == null) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
             return ItemStack.a;
         }
 
-        return list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j);
+        return localizedIndex.getLeft().get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(localizedIndex.getLeft(), localizedIndex.getRight(), j);
     }
 
     @Override
     public ItemStack splitWithoutUpdate(int i) {
-        List<ItemStack> list = this.items;
+        Pair<List<ItemStack>, Integer> localizedIndex = getLocalizedIndex(i);
 
-        if (i >= list.size()) {
+        if (localizedIndex.getLeft() == null) {
-            i -= list.size();
-            list = this.armor;
-        } else {
-            i = this.getReversedItemSlotNum(i);
-        }
-
-        if (i >= list.size()) {
-            i -= list.size();
-            list = this.extraSlots;
-        } else if (list == this.armor) {
-            i = this.getReversedArmorSlotNum(i);
-        }
-
-        if (i >= list.size()) {
             return ItemStack.a;
         }
 
+        List<ItemStack> list = localizedIndex.getLeft();
+        i = localizedIndex.getRight();
+
         if (!list.get(i).isEmpty()) {
             ItemStack itemstack = list.get(i);
 
@@ -280,11 +273,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public void onOpen(CraftHumanEntity who) {
         this.transaction.add(who);
+        this.getCrafting().getViewers().add(who);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         this.transaction.remove(who);
+        this.getCrafting().getViewers().remove(who);
     }
 
     @Override
@@ -326,7 +321,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             }
 
             if (!this.a(itemstack, itemstack1)) {
-                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
+                remains -= Math.min(itemstack1.getMaxStackSize(), this.getMaxStackSize()) - itemstack1.getCount();
             }
 
             if (remains <= 0) {

internal/v1_8_R3/pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>4.0.6</version>
+    <version>4.0.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>4.0.6</version>
+      <version>4.0.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

plugin/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.0.6</version>
+    <version>4.0.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>openinvplugincore</artifactId>
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>4.0.6</version>
+      <version>4.0.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

plugin/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

plugin/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

plugin/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

plugin/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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

plugin/src/main/resources/plugin.yml

@@ -5,6 +5,7 @@ author: lishid
 authors: [Jikoo, ShadowRanger]
 description: >
              This plugin allows you to open a player's inventory as a chest and interact with it in real time.
+api-version: "1.13"
 
 permissions:
   OpenInv.any.default:
@@ -13,47 +14,57 @@ permissions:
   OpenInv.silent.default:
     description: Permission for SilentContainer to default on prior to toggling.
     default: false
+  OpenInv.*:
+    description: Permission for all OpenInv features.
+    default: op
+    children:
+      OpenInv.openinv: true
+      OpenInv.openender: true
+      OpenInv.search: true
+      OpenInv.silent: true
+      OpenInv.anychest: true
+      OpenInv.searchenchant: true
 
 commands:
   openinv:
     aliases: [oi, inv, open]
     description: Open a player's inventory
-    permission: OpenInv.*;OpenInv.openinv
+    permission: OpenInv.openinv
     usage: |-
            /<command> [Player] - Open a player's inventory
   openender:
     aliases: [oe]
     description: Opens the enderchest of a player
-    permission: OpenInv.*;OpenInv.openender
+    permission: OpenInv.openender
     usage: |-
            /<command> [Player] - Open a player's enderchest
   searchinv:
     aliases: [si]
     description: Search and list players having a specific item
-    permission: OpenInv.*;OpenInv.search
+    permission: OpenInv.search
     usage: |-
            /<command> <Item> [MinAmount] - Item is the ID or the Bukkit Material, MinAmount is the minimum amount required
   searchender:
     aliases: [se]
-    permission: OpenInv.*;OpenInv.search
+    permission: OpenInv.search
     description: Searches and lists players having a specific item in their ender chest
     usage: |-
            /<command> <item> [MinAmount] - Item is the ID or the Bukkit Material, MinAmount is the minimum amount required
   silentcontainer:
     aliases: [sc, silent, silentchest]
     description: Toggle SilentContainer function, which stops sounds and animations when using containers.
-    permission: OpenInv.*;OpenInv.silent
+    permission: OpenInv.silent
     usage: |-
            /<command> [Check] - Check or toggle silent chest
   anycontainer:
     aliases: [ac, anychest]
     description: Toggle AnyContainer function, which allows opening of blocked containers.
-    permission: OpenInv.*;OpenInv.anychest
+    permission: OpenInv.anychest
     usage: |-
            /<command> [Check] - Checks or toggle anychest
   searchenchant:
     aliases: [searchenchants]
     description: Search and list players with a specific enchantment.
-    permission: OpenInv.*;OpenInv.searchenchant
+    permission: OpenInv.searchenchant
     usage: |-
            /<command> <[enchantment] [MinLevel]> - Enchantment is the enchantment type, MinLevel is the minimum level. One is optional

pom.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
   <artifactId>openinvparent</artifactId>
   <name>OpenInvParent</name>
   <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.0.6</version>
+  <version>4.0.8-SNAPSHOT</version>
 
   <packaging>pom</packaging>