Bump version to 5.1.8 for release

Now I can do things like have unstaged changes on the master branch when I cut a release! Not good!

.github/dependabot.yml

@@ -4,7 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
-  - package-ecosystem: "maven"
+  - package-ecosystem: "gradle"
     directory: "/"
     schedule:
       interval: "monthly"

.github/workflows/automerge_dependabot.yml

@@ -47,7 +47,7 @@ jobs:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           pull-request-number: "${{ env.PR_NUMBER }}"
       - name: Merge
-        uses: pascalgn/automerge-action@v0.16.3
+        uses: pascalgn/automerge-action@v0.16.4
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: "dependencies,java"

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
     tags-ignore:
       - '**'
     paths-ignore:
-      - resource-pack/**
+      - resource-pack/openinv-legibility-pack/**
   # Enable running CI via other Actions, i.e. for drafting releases and handling PRs.
   workflow_call:
 
@@ -21,14 +21,15 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '21'
-          cache: 'maven'
 
-      # Install Spigot dependencies if necessary.
-      - name: Install Spigot Dependencies
-        run: . scripts/install_spigot_dependencies.sh
+      # TODO convert to a Gradle plugin later for portability
+      - name: Install Spigot dependency
+        run: ./scripts/install_spigot.sh 1.21.4
 
-      - name: Build With Maven
-        run: mvn -e clean package -am -P all
+      - uses: gradle/actions/setup-gradle@v4
+
+      - name: Build with Gradle
+        run: ./gradlew build
 
       # Upload artifacts
       - name: Upload Distributable Jar
@@ -36,10 +37,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: dist
-          path: ./target/OpenInv.jar
-      - name: Upload API Jar
-        id: upload-api
-        uses: actions/upload-artifact@v4
-        with:
-          name: api
-          path: ./api/target/openinvapi*.jar
+          path: ./dist/*

.github/workflows/draft_release.yml

@@ -12,34 +12,31 @@ jobs:
     needs: [ run-ci ]
     runs-on: ubuntu-latest
     steps:
-      # Fetch all history - used to assemble changelog.
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set Release Variables
-        run: bash ./scripts/set_release_env.sh
-
       - name: Download build
         uses: actions/download-artifact@v4
         with:
           name: dist
           path: dist
 
-      - name: Package resource pack
-        run: |-
-          pushd resource-pack
-          zip -r ../dist/openinv-legibility-pack.zip .
-          popd
-
       - name: Create Release
         id: create-release
-        uses: softprops/action-gh-release@v2.0.6
+        uses: softprops/action-gh-release@v2.2.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           name: ${{ env.VERSIONED_NAME }}
-          body: ${{ env.GENERATED_CHANGELOG }}
+          # May actually want to manually specify Paper versions all the time; they won't all
+          # need to be specified in code thanks to Mojang-mapped server internals.
+          # A bit annoying, but not terribly so.
+          # Instead, fetch min and max (which will also be Spigot version) and manually list intermediate versions?
+          body: |-
+            ## Supported server versions
+            ### Paper
+            TODO COMMA-SEPARATED VERSIONS
+            ### Spigot
+            TODO VERSION
+            
+            TODO HELLO HUMAN, PRESS THE GENERATE CHANGELOG BUTTON PLEASE.
           draft: true
           prerelease: false
           files: ./dist/**

.github/workflows/external_release.yml

@@ -34,4 +34,4 @@ jobs:
           game_versions: "${{ env.CURSEFORGE_MINECRAFT_VERSIONS }}"
           release_type: release
           changelog_type: markdown
-          changelog: "${{ env.CURSEFORGE_CHANGELOG }}"
+          changelog: "${{ github.event.release.body }}"

.github/workflows/resource_pack_ci.yml

@@ -7,7 +7,7 @@ on:
     tags-ignore:
       - '**'
     paths:
-      - resource-pack/**
+      - resource-pack/openinv-legibility-pack/**
 
 jobs:
   build:
@@ -20,5 +20,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: openinv-legibility-pack
-          path: ./resource-pack/
+          path: ./resource-pack/openinv-legibility-pack/
           compression-level: 9

.gitignore

@@ -2,9 +2,12 @@
 **/.project
 **/.classpath
 **/.idea/
+**/.gradle/
 **.iml
 **/target/
 **/bin/
 **/out/
+**/build/
+**/dist/
 **/dependency-reduced-pom.xml
 **/pom.xml.versionsBackup

README.MD

@@ -36,22 +36,19 @@ The OpenInv API is available via [JitPack](https://jitpack.io/).
 ```xml
   <dependencies>
     <dependency>
-      <groupId>com.github.jikoo.OpenInv</groupId>
-      <artifactId>openinvapi</artifactId>
+      <groupId>com.github.Jikoo</groupId>
+      <artifactId>OpenInv</artifactId>
       <version>${openinv.version}</version>
     </dependency>
   </dependencies>
 ```
+Note that since JitPack only builds the API now, the "full" OpenInv jar on JitPack is actually the openinvapi artifact. This is a change from previous dependency declaration that I hope to revert.
 
 ### Compilation
-To compile, the relevant Spigot jars must be installed in the local repository.
+To compile, the relevant Spigot jar must be installed in the local repository.
 As OpenInv is compiled against Mojang's mappings, you must run BuildTools with the `--remapped` argument:  
 `java -jar BuildTools.jar --remapped --rev $serverVersion`  
-`$serverVersion` is the version of the server, i.e. `1.18.1`
+`$serverVersion` is the version of the server, i.e. `1.21.4`
 
-To compile just the API, execute Maven as usual:  
-`mvn clean package`  
-
-To compile the full plugin, use the provided profile with `-P all`:  
-`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).
+Once Spigot is installed, execute the gradle wrapper:  
+`./gradlew build`

addon/togglepersist/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+  `openinv-base`
+}
+
+dependencies {
+  implementation(project(":openinvapi"))
+}
+
+tasks.processResources {
+  expand("version" to version)
+}
+
+tasks.register<Copy>("distributeAddons") {
+  into(rootProject.layout.projectDirectory.dir("dist"))
+  from(tasks.jar)
+  rename("openinvtogglepersist.*\\.jar", "OITogglePersist.jar")
+}
+
+tasks.assemble {
+  dependsOn(tasks.named("distributeAddons"))
+}

addon/togglepersist/src/main/java/com/github/jikoo/openinv/togglepersist/TogglePersist.java

@@ -0,0 +1,143 @@
+package com.github.jikoo.openinv.togglepersist;
+
+import com.google.errorprone.annotations.Keep;
+import com.lishid.openinv.event.PlayerToggledEvent;
+import com.lishid.openinv.util.setting.PlayerToggle;
+import com.lishid.openinv.util.setting.PlayerToggles;
+import org.bukkit.configuration.Configuration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.logging.Level;
+
+public class TogglePersist extends JavaPlugin implements Listener {
+
+  private final Map<UUID, Set<String>> enabledToggles = new HashMap<>();
+
+  @Override
+  public void onEnable() {
+    getServer().getPluginManager().registerEvents(this, this);
+
+    File file = new File(getDataFolder(), "toggles.yml");
+
+    // If there's no save file, there's nothing to load.
+    if (!file.exists()) {
+      return;
+    }
+
+    Configuration loaded = YamlConfiguration.loadConfiguration(file);
+
+    // For each toggle, enable loaded players.
+    for (String toggleName : loaded.getKeys(false)) {
+      PlayerToggle toggle = PlayerToggles.get(toggleName);
+      // Ensure toggle exists.
+      if (toggle == null) {
+        continue;
+      }
+
+      for (String idString : loaded.getStringList(toggleName)) {
+        // Ensure valid UUID.
+        UUID uuid;
+        try {
+          uuid = UUID.fromString(idString);
+        } catch (IllegalArgumentException e) {
+          continue;
+        }
+
+        // Track that toggle is enabled.
+        set(uuid, toggleName);
+      }
+    }
+  }
+
+  private void set(UUID playerId, String toggleName) {
+    enabledToggles.compute(playerId, (uuid, toggles) -> {
+      if (toggles == null) {
+        toggles = new HashSet<>();
+      }
+      toggles.add(toggleName);
+      return toggles;
+    });
+  }
+
+  @Override
+  public void onDisable() {
+    Map<String, List<String>> converted = getSaveData();
+
+    YamlConfiguration data = new YamlConfiguration();
+    for (Map.Entry<String, List<String>> playerToggle : converted.entrySet()) {
+      data.set(playerToggle.getKey(), playerToggle.getValue());
+    }
+
+    File file = new File(getDataFolder(), "toggles.yml");
+    try {
+      data.save(file);
+    } catch (IOException e) {
+      getLogger().log(Level.SEVERE, "Unable to save player toggle states", e);
+    }
+  }
+
+  private @NotNull Map<String, List<String>> getSaveData() {
+    Map<String, List<String>> converted = new HashMap<>();
+
+    for (Map.Entry<UUID, Set<String>> playerToggles : enabledToggles.entrySet()) {
+      String idString = playerToggles.getKey().toString();
+      for (String toggleName : playerToggles.getValue()) {
+        // Add player ID to listing for each enabled toggle.
+        converted.compute(toggleName, (name, ids) -> {
+          if (ids == null) {
+            ids = new ArrayList<>();
+          }
+          ids.add(idString);
+          return ids;
+        });
+      }
+    }
+    return converted;
+  }
+
+  @Keep
+  @EventHandler
+  private void onPlayerJoin(@NotNull PlayerJoinEvent event) {
+    UUID playerId = event.getPlayer().getUniqueId();
+    Set<String> toggleNames = enabledToggles.get(playerId);
+
+    if (toggleNames == null) {
+      return;
+    }
+
+    for (String toggleName : toggleNames) {
+      PlayerToggle toggle = PlayerToggles.get(toggleName);
+      if (toggle != null) {
+        toggle.set(playerId, true);
+      }
+    }
+  }
+
+  @Keep
+  @EventHandler
+  private void onToggleSet(@NotNull PlayerToggledEvent event) {
+    if (event.isEnabled()) {
+      set(event.getPlayerId(), event.getToggle().getName());
+    } else {
+      enabledToggles.computeIfPresent(event.getPlayerId(), (uuid, toggles) -> {
+        toggles.remove(event.getToggle().getName());
+        return toggles.isEmpty() ? null : toggles;
+      });
+    }
+  }
+
+}

addon/togglepersist/src/main/resources/plugin.yml

@@ -0,0 +1,7 @@
+name: OITogglePersist
+main: com.github.jikoo.openinv.togglepersist.TogglePersist
+version: ${version}
+author: Jikoo
+description: An OpenInv addon allowing /anycontainer and /silentcontainer to persist across sessions.
+api-version: "1.20"
+depend: [ OpenInv ]

api/build.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+  `openinv-base`
+  `maven-publish`
+}
+
+publishing {
+  publications {
+    create<MavenPublication>("jitpack") {
+      groupId = "com.github.Jikoo.OpenInv"
+      artifactId = "openinvapi"
+    }
+  }
+}

api/pom.xml

@@ -1,49 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2022 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>
-    <artifactId>openinvparent</artifactId>
-    <groupId>com.lishid</groupId>
-    <version>5.0.0</version>
-  </parent>
-
-  <artifactId>openinvapi</artifactId>
-  <name>OpenInvAPI</name>
-
-  <dependencies>
-    <dependency>
-      <artifactId>annotations</artifactId>
-      <groupId>org.jetbrains</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>spigot-api</artifactId>
-      <groupId>org.spigotmc</groupId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

api/src/main/java/com/lishid/openinv/event/OpenPlayerSaveEvent.java

@@ -3,6 +3,7 @@ package com.lishid.openinv.event;
 import com.google.errorprone.annotations.RestrictedApi;
 import com.lishid.openinv.internal.ISpecialInventory;
 import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -11,6 +12,8 @@ import org.jetbrains.annotations.NotNull;
  */
 public class OpenPlayerSaveEvent extends PlayerSaveEvent {
 
+  private static final HandlerList HANDLERS = new HandlerList();
+
   private final ISpecialInventory inventory;
 
   /**
@@ -40,4 +43,14 @@ public class OpenPlayerSaveEvent extends PlayerSaveEvent {
     return inventory;
   }
 
+  @NotNull
+  @Override
+  public HandlerList getHandlers() {
+    return HANDLERS;
+  }
+
+  public static HandlerList getHandlerList() {
+    return HANDLERS;
+  }
+
 }

api/src/main/java/com/lishid/openinv/event/PlayerToggledEvent.java

@@ -0,0 +1,71 @@
+package com.lishid.openinv.event;
+
+import com.google.errorprone.annotations.RestrictedApi;
+import com.lishid.openinv.util.setting.PlayerToggle;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Event fired after OpenInv modifies a toggleable setting for a player.
+ */
+public class PlayerToggledEvent extends Event {
+
+  private static final HandlerList HANDLERS = new HandlerList();
+
+  private final @NotNull PlayerToggle toggle;
+  private final @NotNull UUID uuid;
+  private final boolean enabled;
+
+  @RestrictedApi(
+      explanation = "Constructor is not considered part of the API and may be subject to change.",
+      link = "",
+      allowedOnPath = ".*/com/lishid/openinv/event/OpenEvents.java")
+  @ApiStatus.Internal
+  PlayerToggledEvent(@NotNull PlayerToggle toggle, @NotNull UUID uuid, boolean enabled) {
+    this.toggle = toggle;
+    this.uuid = uuid;
+    this.enabled = enabled;
+  }
+
+  /**
+   * Get the {@link PlayerToggle} affected.
+   *
+   * @return the toggle
+   */
+  public @NotNull PlayerToggle getToggle() {
+    return toggle;
+  }
+
+  /**
+   * Get the {@link UUID} of the player whose setting was changed.
+   *
+   * @return the player ID
+   */
+  public @NotNull UUID getPlayerId() {
+    return uuid;
+  }
+
+  /**
+   * Get whether the toggle is enabled.
+   *
+   * @return true if the toggle is enabled
+   */
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  @NotNull
+  @Override
+  public HandlerList getHandlers() {
+    return HANDLERS;
+  }
+
+  public static HandlerList getHandlerList() {
+    return HANDLERS;
+  }
+
+}

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

@@ -16,15 +16,11 @@
 
 package com.lishid.openinv.internal;
 
-import org.bukkit.block.Barrel;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.EnderChest;
-import org.bukkit.block.ShulkerBox;
-import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Directional;
-import org.bukkit.block.data.type.Chest;
 import org.bukkit.entity.Cat;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryHolder;
@@ -57,62 +53,7 @@ public interface IAnySilentContainer {
      * @param block the {@link Block} of the container
      * @return true if the container is blocked
      */
-    default boolean isAnyContainerNeeded(@NotNull Block block) {
-        BlockState blockState = block.getState();
-
-        // Barrels do not require AnyContainer.
-        if (blockState instanceof Barrel) {
-            return false;
-        }
-
-        // Enderchests require a non-occluding block on top to open.
-        if (blockState instanceof EnderChest) {
-            return block.getRelative(0, 1, 0).getType().isOccluding();
-        }
-
-        // Shulker boxes require half a block clear in the direction they open.
-        if (blockState instanceof ShulkerBox) {
-            return isShulkerBlocked(block);
-        }
-
-        if (!(blockState instanceof org.bukkit.block.Chest)) {
-            return false;
-        }
-
-        if (isChestBlocked(block)) {
-            return true;
-        }
-
-        BlockData blockData = block.getBlockData();
-        if (!(blockData instanceof Chest chest) || chest.getType() == Chest.Type.SINGLE) {
-            return false;
-        }
-
-        BlockFace relativeFace = switch (chest.getFacing()) {
-            case NORTH -> chest.getType() == Chest.Type.RIGHT ? BlockFace.WEST : BlockFace.EAST;
-            case EAST -> chest.getType() == Chest.Type.RIGHT ? BlockFace.NORTH : BlockFace.SOUTH;
-            case SOUTH -> chest.getType() == Chest.Type.RIGHT ? BlockFace.EAST : BlockFace.WEST;
-            case WEST -> chest.getType() == Chest.Type.RIGHT ? BlockFace.SOUTH : BlockFace.NORTH;
-            default -> BlockFace.SELF;
-        };
-        Block relative = block.getRelative(relativeFace);
-
-        if (relative.getType() != block.getType()) {
-            return false;
-        }
-
-        BlockData relativeData = relative.getBlockData();
-        if (!(relativeData instanceof Chest relativeChest)) {
-            return false;
-        }
-
-        if (relativeChest.getFacing() != chest.getFacing()
-                || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
-            return false;
-        }
-
-        return isChestBlocked(relative);
-    }
+    boolean isAnyContainerNeeded(@NotNull Block block);
 
     /**
      * Check if a shulker box block cannot be opened under ordinary circumstances.
@@ -123,9 +64,13 @@ public interface IAnySilentContainer {
     default boolean isShulkerBlocked(@NotNull Block shulkerBox) {
         Directional directional = (Directional) shulkerBox.getBlockData();
         BlockFace facing = directional.getFacing();
+        // Construct a new 1-block bounding box at the origin.
         BoundingBox box = new BoundingBox(0, 0, 0, 1, 1, 1);
+        // Expand the box in the direction the shulker will open.
         box.expand(facing, 0.5);
+        // Move the box away from the origin by a block so only the expansion intersects with a box around the origin.
         box.shift(facing.getOppositeFace().getDirection());
+        // Check if the relative block's collision shape (which will be at the origin) intersects with the expanded box.
         return shulkerBox.getRelative(facing).getCollisionShape().overlaps(box);
     }
 
@@ -147,9 +92,7 @@ public interface IAnySilentContainer {
      * @param block the potential container
      * @return true if the type is a supported container
      */
-    default boolean isAnySilentContainer(@NotNull Block block) {
-        return isAnySilentContainer(block.getState());
-    }
+    boolean isAnySilentContainer(@NotNull Block block);
 
     /**
      * Check if the given {@link BlockState} is a container which can be unblocked or silenced.

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

@@ -16,9 +16,17 @@
 
 package com.lishid.openinv.internal;
 
+import org.bukkit.event.inventory.InventoryType;
+import org.jetbrains.annotations.NotNull;
+
 /**
  * An {@link ISpecialInventory} representing an ender chest.
  */
 public interface ISpecialEnderChest extends ISpecialInventory {
 
+  @Override
+  default @NotNull InventoryType getBukkitType() {
+    return InventoryType.ENDER_CHEST;
+  }
+
 }

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

@@ -18,6 +18,7 @@ package com.lishid.openinv.internal;
 
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
 
@@ -33,6 +34,13 @@ public interface ISpecialInventory {
      */
     @NotNull Inventory getBukkitInventory();
 
+    /**
+     * Get the {@link InventoryType} corresponding to this {@code ISpecialInventory}.
+     *
+     * @return the type of Bukkit inventory
+     */
+    @NotNull InventoryType getBukkitType();
+
     /**
      * Set the owning {@link Player} instance to a newly-joined user.
      *

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

@@ -16,35 +16,17 @@
 
 package com.lishid.openinv.internal;
 
-import java.util.List;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.inventory.Inventory;
+import org.bukkit.event.inventory.InventoryType;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * An {@link ISpecialInventory} representing a player inventory.
  */
 public interface ISpecialPlayerInventory extends ISpecialInventory {
 
-    /*
-     * Player inventory usage varies from all other inventories - as the inventory is technically open at all times,
-     * if the player is online or has been online while the inventory is open, they are in the viewer list.
-     */
     @Override
-    default boolean isInUse() {
-        Inventory inventory = getBukkitInventory();
-        List<HumanEntity> viewers = inventory.getViewers();
-
-        if (viewers.size() != 1) {
-            return !viewers.isEmpty();
-        }
-
-        HumanEntity viewer = viewers.get(0);
-
-        if (!viewer.getUniqueId().equals(getPlayer().getUniqueId())) {
-            return true;
-        }
-
-        return viewer.getOpenInventory().getTopInventory().equals(inventory);
+    default @NotNull InventoryType getBukkitType() {
+        return InventoryType.PLAYER;
     }
 
 }

api/src/main/java/com/lishid/openinv/util/setting/PlayerToggle.java

@@ -0,0 +1,36 @@
+package com.lishid.openinv.util.setting;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * A per-player setting that may be enabled or disabled.
+ */
+public interface PlayerToggle {
+
+  /**
+   * Get the name of the setting.
+   *
+   * @return the setting name
+   */
+  @NotNull String getName();
+
+  /**
+   * Get the state of the toggle for a particular player ID.
+   *
+   * @param uuid the player ID
+   * @return true if the setting is enabled
+   */
+  boolean is(@NotNull UUID uuid);
+
+  /**
+   * Set the state of the toggle for a particular player ID.
+   *
+   * @param uuid the player ID
+   * @param enabled whether the setting is enabled
+   * @return true if the setting changed as a result of being set
+   */
+  boolean set(@NotNull UUID uuid, boolean enabled);
+
+}

api/src/main/java/com/lishid/openinv/util/setting/PlayerToggles.java

@@ -0,0 +1,106 @@
+package com.lishid.openinv.util.setting;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnmodifiableView;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Utility class containing all of OpenInv's {@link PlayerToggle PlayerToggles}.
+ */
+public final class PlayerToggles {
+
+  private static final Map<String, PlayerToggle> TOGGLES = new HashMap<>();
+  private static final PlayerToggle ANY = add(new MemoryToggle("AnyContainer"));
+  private static final PlayerToggle SILENT = add(new MemoryToggle("SilentContainer"));
+
+  /**
+   * Get the AnyContainer toggle.
+   *
+   * @return the AnyContainer toggle
+   */
+  public static @NotNull PlayerToggle any() {
+    return ANY;
+  }
+
+  /**
+   * Get the SilentContainer toggle.
+   *
+   * @return the SilentContainer toggle
+   */
+  public static @NotNull PlayerToggle silent() {
+    return SILENT;
+  }
+
+  /**
+   * Get a toggle by name.
+   *
+   * @param toggleName the name of the toggle
+   * @return the toggle, or null if no such toggle exists.
+   */
+  public static @Nullable PlayerToggle get(@NotNull String toggleName) {
+    PlayerToggle toggle = TOGGLES.get(toggleName);
+    if (toggle == null) {
+      toggle = TOGGLES.get(toggleName.toLowerCase(Locale.ENGLISH));
+    }
+    return toggle;
+  }
+
+  /**
+   * Get an unmodifable view of all toggles available.
+   *
+   * @return a view of all toggles available
+   */
+  public static @UnmodifiableView @NotNull Collection<PlayerToggle> get() {
+    return Collections.unmodifiableCollection(TOGGLES.values());
+  }
+
+  private static @NotNull PlayerToggle add(@NotNull PlayerToggle toggle) {
+    TOGGLES.put(toggle.getName().toLowerCase(Locale.ENGLISH), toggle);
+    return toggle;
+  }
+
+  private PlayerToggles() {
+    throw new IllegalStateException("Cannot create instance of utility class.");
+  }
+
+  private static class MemoryToggle implements PlayerToggle {
+
+    private final @NotNull Set<UUID> enabled;
+    private final @NotNull String name;
+
+    private MemoryToggle(@NotNull String name) {
+      enabled = new HashSet<>();
+      this.name = name;
+    }
+
+    @Override
+    public @NotNull String getName() {
+      return this.name;
+    }
+
+    @Override
+    public boolean is(@NotNull UUID uuid) {
+      return enabled.contains(uuid);
+    }
+
+    @Override
+    public boolean set(@NotNull UUID uuid, boolean enabled) {
+      if (enabled) {
+        return this.enabled.add(uuid);
+      } else {
+        return this.enabled.remove(uuid);
+      }
+    }
+
+  }
+
+}

build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+  `java-library`
+  alias(libs.plugins.paperweight) apply false
+  alias(libs.plugins.shadow) apply false
+}
+
+// Set by Spigot module, used by Paper module to convert to Spigot's version of Mojang mappings.
+project.ext.set("craftbukkitPackage", "UNKNOWN")
+
+repositories {
+  maven("https://repo.papermc.io/repository/maven-public/")
+}
+
+// Allow submodules to target higher Java release versions.
+// Not currently necessary (as lowest supported version is in the 1.21 range)
+// but may become relevant in the future.
+java.disableAutoTargetJvm()
+
+// Task to delete ./dist where final files are output.
+tasks.register("cleanDist") {
+  delete("dist")
+}
+
+tasks.clean {
+  // Also delete distribution folder when cleaning.
+  dependsOn(tasks.named("cleanDist"))
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+  `kotlin-dsl`
+}
+
+repositories {
+  gradlePluginPortal()
+}

buildSrc/src/main/kotlin/openinv-base.gradle.kts

@@ -0,0 +1,34 @@
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.kotlin.dsl.maven
+import org.gradle.kotlin.dsl.repositories
+import org.gradle.kotlin.dsl.dependencies
+
+plugins {
+  `java-library`
+}
+
+java {
+  toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
+repositories {
+  mavenCentral()
+  maven("https://repo.papermc.io/repository/maven-public/")
+  maven("https://hub.spigotmc.org/nexus/content/groups/public/")
+}
+
+dependencies {
+  val libs = versionCatalogs.named("libs")
+  compileOnly(libs.findLibrary("annotations").orElseThrow())
+  compileOnly(libs.findLibrary("spigotapi").orElseThrow())
+}
+
+tasks {
+  withType<JavaCompile>().configureEach {
+    options.release = 21
+    options.encoding = Charsets.UTF_8.name()
+  }
+  withType<Javadoc>().configureEach {
+    options.encoding = Charsets.UTF_8.name()
+  }
+}

buildSrc/src/main/kotlin/remap-spigot.gradle.kts

@@ -0,0 +1,55 @@
+import java.nio.file.Path
+import java.nio.file.Paths
+
+val spigotRemap = configurations.create("spigotRemap")
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  spigotRemap("net.md-5:SpecialSource:1.11.4:shaded")
+}
+
+abstract class RemapTask
+  @Inject constructor(private val project: Project): DefaultTask() {
+
+  @get:Input
+  abstract var spigotVersion: String
+
+  @TaskAction
+  fun remapInputs() {
+    inputs.files.forEach {
+      remap(spigotVersion, it.toPath(), it.toPath().resolveSibling(it.name.replace(".jar", "-obf.jar")))
+    }
+  }
+
+  private fun remap(spigotVersion: String, jarPath: Path, obfPath: Path) {
+    // https://www.spigotmc.org/threads/510208/#post-4184317
+    val specialsource = project.configurations.named("spigotRemap").get().incoming.artifacts.artifacts
+      .first { it.id.componentIdentifier.toString() == "net.md-5:SpecialSource:1.11.4" }.file.path
+    val repo = Paths.get(project.repositories.mavenLocal().url)
+    val spigotDir = repo.resolve("org/spigotmc/spigot/$spigotVersion/")
+    val mappingDir = repo.resolve("org/spigotmc/minecraft-server/$spigotVersion/")
+
+    // Remap original Mojang-mapped jar to obfuscated intermediary
+    val mojangServer = spigotDir.resolve("spigot-$spigotVersion-remapped-mojang.jar")
+    val mojangMappings = mappingDir.resolve("minecraft-server-$spigotVersion-maps-mojang.txt")
+    remapPartial(specialsource, mojangServer, mojangMappings, jarPath, obfPath, true)
+
+    // Remap obfuscated intermediary jar to Spigot and replace original
+    val obfServer = spigotDir.resolve("spigot-$spigotVersion-remapped-obf.jar")
+    val spigotMappings = mappingDir.resolve("minecraft-server-$spigotVersion-maps-spigot.csrg")
+    remapPartial(specialsource, obfServer, spigotMappings, obfPath, jarPath, false)
+  }
+
+  private fun remapPartial(specialSource: String, serverJar: Path, mapping: Path, input: Path, output: Path, reverse: Boolean) {
+    project.providers.exec {
+      commandLine("java", "-cp", "$specialSource${File.pathSeparator}$serverJar",
+        "net.md_5.specialsource.SpecialSource", "--live",
+        "-i", "$input", "-o", "$output",
+        "-m", "$mapping",
+        if (reverse) "--reverse" else "")
+    }.result.get()
+  }
+}

common/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+  `openinv-base`
+}
+
+dependencies {
+  implementation(project(":openinvapi"))
+}

common/pom.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>5.0.0</version>
-    </parent>
-
-    <artifactId>openinvcommon</artifactId>
-
-    <dependencies>
-        <dependency>
-            <artifactId>annotations</artifactId>
-            <groupId>org.jetbrains</groupId>
-        </dependency>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-        </dependency>
-        <dependency>
-            <artifactId>openinvapi</artifactId>
-            <groupId>com.lishid</groupId>
-        </dependency>
-    </dependencies>
-
-</project>

common/src/main/java/com/lishid/openinv/event/OpenEvents.java

@@ -1,12 +1,15 @@
 package com.lishid.openinv.event;
 
 import com.lishid.openinv.internal.ISpecialInventory;
+import com.lishid.openinv.util.setting.PlayerToggle;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.UUID;
+
 /**
  * Construct and call events.
  */
@@ -16,8 +19,12 @@ public final class OpenEvents {
     return call(new PlayerSaveEvent(player));
   }
 
-  public static boolean saveCancelled(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-    return call(new OpenPlayerSaveEvent(player, inventory));
+  public static boolean saveCancelled(@NotNull ISpecialInventory inventory) {
+    return call(new OpenPlayerSaveEvent((Player) inventory.getPlayer(), inventory));
+  }
+
+  public static void notifyPlayerToggle(@NotNull PlayerToggle toggle, @NotNull UUID uuid, boolean state) {
+    Bukkit.getPluginManager().callEvent(new PlayerToggledEvent(toggle, uuid, state));
   }
 
   private static <T extends Event & Cancellable> boolean call(T event) {

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

@@ -0,0 +1,106 @@
+package com.lishid.openinv.internal;
+
+import org.bukkit.block.Barrel;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.EnderChest;
+import org.bukkit.block.ShulkerBox;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Chest;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Method;
+
+public abstract class AnySilentContainerBase implements IAnySilentContainer {
+
+  private static final @Nullable Method BLOCK_GET_STATE_BOOLEAN;
+
+  static {
+    @Nullable Method getState;
+    try {
+      //noinspection JavaReflectionMemberAccess
+      getState = Block.class.getMethod("getState", boolean.class);
+    } catch (NoSuchMethodException e) {
+      getState = null;
+    }
+    BLOCK_GET_STATE_BOOLEAN = getState;
+  }
+
+  private static BlockState getBlockState(Block block) {
+    // Paper: Get state without snapshotting.
+    if (BLOCK_GET_STATE_BOOLEAN != null) {
+      try {
+        return (BlockState) BLOCK_GET_STATE_BOOLEAN.invoke(block, false);
+      } catch (ReflectiveOperationException ignored) {
+        // If we encounter an issue, fall through to regular snapshotting method.
+      }
+    }
+    return block.getState();
+  }
+
+  @Override
+  public boolean isAnyContainerNeeded(@NotNull Block block) {
+    BlockState blockState = getBlockState(block);
+
+    // Barrels do not require AnyContainer.
+    if (blockState instanceof Barrel) {
+      return false;
+    }
+
+    // Enderchests require a non-occluding block on top to open.
+    if (blockState instanceof EnderChest) {
+      return block.getRelative(0, 1, 0).getType().isOccluding();
+    }
+
+    // Shulker boxes require half a block clear in the direction they open.
+    if (blockState instanceof ShulkerBox) {
+      return isShulkerBlocked(block);
+    }
+
+    if (!(blockState instanceof org.bukkit.block.Chest)) {
+      return false;
+    }
+
+    if (isChestBlocked(block)) {
+      return true;
+    }
+
+    BlockData blockData = block.getBlockData();
+    if (!(blockData instanceof Chest chest) || chest.getType() == Chest.Type.SINGLE) {
+      return false;
+    }
+
+    BlockFace relativeFace = switch (chest.getFacing()) {
+      case NORTH -> chest.getType() == Chest.Type.RIGHT ? BlockFace.WEST : BlockFace.EAST;
+      case EAST -> chest.getType() == Chest.Type.RIGHT ? BlockFace.NORTH : BlockFace.SOUTH;
+      case SOUTH -> chest.getType() == Chest.Type.RIGHT ? BlockFace.EAST : BlockFace.WEST;
+      case WEST -> chest.getType() == Chest.Type.RIGHT ? BlockFace.SOUTH : BlockFace.NORTH;
+      default -> BlockFace.SELF;
+    };
+    Block relative = block.getRelative(relativeFace);
+
+    if (relative.getType() != block.getType()) {
+      return false;
+    }
+
+    BlockData relativeData = relative.getBlockData();
+    if (!(relativeData instanceof Chest relativeChest)) {
+      return false;
+    }
+
+    if (relativeChest.getFacing() != chest.getFacing()
+        || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
+      return false;
+    }
+
+    return isChestBlocked(relative);
+  }
+
+  @Override
+  public boolean isAnySilentContainer(@NotNull Block block) {
+    return isAnySilentContainer(getBlockState(block));
+  }
+
+}

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

@@ -0,0 +1,7 @@
+package com.lishid.openinv.internal;
+
+public interface InternalOwned<T> {
+
+  T getOwnerHandle();
+
+}

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

@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2011-2022 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.internal;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-public class OpenInventoryView extends InventoryView {
-
-    private final @NotNull Player player;
-    private final @NotNull ISpecialInventory inventory;
-    private final @NotNull String originalTitle;
-    private String title;
-
-    public OpenInventoryView(
-            @NotNull Player player,
-            @NotNull ISpecialInventory inventory,
-            @NotNull String originalTitle) {
-        this.player = player;
-        this.inventory = inventory;
-        this.originalTitle = originalTitle;
-    }
-
-    @Override
-    public @NotNull Inventory getTopInventory() {
-        return inventory.getBukkitInventory();
-    }
-
-    @Override
-    public @NotNull Inventory getBottomInventory() {
-        return getPlayer().getInventory();
-    }
-
-    @Override
-    public @NotNull HumanEntity getPlayer() {
-        return player;
-    }
-
-    @Override
-    public @NotNull InventoryType getType() {
-        return inventory.getBukkitInventory().getType();
-    }
-
-    @Override
-    public @NotNull String getTitle() {
-        return title == null ? originalTitle : title;
-    }
-
-    @Override
-    public @NotNull String getOriginalTitle() {
-        return originalTitle;
-    }
-
-    @Override
-    public void setTitle(@NotNull String title) {
-        this.title = title;
-    }
-
-}

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

@@ -1,9 +0,0 @@
-package com.lishid.openinv.internal;
-
-import org.bukkit.configuration.ConfigurationSection;
-
-public interface PlaceholderParser {
-
-  void load(ConfigurationSection section) throws Exception;
-
-}

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

@@ -49,6 +49,6 @@ public interface PlayerManager {
      *`
      * @return the InventoryView opened
      */
-    @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);
+    @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory, boolean viewOnly);
 
 }

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

@@ -0,0 +1,4 @@
+package com.lishid.openinv.internal;
+
+public interface ViewOnly {
+}

common/src/main/java/com/lishid/openinv/util/lang/LanguageManager.java

@@ -274,7 +274,7 @@ public class LanguageManager {
         if (sender instanceof Player) {
             return ((Player) sender).getLocale();
         } else {
-            return plugin.getConfig().getString("settings.locale", "en_us");
+            return plugin.getConfig().getString("settings.locale", "en");
         }
     }
 

gradle.properties

@@ -0,0 +1,9 @@
+# Project meta
+group=com.lishid.openinv
+version=5.1.8
+description=A Bukkit plugin for opening normally-inaccessible inventories.
+
+# Gradle configuration
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true

gradle/libs.versions.toml

@@ -0,0 +1,17 @@
+[versions]
+spigotapi = "1.21.4-R0.1-SNAPSHOT"
+specialsource = "1.11.4"
+planarwrappers = "3.3.0"
+annotations = "26.0.2"
+paperweight = "2.0.0-beta.14"
+shadow = "8.3.6"
+
+[libraries]
+spigotapi = { module = "org.spigotmc:spigot-api", version.ref = "spigotapi" }
+specialsource = { module = "net.md-5:SpecialSource", version.ref = "specialsource" }
+planarwrappers = { module = "com.github.jikoo:planarwrappers", version.ref = "planarwrappers" }
+annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
+
+[plugins]
+paperweight = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original 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
+#
+#      https://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.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

internal/common/build.gradle.kts

@@ -0,0 +1,60 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+  `openinv-base`
+  alias(libs.plugins.paperweight)
+}
+
+//tasks {
+//  withType<JavaCompile> {
+//    // OpenPlayer unchecked warning is due to superclass' messy inheritance and legacy methods.
+//    options.compilerArgs.add("-Xlint:unchecked")
+//    // PlayerManager uses "deprecated" method matching vanilla to support legacy save data.
+//    // While vanilla still feels that it is appropriate to use in the load process, we will too.
+//    options.compilerArgs.add("-Xlint:deprecation")
+//  }
+//}
+
+configurations.all {
+  resolutionStrategy.capabilitiesResolution.withCapability("org.spigotmc:spigot-api") {
+    val paper = candidates.firstOrNull {
+      it.id.let {
+        id -> id is ModuleComponentIdentifier && id.module == "paper-api"
+      }
+    }
+    if (paper != null) {
+      select(paper)
+    }
+    because("module is written for Paper servers")
+  }
+}
+
+dependencies {
+  implementation(project(":openinvapi"))
+  implementation(project(":openinvcommon"))
+
+  paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
+}
+
+val spigot = tasks.register<ShadowJar>("spigotRelocations") {
+  dependsOn(tasks.jar)
+  from(sourceSets.main.get().output)
+  relocate("com.lishid.openinv.internal.common", "com.lishid.openinv.internal.reobf")
+  relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.${rootProject.extra["craftbukkitPackage"]}")
+  archiveClassifier = "spigot"
+}
+
+configurations {
+  consumable("spigotRelocated") {
+    attributes {
+      attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+      attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
+      attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
+      attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
+    }
+  }
+}
+
+artifacts {
+  add("spigotRelocated", spigot)
+}

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

@@ -1,19 +1,19 @@
-package com.lishid.openinv.internal.v1_21_R1;
+package com.lishid.openinv.internal.common;
 
 import com.lishid.openinv.internal.Accessor;
 import com.lishid.openinv.internal.IAnySilentContainer;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.internal.v1_21_R1.container.AnySilentContainer;
-import com.lishid.openinv.internal.v1_21_R1.container.OpenEnderChest;
-import com.lishid.openinv.internal.v1_21_R1.container.OpenInventory;
-import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
-import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager;
+import com.lishid.openinv.internal.common.container.AnySilentContainer;
+import com.lishid.openinv.internal.common.container.OpenEnderChest;
+import com.lishid.openinv.internal.common.container.OpenInventory;
+import com.lishid.openinv.internal.common.container.slot.placeholder.PlaceholderLoader;
+import com.lishid.openinv.internal.common.player.PlayerManager;
 import com.lishid.openinv.util.lang.LanguageManager;
 import net.minecraft.world.Container;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 
 public class InternalAccessor implements Accessor {
 
-  private final @NotNull Logger logger;
+  protected final @NotNull Logger logger;
   private final @NotNull PlayerManager manager;
   private final @NotNull AnySilentContainer anySilentContainer;
 
@@ -69,12 +69,11 @@ public class InternalAccessor implements Accessor {
   @Override
   public void reload(@NotNull ConfigurationSection config) {
     ConfigurationSection placeholders = config.getConfigurationSection("placeholders");
-    if (placeholders != null) {
-      try {
-        Placeholders.load(placeholders);
-      } catch (Exception e) {
-        logger.log(Level.WARNING, "Caught exception loading placeholder overrides!", e);
-      }
+    try {
+      // Reset placeholders to defaults and try to load configuration.
+      new PlaceholderLoader().load(placeholders);
+    } catch (Exception e) {
+      logger.log(Level.WARNING, "Caught exception loading placeholder overrides!", e);
     }
   }
 

internal/common/src/main/java/com/lishid/openinv/internal/common/container/AnySilentContainer.java

@@ -14,9 +14,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_20_R3;
+package com.lishid.openinv.internal.common.container;
 
-import com.lishid.openinv.internal.IAnySilentContainer;
+import com.lishid.openinv.internal.AnySilentContainerBase;
+import com.lishid.openinv.internal.common.container.menu.OpenChestMenu;
+import com.lishid.openinv.internal.common.player.PlayerManager;
 import com.lishid.openinv.util.ReflectionHelper;
 import com.lishid.openinv.util.lang.LanguageManager;
 import net.minecraft.core.BlockPos;
@@ -48,7 +50,7 @@ import org.jetbrains.annotations.Nullable;
 import java.lang.reflect.Field;
 import java.util.logging.Logger;
 
-public class AnySilentContainer implements IAnySilentContainer {
+public class AnySilentContainer extends AnySilentContainerBase {
 
     private final @NotNull Logger logger;
     private final @NotNull LanguageManager lang;
@@ -59,10 +61,10 @@ public class AnySilentContainer implements IAnySilentContainer {
         this.lang = lang;
         try {
             try {
-                this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("b");
+                this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("gameModeForPlayer");
                 this.serverPlayerGameModeGameType.setAccessible(true);
             } catch (NoSuchFieldException e) {
-                logger.warning("ServerPlayerGameMode#gameModeForPlayer's obfuscated name has changed!");
+                logger.warning("The field ServerPlayerGameMode#gameModeForPlayer is no longer present!");
                 logger.warning("Please report this at https://github.com/Jikoo/OpenInv/issues");
                 logger.warning("Attempting to fall through using reflection. Please verify that SilentContainer does not fail.");
                 // N.B. gameModeForPlayer is (for now) declared before previousGameModeForPlayer so silent shouldn't break.
@@ -102,7 +104,7 @@ public class AnySilentContainer implements IAnySilentContainer {
             PlayerEnderChestContainer enderChest = player.getEnderChestInventory();
             enderChest.setActiveChest(enderChestTile);
             player.openMenu(new SimpleMenuProvider((containerCounter, playerInventory, ignored) -> {
-                MenuType<?> containers = PlayerManager.getContainers(enderChest.getContainerSize());
+                MenuType<?> containers = OpenChestMenu.getChestMenuType(enderChest.getContainerSize());
                 int rows = enderChest.getContainerSize() / 9;
                 return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
             }, Component.translatable("container.enderchest")));

internal/common/src/main/java/com/lishid/openinv/internal/common/container/OpenEnderChest.java

@@ -1,22 +1,22 @@
-package com.lishid.openinv.internal.v1_21_R1.container;
+package com.lishid.openinv.internal.common.container;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager;
+import com.lishid.openinv.internal.InternalOwned;
+import com.lishid.openinv.internal.common.container.menu.OpenEnderChestMenu;
+import com.lishid.openinv.internal.common.player.PlayerManager;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
 import net.minecraft.world.ContainerHelper;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.StackedContents;
+import net.minecraft.world.entity.player.StackedItemContents;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.StackedContentsCompatible;
 import net.minecraft.world.item.ItemStack;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_21_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.event.inventory.InventoryType;
 import org.jetbrains.annotations.NotNull;
@@ -25,7 +25,8 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
-public class OpenEnderChest implements Container, StackedContentsCompatible, MenuProvider, ISpecialEnderChest {
+public class OpenEnderChest implements Container, StackedContentsCompatible, InternalOwned<ServerPlayer>,
+    ISpecialEnderChest {
 
   private CraftInventory inventory;
   private @NotNull ServerPlayer owner;
@@ -38,6 +39,11 @@ public class OpenEnderChest implements Container, StackedContentsCompatible, Men
     this.items = owner.getEnderChestInventory().items;
   }
 
+  @Override
+  public @NotNull ServerPlayer getOwnerHandle() {
+    return owner;
+  }
+
   @Override
   public @NotNull org.bukkit.inventory.Inventory getBukkitInventory() {
     if (inventory == null) {
@@ -84,12 +90,12 @@ public class OpenEnderChest implements Container, StackedContentsCompatible, Men
   }
 
   @Override
-  public ItemStack getItem(int index) {
+  public @NotNull ItemStack getItem(int index) {
     return index >= 0 && index < items.size() ? items.get(index) : ItemStack.EMPTY;
   }
 
   @Override
-  public ItemStack removeItem(int index, int amount) {
+  public @NotNull ItemStack removeItem(int index, int amount) {
     ItemStack itemstack = ContainerHelper.removeItem(items, index, amount);
 
     if (!itemstack.isEmpty()) {
@@ -100,12 +106,12 @@ public class OpenEnderChest implements Container, StackedContentsCompatible, Men
   }
 
   @Override
-  public ItemStack removeItemNoUpdate(int index) {
+  public @NotNull ItemStack removeItemNoUpdate(int index) {
     return index >= 0 && index < items.size() ? items.set(index, ItemStack.EMPTY) : ItemStack.EMPTY;
   }
 
   @Override
-  public void setItem(int index, ItemStack itemStack) {
+  public void setItem(int index, @NotNull ItemStack itemStack) {
     if (index >= 0 && index < items.size()) {
       items.set(index, itemStack);
     }
@@ -122,27 +128,27 @@ public class OpenEnderChest implements Container, StackedContentsCompatible, Men
   }
 
   @Override
-  public boolean stillValid(Player player) {
+  public boolean stillValid(@NotNull Player player) {
     return true;
   }
 
   @Override
-  public List<ItemStack> getContents() {
+  public @NotNull List<ItemStack> getContents() {
     return items;
   }
 
   @Override
-  public void onOpen(CraftHumanEntity craftHumanEntity) {
+  public void onOpen(@NotNull CraftHumanEntity craftHumanEntity) {
     transaction.add(craftHumanEntity);
   }
 
   @Override
-  public void onClose(CraftHumanEntity craftHumanEntity) {
+  public void onClose(@NotNull CraftHumanEntity craftHumanEntity) {
     transaction.remove(craftHumanEntity);
   }
 
   @Override
-  public List<HumanEntity> getViewers() {
+  public @NotNull List<HumanEntity> getViewers() {
     return transaction;
   }
 
@@ -168,23 +174,21 @@ public class OpenEnderChest implements Container, StackedContentsCompatible, Men
   }
 
   @Override
-  public void fillStackedContents(StackedContents stackedContents) {
+  public void fillStackedContents(@NotNull StackedItemContents stackedContents) {
     for (ItemStack itemstack : items) {
       stackedContents.accountStack(itemstack);
     }
   }
 
-  @Override
-  public Component getDisplayName() {
+  public Component getTitle() {
     return Component.translatableWithFallback("openinv.container.enderchest.prefix", "", owner.getName())
         .append(Component.translatable("container.enderchest"))
         .append(Component.translatableWithFallback("openinv.container.enderchest.suffix", " - %s", owner.getName()));
   }
 
-  @Override
-  public @Nullable AbstractContainerMenu createMenu(int i, Inventory inventory, Player player) {
+  public @Nullable AbstractContainerMenu createMenu(Player player, int i, boolean viewOnly) {
     if (player instanceof ServerPlayer serverPlayer) {
-      return new OpenEnderChestMenu(this, serverPlayer, i);
+      return new OpenEnderChestMenu(this, serverPlayer, i, viewOnly);
     }
     return null;
   }

internal/common/src/main/java/com/lishid/openinv/internal/common/container/OpenInventory.java

@@ -1,17 +1,21 @@
-package com.lishid.openinv.internal.v1_21_R1.container;
+package com.lishid.openinv.internal.common.container;
 
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.Content;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentCrafting;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentCraftingResult;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentCursor;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentDrop;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentEquipment;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentList;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentOffHand;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentViewOnly;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotViewOnly;
+import com.lishid.openinv.internal.InternalOwned;
+import com.lishid.openinv.internal.common.container.bukkit.OpenPlayerInventory;
+import com.lishid.openinv.internal.common.container.menu.OpenInventoryMenu;
+import com.lishid.openinv.internal.common.container.slot.Content;
+import com.lishid.openinv.internal.common.container.slot.ContentCrafting;
+import com.lishid.openinv.internal.common.container.slot.ContentCraftingResult;
+import com.lishid.openinv.internal.common.container.slot.ContentCursor;
+import com.lishid.openinv.internal.common.container.slot.ContentDrop;
+import com.lishid.openinv.internal.common.container.slot.ContentEquipment;
+import com.lishid.openinv.internal.common.container.slot.ContentList;
+import com.lishid.openinv.internal.common.container.slot.ContentOffHand;
+import com.lishid.openinv.internal.common.container.slot.ContentViewOnly;
+import com.lishid.openinv.internal.common.container.slot.SlotViewOnly;
+import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
+import com.lishid.openinv.internal.common.player.PlayerManager;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;
@@ -19,7 +23,6 @@ import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
-import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -27,8 +30,8 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_21_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.event.inventory.InventoryType;
 import org.jetbrains.annotations.NotNull;
@@ -37,7 +40,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
-public class OpenInventory implements Container, MenuProvider, ISpecialPlayerInventory {
+public class OpenInventory implements Container, InternalOwned<ServerPlayer>, ISpecialPlayerInventory {
 
   private final List<Content> slots;
   private final int size;
@@ -189,12 +192,16 @@ public class OpenInventory implements Container, MenuProvider, ISpecialPlayerInv
           };
         }
       });
-      slots.set(startIndex + 11, new ContentCraftingResult(owner));
+      slots.set(startIndex + 11, getCraftingResult(owner));
     }
 
     return startIndex + listSize;
   }
 
+  protected Content getCraftingResult(@NotNull ServerPlayer serverPlayer) {
+    return new ContentCraftingResult(serverPlayer);
+  }
+
   public Slot getMenuSlot(int index, int x, int y) {
     return slots.get(index).asSlot(this, index, x, y);
   }
@@ -203,10 +210,6 @@ public class OpenInventory implements Container, MenuProvider, ISpecialPlayerInv
     return slots.get(index).getSlotType();
   }
 
-  public ServerPlayer getOwnerHandle() {
-    return owner;
-  }
-
   public @NotNull Component getTitle(@Nullable ServerPlayer viewer) {
     MutableComponent component = Component.empty();
     // Prefix for use with custom bitmap image fonts.
@@ -230,6 +233,11 @@ public class OpenInventory implements Container, MenuProvider, ISpecialPlayerInv
     return component;
   }
 
+  @Override
+  public ServerPlayer getOwnerHandle() {
+    return owner;
+  }
+
   @Override
   public @NotNull org.bukkit.inventory.Inventory getBukkitInventory() {
     if (bukkitEntity == null) {
@@ -305,12 +313,12 @@ public class OpenInventory implements Container, MenuProvider, ISpecialPlayerInv
   public void setChanged() {}
 
   @Override
-  public boolean stillValid(Player player) {
+  public boolean stillValid(@NotNull Player player) {
     return true;
   }
 
   @Override
-  public List<ItemStack> getContents() {
+  public @NotNull List<ItemStack> getContents() {
     NonNullList<ItemStack> contents = NonNullList.withSize(getContainerSize(), ItemStack.EMPTY);
     for (int i = 0; i < getContainerSize(); ++i) {
       contents.set(i, getItem(i));
@@ -334,7 +342,7 @@ public class OpenInventory implements Container, MenuProvider, ISpecialPlayerInv
   }
 
   @Override
-  public org.bukkit.entity.Player getOwner() {
+  public @NotNull org.bukkit.entity.Player getOwner() {
     return owner.getBukkitEntity();
   }
 
@@ -351,15 +359,9 @@ public class OpenInventory implements Container, MenuProvider, ISpecialPlayerInv
     owner.containerMenu.setCarried(ItemStack.EMPTY);
   }
 
-  @Override
-  public Component getDisplayName() {
-    return getTitle(null);
-  }
-
-  @Override
-  public @Nullable AbstractContainerMenu createMenu(int i, Inventory inventory, Player player) {
+  public @Nullable AbstractContainerMenu createMenu(Player player, int i, boolean viewOnly) {
     if (player instanceof ServerPlayer serverPlayer) {
-      return new OpenInventoryMenu(this, serverPlayer, i);
+      return new OpenInventoryMenu(this, serverPlayer, i, viewOnly);
     }
     return null;
   }

internal/common/src/main/java/com/lishid/openinv/internal/common/container/bukkit/OpenDummyInventory.java

@@ -0,0 +1,172 @@
+package com.lishid.openinv.internal.common.container.bukkit;
+
+import com.lishid.openinv.internal.ViewOnly;
+import net.minecraft.world.Container;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.ListIterator;
+
+/**
+ * A locked down "empty" inventory that rejects plugin interaction.
+ */
+public class OpenDummyInventory extends CraftInventory implements ViewOnly {
+
+  private final InventoryType type;
+
+  public OpenDummyInventory(Container inventory, InventoryType type) {
+    super(inventory);
+    this.type = type;
+  }
+
+  @Override
+  public @NotNull InventoryType getType() {
+    return type;
+  }
+
+  @Override
+  public @Nullable ItemStack getItem(int index) {
+    return null;
+  }
+
+  @Override
+  public void setItem(int index, @Nullable ItemStack item) {
+
+  }
+
+  @SuppressWarnings("NonApiType")
+  @Override
+  public @NotNull HashMap<Integer, ItemStack> addItem(@NotNull ItemStack... items) throws IllegalArgumentException {
+    return arrayToHashMap(items);
+  }
+
+  @SuppressWarnings("NonApiType")
+  @Override
+  public @NotNull HashMap<Integer, ItemStack> removeItem(@NotNull ItemStack... items) throws IllegalArgumentException {
+    return arrayToHashMap(items);
+  }
+
+  @SuppressWarnings("NonApiType")
+  private static @NotNull HashMap<Integer, ItemStack> arrayToHashMap(@NotNull ItemStack[] items) {
+    HashMap<Integer, ItemStack> ignored = new HashMap<>();
+    for (int index = 0; index < items.length; ++index) {
+      ignored.put(index, items[index]);
+    }
+    return ignored;
+  }
+
+  @Override
+  public ItemStack @NotNull [] getContents() {
+    return new ItemStack[getSize()];
+  }
+
+  @Override
+  public void setContents(@NotNull ItemStack[] items) throws IllegalArgumentException {
+
+  }
+
+  @Override
+  public @NotNull ItemStack @NotNull [] getStorageContents() {
+    return new ItemStack[getSize()];
+  }
+
+  @Override
+  public void setStorageContents(@NotNull ItemStack[] items) throws IllegalArgumentException {
+
+  }
+
+  @Override
+  public boolean contains(@NotNull Material material) throws IllegalArgumentException {
+    return false;
+  }
+
+  @Override
+  public boolean contains(@Nullable ItemStack item) {
+    return false;
+  }
+
+  @Override
+  public boolean contains(@NotNull Material material, int amount) throws IllegalArgumentException {
+    return false;
+  }
+
+  @Override
+  public boolean contains(@Nullable ItemStack item, int amount) {
+    return false;
+  }
+
+  @Override
+  public boolean containsAtLeast(@Nullable ItemStack item, int amount) {
+    return false;
+  }
+
+  @SuppressWarnings("NonApiType")
+  @Override
+  public @NotNull HashMap<Integer, ItemStack> all(
+      @NotNull Material material) throws IllegalArgumentException {
+    return new HashMap<>();
+  }
+
+  @SuppressWarnings("NonApiType")
+  @Override
+  public @NotNull HashMap<Integer, ItemStack> all(@Nullable ItemStack item) {
+    return new HashMap<>();
+  }
+
+  @Override
+  public int first(@NotNull Material material) throws IllegalArgumentException {
+    return -1;
+  }
+
+  @Override
+  public int first(@NotNull ItemStack item) {
+    return -1;
+  }
+
+  @Override
+  public int firstEmpty() {
+    return -1;
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return true;
+  }
+
+  @Override
+  public void remove(@NotNull Material material) throws IllegalArgumentException {
+
+  }
+
+  @Override
+  public void remove(@NotNull ItemStack item) {
+
+  }
+
+  @Override
+  public void clear(int index) {
+
+  }
+
+  @Override
+  public void clear() {
+
+  }
+
+  @Override
+  public @NotNull ListIterator<ItemStack> iterator() {
+    return Collections.emptyListIterator();
+  }
+
+  @Override
+  public @NotNull ListIterator<ItemStack> iterator(int index) {
+    return Collections.emptyListIterator();
+  }
+
+}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/bukkit/OpenDummyPlayerInventory.java

@@ -0,0 +1,136 @@
+package com.lishid.openinv.internal.common.container.bukkit;
+
+import net.minecraft.world.Container;
+import org.bukkit.Material;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class OpenDummyPlayerInventory extends OpenDummyInventory implements PlayerInventory {
+
+  public OpenDummyPlayerInventory(Container inventory) {
+    super(inventory, InventoryType.PLAYER);
+  }
+
+  @Override
+  public HumanEntity getHolder() {
+    return (HumanEntity) super.getHolder();
+  }
+
+  @Override
+  public @NotNull ItemStack[] getArmorContents() {
+    return new ItemStack[4];
+  }
+
+  @Override
+  public @NotNull ItemStack[] getExtraContents() {
+    return new ItemStack[4];
+  }
+
+  @Override
+  public @Nullable ItemStack getHelmet() {
+    return null;
+  }
+
+  @Override
+  public @Nullable ItemStack getChestplate() {
+    return null;
+  }
+
+  @Override
+  public @Nullable ItemStack getLeggings() {
+    return null;
+  }
+
+  @Override
+  public @Nullable ItemStack getBoots() {
+    return null;
+  }
+
+  @Override
+  public void setItem(@NotNull EquipmentSlot slot, @Nullable ItemStack item) {
+
+  }
+
+  @Override
+  public @Nullable ItemStack getItem(@NotNull EquipmentSlot slot) {
+    return null;
+  }
+
+  @Override
+  public void setArmorContents(@Nullable ItemStack[] items) {
+
+  }
+
+  @Override
+  public void setExtraContents(@Nullable ItemStack[] items) {
+
+  }
+
+  @Override
+  public void setHelmet(@Nullable ItemStack helmet) {
+
+  }
+
+  @Override
+  public void setChestplate(@Nullable ItemStack chestplate) {
+
+  }
+
+  @Override
+  public void setLeggings(@Nullable ItemStack leggings) {
+
+  }
+
+  @Override
+  public void setBoots(@Nullable ItemStack boots) {
+
+  }
+
+  @Override
+  public @NotNull ItemStack getItemInMainHand() {
+    return new ItemStack(Material.AIR);
+  }
+
+  @Override
+  public void setItemInMainHand(@Nullable ItemStack item) {
+
+  }
+
+  @Override
+  public @NotNull ItemStack getItemInOffHand() {
+    return new ItemStack(Material.AIR);
+  }
+
+  @Override
+  public void setItemInOffHand(@Nullable ItemStack item) {
+
+  }
+
+  @Deprecated
+  @Override
+  public @NotNull ItemStack getItemInHand() {
+    return new ItemStack(Material.AIR);
+  }
+
+  @Deprecated
+  @Override
+  public void setItemInHand(@Nullable ItemStack stack) {
+
+  }
+
+  @Override
+  public int getHeldItemSlot() {
+    return 0;
+  }
+
+  @Override
+  public void setHeldItemSlot(int slot) {
+
+  }
+
+}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/bukkit/OpenPlayerInventory.java

@@ -1,11 +1,12 @@
-package com.lishid.openinv.internal.v1_21_R1.container;
+package com.lishid.openinv.internal.common.container.bukkit;
 
 import com.google.common.base.Preconditions;
+import com.lishid.openinv.internal.common.container.OpenInventory;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Inventory;
-import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventory;
-import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.ItemStack;
@@ -20,7 +21,7 @@ public class OpenPlayerInventory extends CraftInventory implements PlayerInvento
   }
 
   @Override
-  public OpenInventory getInventory() {
+  public @NotNull OpenInventory getInventory() {
     return (OpenInventory) super.getInventory();
   }
 
@@ -169,11 +170,13 @@ public class OpenPlayerInventory extends CraftInventory implements PlayerInvento
     getInventory().getOwnerHandle().getInventory().offhand.set(0, CraftItemStack.asNMSCopy(item));
   }
 
+  @Deprecated
   @Override
   public @NotNull ItemStack getItemInHand() {
     return getItemInMainHand();
   }
 
+  @Deprecated
   @Override
   public void setItemInHand(@Nullable ItemStack stack) {
     setItemInMainHand(stack);

internal/common/src/main/java/com/lishid/openinv/internal/common/container/bukkit/OpenPlayerInventorySelf.java

@@ -1,5 +1,6 @@
-package com.lishid.openinv.internal.v1_21_R1.container;
+package com.lishid.openinv.internal.common.container.bukkit;
 
+import com.lishid.openinv.internal.common.container.OpenInventory;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 

internal/common/src/main/java/com/lishid/openinv/internal/common/container/menu/OpenChestMenu.java

@@ -1,10 +1,19 @@
-package com.lishid.openinv.internal.v1_21_R1.container;
+package com.lishid.openinv.internal.common.container.menu;
 
 import com.google.common.base.Suppliers;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotPlaceholder;
+import com.lishid.openinv.internal.ISpecialInventory;
+import com.lishid.openinv.internal.InternalOwned;
+import com.lishid.openinv.internal.common.container.bukkit.OpenDummyInventory;
+import com.lishid.openinv.internal.common.container.slot.SlotPlaceholder;
+import com.lishid.openinv.internal.common.container.slot.SlotViewOnly;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ChestMenu;
+import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.ContainerData;
 import net.minecraft.world.inventory.ContainerListener;
 import net.minecraft.world.inventory.ContainerSynchronizer;
@@ -12,6 +21,10 @@ import net.minecraft.world.inventory.DataSlot;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -22,8 +35,18 @@ import java.util.function.Supplier;
 /**
  * An extension of {@link AbstractContainerMenu} that supports {@link SlotPlaceholder placeholders}.
  */
-public abstract class OpenContainerMenu extends AbstractContainerMenu {
+public abstract class OpenChestMenu<T extends Container & ISpecialInventory & InternalOwned<ServerPlayer>>
+    extends AbstractContainerMenu {
 
+  protected static final int BOTTOM_INVENTORY_SIZE = 36;
+
+  protected final T container;
+  protected final ServerPlayer viewer;
+  protected final boolean viewOnly;
+  protected final boolean ownContainer;
+  protected final int topSize;
+  private CraftInventoryView<OpenChestMenu<T>, Inventory> bukkitEntity;
+  // Syncher fields
   private @Nullable ContainerSynchronizer synchronizer;
   private final List<DataSlot> dataSlots = new ArrayList<>();
   private final IntList remoteDataSlots = new IntArrayList();
@@ -31,20 +54,144 @@ public abstract class OpenContainerMenu extends AbstractContainerMenu {
   private ItemStack remoteCarried = ItemStack.EMPTY;
   private boolean suppressRemoteUpdates;
 
-  protected OpenContainerMenu(@Nullable MenuType<?> containers, int containerCounter) {
-    super(containers, containerCounter);
+  protected OpenChestMenu(
+      @NotNull MenuType<ChestMenu> type,
+      int containerCounter,
+      @NotNull T container,
+      @NotNull ServerPlayer viewer,
+      boolean viewOnly) {
+    super(type, containerCounter);
+    this.container = container;
+    this.viewer = viewer;
+    this.viewOnly = viewOnly;
+    ownContainer = container.getOwnerHandle().equals(viewer);
+    topSize = getTopSize(viewer);
+
+    preSlotSetup();
+
+    int upperRows = topSize / 9;
+    // View's upper inventory - our container
+    for (int row = 0; row < upperRows; ++row) {
+      for (int col = 0; col < 9; ++col) {
+        // x and y for client purposes, but hey, we're thorough here.
+        // Adapted from net.minecraft.world.inventory.ChestMenu
+        int x = 8 + col * 18;
+        int y = 18 + row * 18;
+        int index = row * 9 + col;
+
+        // Guard against weird inventory sizes.
+        if (index >= container.getContainerSize()) {
+          addSlot(new SlotViewOnly(container, index, x, y));
+          continue;
+        }
+
+        Slot slot = getUpperSlot(index, x, y);
+
+        addSlot(slot);
+      }
+    }
+
+    // View's lower inventory - viewer inventory
+    int playerInvPad = (upperRows - 4) * 18;
+    for (int row = 0; row < 3; ++row) {
+      for (int col = 0; col < 9; ++col) {
+        int x = 8 + col * 18;
+        int y = playerInvPad + row * 18 + 103;
+        addSlot(new Slot(viewer.getInventory(), row * 9 + col + 9, x, y));
+      }
+    }
+    // Hotbar
+    for (int col = 0; col < 9; ++col) {
+      int x = 8 + col * 18;
+      int y = playerInvPad + 161;
+      addSlot(new Slot(viewer.getInventory(), col, x, y));
+    }
   }
 
-  static @NotNull MenuType<?> getContainers(int inventorySize) {
-      return switch (inventorySize) {
-          case 9 -> MenuType.GENERIC_9x1;
-          case 18 -> MenuType.GENERIC_9x2;
-          case 36 -> MenuType.GENERIC_9x4;
-          case 45 -> MenuType.GENERIC_9x5;
-          case 54 -> MenuType.GENERIC_9x6;
-          // Default to 27-slot inventory
-          default -> MenuType.GENERIC_9x3;
-      };
+  public static @NotNull MenuType<ChestMenu> getChestMenuType(int inventorySize) {
+    inventorySize = ((int) Math.ceil(inventorySize / 9.0)) * 9;
+    return switch (inventorySize) {
+      case 9 -> MenuType.GENERIC_9x1;
+      case 18 -> MenuType.GENERIC_9x2;
+      case 27 -> MenuType.GENERIC_9x3;
+      case 36 -> MenuType.GENERIC_9x4;
+      case 45 -> MenuType.GENERIC_9x5;
+      case 54 -> MenuType.GENERIC_9x6;
+      default -> throw new IllegalArgumentException("Inventory size unsupported: " + inventorySize);
+    };
+  }
+
+  protected void preSlotSetup() {}
+
+  protected @NotNull Slot getUpperSlot(int index, int x, int y) {
+    Slot slot = new Slot(container, index, x, y);
+    if (viewOnly) {
+      return SlotViewOnly.wrap(slot);
+    }
+    return slot;
+  }
+
+
+  @Override
+  public final @NotNull CraftInventoryView<OpenChestMenu<T>, Inventory> getBukkitView() {
+    if (bukkitEntity == null) {
+      bukkitEntity = createBukkitEntity();
+    }
+
+    return bukkitEntity;
+  }
+
+  protected @NotNull CraftInventoryView<OpenChestMenu<T>, Inventory> createBukkitEntity() {
+    Inventory top;
+    if (viewOnly) {
+      top = new OpenDummyInventory(container, container.getBukkitType());
+    } else {
+      top = container.getBukkitInventory();
+    }
+    return new CraftInventoryView<>(viewer.getBukkitEntity(), top, this) {
+      @Override
+      public @Nullable Inventory getInventory(int rawSlot) {
+        if (viewOnly) {
+          return null;
+        }
+        return super.getInventory(rawSlot);
+      }
+
+      @Override
+      public int convertSlot(int rawSlot) {
+        if (viewOnly) {
+          return InventoryView.OUTSIDE;
+        }
+        return super.convertSlot(rawSlot);
+      }
+
+      @Override
+      public @NotNull InventoryType.SlotType getSlotType(int slot) {
+        if (viewOnly) {
+          return InventoryType.SlotType.OUTSIDE;
+        }
+        return super.getSlotType(slot);
+      }
+    };
+  }
+
+  private int getTopSize(ServerPlayer viewer) {
+    MenuType<?> menuType = getType();
+    if (menuType == MenuType.GENERIC_9x1) {
+      return 9;
+    } else if (menuType == MenuType.GENERIC_9x2) {
+      return 18;
+    } else if (menuType == MenuType.GENERIC_9x3) {
+      return 27;
+    } else if (menuType == MenuType.GENERIC_9x4) {
+      return 36;
+    } else if (menuType == MenuType.GENERIC_9x5) {
+      return 45;
+    } else if (menuType == MenuType.GENERIC_9x6) {
+      return 54;
+    }
+    // This is a bit gross, but allows us a safe fallthrough.
+    return menuType.create(-1, viewer.getInventory()).slots.size() - BOTTOM_INVENTORY_SIZE;
   }
 
   /**
@@ -79,7 +226,7 @@ public abstract class OpenContainerMenu extends AbstractContainerMenu {
           continue;
         }
         // Otherwise, add as many as we can from our stack to the slot.
-        modified = addToExistingStack(itemStack, slot);
+        modified |= addToExistingStack(itemStack, slot);
       } else {
         // If this is the first empty slot, keep track of it for later use.
         if (firstEmpty == null) {
@@ -110,8 +257,15 @@ public abstract class OpenContainerMenu extends AbstractContainerMenu {
       return false;
     }
 
-    int total = existing.getCount() + itemStack.getCount();
     int max = slot.getMaxStackSize(existing);
+    int existingCount = existing.getCount();
+
+    // If the stack is already full, we can't add more.
+    if (existingCount >= max) {
+      return false;
+    }
+
+    int total = existingCount + itemStack.getCount();
 
     // If the existing item can accept the entirety of our item, we're done!
     if (total <= max) {
@@ -122,15 +276,31 @@ public abstract class OpenContainerMenu extends AbstractContainerMenu {
     }
 
     // Otherwise, add as many as we can.
-    itemStack.shrink(max - existing.getCount());
+    itemStack.shrink(max - existingCount);
     existing.setCount(max);
     slot.setChanged();
     return true;
   }
 
+  @Override
+  public void clicked(int i, int j, @NotNull ClickType clickType, @NotNull Player player) {
+    if (viewOnly) {
+      if (clickType == ClickType.QUICK_CRAFT) {
+        sendAllDataToRemote();
+      }
+      return;
+    }
+    super.clicked(i, j, clickType, player);
+  }
+
+  @Override
+  public boolean stillValid(@NotNull Player player) {
+    return true;
+  }
+
   // Overrides from here on are purely to modify the sync process to send placeholder items.
   @Override
-  protected Slot addSlot(Slot slot) {
+  protected @NotNull Slot addSlot(@NotNull Slot slot) {
     slot.index = this.slots.size();
     this.slots.add(slot);
     this.lastSlots.add(ItemStack.EMPTY);
@@ -139,7 +309,7 @@ public abstract class OpenContainerMenu extends AbstractContainerMenu {
   }
 
   @Override
-  protected DataSlot addDataSlot(DataSlot dataSlot) {
+  protected @NotNull DataSlot addDataSlot(@NotNull DataSlot dataSlot) {
     this.dataSlots.add(dataSlot);
     this.remoteDataSlots.add(0);
     return dataSlot;
@@ -153,7 +323,7 @@ public abstract class OpenContainerMenu extends AbstractContainerMenu {
   }
 
   @Override
-  public void addSlotListener(ContainerListener containerListener) {
+  public void addSlotListener(@NotNull ContainerListener containerListener) {
     if (!this.containerListeners.contains(containerListener)) {
       this.containerListeners.add(containerListener);
       this.broadcastChanges();
@@ -161,7 +331,7 @@ public abstract class OpenContainerMenu extends AbstractContainerMenu {
   }
 
   @Override
-  public void setSynchronizer(ContainerSynchronizer containerSynchronizer) {
+  public void setSynchronizer(@NotNull ContainerSynchronizer containerSynchronizer) {
     this.synchronizer = containerSynchronizer;
     this.sendAllDataToRemote();
   }
@@ -193,7 +363,7 @@ public abstract class OpenContainerMenu extends AbstractContainerMenu {
   }
 
   @Override
-  public void removeSlotListener(ContainerListener containerListener) {
+  public void removeSlotListener(@NotNull ContainerListener containerListener) {
     this.containerListeners.remove(containerListener);
   }
 

internal/common/src/main/java/com/lishid/openinv/internal/common/container/menu/OpenEnderChestMenu.java

@@ -0,0 +1,53 @@
+package com.lishid.openinv.internal.common.container.menu;
+
+import com.lishid.openinv.internal.common.container.OpenEnderChest;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+public class OpenEnderChestMenu extends OpenChestMenu<OpenEnderChest> {
+
+  public OpenEnderChestMenu(
+      @NotNull OpenEnderChest enderChest,
+      @NotNull ServerPlayer viewer,
+      int containerId,
+      boolean viewOnly) {
+    super(getChestMenuType(enderChest.getContainerSize()), containerId, enderChest, viewer, viewOnly);
+  }
+
+  @Override
+  public @NotNull ItemStack quickMoveStack(@NotNull Player player, int index) {
+    if (viewOnly) {
+      return ItemStack.EMPTY;
+    }
+
+    // See ChestMenu
+    Slot slot = this.slots.get(index);
+
+    if (slot.isFake() || !slot.hasItem()) {
+      return ItemStack.EMPTY;
+    }
+
+    ItemStack itemStack = slot.getItem();
+    ItemStack original = itemStack.copy();
+
+    if (index < topSize) {
+      if (!this.moveItemStackTo(itemStack, topSize, this.slots.size(), true)) {
+        return ItemStack.EMPTY;
+      }
+    } else if (!this.moveItemStackTo(itemStack, 0, topSize, false)) {
+      return ItemStack.EMPTY;
+    }
+
+    if (itemStack.isEmpty()) {
+      slot.setByPlayer(ItemStack.EMPTY);
+    } else {
+      slot.setChanged();
+    }
+
+    return original;
+  }
+
+}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/menu/OpenInventoryMenu.java

@@ -0,0 +1,262 @@
+package com.lishid.openinv.internal.common.container.menu;
+
+import com.google.common.base.Preconditions;
+import com.lishid.openinv.internal.common.container.OpenInventory;
+import com.lishid.openinv.internal.common.container.bukkit.OpenDummyPlayerInventory;
+import com.lishid.openinv.internal.common.container.bukkit.OpenPlayerInventorySelf;
+import com.lishid.openinv.internal.common.container.slot.ContentDrop;
+import com.lishid.openinv.internal.common.container.slot.ContentEquipment;
+import com.lishid.openinv.internal.common.container.slot.SlotViewOnly;
+import com.lishid.openinv.util.Permissions;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ChestMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class OpenInventoryMenu extends OpenChestMenu<OpenInventory> {
+
+  private int offset;
+
+  public OpenInventoryMenu(OpenInventory inventory, ServerPlayer viewer, int i, boolean viewOnly) {
+    super(getMenuType(inventory, viewer), i, inventory, viewer, viewOnly);
+  }
+
+  private static MenuType<ChestMenu> getMenuType(OpenInventory inventory, ServerPlayer viewer) {
+    int size = inventory.getContainerSize();
+    // Disallow duplicate access to own main inventory contents.
+    if (inventory.getOwnerHandle().equals(viewer)) {
+      size -= viewer.getInventory().items.size();
+      size = ((int) Math.ceil(size / 9.0)) * 9;
+    }
+
+    return getChestMenuType(size);
+  }
+
+  @Override
+  protected void preSlotSetup() {
+    offset = ownContainer ? viewer.getInventory().items.size() : 0;
+  }
+
+  @Override
+  protected @NotNull Slot getUpperSlot(int index, int x, int y) {
+    index += offset;
+    Slot slot = container.getMenuSlot(index, x, y);
+
+    // If the slot cannot be interacted with there's nothing to configure.
+    if (slot.getClass().equals(SlotViewOnly.class)) {
+      return slot;
+    }
+
+    // Remove drop slot if viewer is not allowed to use it.
+    if (slot instanceof ContentDrop.SlotDrop
+        && (viewOnly || !Permissions.INVENTORY_SLOT_DROP.hasPermission(viewer.getBukkitEntity()))) {
+      return new SlotViewOnly(container, index, x, y);
+    }
+
+    if (slot instanceof ContentEquipment.SlotEquipment equipment) {
+      if (viewOnly) {
+        return SlotViewOnly.wrap(slot);
+      }
+
+      Permissions perm = switch (equipment.getEquipmentSlot()) {
+        case HEAD -> Permissions.INVENTORY_SLOT_HEAD_ANY;
+        case CHEST -> Permissions.INVENTORY_SLOT_CHEST_ANY;
+        case LEGS -> Permissions.INVENTORY_SLOT_LEGS_ANY;
+        case FEET -> Permissions.INVENTORY_SLOT_FEET_ANY;
+        // Off-hand can hold anything, not just equipment.
+        default -> null;
+      };
+
+      // If the viewer doesn't have permission, only allow equipment the viewee can equip in the slot.
+      if (perm != null && !perm.hasPermission(viewer.getBukkitEntity())) {
+        equipment.onlyEquipmentFor(container.getOwnerHandle());
+      }
+
+      // Equipment slots are a core part of the inventory, so they will always be shown.
+      return slot;
+    }
+
+    // When viewing own inventory, only allow access to equipment and drop slots (equipment allowed above).
+    if (ownContainer && !(slot instanceof ContentDrop.SlotDrop)) {
+      return new SlotViewOnly(container, index, x, y);
+    }
+
+    if (viewOnly) {
+      return SlotViewOnly.wrap(slot);
+    }
+
+    return slot;
+  }
+
+  @Override
+  protected @NotNull CraftInventoryView<OpenChestMenu<OpenInventory>, Inventory> createBukkitEntity() {
+    org.bukkit.inventory.Inventory bukkitInventory;
+    if (viewOnly) {
+      bukkitInventory = new OpenDummyPlayerInventory(container);
+    } else if (ownContainer) {
+      bukkitInventory = new OpenPlayerInventorySelf(container, offset);
+    } else {
+      bukkitInventory = container.getBukkitInventory();
+    }
+
+    return new CraftInventoryView<>(viewer.getBukkitEntity(), bukkitInventory, this) {
+      @Override
+      public org.bukkit.inventory.ItemStack getItem(int index) {
+        if (viewOnly || index < 0) {
+          return null;
+        }
+
+        Slot slot = slots.get(index);
+        return CraftItemStack.asCraftMirror(slot.hasItem() ? slot.getItem() : ItemStack.EMPTY);
+      }
+
+      @Override
+      public boolean isInTop(int rawSlot) {
+        return rawSlot < topSize;
+      }
+
+      @Override
+      public @Nullable Inventory getInventory(int rawSlot) {
+        if (viewOnly) {
+          return null;
+        }
+        if (rawSlot == InventoryView.OUTSIDE || rawSlot == -1) {
+          return null;
+        }
+        Preconditions.checkArgument(rawSlot >= 0 && rawSlot < topSize + offset + BOTTOM_INVENTORY_SIZE,
+            "Slot %s outside of inventory", rawSlot);
+        if (rawSlot > topSize) {
+          return getBottomInventory();
+        }
+        Slot slot = slots.get(rawSlot);
+        if (slot.isFake()) {
+          return null;
+        }
+        return getTopInventory();
+      }
+
+      @Override
+      public int convertSlot(int rawSlot) {
+        if (viewOnly) {
+          return InventoryView.OUTSIDE;
+        }
+        if (rawSlot < 0) {
+          return rawSlot;
+        }
+        if (rawSlot < topSize) {
+          Slot slot = slots.get(rawSlot);
+          if (slot.isFake()) {
+            return InventoryView.OUTSIDE;
+          }
+          return rawSlot;
+        }
+
+        int slot = rawSlot - topSize;
+
+        if (slot >= 27) {
+          slot -= 27;
+        } else {
+          slot += 9;
+        }
+
+        return slot;
+      }
+
+      @Override
+      public @NotNull InventoryType.SlotType getSlotType(int slot) {
+        if (viewOnly || slot < 0) {
+          return InventoryType.SlotType.OUTSIDE;
+        }
+        if (slot >= topSize) {
+          slot -= topSize;
+          if (slot >= 27) {
+            return InventoryType.SlotType.QUICKBAR;
+          }
+          return InventoryType.SlotType.CONTAINER;
+        }
+        return OpenInventoryMenu.this.container.getSlotType(offset + slot);
+      }
+
+      @Override
+      public int countSlots() {
+        return topSize + BOTTOM_INVENTORY_SIZE;
+      }
+    };
+  }
+
+  @Override
+  public @NotNull ItemStack quickMoveStack(@NotNull Player player, int index) {
+    if (viewOnly) {
+      return ItemStack.EMPTY;
+    }
+
+    // See ChestMenu and InventoryMenu
+    Slot slot = this.slots.get(index);
+
+    if (!slot.hasItem() || slot.isFake()) {
+      return ItemStack.EMPTY;
+    }
+
+    ItemStack itemStack = slot.getItem();
+    ItemStack originalStack = itemStack.copy();
+
+    if (index < topSize) {
+      // If we're moving top to bottom, do a normal transfer.
+      if (!this.moveItemStackTo(itemStack, topSize, this.slots.size(), true)) {
+        return ItemStack.EMPTY;
+      }
+    } else {
+      EquipmentSlot equipmentSlot = player.getEquipmentSlotForItem(itemStack);
+      boolean movedGear = switch (equipmentSlot) {
+        // If this is gear, try to move it to the correct slot first.
+        case OFFHAND, FEET, LEGS, CHEST, HEAD -> {
+          // Locate the correct slot in the contents following the main inventory.
+          for (int extra = container.getOwnerHandle().getInventory().items.size() - offset; extra < topSize; ++extra) {
+            Slot extraSlot = getSlot(extra);
+            if (extraSlot instanceof ContentEquipment.SlotEquipment equipSlot
+                && equipSlot.getEquipmentSlot() == equipmentSlot) {
+              // If we've found a matching slot, try to move to it.
+              // If this succeeds, even partially, we will not attempt to move to other slots.
+              // Otherwise, armor is already occupied, so we'll fall through to main inventory.
+              yield this.moveItemStackTo(itemStack, extra, extra + 1, false);
+            }
+          }
+          yield false;
+        }
+        // Non-gear gets no special treatment.
+        default -> false;
+      };
+
+      // If main inventory is not available, there's nowhere else to move.
+      if (offset != 0) {
+        if (!movedGear) {
+          return ItemStack.EMPTY;
+        }
+      } else {
+        // If we didn't move to a gear slot, try to move to a main inventory slot.
+        if (!movedGear && !this.moveItemStackTo(itemStack, 0, container.getOwnerHandle().getInventory().items.size(), true)) {
+          return ItemStack.EMPTY;
+        }
+      }
+    }
+
+    if (itemStack.isEmpty()) {
+      slot.setByPlayer(ItemStack.EMPTY);
+    } else {
+      slot.setChanged();
+    }
+
+    return originalStack;
+  }
+
+}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/Content.java

@@ -1,4 +1,4 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/ContentCrafting.java

@@ -1,6 +1,7 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
-import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
+import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
+import com.lishid.openinv.internal.common.player.OpenPlayer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
 import net.minecraft.world.ContainerHelper;
@@ -30,11 +31,11 @@ public class ContentCrafting implements Content {
     return isAvailable(holder);
   }
 
-  static boolean isAvailable(@NotNull ServerPlayer holder) {
+  public static boolean isAvailable(@NotNull ServerPlayer holder) {
     // Player must be online and not in creative - since the creative client is (semi-)authoritative,
     // it ignores changes without extra help, and will delete the item as a result.
     // Spectator mode is technically possible but may cause the item to be dropped if the client opens an inventory.
-    return holder.connection != null && !holder.connection.isDisconnected() && holder.gameMode.isSurvival();
+    return OpenPlayer.isConnected(holder.connection) && holder.gameMode.isSurvival();
   }
 
   @Override
@@ -107,12 +108,12 @@ public class ContentCrafting implements Content {
     }
 
     @Override
-    public boolean mayPickup(Player player) {
+    public boolean mayPickup(@NotNull Player player) {
       return isAvailable();
     }
 
     @Override
-    public boolean mayPlace(ItemStack itemStack) {
+    public boolean mayPlace(@NotNull ItemStack itemStack) {
       return isAvailable();
     }
 

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/ContentCraftingResult.java

@@ -1,6 +1,6 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
-import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
+import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.InventoryMenu;
@@ -23,7 +23,7 @@ public class ContentCraftingResult extends ContentViewOnly {
   @Override
   public ItemStack get() {
     InventoryMenu inventoryMenu = holder.inventoryMenu;
-    return inventoryMenu.getSlot(inventoryMenu.getResultSlotIndex()).getItem();
+    return inventoryMenu.getResultSlot().getItem();
   }
 
   @Override
@@ -35,7 +35,7 @@ public class ContentCraftingResult extends ContentViewOnly {
           return Placeholders.survivalOnly(holder);
         }
         InventoryMenu inventoryMenu = holder.inventoryMenu;
-        return inventoryMenu.getSlot(inventoryMenu.getResultSlotIndex()).getItem();
+        return inventoryMenu.getResultSlot().getItem();
       }
     };
   }

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/ContentCursor.java

@@ -1,6 +1,7 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
-import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
+import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
+import com.lishid.openinv.internal.common.player.OpenPlayer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Player;
@@ -63,7 +64,7 @@ public class ContentCursor implements Content {
     // Player must be online and not in creative - since the creative client is (semi-)authoritative,
     // it ignores changes without extra help, and will delete the item as a result.
     // Spectator mode is technically possible but may cause the item to be dropped if the client opens an inventory.
-    return holder.connection != null && !holder.connection.isDisconnected() && holder.gameMode.isSurvival();
+    return OpenPlayer.isConnected(holder.connection) && holder.gameMode.isSurvival();
   }
 
   @Override
@@ -93,12 +94,12 @@ public class ContentCursor implements Content {
     }
 
     @Override
-    public boolean mayPickup(Player player) {
+    public boolean mayPickup(@NotNull Player player) {
       return isAvailable();
     }
 
     @Override
-    public boolean mayPlace(ItemStack itemStack) {
+    public boolean mayPlace(@NotNull ItemStack itemStack) {
       return isAvailable();
     }
 

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/ContentDrop.java

@@ -1,6 +1,7 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
-import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
+import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
+import com.lishid.openinv.internal.common.player.OpenPlayer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.Slot;
@@ -63,14 +64,14 @@ public class ContentDrop implements Content {
 
     @Override
     public ItemStack getOrDefault() {
-      return holder.connection != null && !holder.connection.isDisconnected()
+      return OpenPlayer.isConnected(holder.connection)
           ? Placeholders.drop
           : Placeholders.blockedOffline;
     }
 
     @Override
-    public boolean mayPlace(ItemStack itemStack) {
-      return holder.connection != null && !holder.connection.isDisconnected();
+    public boolean mayPlace(@NotNull ItemStack itemStack) {
+      return OpenPlayer.isConnected(holder.connection);
     }
 
     @Override

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/ContentEquipment.java

@@ -1,6 +1,6 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
-import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
+import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -65,12 +65,12 @@ public class ContentEquipment extends ContentList {
     }
 
     @Override
-    public boolean mayPlace(ItemStack var0) {
+    public boolean mayPlace(@NotNull ItemStack itemStack) {
       if (viewer == null) {
         return true;
       }
 
-      return equipmentSlot == EquipmentSlot.OFFHAND || viewer.getEquipmentSlotForItem(var0) == equipmentSlot;
+      return equipmentSlot == EquipmentSlot.OFFHAND || viewer.getEquipmentSlotForItem(itemStack) == equipmentSlot;
     }
 
   }

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/ContentList.java

@@ -1,4 +1,4 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/ContentOffHand.java

@@ -1,8 +1,11 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
+import com.lishid.openinv.internal.common.player.OpenPlayer;
+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.inventory.Slot;
 import org.bukkit.event.inventory.InventoryType;
 import org.jetbrains.annotations.NotNull;
@@ -34,10 +37,13 @@ public class ContentOffHand extends ContentEquipment {
     return new SlotEquipment(container, slot, x, y) {
       @Override
       public void setChanged() {
-        if (holder.connection != null
-            && !holder.connection.isDisconnected()
-            && holder.containerMenu != holder.inventoryMenu) {
-          holder.resendItemInHands();
+        if (OpenPlayer.isConnected(holder.connection) && holder.containerMenu != holder.inventoryMenu) {
+          holder.connection.send(
+              new ClientboundContainerSetSlotPacket(
+                  holder.inventoryMenu.containerId,
+                  holder.inventoryMenu.incrementStateId(),
+                  InventoryMenu.SHIELD_SLOT,
+                  holder.getOffhandItem()));
         }
       }
     };

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/ContentViewOnly.java

@@ -1,4 +1,4 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class ContentViewOnly implements Content {
 
-  @NotNull ServerPlayer holder;
+  protected @NotNull ServerPlayer holder;
 
   public ContentViewOnly(@NotNull ServerPlayer holder) {
     this.holder = holder;

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/SlotPlaceholder.java

@@ -1,4 +1,4 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.Slot;

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/SlotViewOnly.java

@@ -1,6 +1,6 @@
-package com.lishid.openinv.internal.v1_21_R1.container.slot;
+package com.lishid.openinv.internal.common.container.slot;
 
-import com.lishid.openinv.internal.v1_21_R1.container.Placeholders;
+import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.Slot;
@@ -45,20 +45,20 @@ public class SlotViewOnly extends SlotPlaceholder {
   }
 
   @Override
-  public void onQuickCraft(ItemStack var0, ItemStack var1) {
+  public void onQuickCraft(@NotNull ItemStack itemStack1, @NotNull ItemStack itemStack2) {
   }
 
   @Override
-  public void onTake(Player var0, ItemStack var1) {
+  public void onTake(@NotNull Player player, @NotNull ItemStack itemStack) {
   }
 
   @Override
-  public boolean mayPlace(ItemStack var0) {
+  public boolean mayPlace(@NotNull ItemStack itemStack) {
     return false;
   }
 
   @Override
-  public ItemStack getItem() {
+  public @NotNull ItemStack getItem() {
     return ItemStack.EMPTY;
   }
 
@@ -68,15 +68,15 @@ public class SlotViewOnly extends SlotPlaceholder {
   }
 
   @Override
-  public void setByPlayer(ItemStack newStack) {
+  public void setByPlayer(@NotNull ItemStack newStack) {
   }
 
   @Override
-  public void setByPlayer(ItemStack newStack, ItemStack oldStack) {
+  public void setByPlayer(@NotNull ItemStack newStack, @NotNull ItemStack oldStack) {
   }
 
   @Override
-  public void set(ItemStack var0) {
+  public void set(@NotNull ItemStack itemStack) {
   }
 
   @Override
@@ -89,17 +89,17 @@ public class SlotViewOnly extends SlotPlaceholder {
   }
 
   @Override
-  public int getMaxStackSize(ItemStack itemStack) {
+  public int getMaxStackSize(@NotNull ItemStack itemStack) {
     return 0;
   }
 
   @Override
-  public ItemStack remove(int amount) {
+  public @NotNull ItemStack remove(int amount) {
     return ItemStack.EMPTY;
   }
 
   @Override
-  public boolean mayPickup(Player var0) {
+  public boolean mayPickup(@NotNull Player player) {
     return false;
   }
 
@@ -109,27 +109,27 @@ public class SlotViewOnly extends SlotPlaceholder {
   }
 
   @Override
-  public Optional<ItemStack> tryRemove(int var0, int var1, Player var2) {
+  public @NotNull Optional<ItemStack> tryRemove(int var0, int var1, @NotNull Player player) {
     return Optional.empty();
   }
 
   @Override
-  public ItemStack safeTake(int var0, int var1, Player var2) {
+  public @NotNull ItemStack safeTake(int var0, int var1, @NotNull Player player) {
     return ItemStack.EMPTY;
   }
 
   @Override
-  public ItemStack safeInsert(ItemStack itemStack) {
+  public @NotNull ItemStack safeInsert(@NotNull ItemStack itemStack) {
     return itemStack;
   }
 
   @Override
-  public ItemStack safeInsert(ItemStack itemStack, int amount) {
+  public @NotNull ItemStack safeInsert(@NotNull ItemStack itemStack, int amount) {
     return itemStack;
   }
 
   @Override
-  public boolean allowModification(Player var0) {
+  public boolean allowModification(@NotNull Player player) {
     return false;
   }
 

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/placeholder/PlaceholderLoader.java

@@ -0,0 +1,18 @@
+package com.lishid.openinv.internal.common.container.slot.placeholder;
+
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.component.CustomModelData;
+
+import java.util.List;
+
+public class PlaceholderLoader extends PlaceholderLoaderBase {
+
+  private static final CustomModelData DEFAULT_CUSTOM_MODEL_DATA = new CustomModelData(List.of(), List.of(), List.of("openinv:custom"), List.of());
+
+  @Override
+  protected void addModelData(ItemStack itemStack) {
+    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
+  }
+
+}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/placeholder/PlaceholderLoaderBase.java

@@ -1,4 +1,4 @@
-package com.lishid.openinv.internal.v1_21_R1.container;
+package com.lishid.openinv.internal.common.container.slot.placeholder;
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
@@ -7,12 +7,10 @@ import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.Unit;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.component.CustomModelData;
 import net.minecraft.world.item.component.DyedItemColor;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.ItemLike;
@@ -20,58 +18,59 @@ import net.minecraft.world.level.block.entity.BannerPattern;
 import net.minecraft.world.level.block.entity.BannerPatternLayers;
 import net.minecraft.world.level.block.entity.BannerPatterns;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.v1_21_R1.CraftRegistry;
+import org.bukkit.craftbukkit.CraftRegistry;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.EnumMap;
 import java.util.List;
 import java.util.Optional;
 
-public final class Placeholders {
+public abstract class PlaceholderLoaderBase {
 
-  private static final CustomModelData DEFAULT_CUSTOM_MODEL_DATA = new CustomModelData(9999);
-  public static final @NotNull EnumMap<GameType, ItemStack> BLOCKED_GAME_TYPE = new EnumMap<>(GameType.class);
-  public static @NotNull ItemStack craftingOutput = defaultCraftingOutput();
-  public static @NotNull ItemStack cursor = defaultCursor();
-  public static @NotNull ItemStack drop = defaultDrop();
-  public static @NotNull ItemStack emptyHelmet = getEmptyArmor(Items.LEATHER_HELMET);
-  public static @NotNull ItemStack emptyChestplate = getEmptyArmor(Items.LEATHER_CHESTPLATE);
-  public static @NotNull ItemStack emptyLeggings = getEmptyArmor(Items.LEATHER_LEGGINGS);
-  public static @NotNull ItemStack emptyBoots = getEmptyArmor(Items.LEATHER_BOOTS);
-  public static @NotNull ItemStack emptyOffHand = getEmptyShield();
-  public static @NotNull ItemStack notSlot = defaultNotSlot();
-  public static @NotNull ItemStack blockedOffline = defaultBlockedOffline();
-
-  static {
+  protected PlaceholderLoaderBase() {
     for (GameType type : GameType.values()) {
       // Barrier: "Not available - Creative" etc.
       ItemStack typeItem = new ItemStack(Items.BARRIER);
       typeItem.set(
           DataComponents.ITEM_NAME,
           Component.translatable("options.narrator.notavailable").append(" - ").append(type.getShortDisplayName()));
-      BLOCKED_GAME_TYPE.put(type, typeItem);
+      Placeholders.BLOCKED_GAME_TYPE.put(type, typeItem);
     }
+    Placeholders.craftingOutput = defaultCraftingOutput();
+    Placeholders.cursor = defaultCursor();
+    Placeholders.drop = defaultDrop();
+    Placeholders.emptyHelmet = getEmptyArmor(Items.LEATHER_HELMET);
+    Placeholders.emptyChestplate = getEmptyArmor(Items.LEATHER_CHESTPLATE);
+    Placeholders.emptyLeggings = getEmptyArmor(Items.LEATHER_LEGGINGS);
+    Placeholders.emptyBoots = getEmptyArmor(Items.LEATHER_BOOTS);
+    Placeholders.emptyOffHand = defaultShield();
+    Placeholders.notSlot = defaultNotSlot();
+    Placeholders.blockedOffline = defaultBlockedOffline();
   }
 
-  public static void load(@NotNull ConfigurationSection section) throws Exception {
-    craftingOutput = parse(section, "crafting-output", craftingOutput);
-    cursor = parse(section, "cursor", cursor);
-    drop = parse(section, "drop", drop);
-    emptyHelmet = parse(section, "empty-helmet", emptyHelmet);
-    emptyChestplate = parse(section, "empty-chestplate", emptyChestplate);
-    emptyLeggings = parse(section, "empty-leggings", emptyLeggings);
-    emptyBoots = parse(section, "empty-boots", emptyBoots);
-    emptyOffHand = parse(section, "empty-off-hand", emptyOffHand);
-    notSlot = parse(section, "not-a-slot", notSlot);
-    blockedOffline = parse(section, "blocked.offline", blockedOffline);
-    BLOCKED_GAME_TYPE.put(GameType.CREATIVE, parse(section, "blocked.creative", BLOCKED_GAME_TYPE.get(GameType.CREATIVE)));
-    BLOCKED_GAME_TYPE.put(GameType.SPECTATOR, parse(section, "blocked.spectator", BLOCKED_GAME_TYPE.get(GameType.SPECTATOR)));
+  public void load(@Nullable ConfigurationSection section) throws Exception {
+    Placeholders.craftingOutput = parse(section, "crafting-output", Placeholders.craftingOutput);
+    Placeholders.cursor = parse(section, "cursor", Placeholders.cursor);
+    Placeholders.drop = parse(section, "drop", Placeholders.drop);
+    Placeholders.emptyHelmet = parse(section, "empty-helmet", Placeholders.emptyHelmet);
+    Placeholders.emptyChestplate = parse(section, "empty-chestplate", Placeholders.emptyChestplate);
+    Placeholders.emptyLeggings = parse(section, "empty-leggings", Placeholders.emptyLeggings);
+    Placeholders.emptyBoots = parse(section, "empty-boots", Placeholders.emptyBoots);
+    Placeholders.emptyOffHand = parse(section, "empty-off-hand", Placeholders.emptyOffHand);
+    Placeholders.notSlot = parse(section, "not-a-slot", Placeholders.notSlot);
+    Placeholders.blockedOffline = parse(section, "blocked.offline", Placeholders.blockedOffline);
+    Placeholders.BLOCKED_GAME_TYPE.put(GameType.CREATIVE, parse(section, "blocked.creative", Placeholders.BLOCKED_GAME_TYPE.get(GameType.CREATIVE)));
+    Placeholders.BLOCKED_GAME_TYPE.put(GameType.SPECTATOR, parse(section, "blocked.spectator", Placeholders.BLOCKED_GAME_TYPE.get(GameType.SPECTATOR)));
   }
 
   private static @NotNull ItemStack parse(
-      @NotNull ConfigurationSection section,
+      @Nullable ConfigurationSection section,
       @NotNull String path,
       @NotNull ItemStack defaultStack) throws Exception {
+    if (section == null) {
+      return defaultStack;
+    }
+
     String itemText = section.getString(path);
 
     if (itemText == null) {
@@ -83,69 +82,64 @@ public final class Placeholders {
     return parsed.filter(itemStack -> !itemStack.isEmpty()).orElse(defaultStack);
   }
 
-  public static ItemStack survivalOnly(@NotNull ServerPlayer serverPlayer) {
-    if (serverPlayer.connection == null || serverPlayer.connection.isDisconnected()) {
-      return blockedOffline;
-    }
+  protected abstract void addModelData(ItemStack itemStack);
 
-    return BLOCKED_GAME_TYPE.getOrDefault(serverPlayer.gameMode.getGameModeForPlayer(), ItemStack.EMPTY);
-  }
-
-  private static ItemStack defaultCraftingOutput() {
+  protected @NotNull ItemStack defaultCraftingOutput() {
     // Crafting table: "Crafting"
     ItemStack itemStack = new ItemStack(Items.CRAFTING_TABLE);
     itemStack.set(DataComponents.ITEM_NAME, Component.translatable("container.crafting"));
-    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
+    addModelData(itemStack);
     return itemStack;
   }
 
-  private static ItemStack defaultCursor() {
+  protected @NotNull ItemStack defaultCursor() {
     // Cursor-like banner with no tooltip
     ItemStack itemStack = new ItemStack(Items.WHITE_BANNER);
     RegistryAccess minecraftRegistry = CraftRegistry.getMinecraftRegistry();
-    Registry<BannerPattern> bannerPatterns = minecraftRegistry.registryOrThrow(Registries.BANNER_PATTERN);
-    BannerPattern halfDiagBottomRight = bannerPatterns.getOrThrow(BannerPatterns.DIAGONAL_RIGHT);
-    BannerPattern downRight = bannerPatterns.getOrThrow(BannerPatterns.STRIPE_DOWNRIGHT);
-    BannerPattern border = bannerPatterns.getOrThrow(BannerPatterns.BORDER);
+    Registry<BannerPattern> bannerPatterns = minecraftRegistry.lookupOrThrow(Registries.BANNER_PATTERN);
+    BannerPattern halfDiagBottomRight = bannerPatterns.getOrThrow(BannerPatterns.DIAGONAL_RIGHT).value();
+    BannerPattern downRight = bannerPatterns.getOrThrow(BannerPatterns.STRIPE_DOWNRIGHT).value();
+    BannerPattern border = bannerPatterns.getOrThrow(BannerPatterns.BORDER).value();
     itemStack.set(DataComponents.BANNER_PATTERNS,
         new BannerPatternLayers(List.of(
             new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(halfDiagBottomRight), DyeColor.GRAY),
             new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(downRight), DyeColor.WHITE),
             new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(border), DyeColor.GRAY))));
-    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
+    addModelData(itemStack);
     itemStack.set(DataComponents.HIDE_TOOLTIP, Unit.INSTANCE);
     return itemStack;
   }
 
-  private static ItemStack defaultDrop() {
+  protected @NotNull ItemStack defaultDrop() {
     // Dropper: "Drop Selected Item"
     ItemStack itemStack = new ItemStack(Items.DROPPER);
     // Note: translatable component, not keybind component! We want the text identifying the keybind, not the key.
     itemStack.set(DataComponents.ITEM_NAME, Component.translatable("key.drop"));
-    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
+    addModelData(itemStack);
     return itemStack;
   }
 
-  private static ItemStack getEmptyArmor(ItemLike item) {
+  protected @NotNull ItemStack getEmptyArmor(@NotNull ItemLike item) {
     // Inventory-background-grey-ish leather armor with no tooltip
     ItemStack itemStack = new ItemStack(item);
     DyedItemColor color = new DyedItemColor(0xC8C8C8, false);
     itemStack.set(DataComponents.DYED_COLOR, color);
     itemStack.set(DataComponents.HIDE_TOOLTIP, Unit.INSTANCE);
-    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
+    addModelData(itemStack);
     return itemStack;
   }
 
-  private static ItemStack getEmptyShield() {
+  protected @NotNull ItemStack defaultShield() {
+    // Shield with "missing texture" pattern, magenta and black squares.
     ItemStack itemStack = new ItemStack(Items.SHIELD);
     itemStack.set(DataComponents.BASE_COLOR, DyeColor.MAGENTA);
     RegistryAccess minecraftRegistry = CraftRegistry.getMinecraftRegistry();
-    Registry<BannerPattern> bannerPatterns = minecraftRegistry.registryOrThrow(Registries.BANNER_PATTERN);
-    BannerPattern halfLeft = bannerPatterns.getOrThrow(BannerPatterns.HALF_VERTICAL);
-    BannerPattern topLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_LEFT);
-    BannerPattern topRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_RIGHT);
-    BannerPattern bottomLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_LEFT);
-    BannerPattern bottomRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_RIGHT);
+    Registry<BannerPattern> bannerPatterns = minecraftRegistry.lookupOrThrow(Registries.BANNER_PATTERN);
+    BannerPattern halfLeft = bannerPatterns.getOrThrow(BannerPatterns.HALF_VERTICAL).value();
+    BannerPattern topLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_LEFT).value();
+    BannerPattern topRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_RIGHT).value();
+    BannerPattern bottomLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_LEFT).value();
+    BannerPattern bottomRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_RIGHT).value();
     itemStack.set(DataComponents.BANNER_PATTERNS,
         new BannerPatternLayers(List.of(
             new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(halfLeft), DyeColor.BLACK),
@@ -154,19 +148,19 @@ public final class Placeholders {
             new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(topRight), DyeColor.BLACK),
             new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(bottomRight), DyeColor.BLACK))));
     itemStack.set(DataComponents.HIDE_TOOLTIP, Unit.INSTANCE);
-    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
+    addModelData(itemStack);
     return itemStack;
   }
 
-  private static ItemStack defaultNotSlot() {
+  protected @NotNull ItemStack defaultNotSlot() {
     // White pane with no tooltip
     ItemStack itemStack = new ItemStack(Items.WHITE_STAINED_GLASS_PANE);
     itemStack.set(DataComponents.HIDE_TOOLTIP, Unit.INSTANCE);
-    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
+    addModelData(itemStack);
     return itemStack;
   }
 
-  private static ItemStack defaultBlockedOffline() {
+  protected @NotNull ItemStack defaultBlockedOffline() {
     // Barrier: "Not available - Offline"
     ItemStack itemStack = new ItemStack(Items.BARRIER);
     itemStack.set(DataComponents.ITEM_NAME,
@@ -176,8 +170,4 @@ public final class Placeholders {
     return itemStack;
   }
 
-  private Placeholders() {
-    throw new IllegalStateException("Cannot create instance of utility class.");
-  }
-
 }

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/placeholder/Placeholders.java

@@ -0,0 +1,37 @@
+package com.lishid.openinv.internal.common.container.slot.placeholder;
+
+import com.lishid.openinv.internal.common.player.OpenPlayer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.GameType;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.EnumMap;
+
+public final class Placeholders {
+
+  static final @NotNull EnumMap<GameType, ItemStack> BLOCKED_GAME_TYPE = new EnumMap<>(GameType.class);
+  public static @NotNull ItemStack craftingOutput = ItemStack.EMPTY;
+  public static @NotNull ItemStack cursor = ItemStack.EMPTY;
+  public static @NotNull ItemStack drop = ItemStack.EMPTY;
+  public static @NotNull ItemStack emptyHelmet = ItemStack.EMPTY;
+  public static @NotNull ItemStack emptyChestplate = ItemStack.EMPTY;
+  public static @NotNull ItemStack emptyLeggings = ItemStack.EMPTY;
+  public static @NotNull ItemStack emptyBoots = ItemStack.EMPTY;
+  public static @NotNull ItemStack emptyOffHand = ItemStack.EMPTY;
+  public static @NotNull ItemStack notSlot = ItemStack.EMPTY;
+  public static @NotNull ItemStack blockedOffline = ItemStack.EMPTY;
+
+  public static ItemStack survivalOnly(@NotNull ServerPlayer serverPlayer) {
+    if (!OpenPlayer.isConnected(serverPlayer.connection)) {
+      return blockedOffline;
+    }
+
+    return BLOCKED_GAME_TYPE.getOrDefault(serverPlayer.gameMode.getGameModeForPlayer(), ItemStack.EMPTY);
+  }
+
+  private Placeholders() {
+    throw new IllegalStateException("Cannot create instance of utility class.");
+  }
+
+}

internal/common/src/main/java/com/lishid/openinv/internal/common/player/OpenPlayer.java

@@ -1,4 +1,4 @@
-package com.lishid.openinv.internal.v1_21_R1.player;
+package com.lishid.openinv.internal.common.player;
 
 import com.lishid.openinv.event.OpenEvents;
 import com.mojang.logging.LogUtils;
@@ -8,9 +8,10 @@ import net.minecraft.nbt.NbtIo;
 import net.minecraft.nbt.NumericTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import net.minecraft.world.level.storage.PlayerDataStorage;
-import org.bukkit.craftbukkit.v1_21_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -51,6 +52,7 @@ public class OpenPlayer extends CraftPlayer {
       "SpawnAngle",
       "SpawnDimension",
       "raid_omen_position",
+      "ender_pearls",
       // Player#addAdditionalSaveData(CompoundTag)
       "ShoulderEntityLeft",
       "ShoulderEntityRight",
@@ -174,4 +176,8 @@ public class OpenPlayer extends CraftPlayer {
     }
   }
 
+  public static boolean isConnected(@Nullable ServerGamePacketListenerImpl connection) {
+    return connection != null && !connection.isDisconnected();
+  }
+
 }

internal/common/src/main/java/com/lishid/openinv/internal/common/player/PlayerManager.java

@@ -1,19 +1,20 @@
-package com.lishid.openinv.internal.v1_21_R1.player;
+package com.lishid.openinv.internal.common.player;
 
 import com.lishid.openinv.internal.ISpecialInventory;
-import com.lishid.openinv.internal.v1_21_R1.container.OpenEnderChest;
-import com.lishid.openinv.internal.v1_21_R1.container.OpenInventory;
+import com.lishid.openinv.internal.common.container.OpenEnderChest;
+import com.lishid.openinv.internal.common.container.OpenInventory;
 import com.mojang.authlib.GameProfile;
 import com.mojang.serialization.Dynamic;
+import io.papermc.paper.adventure.PaperAdventure;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ClientInformation;
+import net.minecraft.server.level.ParticleStatus;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.ChatVisiblity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -23,10 +24,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_21_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_21_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_21_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
 import org.jetbrains.annotations.NotNull;
@@ -38,18 +39,7 @@ import java.util.logging.Logger;
 
 public class PlayerManager implements com.lishid.openinv.internal.PlayerManager {
 
-  private static boolean paper;
-
-  static {
-    try {
-      Class.forName("io.papermc.paper.configuration.Configuration");
-      paper = true;
-    } catch (ClassNotFoundException ignored) {
-      paper = false;
-    }
-  }
-
-  private final @NotNull Logger logger;
+  protected final @NotNull Logger logger;
   private @Nullable Field bukkitEntity;
 
   public PlayerManager(@NotNull Logger logger) {
@@ -85,11 +75,6 @@ public class PlayerManager implements com.lishid.openinv.internal.PlayerManager
 
   @Override
   public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
-    // Ensure player has data
-    if (!offline.hasPlayedBefore()) {
-      return null;
-    }
-
     MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
     ServerLevel worldServer = server.getLevel(Level.OVERWORLD);
 
@@ -112,7 +97,7 @@ public class PlayerManager implements com.lishid.openinv.internal.PlayerManager
     return null;
   }
 
-  private @NotNull ServerPlayer createNewPlayer(
+  protected @NotNull ServerPlayer createNewPlayer(
       @NotNull MinecraftServer server,
       @NotNull ServerLevel worldServer,
       @NotNull final OfflinePlayer offline) {
@@ -129,7 +114,8 @@ public class PlayerManager implements com.lishid.openinv.internal.PlayerManager
         ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
         ServerPlayer.DEFAULT_MAIN_HAND,
         true,
-        false // Don't list in player list (not that this player is in the list anyway).
+        false, // Don't list in player list (not that this player is in the list anyway).
+        ParticleStatus.MINIMAL
     );
 
     ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
@@ -162,10 +148,8 @@ public class PlayerManager implements com.lishid.openinv.internal.PlayerManager
     // Game type settings are also loaded separately.
     player.loadGameTypes(loadedData);
 
-    if (paper) {
-      // Paper: world is not loaded by ServerPlayer#load(CompoundTag).
-      parseWorld(player, loadedData);
-    }
+    // World is not loaded by ServerPlayer#load(CompoundTag) on Paper.
+    parseWorld(player, loadedData);
 
     return true;
   }
@@ -185,17 +169,26 @@ public class PlayerManager implements com.lishid.openinv.internal.PlayerManager
           .resultOrPartial(logger::warning)
           .map(player.server::getLevel)
           // If ServerLevel exists, set, otherwise move to spawn.
-          .ifPresentOrElse(player::setServerLevel, () -> player.spawnIn(null));
+          .ifPresentOrElse(player::setServerLevel, () -> spawnInDefaultWorld(player));
       return;
     }
     if (bukkitWorld == null) {
-      player.spawnIn(null);
+      spawnInDefaultWorld(player);
       return;
     }
     player.setServerLevel(((CraftWorld) bukkitWorld).getHandle());
   }
 
-  private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+  private void spawnInDefaultWorld(ServerPlayer player) {
+    ServerLevel level = player.server.getLevel(Level.OVERWORLD);
+    if (level != null) {
+      player.spawnIn(level);
+    } else {
+      logger.warning("Tried to load player with invalid world when no fallback was available!");
+    }
+  }
+
+  protected void injectPlayer(ServerPlayer player) throws IllegalAccessException {
     if (bukkitEntity == null) {
       return;
     }
@@ -224,46 +217,51 @@ public class PlayerManager implements com.lishid.openinv.internal.PlayerManager
   }
 
   @Override
-  public @Nullable InventoryView openInventory(@NotNull Player bukkitPlayer, @NotNull ISpecialInventory inventory) {
+  public @Nullable InventoryView openInventory(@NotNull Player bukkitPlayer, @NotNull ISpecialInventory inventory, boolean viewOnly) {
     ServerPlayer player = getHandle(bukkitPlayer);
 
-    if (player.connection == null) {
-      return null;
-    }
-
-    MenuProvider provider;
-    Component title;
-    if (inventory instanceof OpenInventory playerInv) {
-      provider = playerInv;
-      title = playerInv.getTitle(player);
-    } else if (inventory instanceof OpenEnderChest enderChest) {
-      provider = enderChest;
-      title = enderChest.getDisplayName();
-    } else {
+    if (!OpenPlayer.isConnected(player.connection)) {
       return null;
     }
 
     // See net.minecraft.server.level.ServerPlayer#openMenu(MenuProvider)
-    AbstractContainerMenu menu = provider.createMenu(player.nextContainerCounter(), player.getInventory(), player);
+    AbstractContainerMenu menu;
+    Component title;
+    if (inventory instanceof OpenInventory playerInv) {
+      menu = playerInv.createMenu(player, player.nextContainerCounter(), viewOnly);
+      title = playerInv.getTitle(player);
+    } else if (inventory instanceof OpenEnderChest enderChest) {
+      menu = enderChest.createMenu(player, player.nextContainerCounter(), viewOnly);
+      title = enderChest.getTitle();
+    } else {
+      return null;
+    }
 
     // Should never happen, player is a ServerPlayer with an active connection.
     if (menu == null) {
       return null;
     }
 
-    // Set up title (the whole reason we're not just using Player#openInventory(Inventory)).
-    // Title can only be set once for a menu, and is set during the open process.
+    // Set up title. Title can only be set once for a menu, and is set during the open process.
+    // Further title changes are a hack where the client is sent a "new" inventory with the same ID,
+    // resulting in a title change but no other state modifications (like cursor position).
     menu.setTitle(title);
 
-    menu = CraftEventFactory.callInventoryOpenEvent(player, menu, false);
+    var pair = CraftEventFactory.callInventoryOpenEventWithTitle(player, menu);
+    menu = pair.getSecond();
 
     // Menu is null if event is cancelled.
     if (menu == null) {
       return null;
     }
 
+    var newTitle = pair.getFirst();
+    if (newTitle != null) {
+      title = PaperAdventure.asVanilla(newTitle);
+    }
+
     player.containerMenu = menu;
-    player.connection.send(new ClientboundOpenScreenPacket(menu.containerId, menu.getType(), menu.getTitle()));
+    player.connection.send(new ClientboundOpenScreenPacket(menu.containerId, menu.getType(), title));
     player.initMenu(menu);
 
     return menu.getBukkitView();

internal/paper1_21_1/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+  `openinv-base`
+  alias(libs.plugins.paperweight)
+}
+
+configurations.all {
+  resolutionStrategy.capabilitiesResolution.withCapability("org.spigotmc:spigot-api") {
+    val paper = candidates.firstOrNull {
+      it.id.let {
+        id -> id is ModuleComponentIdentifier && id.module == "paper-api"
+      }
+    }
+    if (paper != null) {
+      select(paper)
+    }
+    because("module is written for Paper servers")
+  }
+}
+
+dependencies {
+  implementation(project(":openinvapi"))
+  implementation(project(":openinvcommon"))
+  implementation(project(":openinvadaptercommon"))
+  implementation(project(":openinvadapterpaper1_21_3"))
+
+  paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT")
+}

internal/paper1_21_1/src/main/java/com/lishid/openinv/internal/paper1_21_1/InternalAccessor.java

@@ -1,29 +1,37 @@
-package com.lishid.openinv.internal.v1_20_R4;
+package com.lishid.openinv.internal.paper1_21_1;
 
 import com.lishid.openinv.internal.Accessor;
 import com.lishid.openinv.internal.IAnySilentContainer;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.common.container.AnySilentContainer;
+import com.lishid.openinv.internal.common.container.OpenEnderChest;
+import com.lishid.openinv.internal.paper1_21_1.container.OpenInventory;
+import com.lishid.openinv.internal.paper1_21_1.container.slot.placeholder.PlaceholderLoader;
+import com.lishid.openinv.internal.paper1_21_1.player.PlayerManager;
 import com.lishid.openinv.util.lang.LanguageManager;
 import net.minecraft.world.Container;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftInventory;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class InternalAccessor implements Accessor {
 
+  private final @NotNull Logger logger;
   private final @NotNull PlayerManager manager;
   private final @NotNull AnySilentContainer anySilentContainer;
 
   public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {
-    manager = new PlayerManager(logger, lang);
-    anySilentContainer = new AnySilentContainer(logger, lang);
+    this.logger = logger;
+    this.manager = new PlayerManager(logger);
+    this.anySilentContainer = new AnySilentContainer(logger, lang);
   }
 
   @Override
@@ -38,12 +46,12 @@ public class InternalAccessor implements Accessor {
 
   @Override
   public @NotNull ISpecialPlayerInventory createPlayerInventory(@NotNull Player player) {
-    return new SpecialPlayerInventory(player, player.isOnline());
+    return new OpenInventory(player);
   }
 
   @Override
   public @NotNull ISpecialEnderChest createEnderChest(@NotNull Player player) {
-    return new SpecialEnderChest(player, player.isOnline());
+    return new OpenEnderChest(player);
   }
 
   @Override
@@ -59,6 +67,14 @@ public class InternalAccessor implements Accessor {
   }
 
   @Override
-  public void reload(@NotNull ConfigurationSection config) {}
+  public void reload(@NotNull ConfigurationSection config) {
+    ConfigurationSection placeholders = config.getConfigurationSection("placeholders");
+    try {
+      // Reset placeholders to defaults and try to load configuration.
+      new PlaceholderLoader().load(placeholders);
+    } catch (Exception e) {
+      logger.log(Level.WARNING, "Caught exception loading placeholder overrides!", e);
+    }
+  }
 
 }

internal/paper1_21_1/src/main/java/com/lishid/openinv/internal/paper1_21_1/container/OpenInventory.java

@@ -0,0 +1,20 @@
+package com.lishid.openinv.internal.paper1_21_1.container;
+
+import com.lishid.openinv.internal.common.container.slot.Content;
+import com.lishid.openinv.internal.paper1_21_1.container.slot.ContentCraftingResult;
+import net.minecraft.server.level.ServerPlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class OpenInventory extends com.lishid.openinv.internal.common.container.OpenInventory {
+
+  public OpenInventory(@NotNull Player bukkitPlayer) {
+    super(bukkitPlayer);
+  }
+
+  @Override
+  protected Content getCraftingResult(@NotNull ServerPlayer serverPlayer) {
+    return new ContentCraftingResult(serverPlayer);
+  }
+
+}

internal/paper1_21_1/src/main/java/com/lishid/openinv/internal/paper1_21_1/container/slot/ContentCraftingResult.java

@@ -0,0 +1,46 @@
+package com.lishid.openinv.internal.paper1_21_1.container.slot;
+
+import com.lishid.openinv.internal.common.container.slot.ContentCrafting;
+import com.lishid.openinv.internal.common.container.slot.ContentViewOnly;
+import com.lishid.openinv.internal.common.container.slot.SlotViewOnly;
+import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.inventory.InventoryMenu;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.event.inventory.InventoryType;
+import org.jetbrains.annotations.NotNull;
+
+public class ContentCraftingResult extends ContentViewOnly {
+
+  public ContentCraftingResult(@NotNull ServerPlayer holder) {
+    super(holder);
+  }
+
+  @Override
+  public ItemStack get() {
+    InventoryMenu inventoryMenu = holder.inventoryMenu;
+    return inventoryMenu.getSlot(inventoryMenu.getResultSlotIndex()).getItem();
+  }
+
+  @Override
+  public Slot asSlot(Container container, int slot, int x, int y) {
+    return new SlotViewOnly(container, slot, x, y) {
+      @Override
+      public ItemStack getOrDefault() {
+        if (!ContentCrafting.isAvailable(holder)) {
+          return Placeholders.survivalOnly(holder);
+        }
+        InventoryMenu inventoryMenu = holder.inventoryMenu;
+        return inventoryMenu.getSlot(inventoryMenu.getResultSlotIndex()).getItem();
+      }
+    };
+  }
+
+  @Override
+  public InventoryType.SlotType getSlotType() {
+    return InventoryType.SlotType.RESULT;
+  }
+
+}

internal/paper1_21_1/src/main/java/com/lishid/openinv/internal/paper1_21_1/container/slot/placeholder/PlaceholderLoader.java

@@ -0,0 +1,65 @@
+package com.lishid.openinv.internal.paper1_21_1.container.slot.placeholder;
+
+import com.lishid.openinv.internal.paper1_21_3.container.slot.placeholder.NumericDataPlaceholderLoader;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.util.Unit;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.block.entity.BannerPattern;
+import net.minecraft.world.level.block.entity.BannerPatternLayers;
+import net.minecraft.world.level.block.entity.BannerPatterns;
+import org.bukkit.craftbukkit.CraftRegistry;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class PlaceholderLoader extends NumericDataPlaceholderLoader {
+
+  @Override
+  protected @NotNull ItemStack defaultCursor() {
+    // Cursor-like banner with no tooltip
+    ItemStack itemStack = new ItemStack(Items.WHITE_BANNER);
+    RegistryAccess minecraftRegistry = CraftRegistry.getMinecraftRegistry();
+    Registry<BannerPattern> bannerPatterns = minecraftRegistry.registryOrThrow(Registries.BANNER_PATTERN);
+    BannerPattern halfDiagBottomRight = bannerPatterns.getOrThrow(BannerPatterns.DIAGONAL_RIGHT);
+    BannerPattern downRight = bannerPatterns.getOrThrow(BannerPatterns.STRIPE_DOWNRIGHT);
+    BannerPattern border = bannerPatterns.getOrThrow(BannerPatterns.BORDER);
+    itemStack.set(DataComponents.BANNER_PATTERNS,
+        new BannerPatternLayers(List.of(
+            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(halfDiagBottomRight), DyeColor.GRAY),
+            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(downRight), DyeColor.WHITE),
+            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(border), DyeColor.GRAY))));
+    addModelData(itemStack);
+    itemStack.set(DataComponents.HIDE_TOOLTIP, Unit.INSTANCE);
+    return itemStack;
+  }
+
+  @Override
+  protected @NotNull ItemStack defaultShield() {
+    // Shield with "missing texture" pattern, magenta and black squares.
+    ItemStack itemStack = new ItemStack(Items.SHIELD);
+    itemStack.set(DataComponents.BASE_COLOR, DyeColor.MAGENTA);
+    RegistryAccess minecraftRegistry = CraftRegistry.getMinecraftRegistry();
+    Registry<BannerPattern> bannerPatterns = minecraftRegistry.registryOrThrow(Registries.BANNER_PATTERN);
+    BannerPattern halfLeft = bannerPatterns.getOrThrow(BannerPatterns.HALF_VERTICAL);
+    BannerPattern topLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_LEFT);
+    BannerPattern topRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_RIGHT);
+    BannerPattern bottomLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_LEFT);
+    BannerPattern bottomRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_RIGHT);
+    itemStack.set(DataComponents.BANNER_PATTERNS,
+        new BannerPatternLayers(List.of(
+            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(halfLeft), DyeColor.BLACK),
+            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(topLeft), DyeColor.MAGENTA),
+            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(bottomLeft), DyeColor.MAGENTA),
+            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(topRight), DyeColor.BLACK),
+            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(bottomRight), DyeColor.BLACK))));
+    itemStack.set(DataComponents.HIDE_TOOLTIP, Unit.INSTANCE);
+    addModelData(itemStack);
+    return itemStack;
+  }
+
+}

internal/paper1_21_1/src/main/java/com/lishid/openinv/internal/paper1_21_1/player/PlayerManager.java

@@ -0,0 +1,54 @@
+package com.lishid.openinv.internal.paper1_21_1.player;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ClientInformation;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.ChatVisiblity;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.logging.Logger;
+
+public class PlayerManager extends com.lishid.openinv.internal.common.player.PlayerManager {
+  public PlayerManager(@NotNull Logger logger) {
+    super(logger);
+  }
+
+  @Override
+  protected @NotNull ServerPlayer createNewPlayer(
+      @NotNull MinecraftServer server,
+      @NotNull ServerLevel worldServer,
+      @NotNull final OfflinePlayer offline) {
+    // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
+    // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
+    GameProfile profile = new GameProfile(offline.getUniqueId(),
+        offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
+
+    ClientInformation dummyInfo = new ClientInformation(
+        "en_us",
+        1, // Reduce distance just in case.
+        ChatVisiblity.HIDDEN, // Don't accept chat.
+        false,
+        ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
+        ServerPlayer.DEFAULT_MAIN_HAND,
+        true,
+        false // Don't list in player list (not that this player is in the list anyway).
+    );
+
+    ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
+
+    try {
+      injectPlayer(entity);
+    } catch (IllegalAccessException e) {
+      logger.log(
+          java.util.logging.Level.WARNING,
+          e,
+          () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
+    }
+
+    return entity;
+  }
+
+}

internal/paper1_21_3/build.gradle.kts

@@ -0,0 +1,26 @@
+plugins {
+  `openinv-base`
+  alias(libs.plugins.paperweight)
+}
+
+configurations.all {
+  resolutionStrategy.capabilitiesResolution.withCapability("org.spigotmc:spigot-api") {
+    val paper = candidates.firstOrNull {
+      it.id.let {
+        id -> id is ModuleComponentIdentifier && id.module == "paper-api"
+      }
+    }
+    if (paper != null) {
+      select(paper)
+    }
+    because("module is written for Paper servers")
+  }
+}
+
+dependencies {
+  implementation(project(":openinvapi"))
+  implementation(project(":openinvcommon"))
+  implementation(project(":openinvadaptercommon"))
+
+  paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
+}

internal/paper1_21_3/src/main/java/com/lishid/openinv/internal/paper1_21_3/InternalAccessor.java

@@ -0,0 +1,28 @@
+package com.lishid.openinv.internal.paper1_21_3;
+
+import com.lishid.openinv.internal.paper1_21_3.container.slot.placeholder.NumericDataPlaceholderLoader;
+import com.lishid.openinv.util.lang.LanguageManager;
+import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class InternalAccessor extends com.lishid.openinv.internal.common.InternalAccessor {
+
+  public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {
+    super(logger, lang);
+  }
+
+  @Override
+  public void reload(@NotNull ConfigurationSection config) {
+    ConfigurationSection placeholders = config.getConfigurationSection("placeholders");
+    try {
+      // Reset placeholders to defaults and try to load configuration.
+      new NumericDataPlaceholderLoader().load(placeholders);
+    } catch (Exception e) {
+      logger.log(Level.WARNING, "Caught exception loading placeholder overrides!", e);
+    }
+  }
+
+}

internal/paper1_21_3/src/main/java/com/lishid/openinv/internal/paper1_21_3/container/slot/placeholder/NumericDataPlaceholderLoader.java

@@ -0,0 +1,31 @@
+package com.lishid.openinv.internal.paper1_21_3.container.slot.placeholder;
+
+import com.lishid.openinv.internal.common.container.slot.placeholder.PlaceholderLoaderBase;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.util.Unit;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.component.CustomModelData;
+import net.minecraft.world.level.block.entity.BannerPattern;
+import net.minecraft.world.level.block.entity.BannerPatternLayers;
+import net.minecraft.world.level.block.entity.BannerPatterns;
+import org.bukkit.craftbukkit.CraftRegistry;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class NumericDataPlaceholderLoader extends PlaceholderLoaderBase {
+
+  private static final CustomModelData DEFAULT_CUSTOM_MODEL_DATA = new CustomModelData(9999);
+
+  @Override
+  protected void addModelData(ItemStack itemStack) {
+    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
+  }
+
+}

internal/spigot/build.gradle.kts

@@ -0,0 +1,50 @@
+plugins {
+  `remap-spigot`
+  `openinv-base`
+  alias(libs.plugins.shadow)
+}
+
+repositories {
+  mavenLocal()
+}
+
+val spigotVer = "1.21.4-R0.1-SNAPSHOT"
+rootProject.extra["craftbukkitPackage"] = "v1_21_R3"
+
+configurations.all {
+  resolutionStrategy.capabilitiesResolution.withCapability("org.spigotmc:spigot-api") {
+    val spigot = candidates.firstOrNull {
+      it.id.let {
+        id -> id is ModuleComponentIdentifier && id.module == "spigot-api"
+      }
+    }
+    if (spigot != null) {
+      select(spigot)
+    }
+    because("module is written for Spigot servers")
+  }
+}
+
+dependencies {
+  compileOnly(libs.spigotapi)
+  compileOnly(create("org.spigotmc", "spigot", spigotVer, classifier = "remapped-mojang"))
+
+  compileOnly(project(":openinvapi"))
+  compileOnly(project(":openinvcommon"))
+
+  // Reduce duplicate code by lightly remapping common adapter.
+  implementation(project(":openinvadaptercommon", configuration = "spigotRelocated"))
+}
+
+tasks.shadowJar {
+  relocate("com.lishid.openinv.internal.common", "com.lishid.openinv.internal.reobf")
+}
+
+// TODO this appears to be a deprecated way to do things
+//   may want to just move all helper methods here.
+tasks.register<Remap_spigot_gradle.RemapTask>("reobf") {
+  notCompatibleWithConfigurationCache("gradle is hard")
+  dependsOn(tasks.shadowJar)
+  inputs.files(tasks.shadowJar.get().outputs.files.files)
+  spigotVersion = spigotVer
+}

internal/spigot/src/main/java/com/lishid/openinv/internal/reobf/container/AnySilentContainer.java

@@ -0,0 +1,194 @@
+package com.lishid.openinv.internal.reobf.container;
+
+import com.lishid.openinv.internal.AnySilentContainerBase;
+import com.lishid.openinv.internal.reobf.container.menu.OpenChestMenu;
+import com.lishid.openinv.internal.reobf.player.PlayerManager;
+import com.lishid.openinv.util.ReflectionHelper;
+import com.lishid.openinv.util.lang.LanguageManager;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.level.ServerPlayerGameMode;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.SimpleMenuProvider;
+import net.minecraft.world.inventory.ChestMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.inventory.PlayerEnderChestContainer;
+import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.block.BarrelBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.ChestBlock;
+import net.minecraft.world.level.block.ShulkerBoxBlock;
+import net.minecraft.world.level.block.TrappedChestBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
+import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.Statistic;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Field;
+import java.util.logging.Logger;
+
+public class AnySilentContainer extends AnySilentContainerBase {
+
+  private final @NotNull Logger logger;
+  private final @NotNull LanguageManager lang;
+  private @Nullable Field serverPlayerGameModeGameType;
+
+  public AnySilentContainer(@NotNull Logger logger, @NotNull LanguageManager lang) {
+    this.logger = logger;
+    this.lang = lang;
+    try {
+      try {
+        this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("b");
+        this.serverPlayerGameModeGameType.setAccessible(true);
+      } catch (NoSuchFieldException e) {
+        logger.warning("The mapping of ServerPlayerGameMode#gameModeForPlayer has changed!");
+        logger.warning("Please report this at https://github.com/Jikoo/OpenInv/issues");
+        logger.warning("Attempting to fall through using reflection. Please verify that SilentContainer does not fail.");
+        // N.B. gameModeForPlayer is (for now) declared before previousGameModeForPlayer so silent shouldn't break.
+        this.serverPlayerGameModeGameType = ReflectionHelper.grabFieldByType(ServerPlayerGameMode.class, GameType.class);
+      }
+    } catch (SecurityException e) {
+      logger.warning("Unable to directly write player game mode! SilentContainer will fail.");
+      logger.log(java.util.logging.Level.WARNING, "Error obtaining GameType field", e);
+    }
+  }
+
+  @Override
+  public boolean activateContainer(
+      @NotNull final Player bukkitPlayer,
+      final boolean silentchest,
+      @NotNull final org.bukkit.block.Block bukkitBlock) {
+
+    // Silent ender chest is API-only
+    if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
+      bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
+      bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+      return true;
+    }
+
+    ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
+
+    final net.minecraft.world.level.Level level = player.level();
+    final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
+    final BlockEntity blockEntity = level.getBlockEntity(blockPos);
+
+    if (blockEntity == null) {
+      return false;
+    }
+
+    if (blockEntity instanceof EnderChestBlockEntity enderChestTile) {
+      // Anychest ender chest. See net.minecraft.world.level.block.EnderChestBlock
+      PlayerEnderChestContainer enderChest = player.getEnderChestInventory();
+      enderChest.setActiveChest(enderChestTile);
+      player.openMenu(new SimpleMenuProvider((containerCounter, playerInventory, ignored) -> {
+        MenuType<?> containers = OpenChestMenu.getChestMenuType(enderChest.getContainerSize());
+        int rows = enderChest.getContainerSize() / 9;
+        return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
+      }, Component.translatable("container.enderchest")));
+      bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+      return true;
+    }
+
+    if (!(blockEntity instanceof MenuProvider menuProvider)) {
+      return false;
+    }
+
+    BlockState blockState = level.getBlockState(blockPos);
+    Block block = blockState.getBlock();
+
+    if (block instanceof ChestBlock chestBlock) {
+
+      // boolean flag: do not check if chest is blocked
+      menuProvider = chestBlock.getMenuProvider(blockState, level, blockPos, true);
+
+      if (menuProvider == null) {
+        lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
+        return false;
+      }
+
+      if (block instanceof TrappedChestBlock) {
+        bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
+      } else {
+        bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
+      }
+    }
+
+    if (block instanceof ShulkerBoxBlock) {
+      bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
+    }
+
+    if (block instanceof BarrelBlock) {
+      bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
+    }
+
+    // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
+    if (!silentchest || player.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) {
+      player.openMenu(menuProvider);
+      return true;
+    }
+
+    // SilentChest requires access to setting players' game mode directly.
+    if (this.serverPlayerGameModeGameType == null) {
+      return false;
+    }
+
+    if (blockEntity instanceof RandomizableContainerBlockEntity lootable) {
+      if (lootable.lootTable != null) {
+        lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
+        return false;
+      }
+    }
+
+    GameType gameType = player.gameMode.getGameModeForPlayer();
+    this.forceGameType(player, GameType.SPECTATOR);
+    player.openMenu(menuProvider);
+    this.forceGameType(player, gameType);
+    return true;
+  }
+
+  @Override
+  public void deactivateContainer(@NotNull final Player bukkitPlayer) {
+    if (this.serverPlayerGameModeGameType == null || bukkitPlayer.getGameMode() == GameMode.SPECTATOR) {
+      return;
+    }
+
+    ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
+
+    // Force game mode change without informing plugins or players.
+    // Regular game mode set calls GameModeChangeEvent and is cancellable.
+    GameType gameType = player.gameMode.getGameModeForPlayer();
+    this.forceGameType(player, GameType.SPECTATOR);
+
+    // ServerPlayer#closeContainer cannot be called without entering an
+    // infinite loop because this method is called during inventory close.
+    // From ServerPlayer#closeContainer -> CraftEventFactory#handleInventoryCloseEvent
+    player.containerMenu.transferTo(player.inventoryMenu, player.getBukkitEntity());
+    // From ServerPlayer#closeContainer
+    player.doCloseContainer();
+    // Regular inventory close will handle the rest - packet sending, etc.
+
+    // Revert forced game mode.
+    this.forceGameType(player, gameType);
+  }
+
+  private void forceGameType(final ServerPlayer player, final GameType gameMode) {
+    if (this.serverPlayerGameModeGameType == null) {
+      // No need to warn repeatedly, error on startup and lack of function should be enough.
+      return;
+    }
+    try {
+      this.serverPlayerGameModeGameType.setAccessible(true);
+      this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
+    } catch (IllegalArgumentException | IllegalAccessException e) {
+      logger.log(java.util.logging.Level.WARNING, "Error bypassing GameModeChangeEvent", e);
+    }
+  }
+
+}

internal/spigot/src/main/java/com/lishid/openinv/internal/reobf/player/PlayerManager.java

@@ -0,0 +1,220 @@
+package com.lishid.openinv.internal.reobf.player;
+
+import com.lishid.openinv.internal.ISpecialInventory;
+import com.lishid.openinv.internal.reobf.container.OpenEnderChest;
+import com.lishid.openinv.internal.reobf.container.OpenInventory;
+import com.mojang.authlib.GameProfile;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ClientInformation;
+import net.minecraft.server.level.ParticleStatus;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.ChatVisiblity;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.level.Level;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_21_R3.event.CraftEventFactory;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Field;
+import java.util.logging.Logger;
+
+public class PlayerManager implements com.lishid.openinv.internal.PlayerManager {
+
+  private final @NotNull Logger logger;
+  private @Nullable Field bukkitEntity;
+
+  public PlayerManager(@NotNull Logger logger) {
+    this.logger = logger;
+    try {
+      bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
+    } catch (NoSuchFieldException e) {
+      logger.warning("Unable to obtain field to inject custom save process - certain player data may be lost when saving!");
+      logger.log(java.util.logging.Level.WARNING, e.getMessage(), e);
+      bukkitEntity = null;
+    }
+  }
+
+  public static @NotNull ServerPlayer getHandle(final Player player) {
+    if (player instanceof CraftPlayer) {
+      return ((CraftPlayer) player).getHandle();
+    }
+
+    Server server = player.getServer();
+    ServerPlayer nmsPlayer = null;
+
+    if (server instanceof CraftServer) {
+      nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getUniqueId());
+    }
+
+    if (nmsPlayer == null) {
+      // Could use reflection to examine fields, but it's honestly not worth the bother.
+      throw new RuntimeException("Unable to fetch EntityPlayer from Player implementation " + player.getClass().getName());
+    }
+
+    return nmsPlayer;
+  }
+
+  @Override
+  public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
+    MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+    ServerLevel worldServer = server.getLevel(Level.OVERWORLD);
+
+    if (worldServer == null) {
+      return null;
+    }
+
+    // Create a new ServerPlayer.
+    ServerPlayer entity = createNewPlayer(server, worldServer, offline);
+
+    // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
+    entity.getAdvancements().stopListening();
+
+    // Try to load the player's data.
+    if (loadData(entity)) {
+      // If data is loaded successfully, return the Bukkit entity.
+      return entity.getBukkitEntity();
+    }
+
+    return null;
+  }
+
+  private @NotNull ServerPlayer createNewPlayer(
+      @NotNull MinecraftServer server,
+      @NotNull ServerLevel worldServer,
+      @NotNull final OfflinePlayer offline) {
+    // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
+    // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
+    GameProfile profile = new GameProfile(offline.getUniqueId(),
+        offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
+
+    ClientInformation dummyInfo = new ClientInformation(
+        "en_us",
+        1, // Reduce distance just in case.
+        ChatVisiblity.HIDDEN, // Don't accept chat.
+        false,
+        ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
+        ServerPlayer.DEFAULT_MAIN_HAND,
+        true,
+        false, // Don't list in player list (not that this player is in the list anyway).
+        ParticleStatus.MINIMAL
+    );
+
+    ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
+
+    try {
+      injectPlayer(entity);
+    } catch (IllegalAccessException e) {
+      logger.log(
+          java.util.logging.Level.WARNING,
+          e,
+          () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
+    }
+
+    return entity;
+  }
+
+  boolean loadData(@NotNull ServerPlayer player) {
+    // See CraftPlayer#loadData
+    CompoundTag loadedData = player.server.getPlayerList().playerIo.load(player).orElse(null);
+
+    if (loadedData == null) {
+      // Exceptions with loading are logged by Mojang.
+      return false;
+    }
+
+    // Read basic data into the player.
+    player.load(loadedData);
+    // Also read "extra" data.
+    player.readAdditionalSaveData(loadedData);
+    // Game type settings are also loaded separately.
+    player.loadGameTypes(loadedData);
+
+    return true;
+  }
+
+  private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+    if (bukkitEntity == null) {
+      return;
+    }
+
+    bukkitEntity.setAccessible(true);
+
+    bukkitEntity.set(player, new OpenPlayer(player.server.server, player, this));
+  }
+
+  @Override
+  public @NotNull Player inject(@NotNull Player player) {
+    try {
+      ServerPlayer nmsPlayer = getHandle(player);
+      if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
+        return openPlayer;
+      }
+      injectPlayer(nmsPlayer);
+      return nmsPlayer.getBukkitEntity();
+    } catch (IllegalAccessException e) {
+      logger.log(
+          java.util.logging.Level.WARNING,
+          e,
+          () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
+      return player;
+    }
+  }
+
+  @Override
+  public @Nullable InventoryView openInventory(@NotNull Player bukkitPlayer, @NotNull ISpecialInventory inventory, boolean viewOnly) {
+    ServerPlayer player = getHandle(bukkitPlayer);
+
+    if (!OpenPlayer.isConnected(player.connection)) {
+      return null;
+    }
+
+    // See net.minecraft.server.level.ServerPlayer#openMenu(MenuProvider)
+    AbstractContainerMenu menu;
+    Component title;
+    if (inventory instanceof OpenInventory playerInv) {
+      menu = playerInv.createMenu(player, player.nextContainerCounter(), viewOnly);
+      title = playerInv.getTitle(player);
+    } else if (inventory instanceof OpenEnderChest enderChest) {
+      menu = enderChest.createMenu(player, player.nextContainerCounter(), viewOnly);
+      title = enderChest.getTitle();
+    } else {
+      return null;
+    }
+
+    // Should never happen, player is a ServerPlayer with an active connection.
+    if (menu == null) {
+      return null;
+    }
+
+    // Set up title. Title can only be set once for a menu, and is set during the open process.
+    // Further title changes are a hack where the client is sent a "new" inventory with the same ID,
+    // resulting in a title change but no other state modifications (like cursor position).
+    menu.setTitle(title);
+
+    menu = CraftEventFactory.callInventoryOpenEvent(player, menu, false);
+
+    // Menu is null if event is cancelled.
+    if (menu == null) {
+      return null;
+    }
+
+    player.containerMenu = menu;
+    player.connection.send(new ClientboundOpenScreenPacket(menu.containerId, menu.getType(), menu.getTitle()));
+    player.initMenu(menu);
+
+    return menu.getBukkitView();
+  }
+
+}

internal/v1_20_R3/pom.xml

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2011-2023 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>
-    <artifactId>openinvparent</artifactId>
-    <groupId>com.lishid</groupId>
-    <relativePath>../../pom.xml</relativePath>
-    <version>5.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_20_R3</artifactId>
-  <name>OpenInvAdapter1_20_R3</name>
-
-  <properties>
-    <maven.compiler.system>17</maven.compiler.system>
-    <maven.compiler.release>17</maven.compiler.release>
-    <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>${spigot.version}</version>
-    </dependency>
-    <dependency>
-      <artifactId>spigot</artifactId>
-      <groupId>org.spigotmc</groupId>
-      <scope>provided</scope>
-      <version>${spigot.version}</version>
-      <classifier>remapped-mojang</classifier>
-    </dependency>
-    <dependency>
-      <artifactId>openinvapi</artifactId>
-      <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>openinvcommon</artifactId>
-      <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>annotations</artifactId>
-      <groupId>org.jetbrains</groupId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>net.md-5</groupId>
-        <artifactId>specialsource-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

internal/v1_20_R3/src/main/java/com/lishid/openinv/internal/v1_20_R3/InternalAccessor.java

@@ -1,64 +0,0 @@
-package com.lishid.openinv.internal.v1_20_R3;
-
-import com.lishid.openinv.internal.Accessor;
-import com.lishid.openinv.internal.IAnySilentContainer;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.util.lang.LanguageManager;
-import net.minecraft.world.Container;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventory;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.logging.Logger;
-
-public class InternalAccessor implements Accessor {
-
-  private final @NotNull PlayerManager manager;
-  private final @NotNull AnySilentContainer anySilentContainer;
-
-  public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {
-    manager = new PlayerManager(logger, lang);
-    anySilentContainer = new AnySilentContainer(logger, lang);
-  }
-
-  @Override
-  public @NotNull PlayerManager getPlayerManager() {
-    return manager;
-  }
-
-  @Override
-  public @NotNull IAnySilentContainer getAnySilentContainer() {
-    return anySilentContainer;
-  }
-
-  @Override
-  public @NotNull ISpecialPlayerInventory createPlayerInventory(@NotNull Player player) {
-    return new SpecialPlayerInventory(player, player.isOnline());
-  }
-
-  @Override
-  public @NotNull ISpecialEnderChest createEnderChest(@NotNull Player player) {
-    return new SpecialEnderChest(player, player.isOnline());
-  }
-
-  @Override
-  public <T extends ISpecialInventory> @Nullable T get(@NotNull Inventory bukkitInventory, @NotNull Class<T> clazz) {
-    if (!(bukkitInventory instanceof CraftInventory craftInventory)) {
-      return null;
-    }
-    Container container = craftInventory.getInventory();
-    if (clazz.isInstance(container)) {
-      return clazz.cast(container);
-    }
-    return null;
-  }
-
-  @Override
-  public void reload(@NotNull ConfigurationSection config) {}
-
-}

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

@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_20_R3;
-
-import com.lishid.openinv.event.OpenEvents;
-import com.mojang.logging.LogUtils;
-import net.minecraft.Util;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtIo;
-import net.minecraft.nbt.NumericTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.storage.PlayerDataStorage;
-import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Set;
-
-public class OpenPlayer extends CraftPlayer {
-
-    private static final Set<String> RESET_TAGS = Set.of(
-        // net.minecraft.world.Entity#saveWithoutId(CompoundTag)
-        "CustomName",
-        "CustomNameVisible",
-        "Silent",
-        "NoGravity",
-        "Glowing",
-        "TicksFrozen",
-        "HasVisualFire",
-        "Tags",
-        "Passengers",
-        // net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
-        // Intentional omissions to prevent mount loss: Attach, Entity, and RootVehicle
-        "warden_spawn_tracker",
-        "enteredNetherPosition",
-        "SpawnX",
-        "SpawnY",
-        "SpawnZ",
-        "SpawnForced",
-        "SpawnAngle",
-        "SpawnDimension",
-        // net.minecraft.world.entity.player.Player#addAdditionalSaveData(CompoundTag)
-        "ShoulderEntityLeft",
-        "ShoulderEntityRight",
-        "LastDeathLocation",
-        // net.minecraft.world.entity.LivingEntity#addAdditionalSaveData(CompoundTag)
-        "ActiveEffects", // Backwards compat: Renamed from 1.19
-        "active_effects",
-        "SleepingX",
-        "SleepingY",
-        "SleepingZ",
-        "Brain"
-    );
-
-    private final PlayerManager manager;
-
-    OpenPlayer(CraftServer server, ServerPlayer entity, PlayerManager manager) {
-        super(server, entity);
-        this.manager = manager;
-    }
-
-    @Override
-    public void loadData() {
-        manager.loadData(getHandle());
-    }
-
-    @Override
-    public void saveData() {
-        if (OpenEvents.saveCancelled(this)) {
-            return;
-        }
-
-        ServerPlayer player = this.getHandle();
-        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
-        try {
-            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
-
-            CompoundTag oldData = isOnline() ? null : worldNBTStorage.getPlayerData(player.getStringUUID());
-            CompoundTag playerData = getWritableTag(oldData);
-            playerData = player.saveWithoutId(playerData);
-            setExtraData(playerData);
-
-            if (oldData != null) {
-                // Revert certain special data values when offline.
-                revertSpecialValues(playerData, oldData);
-            }
-
-            Path playerDataDir = worldNBTStorage.getPlayerDir().toPath();
-            Path file = Files.createTempFile(playerDataDir, player.getStringUUID() + "-", ".dat");
-            NbtIo.writeCompressed(playerData, file);
-            Path dataFile = playerDataDir.resolve(player.getStringUUID() + ".dat");
-            Path backupFile = playerDataDir.resolve(player.getStringUUID() + ".dat_old");
-            Util.safeReplaceFile(dataFile, file, backupFile);
-        } catch (Exception e) {
-            LogUtils.getLogger().warn("Failed to save player data for {}: {}", player.getScoreboardName(), e);
-        }
-    }
-
-    @Contract("null -> new")
-    private @NotNull CompoundTag getWritableTag(@Nullable CompoundTag oldData) {
-        if (oldData == null) {
-            return new CompoundTag();
-        }
-
-        // Copy old data. This is a deep clone, so operating on it should be safe.
-        oldData = oldData.copy();
-
-        // Remove vanilla/server data that is not written every time.
-        oldData.getAllKeys()
-            .removeIf(key -> RESET_TAGS.contains(key) || key.startsWith("Bukkit"));
-
-        return oldData;
-    }
-
-    private void revertSpecialValues(@NotNull CompoundTag newData, @NotNull CompoundTag oldData) {
-        // Revert automatic updates to play timestamps.
-        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
-        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
-        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
-    }
-
-    private <T extends Tag> void copyValue(
-        @NotNull CompoundTag source,
-        @NotNull CompoundTag target,
-        @NotNull String container,
-        @NotNull String key,
-        @NotNull Class<T> tagType) {
-        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
-        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
-
-        // New container being null means the server implementation doesn't store this data.
-        if (newContainer == null) {
-            return;
-        }
-
-        // If old tag exists, copy it to new location, removing otherwise.
-        setTag(newContainer, key, getTag(oldContainer, key, tagType));
-    }
-
-    private <T extends Tag> @Nullable T getTag(
-        @Nullable CompoundTag container,
-        @NotNull String key,
-        @NotNull Class<T> dataType) {
-        if (container == null) {
-            return null;
-        }
-        Tag value = container.get(key);
-        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
-            return null;
-        }
-        return dataType.cast(value);
-    }
-
-    private <T extends Tag> void setTag(
-        @NotNull CompoundTag container,
-        @NotNull String key,
-        @Nullable T data) {
-        if (data == null) {
-            container.remove(key);
-        } else {
-            container.put(key, data);
-        }
-    }
-
-}

internal/v1_20_R3/src/main/java/com/lishid/openinv/internal/v1_20_R3/PlayerManager.java

@@ -1,297 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_20_R3;
-
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.lishid.openinv.internal.InventoryViewTitle;
-import com.lishid.openinv.internal.OpenInventoryView;
-import com.lishid.openinv.util.lang.LanguageManager;
-import com.mojang.authlib.GameProfile;
-import com.mojang.serialization.Dynamic;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ClientInformation;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.ChatVisiblity;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.dimension.DimensionType;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_20_R3.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftContainer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Field;
-import java.util.UUID;
-import java.util.logging.Logger;
-
-public class PlayerManager implements com.lishid.openinv.internal.PlayerManager {
-
-    private static boolean paper;
-
-    static {
-        try {
-            Class.forName("io.papermc.paper.configuration.Configuration");
-            paper = true;
-        } catch (ClassNotFoundException ignored) {
-            paper = false;
-        }
-    }
-
-    private final @NotNull Logger logger;
-    private final @NotNull LanguageManager lang;
-    private @Nullable Field bukkitEntity;
-
-    public PlayerManager(@NotNull Logger logger, @NotNull LanguageManager lang) {
-        this.logger = logger;
-        this.lang = lang;
-        try {
-            bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
-        } catch (NoSuchFieldException e) {
-            logger.warning("Unable to obtain field to inject custom save process - certain player data may be lost when saving!");
-            logger.log(java.util.logging.Level.WARNING, e.getMessage(), e);
-            bukkitEntity = null;
-        }
-    }
-
-    public static @NotNull ServerPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        ServerPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getUniqueId());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from Player implementation " + player.getClass().getName());
-        }
-
-        return nmsPlayer;
-    }
-
-    @Override
-    public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        ServerLevel worldServer = server.getLevel(Level.OVERWORLD);
-
-        if (worldServer == null) {
-            return null;
-        }
-
-        // Create a new ServerPlayer.
-        ServerPlayer entity = createNewPlayer(server, worldServer, offline);
-
-        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
-        entity.getAdvancements().stopListening();
-
-        // Try to load the player's data.
-        if (loadData(entity)) {
-            // If data is loaded successfully, return the Bukkit entity.
-            return entity.getBukkitEntity();
-        }
-
-        return null;
-    }
-
-    private @NotNull ServerPlayer createNewPlayer(
-        @NotNull MinecraftServer server,
-        @NotNull ServerLevel worldServer,
-        @NotNull final OfflinePlayer offline) {
-        // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
-        // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
-        GameProfile profile = new GameProfile(offline.getUniqueId(),
-            offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
-
-        ClientInformation dummyInfo = new ClientInformation(
-            "en_us",
-            1, // Reduce distance just in case.
-            ChatVisiblity.HIDDEN, // Don't accept chat.
-            false,
-            ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
-            ServerPlayer.DEFAULT_MAIN_HAND,
-            true,
-            false // Don't list in player list (not that this player is in the list anyway).
-        );
-
-        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
-
-        try {
-            injectPlayer(entity);
-        } catch (IllegalAccessException e) {
-            logger.log(
-                java.util.logging.Level.WARNING,
-                e,
-                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
-        }
-
-        return entity;
-    }
-
-    boolean loadData(@NotNull ServerPlayer player) {
-        // See CraftPlayer#loadData
-        CompoundTag loadedData = player.server.getPlayerList().playerIo.load(player);
-
-        if (loadedData == null) {
-            // Exceptions with loading are logged by Mojang.
-            return false;
-        }
-
-        // Read basic data into the player.
-        player.load(loadedData);
-        // Also read "extra" data.
-        player.readAdditionalSaveData(loadedData);
-        // Game type settings are also loaded separately.
-        player.loadGameTypes(loadedData);
-
-        if (paper) {
-            // Paper: world is not loaded by ServerPlayer#load(CompoundTag).
-            parseWorld(player, loadedData);
-        }
-
-        return true;
-    }
-
-    private void parseWorld(@NotNull ServerPlayer player, @NotNull CompoundTag loadedData) {
-        // See PlayerList#placeNewPlayer
-        World bukkitWorld;
-        if (loadedData.contains("WorldUUIDMost") && loadedData.contains("WorldUUIDLeast")) {
-            // Modern Bukkit world.
-            bukkitWorld = Bukkit.getServer().getWorld(new UUID(loadedData.getLong("WorldUUIDMost"), loadedData.getLong("WorldUUIDLeast")));
-        } else if (loadedData.contains("world", net.minecraft.nbt.Tag.TAG_STRING)) {
-            // Legacy Bukkit world.
-            bukkitWorld = Bukkit.getServer().getWorld(loadedData.getString("world"));
-        } else {
-            // Vanilla player data.
-            DimensionType.parseLegacy(new Dynamic<>(NbtOps.INSTANCE, loadedData.get("Dimension")))
-                .resultOrPartial(logger::warning)
-                .map(player.server::getLevel)
-                // If ServerLevel exists, set, otherwise move to spawn.
-                .ifPresentOrElse(player::setServerLevel, () -> player.spawnIn(null));
-            return;
-        }
-        if (bukkitWorld == null) {
-            player.spawnIn(null);
-            return;
-        }
-        player.setServerLevel(((CraftWorld) bukkitWorld).getHandle());
-    }
-
-    private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
-        if (bukkitEntity == null) {
-            return;
-        }
-
-        bukkitEntity.setAccessible(true);
-
-        bukkitEntity.set(player, new OpenPlayer(player.server.server, player, this));
-    }
-
-    @Override
-    public @NotNull Player inject(@NotNull Player player) {
-        try {
-            ServerPlayer nmsPlayer = getHandle(player);
-            if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
-                return openPlayer;
-            }
-            injectPlayer(nmsPlayer);
-            return nmsPlayer.getBukkitEntity();
-        } catch (IllegalAccessException e) {
-            logger.log(
-                java.util.logging.Level.WARNING,
-                e,
-                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
-            return player;
-        }
-    }
-
-    @Override
-    public @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-
-        ServerPlayer nmsPlayer = getHandle(player);
-
-        if (nmsPlayer.connection == null) {
-            return null;
-        }
-
-        InventoryViewTitle title = InventoryViewTitle.of(inventory);
-
-        if (title == null) {
-            return player.openInventory(inventory.getBukkitInventory());
-        }
-
-        InventoryView view = new OpenInventoryView(player, inventory, title.getTitle(lang, player, inventory));
-        AbstractContainerMenu container = new CraftContainer(view, nmsPlayer, nmsPlayer.nextContainerCounter()) {
-            @Override
-            public MenuType<?> getType() {
-                return getContainers(inventory.getBukkitInventory().getSize());
-            }
-        };
-
-        container.setTitle(Component.literal(view.getOriginalTitle()));
-        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
-
-        if (container == null) {
-            return null;
-        }
-
-        nmsPlayer.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(),
-                Component.literal(container.getBukkitView().getTitle())));
-        nmsPlayer.containerMenu = container;
-        nmsPlayer.initMenu(container);
-
-        return container.getBukkitView();
-
-    }
-
-    static @NotNull MenuType<?> getContainers(int inventorySize) {
-
-        return switch (inventorySize) {
-            case 9 -> MenuType.GENERIC_9x1;
-            case 18 -> MenuType.GENERIC_9x2;
-            case 36 -> MenuType.GENERIC_9x4; // PLAYER
-            case 41, 45 -> MenuType.GENERIC_9x5;
-            case 54 -> MenuType.GENERIC_9x6;
-            default -> MenuType.GENERIC_9x3; // Default 27-slot inventory
-        };
-    }
-
-}

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

@@ -1,351 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_20_R3;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import net.minecraft.core.NonNullList;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.ContainerHelper;
-import net.minecraft.world.ContainerListener;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.StackedContents;
-import net.minecraft.world.inventory.PlayerEnderChestContainer;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_20_R3.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpecialEnderChest {
-
-    private final CraftInventory inventory;
-    private ServerPlayer owner;
-    private NonNullList<ItemStack> items;
-    private boolean playerOnline;
-
-    public SpecialEnderChest(final org.bukkit.entity.Player player, final Boolean online) {
-        super(PlayerManager.getHandle(player));
-        this.inventory = new CraftInventory(this);
-        this.owner = PlayerManager.getHandle(player);
-        this.playerOnline = online;
-        this.items = this.owner.getEnderChestInventory().items;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final org.bukkit.entity.Player player) {
-        if (this.playerOnline) {
-            return;
-        }
-
-        ServerPlayer offlinePlayer = this.owner;
-        ServerPlayer onlinePlayer = PlayerManager.getHandle(player);
-
-        // Set owner to new player.
-        this.owner = onlinePlayer;
-
-        // Set player's ender chest contents to our modified contents.
-        PlayerEnderChestContainer onlineEnderChest = onlinePlayer.getEnderChestInventory();
-        for (int i = 0; i < onlineEnderChest.getContainerSize(); ++i) {
-            onlineEnderChest.setItem(i, this.items.get(i));
-        }
-
-        // Set our item array to the new inventory's array.
-        this.items = onlineEnderChest.items;
-
-        // Add viewers to new inventory.
-        onlineEnderChest.transaction.addAll(offlinePlayer.getEnderChestInventory().transaction);
-
-        this.playerOnline = true;
-    }
-
-    @Override
-    public @NotNull org.bukkit.entity.Player getPlayer() {
-        return owner.getBukkitEntity();
-    }
-
-    @Override
-    public void setChanged() {
-        this.owner.getEnderChestInventory().setChanged();
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.owner.getEnderChestInventory().onOpen(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.owner.getEnderChestInventory().onClose(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.owner.getEnderChestInventory().getViewers();
-    }
-
-    @Override
-    public boolean stillValid(Player player) {
-        return true;
-    }
-
-    @Override
-    public void setActiveChest(EnderChestBlockEntity enderChest) {
-        this.owner.getEnderChestInventory().setActiveChest(enderChest);
-    }
-
-    @Override
-    public boolean isActiveChest(EnderChestBlockEntity enderChest) {
-        return this.owner.getEnderChestInventory().isActiveChest(enderChest);
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return this.owner.getEnderChestInventory().getMaxStackSize();
-    }
-
-    @Override
-    public void setMaxStackSize(int i) {
-        this.owner.getEnderChestInventory().setMaxStackSize(i);
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner.getEnderChestInventory().getOwner();
-    }
-
-    @Override
-    public @Nullable Location getLocation() {
-        return null;
-    }
-
-    @Override
-    public void addListener(ContainerListener listener) {
-        this.owner.getEnderChestInventory().addListener(listener);
-    }
-
-    @Override
-    public void removeListener(ContainerListener listener) {
-        this.owner.getEnderChestInventory().removeListener(listener);
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.EMPTY;
-    }
-
-    @Override
-    public ItemStack removeItem(int i, int j) {
-        ItemStack itemstack = ContainerHelper.removeItem(this.items, i, j);
-        if (!itemstack.isEmpty()) {
-            this.setChanged();
-        }
-
-        return itemstack;
-    }
-
-    @Override
-    public ItemStack addItem(ItemStack itemstack) {
-        ItemStack localItem = itemstack.copy();
-        this.moveItemToOccupiedSlotsWithSameType(localItem);
-        if (localItem.isEmpty()) {
-            return ItemStack.EMPTY;
-        } else {
-            this.moveItemToEmptySlots(localItem);
-            return localItem.isEmpty() ? ItemStack.EMPTY : localItem;
-        }
-    }
-
-    @Override
-    public boolean canAddItem(ItemStack itemstack) {
-        for (ItemStack itemstack1 : this.items) {
-            if (itemstack1.isEmpty() || (ItemStack.isSameItemSameTags(itemstack1, itemstack) && itemstack1.getCount() < itemstack1.getMaxStackSize())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private void moveItemToEmptySlots(ItemStack itemstack) {
-        for(int i = 0; i < this.getContainerSize(); ++i) {
-            ItemStack localItem = this.getItem(i);
-            if (localItem.isEmpty()) {
-                this.setItem(i, itemstack.copy());
-                itemstack.setCount(0);
-                return;
-            }
-        }
-    }
-
-    private void moveItemToOccupiedSlotsWithSameType(ItemStack itemstack) {
-        for(int i = 0; i < this.getContainerSize(); ++i) {
-            ItemStack localItem = this.getItem(i);
-            if (ItemStack.isSameItemSameTags(localItem, itemstack)) {
-                this.moveItemsBetweenStacks(itemstack, localItem);
-                if (itemstack.isEmpty()) {
-                    return;
-                }
-            }
-        }
-    }
-
-    private void moveItemsBetweenStacks(ItemStack itemstack, ItemStack itemstack1) {
-        int i = Math.min(this.getMaxStackSize(), itemstack1.getMaxStackSize());
-        int j = Math.min(itemstack.getCount(), i - itemstack1.getCount());
-        if (j > 0) {
-            itemstack1.grow(j);
-            itemstack.shrink(j);
-            this.setChanged();
-        }
-    }
-
-    @Override
-    public ItemStack removeItemNoUpdate(int i) {
-        ItemStack itemstack = this.items.get(i);
-        if (itemstack.isEmpty()) {
-            return ItemStack.EMPTY;
-        } else {
-            this.items.set(i, ItemStack.EMPTY);
-            return itemstack;
-        }
-    }
-
-    @Override
-    public void setItem(int i, ItemStack itemstack) {
-        this.items.set(i, itemstack);
-        if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
-            itemstack.setCount(this.getMaxStackSize());
-        }
-
-        this.setChanged();
-    }
-
-    @Override
-    public int getContainerSize() {
-        return this.owner.getEnderChestInventory().getContainerSize();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return this.items.stream().allMatch(ItemStack::isEmpty);
-    }
-
-    @Override
-    public void startOpen(Player player) {
-    }
-
-    @Override
-    public void stopOpen(Player player) {
-    }
-
-    @Override
-    public boolean canPlaceItem(int i, ItemStack itemstack) {
-        return true;
-    }
-
-    @Override
-    public void clearContent() {
-        this.items.clear();
-        this.setChanged();
-    }
-
-    @Override
-    public void fillStackedContents(StackedContents stackedContents) {
-        for (ItemStack itemstack : this.items) {
-            stackedContents.accountStack(itemstack);
-        }
-
-    }
-
-    @Override
-    public List<ItemStack> removeAllItems() {
-        List<ItemStack> list = this.items.stream().filter(Predicate.not(ItemStack::isEmpty)).collect(Collectors.toList());
-        this.clearContent();
-        return list;
-    }
-
-    @Override
-    public ItemStack removeItemType(Item item, int i) {
-        ItemStack itemstack = new ItemStack(item, 0);
-
-        for(int j = this.getContainerSize() - 1; j >= 0; --j) {
-            ItemStack localItem = this.getItem(j);
-            if (localItem.getItem().equals(item)) {
-                int k = i - itemstack.getCount();
-                ItemStack splitItem = localItem.split(k);
-                itemstack.grow(splitItem.getCount());
-                if (itemstack.getCount() == i) {
-                    break;
-                }
-            }
-        }
-
-        if (!itemstack.isEmpty()) {
-            this.setChanged();
-        }
-
-        return itemstack;
-    }
-
-    @Override
-    public String toString() {
-        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).toList().toString();
-    }
-
-    @Override
-    public void fromTag(ListTag listTag) {
-        for (int i = 0; i < this.getContainerSize(); ++i) {
-            this.setItem(i, ItemStack.EMPTY);
-        }
-
-        for (int i = 0; i < listTag.size(); ++i) {
-            CompoundTag compoundTag = listTag.getCompound(i);
-            int j = compoundTag.getByte("Slot") & 255;
-            if (j < this.getContainerSize()) {
-                this.setItem(j, ItemStack.of(compoundTag));
-            }
-        }
-
-    }
-
-}

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

@@ -1,807 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_20_R3;
-
-import com.google.common.collect.ImmutableList;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportCategory;
-import net.minecraft.ReportedException;
-import net.minecraft.core.NonNullList;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.tags.DamageTypeTags;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.Container;
-import net.minecraft.world.ContainerHelper;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.StackedContents;
-import net.minecraft.world.item.ArmorItem;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_20_R3.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerInventory {
-
-    private final CraftInventory inventory;
-    private boolean playerOnline;
-    private Player player;
-    private NonNullList<ItemStack> items;
-    private NonNullList<ItemStack> armor;
-    private NonNullList<ItemStack> offhand;
-    private List<NonNullList<ItemStack>> compartments;
-
-    public SpecialPlayerInventory(@NotNull org.bukkit.entity.Player bukkitPlayer, @NotNull Boolean online) {
-        super(PlayerManager.getHandle(bukkitPlayer));
-        this.inventory = new CraftInventory(this);
-        this.playerOnline = online;
-        this.player = super.player;
-        this.selected = player.getInventory().selected;
-        this.items = this.player.getInventory().items;
-        this.armor = this.player.getInventory().armor;
-        this.offhand = this.player.getInventory().offhand;
-        this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull org.bukkit.entity.Player player) {
-        if (this.playerOnline) {
-            return;
-        }
-
-        Player offlinePlayer = this.player;
-        Player onlinePlayer = PlayerManager.getHandle(player);
-        onlinePlayer.getInventory().transaction.addAll(this.transaction);
-
-        // Set owner to new player.
-        this.player = onlinePlayer;
-
-        // Set player's inventory contents to our modified contents.
-        Inventory onlineInventory = onlinePlayer.getInventory();
-        for (int i = 0; i < getContainerSize(); ++i) {
-            onlineInventory.setItem(i, getRawItem(i));
-        }
-        onlineInventory.selected = this.selected;
-
-        // Set our item arrays to the new inventory's arrays.
-        this.items = onlineInventory.items;
-        this.armor = onlineInventory.armor;
-        this.offhand = onlineInventory.offhand;
-        this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
-
-        // Add existing viewers to new viewer list.
-        Inventory offlineInventory = offlinePlayer.getInventory();
-        // Remove self from listing - player is always a viewer of their own inventory, prevent duplicates.
-        offlineInventory.transaction.remove(offlinePlayer.getBukkitEntity());
-        onlineInventory.transaction.addAll(offlineInventory.transaction);
-
-        this.playerOnline = true;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return this.inventory;
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public @NotNull HumanEntity getPlayer() {
-        return this.player.getBukkitEntity();
-    }
-
-    private @NotNull ItemStack getRawItem(int i) {
-        if (i < 0) {
-            return ItemStack.EMPTY;
-        }
-
-        NonNullList<ItemStack> list;
-        for (Iterator<NonNullList<ItemStack>> iterator = this.compartments.iterator(); iterator.hasNext(); i -= list.size()) {
-            list = iterator.next();
-            if (i < list.size()) {
-                return list.get(i);
-            }
-        }
-
-        return ItemStack.EMPTY;
-    }
-
-    private void setRawItem(int i, @NotNull ItemStack itemStack) {
-        if (i < 0) {
-            return;
-        }
-
-        NonNullList<ItemStack> list;
-        for (Iterator<NonNullList<ItemStack>> iterator = this.compartments.iterator(); iterator.hasNext(); i -= list.size()) {
-            list = iterator.next();
-            if (i < list.size()) {
-                list.set(i, itemStack);
-            }
-        }
-    }
-
-    private record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
-
-    private @NotNull SpecialPlayerInventory.IndexedCompartment getIndexedContent(int index) {
-        if (index < items.size()) {
-            return new IndexedCompartment(items, getReversedItemSlotNum(index));
-        }
-
-        index -= items.size();
-
-        if (index < armor.size()) {
-            return new IndexedCompartment(armor, getReversedArmorSlotNum(index));
-        }
-
-        index -= armor.size();
-
-        if (index < offhand.size()) {
-            return new IndexedCompartment(offhand, index);
-        }
-
-        index -= offhand.size();
-
-        return new IndexedCompartment(null, index);
-    }
-
-    private int getReversedArmorSlotNum(final int i) {
-        if (i == 0) {
-            return 3;
-        }
-        if (i == 1) {
-            return 2;
-        }
-        if (i == 2) {
-            return 1;
-        }
-        if (i == 3) {
-            return 0;
-        }
-        return i;
-    }
-
-    private int getReversedItemSlotNum(final int i) {
-        if (i >= 27) {
-            return i - 27;
-        }
-        return i + 9;
-    }
-
-    private boolean contains(Predicate<ItemStack> predicate) {
-        return this.compartments.stream().flatMap(NonNullList::stream).anyMatch(predicate);
-    }
-
-    @Override
-    public List<ItemStack> getArmorContents() {
-        return this.armor;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.player.getInventory().onOpen(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.player.getInventory().onClose(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.player.getInventory().getViewers();
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.player.getBukkitEntity();
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return this.player.getInventory().getMaxStackSize();
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        this.player.getInventory().setMaxStackSize(size);
-    }
-
-    @Override
-    public Location getLocation() {
-        return this.player.getBukkitEntity().getLocation();
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return false;
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.compartments.stream().flatMap(Collection::stream).collect(Collectors.toList());
-    }
-
-    @Override
-    public ItemStack getSelected() {
-        return isHotbarSlot(this.selected) ? this.items.get(this.selected) : ItemStack.EMPTY;
-    }
-
-    private boolean hasRemainingSpaceForItem(ItemStack itemstack, ItemStack itemstack1) {
-        return !itemstack.isEmpty() && ItemStack.isSameItemSameTags(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
-    }
-
-    @Override
-    public int canHold(ItemStack itemstack) {
-        int remains = itemstack.getCount();
-
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.getRawItem(i);
-            if (itemstack1.isEmpty()) {
-                return itemstack.getCount();
-            }
-
-            if (this.hasRemainingSpaceForItem(itemstack1, itemstack)) {
-                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
-            }
-
-            if (remains <= 0) {
-                return itemstack.getCount();
-            }
-        }
-
-        ItemStack offhandItemStack = this.getRawItem(this.items.size() + this.armor.size());
-        if (this.hasRemainingSpaceForItem(offhandItemStack, itemstack)) {
-            remains -= (offhandItemStack.getMaxStackSize() < this.getMaxStackSize() ? offhandItemStack.getMaxStackSize() : this.getMaxStackSize()) - offhandItemStack.getCount();
-        }
-
-        return remains <= 0 ? itemstack.getCount() : itemstack.getCount() - remains;
-    }
-
-    @Override
-    public int getFreeSlot() {
-        for(int i = 0; i < this.items.size(); ++i) {
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public void setPickedItem(ItemStack itemstack) {
-        int i = this.findSlotMatchingItem(itemstack);
-        if (isHotbarSlot(i)) {
-            this.selected = i;
-        } else if (i == -1) {
-            this.selected = this.getSuitableHotbarSlot();
-            if (!this.items.get(this.selected).isEmpty()) {
-                int j = this.getFreeSlot();
-                if (j != -1) {
-                    this.items.set(j, this.items.get(this.selected));
-                }
-            }
-
-            this.items.set(this.selected, itemstack);
-        } else {
-            this.pickSlot(i);
-        }
-
-    }
-
-    @Override
-    public void pickSlot(int i) {
-        this.selected = this.getSuitableHotbarSlot();
-        ItemStack itemstack = this.items.get(this.selected);
-        this.items.set(this.selected, this.items.get(i));
-        this.items.set(i, itemstack);
-    }
-
-    @Override
-    public int findSlotMatchingItem(ItemStack itemstack) {
-        for(int i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameTags(itemstack, this.items.get(i))) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int findSlotMatchingUnusedItem(ItemStack itemStack) {
-        for(int i = 0; i < this.items.size(); ++i) {
-            ItemStack localItem = this.items.get(i);
-            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameTags(itemStack, this.items.get(i)) && !this.items.get(i).isDamaged() && !localItem.isEnchanted() && !localItem.hasCustomHoverName()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int getSuitableHotbarSlot() {
-        int i;
-        int j;
-        for(j = 0; j < 9; ++j) {
-            i = (this.selected + j) % 9;
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        for(j = 0; j < 9; ++j) {
-            i = (this.selected + j) % 9;
-            if (!this.items.get(i).isEnchanted()) {
-                return i;
-            }
-        }
-
-        return this.selected;
-    }
-
-    @Override
-    public void swapPaint(double d0) {
-        if (d0 > 0.0D) {
-            d0 = 1.0D;
-        }
-
-        if (d0 < 0.0D) {
-            d0 = -1.0D;
-        }
-
-        this.selected = (int) (this.selected - d0);
-
-        while (this.selected < 0) {
-            this.selected += 9;
-        }
-
-        while(this.selected >= 9) {
-            this.selected -= 9;
-        }
-    }
-
-    @Override
-    public int clearOrCountMatchingItems(Predicate<ItemStack> predicate, int i, Container container) {
-        byte b0 = 0;
-        boolean flag = i == 0;
-        int j = b0 + ContainerHelper.clearOrCountMatchingItems(this, predicate, i - b0, flag);
-        j += ContainerHelper.clearOrCountMatchingItems(container, predicate, i - j, flag);
-        ItemStack itemstack = this.player.containerMenu.getCarried();
-        j += ContainerHelper.clearOrCountMatchingItems(itemstack, predicate, i - j, flag);
-        if (itemstack.isEmpty()) {
-            this.player.containerMenu.setCarried(ItemStack.EMPTY);
-        }
-
-        return j;
-    }
-
-    private int addResource(ItemStack itemstack) {
-        int i = this.getSlotWithRemainingSpace(itemstack);
-        if (i == -1) {
-            i = this.getFreeSlot();
-        }
-
-        return i == -1 ? itemstack.getCount() : this.addResource(i, itemstack);
-    }
-
-    private int addResource(int i, ItemStack itemstack) {
-        Item item = itemstack.getItem();
-        int j = itemstack.getCount();
-        ItemStack localItemStack = this.getRawItem(i);
-        if (localItemStack.isEmpty()) {
-            localItemStack = new ItemStack(item, 0);
-            if (itemstack.hasTag()) {
-                // hasTag ensures tag not null
-                //noinspection ConstantConditions
-                localItemStack.setTag(itemstack.getTag().copy());
-            }
-
-            this.setRawItem(i, localItemStack);
-        }
-
-        int k = Math.min(j, localItemStack.getMaxStackSize() - localItemStack.getCount());
-
-        if (k > this.getMaxStackSize() - localItemStack.getCount()) {
-            k = this.getMaxStackSize() - localItemStack.getCount();
-        }
-
-        if (k != 0) {
-            j -= k;
-            localItemStack.grow(k);
-            localItemStack.setPopTime(5);
-        }
-
-        return j;
-    }
-
-    @Override
-    public int getSlotWithRemainingSpace(ItemStack itemstack) {
-        if (this.hasRemainingSpaceForItem(this.getRawItem(this.selected), itemstack)) {
-            return this.selected;
-        } else if (this.hasRemainingSpaceForItem(this.getRawItem(40), itemstack)) {
-            return 40;
-        } else {
-            for(int i = 0; i < this.items.size(); ++i) {
-                if (this.hasRemainingSpaceForItem(this.items.get(i), itemstack)) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-    }
-
-    @Override
-    public void tick() {
-        for (NonNullList<ItemStack> compartment : this.compartments) {
-            for (int i = 0; i < compartment.size(); ++i) {
-                if (!compartment.get(i).isEmpty()) {
-                    compartment.get(i).inventoryTick(this.player.level(), this.player, i, this.selected == i);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean add(ItemStack itemStack) {
-        return this.add(-1, itemStack);
-    }
-
-    @Override
-    public boolean add(int i, ItemStack itemStack) {
-        if (itemStack.isEmpty()) {
-            return false;
-        } else {
-            try {
-                if (itemStack.isDamaged()) {
-                    if (i == -1) {
-                        i = this.getFreeSlot();
-                    }
-
-                    if (i >= 0) {
-                        this.items.set(i, itemStack.copy());
-                        this.items.get(i).setPopTime(5);
-                        itemStack.setCount(0);
-                        return true;
-                    } else if (this.player.getAbilities().instabuild) {
-                        itemStack.setCount(0);
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    int j;
-                    do {
-                        j = itemStack.getCount();
-                        if (i == -1) {
-                            itemStack.setCount(this.addResource(itemStack));
-                        } else {
-                            itemStack.setCount(this.addResource(i, itemStack));
-                        }
-                    } while(!itemStack.isEmpty() && itemStack.getCount() < j);
-
-                    if (itemStack.getCount() == j && this.player.getAbilities().instabuild) {
-                        itemStack.setCount(0);
-                        return true;
-                    } else {
-                        return itemStack.getCount() < j;
-                    }
-                }
-            } catch (Throwable var6) {
-                CrashReport crashReport = CrashReport.forThrowable(var6, "Adding item to inventory");
-                CrashReportCategory crashReportCategory = crashReport.addCategory("Item being added");
-                crashReportCategory.setDetail("Item ID", Item.getId(itemStack.getItem()));
-                crashReportCategory.setDetail("Item data", itemStack.getDamageValue());
-                crashReportCategory.setDetail("Item name", () -> itemStack.getHoverName().getString());
-                throw new ReportedException(crashReport);
-            }
-        }
-    }
-
-    @Override
-    public void placeItemBackInInventory(ItemStack itemStack) {
-        this.placeItemBackInInventory(itemStack, true);
-    }
-
-    @Override
-    public void placeItemBackInInventory(ItemStack itemStack, boolean flag) {
-        while(true) {
-            if (!itemStack.isEmpty()) {
-                int i = this.getSlotWithRemainingSpace(itemStack);
-                if (i == -1) {
-                    i = this.getFreeSlot();
-                }
-
-                if (i != -1) {
-                    int j = itemStack.getMaxStackSize() - this.getRawItem(i).getCount();
-                    if (this.add(i, itemStack.split(j)) && flag && this.player instanceof ServerPlayer) {
-                        ((ServerPlayer)this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, 0, i, this.getRawItem(i)));
-                    }
-                    continue;
-                }
-
-                this.player.drop(itemStack, false);
-            }
-
-            return;
-        }
-    }
-
-    @Override
-    public ItemStack removeItem(int rawIndex, final int j) {
-        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
-
-        if (indexedCompartment.compartment() == null
-                || indexedCompartment.compartment().get(indexedCompartment.index()).isEmpty()) {
-            return ItemStack.EMPTY;
-        }
-
-        return ContainerHelper.removeItem(indexedCompartment.compartment(), indexedCompartment.index(), j);
-    }
-
-    @Override
-    public void removeItem(ItemStack itemStack) {
-        for (NonNullList<ItemStack> compartment : this.compartments) {
-            for (int i = 0; i < compartment.size(); ++i) {
-                if (compartment.get(i) == itemStack) {
-                    compartment.set(i, ItemStack.EMPTY);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public ItemStack removeItemNoUpdate(int rawIndex) {
-        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
-
-        if (indexedCompartment.compartment() == null) {
-            return ItemStack.EMPTY;
-        }
-
-        ItemStack removed = indexedCompartment.compartment().set(indexedCompartment.index(), ItemStack.EMPTY);
-
-        if (removed.isEmpty()) {
-            return ItemStack.EMPTY;
-        }
-
-        return removed;
-    }
-
-    @Override
-    public void setItem(int rawIndex, final ItemStack itemStack) {
-        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
-
-        if (indexedCompartment.compartment() == null) {
-            this.player.drop(itemStack, true);
-            return;
-        }
-
-        indexedCompartment.compartment().set(indexedCompartment.index(), itemStack);
-    }
-
-    @Override
-    public float getDestroySpeed(BlockState blockState) {
-        return this.items.get(this.selected).getDestroySpeed(blockState);
-    }
-
-    @Override
-    public ListTag save(ListTag listTag) {
-        for (int i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty()) {
-                CompoundTag compoundTag = new CompoundTag();
-                compoundTag.putByte("Slot", (byte)i);
-                this.items.get(i).save(compoundTag);
-                listTag.add(compoundTag);
-            }
-        }
-
-        for (int i = 0; i < this.armor.size(); ++i) {
-            if (!this.armor.get(i).isEmpty()) {
-                CompoundTag compoundTag = new CompoundTag();
-                compoundTag.putByte("Slot", (byte)(i + 100));
-                this.armor.get(i).save(compoundTag);
-                listTag.add(compoundTag);
-            }
-        }
-
-        for (int i = 0; i < this.offhand.size(); ++i) {
-            if (!this.offhand.get(i).isEmpty()) {
-                CompoundTag compoundTag = new CompoundTag();
-                compoundTag.putByte("Slot", (byte)(i + 150));
-                this.offhand.get(i).save(compoundTag);
-                listTag.add(compoundTag);
-            }
-        }
-
-        return listTag;
-    }
-
-    @Override
-    public void load(ListTag listTag) {
-        this.items.clear();
-        this.armor.clear();
-        this.offhand.clear();
-
-        for(int i = 0; i < listTag.size(); ++i) {
-            CompoundTag compoundTag = listTag.getCompound(i);
-            int j = compoundTag.getByte("Slot") & 255;
-            ItemStack itemstack = ItemStack.of(compoundTag);
-            if (!itemstack.isEmpty()) {
-                if (j < this.items.size()) {
-                    this.items.set(j, itemstack);
-                } else if (j >= 100 && j < this.armor.size() + 100) {
-                    this.armor.set(j - 100, itemstack);
-                } else if (j >= 150 && j < this.offhand.size() + 150) {
-                    this.offhand.set(j - 150, itemstack);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public int getContainerSize() {
-        return 45;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return !contains(itemStack -> !itemStack.isEmpty());
-    }
-
-    @Override
-    public ItemStack getItem(int rawIndex) {
-        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
-
-        if (indexedCompartment.compartment() == null) {
-            return ItemStack.EMPTY;
-        }
-
-        return indexedCompartment.compartment().get(indexedCompartment.index());
-    }
-
-    @Override
-    public Component getName() {
-        return this.player.getName();
-    }
-
-    @Override
-    public ItemStack getArmor(int index) {
-        return this.armor.get(index);
-    }
-
-    @Override
-    public void hurtArmor(DamageSource damagesource, float damage, int[] armorIndices) {
-        if (damage > 0.0F) {
-            damage /= 4.0F;
-            if (damage < 1.0F) {
-                damage = 1.0F;
-            }
-
-            for (int index : armorIndices) {
-                ItemStack itemstack = this.armor.get(index);
-                if ((!damagesource.is(DamageTypeTags.IS_FIRE) || !itemstack.getItem().isFireResistant()) && itemstack.getItem() instanceof ArmorItem) {
-                    itemstack.hurtAndBreak((int) damage, this.player, localPlayer -> localPlayer.broadcastBreakEvent(EquipmentSlot.byTypeAndIndex(EquipmentSlot.Type.ARMOR, index)));
-                }
-            }
-        }
-    }
-
-    @Override
-    public void dropAll() {
-        for (NonNullList<ItemStack> compartment : this.compartments) {
-            for (int i = 0; i < compartment.size(); ++i) {
-                ItemStack itemstack = compartment.get(i);
-                if (!itemstack.isEmpty()) {
-                    this.player.drop(itemstack, true, false);
-                    compartment.set(i, ItemStack.EMPTY);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void setChanged() {
-        super.setChanged();
-    }
-
-    @Override
-    public int getTimesChanged() {
-        return super.getTimesChanged();
-    }
-
-    @Override
-    public boolean stillValid(Player player) {
-        return true;
-    }
-
-    @Override
-    public boolean contains(ItemStack itemstack) {
-        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(itemstack.getItem()));
-    }
-
-    @Override
-    public boolean contains(TagKey<Item> tagKey) {
-
-        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(tagKey));
-    }
-
-    @Override
-    public void replaceWith(Inventory inventory) {
-        Function<Integer, ItemStack> getter;
-
-        if (inventory instanceof SpecialPlayerInventory specialPlayerInventory) {
-            getter = specialPlayerInventory::getRawItem;
-        } else {
-            getter = inventory::getItem;
-        }
-
-        for(int i = 0; i < this.getContainerSize(); ++i) {
-            this.setRawItem(i, getter.apply(i));
-        }
-
-        this.selected = inventory.selected;
-    }
-
-    @Override
-    public void clearContent() {
-        for (NonNullList<ItemStack> compartment : this.compartments) {
-            compartment.clear();
-        }
-    }
-
-    @Override
-    public void fillStackedContents(StackedContents stackedContents) {
-        for (ItemStack itemstack : this.items) {
-            stackedContents.accountSimpleStack(itemstack);
-        }
-    }
-
-    @Override
-    public ItemStack removeFromSelected(boolean dropWholeStack) {
-        ItemStack itemstack = this.getSelected();
-        return itemstack.isEmpty() ? ItemStack.EMPTY : this.removeItem(this.selected, dropWholeStack ? itemstack.getCount() : 1);
-    }
-
-}

internal/v1_20_R4/pom.xml

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2011-2023 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>
-    <artifactId>openinvparent</artifactId>
-    <groupId>com.lishid</groupId>
-    <relativePath>../../pom.xml</relativePath>
-    <version>5.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_20_R4</artifactId>
-  <name>OpenInvAdapter1_20_R4</name>
-
-  <properties>
-    <maven.compiler.system>21</maven.compiler.system>
-    <maven.compiler.release>21</maven.compiler.release>
-    <spigot.version>1.20.6-R0.1-SNAPSHOT</spigot.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>${spigot.version}</version>
-    </dependency>
-    <dependency>
-      <artifactId>spigot</artifactId>
-      <groupId>org.spigotmc</groupId>
-      <scope>provided</scope>
-      <version>${spigot.version}</version>
-      <classifier>remapped-mojang</classifier>
-    </dependency>
-    <dependency>
-      <artifactId>openinvapi</artifactId>
-      <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>openinvcommon</artifactId>
-      <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>annotations</artifactId>
-      <groupId>org.jetbrains</groupId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>net.md-5</groupId>
-        <artifactId>specialsource-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

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

@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_20_R4;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import com.lishid.openinv.util.ReflectionHelper;
-import com.lishid.openinv.util.lang.LanguageManager;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.level.ServerPlayerGameMode;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.SimpleMenuProvider;
-import net.minecraft.world.inventory.ChestMenu;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.inventory.PlayerEnderChestContainer;
-import net.minecraft.world.level.GameType;
-import net.minecraft.world.level.block.BarrelBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.ChestBlock;
-import net.minecraft.world.level.block.ShulkerBoxBlock;
-import net.minecraft.world.level.block.TrappedChestBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
-import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    private final @NotNull Logger logger;
-    private final @NotNull LanguageManager lang;
-    private @Nullable Field serverPlayerGameModeGameType;
-
-    public AnySilentContainer(@NotNull Logger logger, @NotNull LanguageManager lang) {
-        this.logger = logger;
-        this.lang = lang;
-        try {
-            try {
-                this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("b");
-                this.serverPlayerGameModeGameType.setAccessible(true);
-            } catch (NoSuchFieldException e) {
-                logger.warning("ServerPlayerGameMode#gameModeForPlayer's obfuscated name has changed!");
-                logger.warning("Please report this at https://github.com/Jikoo/OpenInv/issues");
-                logger.warning("Attempting to fall through using reflection. Please verify that SilentContainer does not fail.");
-                // N.B. gameModeForPlayer is (for now) declared before previousGameModeForPlayer so silent shouldn't break.
-                this.serverPlayerGameModeGameType = ReflectionHelper.grabFieldByType(ServerPlayerGameMode.class, GameType.class);
-            }
-        } catch (SecurityException e) {
-            logger.warning("Unable to directly write player game mode! SilentContainer will fail.");
-            logger.log(java.util.logging.Level.WARNING, "Error obtaining GameType field", e);
-        }
-    }
-
-    @Override
-    public boolean activateContainer(
-            @NotNull final Player bukkitPlayer,
-            final boolean silentchest,
-            @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        // Silent ender chest is API-only
-        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
-
-        final net.minecraft.world.level.Level level = player.level();
-        final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final BlockEntity blockEntity = level.getBlockEntity(blockPos);
-
-        if (blockEntity == null) {
-            return false;
-        }
-
-        if (blockEntity instanceof EnderChestBlockEntity enderChestTile) {
-            // Anychest ender chest. See net.minecraft.world.level.block.EnderChestBlock
-            PlayerEnderChestContainer enderChest = player.getEnderChestInventory();
-            enderChest.setActiveChest(enderChestTile);
-            player.openMenu(new SimpleMenuProvider((containerCounter, playerInventory, ignored) -> {
-                MenuType<?> containers = PlayerManager.getContainers(enderChest.getContainerSize());
-                int rows = enderChest.getContainerSize() / 9;
-                return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
-            }, Component.translatable("container.enderchest")));
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        if (!(blockEntity instanceof MenuProvider menuProvider)) {
-            return false;
-        }
-
-        BlockState blockState = level.getBlockState(blockPos);
-        Block block = blockState.getBlock();
-
-        if (block instanceof ChestBlock chestBlock) {
-
-            // boolean flag: do not check if chest is blocked
-            menuProvider = chestBlock.getMenuProvider(blockState, level, blockPos, true);
-
-            if (menuProvider == null) {
-                lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-
-            if (block instanceof TrappedChestBlock) {
-                bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
-            } else {
-                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
-            }
-        }
-
-        if (block instanceof ShulkerBoxBlock) {
-            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
-        }
-
-        if (block instanceof BarrelBlock) {
-            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
-        }
-
-        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) {
-            player.openMenu(menuProvider);
-            return true;
-        }
-
-        // SilentChest requires access to setting players' game mode directly.
-        if (this.serverPlayerGameModeGameType == null) {
-            return false;
-        }
-
-        if (blockEntity instanceof RandomizableContainerBlockEntity lootable) {
-            if (lootable.lootTable != null) {
-                lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-        }
-
-        GameType gameType = player.gameMode.getGameModeForPlayer();
-        this.forceGameType(player, GameType.SPECTATOR);
-        player.openMenu(menuProvider);
-        this.forceGameType(player, gameType);
-        return true;
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.serverPlayerGameModeGameType == null || bukkitPlayer.getGameMode() == GameMode.SPECTATOR) {
-            return;
-        }
-
-        ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
-
-        // Force game mode change without informing plugins or players.
-        // Regular game mode set calls GameModeChangeEvent and is cancellable.
-        GameType gameType = player.gameMode.getGameModeForPlayer();
-        this.forceGameType(player, GameType.SPECTATOR);
-
-        // ServerPlayer#closeContainer cannot be called without entering an
-        // infinite loop because this method is called during inventory close.
-        // From ServerPlayer#closeContainer -> CraftEventFactory#handleInventoryCloseEvent
-        player.containerMenu.transferTo(player.inventoryMenu, player.getBukkitEntity());
-        // From ServerPlayer#closeContainer
-        player.doCloseContainer();
-        // Regular inventory close will handle the rest - packet sending, etc.
-
-        // Revert forced game mode.
-        this.forceGameType(player, gameType);
-    }
-
-    private void forceGameType(final ServerPlayer player, final GameType gameMode) {
-        if (this.serverPlayerGameModeGameType == null) {
-            // No need to warn repeatedly, error on startup and lack of function should be enough.
-            return;
-        }
-        try {
-            this.serverPlayerGameModeGameType.setAccessible(true);
-            this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            logger.log(java.util.logging.Level.WARNING, "Error bypassing GameModeChangeEvent", e);
-        }
-    }
-
-}

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

@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_20_R4;
-
-import com.lishid.openinv.event.OpenEvents;
-import com.mojang.logging.LogUtils;
-import net.minecraft.Util;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtIo;
-import net.minecraft.nbt.NumericTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.storage.PlayerDataStorage;
-import org.bukkit.craftbukkit.v1_20_R4.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R4.entity.CraftPlayer;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Set;
-
-public class OpenPlayer extends CraftPlayer {
-
-    /**
-     * List of tags to always reset when saving.
-     *
-     * @see net.minecraft.world.entity.Entity#saveWithoutId(CompoundTag)
-     * @see net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
-     * @see net.minecraft.world.entity.player.Player#addAdditionalSaveData(CompoundTag)
-     * @see net.minecraft.world.entity.LivingEntity#addAdditionalSaveData(CompoundTag)
-     */
-    private static final Set<String> RESET_TAGS = Set.of(
-        // Entity#saveWithoutId(CompoundTag)
-        "CustomName",
-        "CustomNameVisible",
-        "Silent",
-        "NoGravity",
-        "Glowing",
-        "TicksFrozen",
-        "HasVisualFire",
-        "Tags",
-        "Passengers",
-        // ServerPlayer#addAdditionalSaveData(CompoundTag)
-        // Intentional omissions to prevent mount loss: Attach, Entity, and RootVehicle
-        "warden_spawn_tracker",
-        "enteredNetherPosition",
-        "SpawnX",
-        "SpawnY",
-        "SpawnZ",
-        "SpawnForced",
-        "SpawnAngle",
-        "SpawnDimension",
-        "raid_omen_position",
-        // Player#addAdditionalSaveData(CompoundTag)
-        "ShoulderEntityLeft",
-        "ShoulderEntityRight",
-        "LastDeathLocation",
-        "current_explosion_impact_pos",
-        // LivingEntity#addAdditionalSaveData(CompoundTag)
-        "ActiveEffects", // Backwards compat: Renamed from 1.19
-        "active_effects",
-        "SleepingX",
-        "SleepingY",
-        "SleepingZ",
-        "Brain"
-    );
-
-    private final PlayerManager manager;
-
-    OpenPlayer(CraftServer server, ServerPlayer entity, PlayerManager manager) {
-        super(server, entity);
-        this.manager = manager;
-    }
-
-    @Override
-    public void loadData() {
-        manager.loadData(getHandle());
-    }
-
-    @Override
-    public void saveData() {
-        if (OpenEvents.saveCancelled(this)) {
-            return;
-        }
-
-        ServerPlayer player = this.getHandle();
-        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
-        try {
-            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
-
-            CompoundTag oldData = isOnline() ? null : worldNBTStorage.load(player.getName().getString(), player.getStringUUID()).orElse(null);
-            CompoundTag playerData = getWritableTag(oldData);
-            playerData = player.saveWithoutId(playerData);
-            setExtraData(playerData);
-
-            if (oldData != null) {
-                // Revert certain special data values when offline.
-                revertSpecialValues(playerData, oldData);
-            }
-
-            Path playerDataDir = worldNBTStorage.getPlayerDir().toPath();
-            Path tempFile = Files.createTempFile(playerDataDir, player.getStringUUID() + "-", ".dat");
-            NbtIo.writeCompressed(playerData, tempFile);
-            Path dataFile = playerDataDir.resolve(player.getStringUUID() + ".dat");
-            Path backupFile = playerDataDir.resolve(player.getStringUUID() + ".dat_old");
-            Util.safeReplaceFile(dataFile, tempFile, backupFile);
-        } catch (Exception e) {
-            LogUtils.getLogger().warn("Failed to save player data for {}: {}", player.getScoreboardName(), e);
-        }
-    }
-
-    @Contract("null -> new")
-    private @NotNull CompoundTag getWritableTag(@Nullable CompoundTag oldData) {
-        if (oldData == null) {
-            return new CompoundTag();
-        }
-
-        // Copy old data. This is a deep clone, so operating on it should be safe.
-        oldData = oldData.copy();
-
-        // Remove vanilla/server data that is not written every time.
-        oldData.getAllKeys()
-            .removeIf(key -> RESET_TAGS.contains(key) || key.startsWith("Bukkit"));
-
-        return oldData;
-    }
-
-    private void revertSpecialValues(@NotNull CompoundTag newData, @NotNull CompoundTag oldData) {
-        // Revert automatic updates to play timestamps.
-        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
-        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
-        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
-    }
-
-    private <T extends Tag> void copyValue(
-        @NotNull CompoundTag source,
-        @NotNull CompoundTag target,
-        @NotNull String container,
-        @NotNull String key,
-        @NotNull Class<T> tagType) {
-        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
-        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
-
-        // New container being null means the server implementation doesn't store this data.
-        if (newContainer == null) {
-            return;
-        }
-
-        // If old tag exists, copy it to new location, removing otherwise.
-        setTag(newContainer, key, getTag(oldContainer, key, tagType));
-    }
-
-    private <T extends Tag> @Nullable T getTag(
-        @Nullable CompoundTag container,
-        @NotNull String key,
-        @NotNull Class<T> dataType) {
-        if (container == null) {
-            return null;
-        }
-        Tag value = container.get(key);
-        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
-            return null;
-        }
-        return dataType.cast(value);
-    }
-
-    private <T extends Tag> void setTag(
-        @NotNull CompoundTag container,
-        @NotNull String key,
-        @Nullable T data) {
-        if (data == null) {
-            container.remove(key);
-        } else {
-            container.put(key, data);
-        }
-    }
-
-}

internal/v1_20_R4/src/main/java/com/lishid/openinv/internal/v1_20_R4/PlayerManager.java

@@ -1,297 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_20_R4;
-
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.lishid.openinv.internal.InventoryViewTitle;
-import com.lishid.openinv.internal.OpenInventoryView;
-import com.lishid.openinv.util.lang.LanguageManager;
-import com.mojang.authlib.GameProfile;
-import com.mojang.serialization.Dynamic;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ClientInformation;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.ChatVisiblity;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.dimension.DimensionType;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_20_R4.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R4.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R4.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_20_R4.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftContainer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Field;
-import java.util.UUID;
-import java.util.logging.Logger;
-
-public class PlayerManager implements com.lishid.openinv.internal.PlayerManager {
-
-    private static boolean paper;
-
-    static {
-        try {
-            Class.forName("io.papermc.paper.configuration.Configuration");
-            paper = true;
-        } catch (ClassNotFoundException ignored) {
-            paper = false;
-        }
-    }
-
-    private final @NotNull Logger logger;
-    private final @NotNull LanguageManager lang;
-    private @Nullable Field bukkitEntity;
-
-    public PlayerManager(@NotNull Logger logger, @NotNull LanguageManager lang) {
-        this.logger = logger;
-        this.lang = lang;
-        try {
-            bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
-        } catch (NoSuchFieldException e) {
-            logger.warning("Unable to obtain field to inject custom save process - certain player data may be lost when saving!");
-            logger.log(java.util.logging.Level.WARNING, e.getMessage(), e);
-            bukkitEntity = null;
-        }
-    }
-
-    public static @NotNull ServerPlayer getHandle(final Player player) {
-        if (player instanceof CraftPlayer) {
-            return ((CraftPlayer) player).getHandle();
-        }
-
-        Server server = player.getServer();
-        ServerPlayer nmsPlayer = null;
-
-        if (server instanceof CraftServer) {
-            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getUniqueId());
-        }
-
-        if (nmsPlayer == null) {
-            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from Player implementation " + player.getClass().getName());
-        }
-
-        return nmsPlayer;
-    }
-
-    @Override
-    public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!offline.hasPlayedBefore()) {
-            return null;
-        }
-
-        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-        ServerLevel worldServer = server.getLevel(Level.OVERWORLD);
-
-        if (worldServer == null) {
-            return null;
-        }
-
-        // Create a new ServerPlayer.
-        ServerPlayer entity = createNewPlayer(server, worldServer, offline);
-
-        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
-        entity.getAdvancements().stopListening();
-
-        // Try to load the player's data.
-        if (loadData(entity)) {
-            // If data is loaded successfully, return the Bukkit entity.
-            return entity.getBukkitEntity();
-        }
-
-        return null;
-    }
-
-    private @NotNull ServerPlayer createNewPlayer(
-        @NotNull MinecraftServer server,
-        @NotNull ServerLevel worldServer,
-        @NotNull final OfflinePlayer offline) {
-        // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
-        // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
-        GameProfile profile = new GameProfile(offline.getUniqueId(),
-            offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
-
-        ClientInformation dummyInfo = new ClientInformation(
-            "en_us",
-            1, // Reduce distance just in case.
-            ChatVisiblity.HIDDEN, // Don't accept chat.
-            false,
-            ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
-            ServerPlayer.DEFAULT_MAIN_HAND,
-            true,
-            false // Don't list in player list (not that this player is in the list anyway).
-        );
-
-        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
-
-        try {
-            injectPlayer(entity);
-        } catch (IllegalAccessException e) {
-            logger.log(
-                java.util.logging.Level.WARNING,
-                e,
-                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
-        }
-
-        return entity;
-    }
-
-    boolean loadData(@NotNull ServerPlayer player) {
-        // See CraftPlayer#loadData
-        CompoundTag loadedData = player.server.getPlayerList().playerIo.load(player).orElse(null);
-
-        if (loadedData == null) {
-            // Exceptions with loading are logged by Mojang.
-            return false;
-        }
-
-        // Read basic data into the player.
-        player.load(loadedData);
-        // Also read "extra" data.
-        player.readAdditionalSaveData(loadedData);
-        // Game type settings are also loaded separately.
-        player.loadGameTypes(loadedData);
-
-        if (paper) {
-            // Paper: world is not loaded by ServerPlayer#load(CompoundTag).
-            parseWorld(player, loadedData);
-        }
-
-        return true;
-    }
-
-    private void parseWorld(@NotNull ServerPlayer player, @NotNull CompoundTag loadedData) {
-        // See PlayerList#placeNewPlayer
-        World bukkitWorld;
-        if (loadedData.contains("WorldUUIDMost") && loadedData.contains("WorldUUIDLeast")) {
-            // Modern Bukkit world.
-            bukkitWorld = Bukkit.getServer().getWorld(new UUID(loadedData.getLong("WorldUUIDMost"), loadedData.getLong("WorldUUIDLeast")));
-        } else if (loadedData.contains("world", net.minecraft.nbt.Tag.TAG_STRING)) {
-            // Legacy Bukkit world.
-            bukkitWorld = Bukkit.getServer().getWorld(loadedData.getString("world"));
-        } else {
-            // Vanilla player data.
-            DimensionType.parseLegacy(new Dynamic<>(NbtOps.INSTANCE, loadedData.get("Dimension")))
-                .resultOrPartial(logger::warning)
-                .map(player.server::getLevel)
-                // If ServerLevel exists, set, otherwise move to spawn.
-                .ifPresentOrElse(player::setServerLevel, () -> player.spawnIn(null));
-            return;
-        }
-        if (bukkitWorld == null) {
-            player.spawnIn(null);
-            return;
-        }
-        player.setServerLevel(((CraftWorld) bukkitWorld).getHandle());
-    }
-
-    private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
-        if (bukkitEntity == null) {
-            return;
-        }
-
-        bukkitEntity.setAccessible(true);
-
-        bukkitEntity.set(player, new OpenPlayer(player.server.server, player, this));
-    }
-
-    @Override
-    public @NotNull Player inject(@NotNull Player player) {
-        try {
-            ServerPlayer nmsPlayer = getHandle(player);
-            if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
-                return openPlayer;
-            }
-            injectPlayer(nmsPlayer);
-            return nmsPlayer.getBukkitEntity();
-        } catch (IllegalAccessException e) {
-            logger.log(
-                java.util.logging.Level.WARNING,
-                e,
-                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
-            return player;
-        }
-    }
-
-    @Override
-    public @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-
-        ServerPlayer nmsPlayer = getHandle(player);
-
-        if (nmsPlayer.connection == null) {
-            return null;
-        }
-
-        InventoryViewTitle title = InventoryViewTitle.of(inventory);
-
-        if (title == null) {
-            return player.openInventory(inventory.getBukkitInventory());
-        }
-
-        InventoryView view = new OpenInventoryView(player, inventory, title.getTitle(lang, player, inventory));
-        AbstractContainerMenu container = new CraftContainer(view, nmsPlayer, nmsPlayer.nextContainerCounter()) {
-            @Override
-            public MenuType<?> getType() {
-                return getContainers(inventory.getBukkitInventory().getSize());
-            }
-        };
-
-        container.setTitle(Component.literal(view.getOriginalTitle()));
-        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
-
-        if (container == null) {
-            return null;
-        }
-
-        nmsPlayer.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(),
-                Component.literal(container.getBukkitView().getTitle())));
-        nmsPlayer.containerMenu = container;
-        nmsPlayer.initMenu(container);
-
-        return container.getBukkitView();
-
-    }
-
-    static @NotNull MenuType<?> getContainers(int inventorySize) {
-
-        return switch (inventorySize) {
-            case 9 -> MenuType.GENERIC_9x1;
-            case 18 -> MenuType.GENERIC_9x2;
-            case 36 -> MenuType.GENERIC_9x4; // PLAYER
-            case 41, 45 -> MenuType.GENERIC_9x5;
-            case 54 -> MenuType.GENERIC_9x6;
-            default -> MenuType.GENERIC_9x3; // Default 27-slot inventory
-        };
-    }
-
-}

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

@@ -1,352 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_20_R4;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.NonNullList;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.ContainerHelper;
-import net.minecraft.world.ContainerListener;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.StackedContents;
-import net.minecraft.world.inventory.PlayerEnderChestContainer;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_20_R4.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpecialEnderChest {
-
-    private final CraftInventory inventory;
-    private ServerPlayer owner;
-    private NonNullList<ItemStack> items;
-    private boolean playerOnline;
-
-    public SpecialEnderChest(final org.bukkit.entity.Player player, final Boolean online) {
-        super(PlayerManager.getHandle(player));
-        this.inventory = new CraftInventory(this);
-        this.owner = PlayerManager.getHandle(player);
-        this.playerOnline = online;
-        this.items = this.owner.getEnderChestInventory().items;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return inventory;
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull final org.bukkit.entity.Player player) {
-        if (this.playerOnline) {
-            return;
-        }
-
-        ServerPlayer offlinePlayer = this.owner;
-        ServerPlayer onlinePlayer = PlayerManager.getHandle(player);
-
-        // Set owner to new player.
-        this.owner = onlinePlayer;
-
-        // Set player's ender chest contents to our modified contents.
-        PlayerEnderChestContainer onlineEnderChest = onlinePlayer.getEnderChestInventory();
-        for (int i = 0; i < onlineEnderChest.getContainerSize(); ++i) {
-            onlineEnderChest.setItem(i, this.items.get(i));
-        }
-
-        // Set our item array to the new inventory's array.
-        this.items = onlineEnderChest.items;
-
-        // Add viewers to new inventory.
-        onlineEnderChest.transaction.addAll(offlinePlayer.getEnderChestInventory().transaction);
-
-        this.playerOnline = true;
-    }
-
-    @Override
-    public @NotNull org.bukkit.entity.Player getPlayer() {
-        return owner.getBukkitEntity();
-    }
-
-    @Override
-    public void setChanged() {
-        this.owner.getEnderChestInventory().setChanged();
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.owner.getEnderChestInventory().onOpen(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.owner.getEnderChestInventory().onClose(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.owner.getEnderChestInventory().getViewers();
-    }
-
-    @Override
-    public boolean stillValid(Player player) {
-        return true;
-    }
-
-    @Override
-    public void setActiveChest(EnderChestBlockEntity enderChest) {
-        this.owner.getEnderChestInventory().setActiveChest(enderChest);
-    }
-
-    @Override
-    public boolean isActiveChest(EnderChestBlockEntity enderChest) {
-        return this.owner.getEnderChestInventory().isActiveChest(enderChest);
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return this.owner.getEnderChestInventory().getMaxStackSize();
-    }
-
-    @Override
-    public void setMaxStackSize(int i) {
-        this.owner.getEnderChestInventory().setMaxStackSize(i);
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner.getEnderChestInventory().getOwner();
-    }
-
-    @Override
-    public @Nullable Location getLocation() {
-        return null;
-    }
-
-    @Override
-    public void addListener(ContainerListener listener) {
-        this.owner.getEnderChestInventory().addListener(listener);
-    }
-
-    @Override
-    public void removeListener(ContainerListener listener) {
-        this.owner.getEnderChestInventory().removeListener(listener);
-    }
-
-    @Override
-    public ItemStack getItem(int i) {
-        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.EMPTY;
-    }
-
-    @Override
-    public ItemStack removeItem(int i, int j) {
-        ItemStack itemstack = ContainerHelper.removeItem(this.items, i, j);
-        if (!itemstack.isEmpty()) {
-            this.setChanged();
-        }
-
-        return itemstack;
-    }
-
-    @Override
-    public ItemStack addItem(ItemStack itemstack) {
-        ItemStack localItem = itemstack.copy();
-        this.moveItemToOccupiedSlotsWithSameType(localItem);
-        if (localItem.isEmpty()) {
-            return ItemStack.EMPTY;
-        } else {
-            this.moveItemToEmptySlots(localItem);
-            return localItem.isEmpty() ? ItemStack.EMPTY : localItem;
-        }
-    }
-
-    @Override
-    public boolean canAddItem(ItemStack itemstack) {
-        for (ItemStack itemstack1 : this.items) {
-            if (itemstack1.isEmpty() || (ItemStack.isSameItemSameComponents(itemstack1, itemstack) && itemstack1.getCount() < itemstack1.getMaxStackSize())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private void moveItemToEmptySlots(ItemStack itemstack) {
-        for(int i = 0; i < this.getContainerSize(); ++i) {
-            ItemStack localItem = this.getItem(i);
-            if (localItem.isEmpty()) {
-                this.setItem(i, itemstack.copy());
-                itemstack.setCount(0);
-                return;
-            }
-        }
-    }
-
-    private void moveItemToOccupiedSlotsWithSameType(ItemStack itemstack) {
-        for(int i = 0; i < this.getContainerSize(); ++i) {
-            ItemStack localItem = this.getItem(i);
-            if (ItemStack.isSameItemSameComponents(localItem, itemstack)) {
-                this.moveItemsBetweenStacks(itemstack, localItem);
-                if (itemstack.isEmpty()) {
-                    return;
-                }
-            }
-        }
-    }
-
-    private void moveItemsBetweenStacks(ItemStack itemstack, ItemStack itemstack1) {
-        int i = Math.min(this.getMaxStackSize(), itemstack1.getMaxStackSize());
-        int j = Math.min(itemstack.getCount(), i - itemstack1.getCount());
-        if (j > 0) {
-            itemstack1.grow(j);
-            itemstack.shrink(j);
-            this.setChanged();
-        }
-    }
-
-    @Override
-    public ItemStack removeItemNoUpdate(int i) {
-        ItemStack itemstack = this.items.get(i);
-        if (itemstack.isEmpty()) {
-            return ItemStack.EMPTY;
-        } else {
-            this.items.set(i, ItemStack.EMPTY);
-            return itemstack;
-        }
-    }
-
-    @Override
-    public void setItem(int i, ItemStack itemstack) {
-        this.items.set(i, itemstack);
-        if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
-            itemstack.setCount(this.getMaxStackSize());
-        }
-
-        this.setChanged();
-    }
-
-    @Override
-    public int getContainerSize() {
-        return this.owner.getEnderChestInventory().getContainerSize();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return this.items.stream().allMatch(ItemStack::isEmpty);
-    }
-
-    @Override
-    public void startOpen(Player player) {
-    }
-
-    @Override
-    public void stopOpen(Player player) {
-    }
-
-    @Override
-    public boolean canPlaceItem(int i, ItemStack itemstack) {
-        return true;
-    }
-
-    @Override
-    public void clearContent() {
-        this.items.clear();
-        this.setChanged();
-    }
-
-    @Override
-    public void fillStackedContents(StackedContents stackedContents) {
-        for (ItemStack itemstack : this.items) {
-            stackedContents.accountStack(itemstack);
-        }
-
-    }
-
-    @Override
-    public List<ItemStack> removeAllItems() {
-        List<ItemStack> list = this.items.stream().filter(Predicate.not(ItemStack::isEmpty)).collect(Collectors.toList());
-        this.clearContent();
-        return list;
-    }
-
-    @Override
-    public ItemStack removeItemType(Item item, int i) {
-        ItemStack itemstack = new ItemStack(item, 0);
-
-        for(int j = this.getContainerSize() - 1; j >= 0; --j) {
-            ItemStack localItem = this.getItem(j);
-            if (localItem.getItem().equals(item)) {
-                int k = i - itemstack.getCount();
-                ItemStack splitItem = localItem.split(k);
-                itemstack.grow(splitItem.getCount());
-                if (itemstack.getCount() == i) {
-                    break;
-                }
-            }
-        }
-
-        if (!itemstack.isEmpty()) {
-            this.setChanged();
-        }
-
-        return itemstack;
-    }
-
-    @Override
-    public String toString() {
-        return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).toList().toString();
-    }
-
-    @Override
-    public void fromTag(ListTag listTag, HolderLookup.Provider holderLookup) {
-        for (int i = 0; i < this.getContainerSize(); ++i) {
-            this.setItem(i, ItemStack.EMPTY);
-        }
-
-        for (int i = 0; i < listTag.size(); ++i) {
-            CompoundTag compoundTag = listTag.getCompound(i);
-            int j = compoundTag.getByte("Slot") & 255;
-            if (j < this.getContainerSize()) {
-                this.setItem(j, ItemStack.parseOptional(holderLookup, compoundTag));
-            }
-        }
-
-    }
-
-}

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

@@ -1,768 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_20_R4;
-
-import com.google.common.collect.ImmutableList;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportCategory;
-import net.minecraft.ReportedException;
-import net.minecraft.core.NonNullList;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.Container;
-import net.minecraft.world.ContainerHelper;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.StackedContents;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_20_R4.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftInventory;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerInventory {
-
-    private final CraftInventory inventory;
-    private boolean playerOnline;
-    private Player player;
-    private NonNullList<ItemStack> items;
-    private NonNullList<ItemStack> armor;
-    private NonNullList<ItemStack> offhand;
-    private List<NonNullList<ItemStack>> compartments;
-
-    public SpecialPlayerInventory(@NotNull org.bukkit.entity.Player bukkitPlayer, @NotNull Boolean online) {
-        super(PlayerManager.getHandle(bukkitPlayer));
-        this.inventory = new CraftInventory(this);
-        this.playerOnline = online;
-        this.player = super.player;
-        this.selected = player.getInventory().selected;
-        this.items = this.player.getInventory().items;
-        this.armor = this.player.getInventory().armor;
-        this.offhand = this.player.getInventory().offhand;
-        this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
-    }
-
-    @Override
-    public void setPlayerOnline(@NotNull org.bukkit.entity.Player player) {
-        if (this.playerOnline) {
-            return;
-        }
-
-        Player offlinePlayer = this.player;
-        Player onlinePlayer = PlayerManager.getHandle(player);
-        onlinePlayer.getInventory().transaction.addAll(this.transaction);
-
-        // Set owner to new player.
-        this.player = onlinePlayer;
-
-        // Set player's inventory contents to our modified contents.
-        Inventory onlineInventory = onlinePlayer.getInventory();
-        for (int i = 0; i < getContainerSize(); ++i) {
-            onlineInventory.setItem(i, getRawItem(i));
-        }
-        onlineInventory.selected = this.selected;
-
-        // Set our item arrays to the new inventory's arrays.
-        this.items = onlineInventory.items;
-        this.armor = onlineInventory.armor;
-        this.offhand = onlineInventory.offhand;
-        this.compartments = ImmutableList.of(this.items, this.armor, this.offhand);
-
-        // Add existing viewers to new viewer list.
-        Inventory offlineInventory = offlinePlayer.getInventory();
-        // Remove self from listing - player is always a viewer of their own inventory, prevent duplicates.
-        offlineInventory.transaction.remove(offlinePlayer.getBukkitEntity());
-        onlineInventory.transaction.addAll(offlineInventory.transaction);
-
-        this.playerOnline = true;
-    }
-
-    @Override
-    public @NotNull CraftInventory getBukkitInventory() {
-        return this.inventory;
-    }
-
-    @Override
-    public void setPlayerOffline() {
-        this.playerOnline = false;
-    }
-
-    @Override
-    public @NotNull HumanEntity getPlayer() {
-        return this.player.getBukkitEntity();
-    }
-
-    private @NotNull ItemStack getRawItem(int i) {
-        if (i < 0) {
-            return ItemStack.EMPTY;
-        }
-
-        NonNullList<ItemStack> list;
-        for (Iterator<NonNullList<ItemStack>> iterator = this.compartments.iterator(); iterator.hasNext(); i -= list.size()) {
-            list = iterator.next();
-            if (i < list.size()) {
-                return list.get(i);
-            }
-        }
-
-        return ItemStack.EMPTY;
-    }
-
-    private void setRawItem(int i, @NotNull ItemStack itemStack) {
-        if (i < 0) {
-            return;
-        }
-
-        NonNullList<ItemStack> list;
-        for (Iterator<NonNullList<ItemStack>> iterator = this.compartments.iterator(); iterator.hasNext(); i -= list.size()) {
-            list = iterator.next();
-            if (i < list.size()) {
-                list.set(i, itemStack);
-            }
-        }
-    }
-
-    private record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}
-
-    private @NotNull SpecialPlayerInventory.IndexedCompartment getIndexedContent(int index) {
-        if (index < items.size()) {
-            return new IndexedCompartment(items, getReversedItemSlotNum(index));
-        }
-
-        index -= items.size();
-
-        if (index < armor.size()) {
-            return new IndexedCompartment(armor, getReversedArmorSlotNum(index));
-        }
-
-        index -= armor.size();
-
-        if (index < offhand.size()) {
-            return new IndexedCompartment(offhand, index);
-        }
-
-        index -= offhand.size();
-
-        return new IndexedCompartment(null, index);
-    }
-
-    private int getReversedArmorSlotNum(final int i) {
-        if (i == 0) {
-            return 3;
-        }
-        if (i == 1) {
-            return 2;
-        }
-        if (i == 2) {
-            return 1;
-        }
-        if (i == 3) {
-            return 0;
-        }
-        return i;
-    }
-
-    private int getReversedItemSlotNum(final int i) {
-        if (i >= 27) {
-            return i - 27;
-        }
-        return i + 9;
-    }
-
-    @Override
-    public boolean contains(Predicate<ItemStack> predicate) {
-        return this.compartments.stream().flatMap(NonNullList::stream).anyMatch(predicate);
-    }
-
-    @Override
-    public List<ItemStack> getArmorContents() {
-        return this.armor;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        this.player.getInventory().onOpen(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        this.player.getInventory().onClose(who);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return this.player.getInventory().getViewers();
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.player.getBukkitEntity();
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return this.player.getInventory().getMaxStackSize();
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        this.player.getInventory().setMaxStackSize(size);
-    }
-
-    @Override
-    public Location getLocation() {
-        return this.player.getBukkitEntity().getLocation();
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return false;
-    }
-
-    @Override
-    public List<ItemStack> getContents() {
-        return this.compartments.stream().flatMap(Collection::stream).collect(Collectors.toList());
-    }
-
-    @Override
-    public ItemStack getSelected() {
-        return isHotbarSlot(this.selected) ? this.items.get(this.selected) : ItemStack.EMPTY;
-    }
-
-    private boolean hasRemainingSpaceForItem(ItemStack itemstack, ItemStack itemstack1) {
-        return !itemstack.isEmpty() && ItemStack.isSameItemSameComponents(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize();
-    }
-
-    @Override
-    public int canHold(ItemStack itemstack) {
-        int remains = itemstack.getCount();
-
-        for (int i = 0; i < this.items.size(); ++i) {
-            ItemStack itemstack1 = this.getRawItem(i);
-            if (itemstack1.isEmpty()) {
-                return itemstack.getCount();
-            }
-
-            if (this.hasRemainingSpaceForItem(itemstack1, itemstack)) {
-                remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount();
-            }
-
-            if (remains <= 0) {
-                return itemstack.getCount();
-            }
-        }
-
-        ItemStack offhandItemStack = this.getRawItem(this.items.size() + this.armor.size());
-        if (this.hasRemainingSpaceForItem(offhandItemStack, itemstack)) {
-            remains -= (offhandItemStack.getMaxStackSize() < this.getMaxStackSize() ? offhandItemStack.getMaxStackSize() : this.getMaxStackSize()) - offhandItemStack.getCount();
-        }
-
-        return remains <= 0 ? itemstack.getCount() : itemstack.getCount() - remains;
-    }
-
-    @Override
-    public int getFreeSlot() {
-        for(int i = 0; i < this.items.size(); ++i) {
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public void setPickedItem(ItemStack itemstack) {
-        int i = this.findSlotMatchingItem(itemstack);
-        if (isHotbarSlot(i)) {
-            this.selected = i;
-        } else if (i == -1) {
-            this.selected = this.getSuitableHotbarSlot();
-            if (!this.items.get(this.selected).isEmpty()) {
-                int j = this.getFreeSlot();
-                if (j != -1) {
-                    this.items.set(j, this.items.get(this.selected));
-                }
-            }
-
-            this.items.set(this.selected, itemstack);
-        } else {
-            this.pickSlot(i);
-        }
-
-    }
-
-    @Override
-    public void pickSlot(int i) {
-        this.selected = this.getSuitableHotbarSlot();
-        ItemStack itemstack = this.items.get(this.selected);
-        this.items.set(this.selected, this.items.get(i));
-        this.items.set(i, itemstack);
-    }
-
-    @Override
-    public int findSlotMatchingItem(ItemStack itemstack) {
-        for(int i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameComponents(itemstack, this.items.get(i))) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int findSlotMatchingUnusedItem(ItemStack itemStack) {
-        for(int i = 0; i < this.items.size(); ++i) {
-            ItemStack localItem = this.items.get(i);
-            if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameComponents(itemStack, this.items.get(i)) && !this.items.get(i).isDamaged() && !localItem.isEnchanted() && !localItem.has(DataComponents.CUSTOM_NAME)) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int getSuitableHotbarSlot() {
-        int i;
-        int j;
-        for(j = 0; j < 9; ++j) {
-            i = (this.selected + j) % 9;
-            if (this.items.get(i).isEmpty()) {
-                return i;
-            }
-        }
-
-        for(j = 0; j < 9; ++j) {
-            i = (this.selected + j) % 9;
-            if (!this.items.get(i).isEnchanted()) {
-                return i;
-            }
-        }
-
-        return this.selected;
-    }
-
-    @Override
-    public void swapPaint(double d0) {
-        int i = (int) Math.signum(d0);
-
-        this.selected -= i;
-
-        while (this.selected < 0) {
-            this.selected += 9;
-        }
-
-        while(this.selected >= 9) {
-            this.selected -= 9;
-        }
-    }
-
-    @Override
-    public int clearOrCountMatchingItems(Predicate<ItemStack> predicate, int i, Container container) {
-        byte b0 = 0;
-        boolean flag = i == 0;
-        int j = b0 + ContainerHelper.clearOrCountMatchingItems(this, predicate, i - b0, flag);
-        j += ContainerHelper.clearOrCountMatchingItems(container, predicate, i - j, flag);
-        ItemStack itemstack = this.player.containerMenu.getCarried();
-        j += ContainerHelper.clearOrCountMatchingItems(itemstack, predicate, i - j, flag);
-        if (itemstack.isEmpty()) {
-            this.player.containerMenu.setCarried(ItemStack.EMPTY);
-        }
-
-        return j;
-    }
-
-    private int addResource(ItemStack itemstack) {
-        int i = this.getSlotWithRemainingSpace(itemstack);
-        if (i == -1) {
-            i = this.getFreeSlot();
-        }
-
-        return i == -1 ? itemstack.getCount() : this.addResource(i, itemstack);
-    }
-
-    private int addResource(int i, ItemStack itemstack) {
-        int j = itemstack.getCount();
-        ItemStack localItemStack = this.getRawItem(i);
-        if (localItemStack.isEmpty()) {
-            localItemStack = itemstack.copyWithCount(0);
-            this.setRawItem(i, localItemStack);
-        }
-
-        int k = Math.min(j, this.getMaxStackSize(localItemStack) - localItemStack.getCount());
-
-        if (k != 0) {
-            j -= k;
-            localItemStack.grow(k);
-            localItemStack.setPopTime(5);
-        }
-
-        return j;
-    }
-
-    @Override
-    public int getSlotWithRemainingSpace(ItemStack itemstack) {
-        if (this.hasRemainingSpaceForItem(this.getRawItem(this.selected), itemstack)) {
-            return this.selected;
-        } else if (this.hasRemainingSpaceForItem(this.getRawItem(40), itemstack)) {
-            return 40;
-        } else {
-            for(int i = 0; i < this.items.size(); ++i) {
-                if (this.hasRemainingSpaceForItem(this.items.get(i), itemstack)) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-    }
-
-    @Override
-    public void tick() {
-        for (NonNullList<ItemStack> compartment : this.compartments) {
-            for (int i = 0; i < compartment.size(); ++i) {
-                if (!compartment.get(i).isEmpty()) {
-                    compartment.get(i).inventoryTick(this.player.level(), this.player, i, this.selected == i);
-                }
-            }
-        }
-
-    }
-
-    @Override
-    public boolean add(ItemStack itemStack) {
-        return this.add(-1, itemStack);
-    }
-
-    @Override
-    public boolean add(int i, ItemStack itemStack) {
-        if (itemStack.isEmpty()) {
-            return false;
-        } else {
-            try {
-                if (itemStack.isDamaged()) {
-                    if (i == -1) {
-                        i = this.getFreeSlot();
-                    }
-
-                    if (i >= 0) {
-                        this.items.set(i, itemStack.copy());
-                        this.items.get(i).setPopTime(5);
-                        itemStack.setCount(0);
-                        return true;
-                    } else if (this.player.hasInfiniteMaterials()) {
-                        itemStack.setCount(0);
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    int j;
-                    do {
-                        j = itemStack.getCount();
-                        if (i == -1) {
-                            itemStack.setCount(this.addResource(itemStack));
-                        } else {
-                            itemStack.setCount(this.addResource(i, itemStack));
-                        }
-                    } while(!itemStack.isEmpty() && itemStack.getCount() < j);
-
-                    if (itemStack.getCount() == j && this.player.hasInfiniteMaterials()) {
-                        itemStack.setCount(0);
-                        return true;
-                    } else {
-                        return itemStack.getCount() < j;
-                    }
-                }
-            } catch (Throwable var6) {
-                CrashReport crashReport = CrashReport.forThrowable(var6, "Adding item to inventory");
-                CrashReportCategory crashReportCategory = crashReport.addCategory("Item being added");
-                crashReportCategory.setDetail("Item ID", Item.getId(itemStack.getItem()));
-                crashReportCategory.setDetail("Item data", itemStack.getDamageValue());
-                crashReportCategory.setDetail("Item name", () -> itemStack.getHoverName().getString());
-                throw new ReportedException(crashReport);
-            }
-        }
-    }
-
-    @Override
-    public void placeItemBackInInventory(ItemStack itemStack) {
-        this.placeItemBackInInventory(itemStack, true);
-    }
-
-    @Override
-    public void placeItemBackInInventory(ItemStack itemStack, boolean flag) {
-        while(true) {
-            if (!itemStack.isEmpty()) {
-                int i = this.getSlotWithRemainingSpace(itemStack);
-                if (i == -1) {
-                    i = this.getFreeSlot();
-                }
-
-                if (i != -1) {
-                    int j = itemStack.getMaxStackSize() - this.getRawItem(i).getCount();
-                    if (this.add(i, itemStack.split(j)) && flag && this.player instanceof ServerPlayer) {
-                        ((ServerPlayer)this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, 0, i, this.getRawItem(i)));
-                    }
-                    continue;
-                }
-
-                this.player.drop(itemStack, false);
-            }
-
-            return;
-        }
-    }
-
-    @Override
-    public ItemStack removeItem(int rawIndex, final int j) {
-        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
-
-        if (indexedCompartment.compartment() == null
-                || indexedCompartment.compartment().get(indexedCompartment.index()).isEmpty()) {
-            return ItemStack.EMPTY;
-        }
-
-        return ContainerHelper.removeItem(indexedCompartment.compartment(), indexedCompartment.index(), j);
-    }
-
-    @Override
-    public void removeItem(ItemStack itemStack) {
-        for (NonNullList<ItemStack> compartment : this.compartments) {
-            for (int i = 0; i < compartment.size(); ++i) {
-                if (compartment.get(i) == itemStack) {
-                    compartment.set(i, ItemStack.EMPTY);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public ItemStack removeItemNoUpdate(int rawIndex) {
-        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
-
-        if (indexedCompartment.compartment() == null) {
-            return ItemStack.EMPTY;
-        }
-
-        ItemStack removed = indexedCompartment.compartment().set(indexedCompartment.index(), ItemStack.EMPTY);
-
-        if (removed.isEmpty()) {
-            return ItemStack.EMPTY;
-        }
-
-        return removed;
-    }
-
-    @Override
-    public void setItem(int rawIndex, final ItemStack itemStack) {
-        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
-
-        if (indexedCompartment.compartment() == null) {
-            this.player.drop(itemStack, true);
-            return;
-        }
-
-        indexedCompartment.compartment().set(indexedCompartment.index(), itemStack);
-    }
-
-    @Override
-    public float getDestroySpeed(BlockState blockState) {
-        return this.items.get(this.selected).getDestroySpeed(blockState);
-    }
-
-    @Override
-    public ListTag save(ListTag listTag) {
-        for (int i = 0; i < this.items.size(); ++i) {
-            if (!this.items.get(i).isEmpty()) {
-                CompoundTag compoundTag = new CompoundTag();
-                compoundTag.putByte("Slot", (byte)i);
-                this.items.get(i).save(this.player.registryAccess(), compoundTag);
-                listTag.add(compoundTag);
-            }
-        }
-
-        for (int i = 0; i < this.armor.size(); ++i) {
-            if (!this.armor.get(i).isEmpty()) {
-                CompoundTag compoundTag = new CompoundTag();
-                compoundTag.putByte("Slot", (byte)(i + 100));
-                this.armor.get(i).save(this.player.registryAccess(), compoundTag);
-                listTag.add(compoundTag);
-            }
-        }
-
-        for (int i = 0; i < this.offhand.size(); ++i) {
-            if (!this.offhand.get(i).isEmpty()) {
-                CompoundTag compoundTag = new CompoundTag();
-                compoundTag.putByte("Slot", (byte)(i + 150));
-                this.offhand.get(i).save(this.player.registryAccess(), compoundTag);
-                listTag.add(compoundTag);
-            }
-        }
-
-        return listTag;
-    }
-
-    @Override
-    public void load(ListTag listTag) {
-        this.items.clear();
-        this.armor.clear();
-        this.offhand.clear();
-
-        for(int i = 0; i < listTag.size(); ++i) {
-            CompoundTag compoundTag = listTag.getCompound(i);
-            int j = compoundTag.getByte("Slot") & 255;
-            ItemStack itemstack = ItemStack.parse(this.player.registryAccess(), compoundTag).orElse(ItemStack.EMPTY);
-            if (j < this.items.size()) {
-                this.items.set(j, itemstack);
-            } else if (j >= 100 && j < this.armor.size() + 100) {
-                this.armor.set(j - 100, itemstack);
-            } else if (j >= 150 && j < this.offhand.size() + 150) {
-                this.offhand.set(j - 150, itemstack);
-            }
-        }
-
-    }
-
-    @Override
-    public int getContainerSize() {
-        return 45;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return !contains(itemStack -> !itemStack.isEmpty());
-    }
-
-    @Override
-    public ItemStack getItem(int rawIndex) {
-        IndexedCompartment indexedCompartment = getIndexedContent(rawIndex);
-
-        if (indexedCompartment.compartment() == null) {
-            return ItemStack.EMPTY;
-        }
-
-        return indexedCompartment.compartment().get(indexedCompartment.index());
-    }
-
-    @Override
-    public Component getName() {
-        return this.player.getName();
-    }
-
-    @Override
-    public ItemStack getArmor(int index) {
-        return this.armor.get(index);
-    }
-
-    @Override
-    public void dropAll() {
-        for (NonNullList<ItemStack> compartment : this.compartments) {
-            for (int i = 0; i < compartment.size(); ++i) {
-                ItemStack itemstack = compartment.get(i);
-                if (!itemstack.isEmpty()) {
-                    this.player.drop(itemstack, true, false);
-                    compartment.set(i, ItemStack.EMPTY);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void setChanged() {
-        super.setChanged();
-    }
-
-    @Override
-    public int getTimesChanged() {
-        return super.getTimesChanged();
-    }
-
-    @Override
-    public boolean stillValid(Player player) {
-        return true;
-    }
-
-    @Override
-    public boolean contains(ItemStack itemstack) {
-        return contains(itemStack -> !itemStack.isEmpty() && ItemStack.isSameItemSameComponents(itemstack, itemStack));
-    }
-
-    @Override
-    public boolean contains(TagKey<Item> tagKey) {
-        return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(tagKey));
-    }
-
-    @Override
-    public void replaceWith(Inventory inventory) {
-        Function<Integer, ItemStack> getter;
-
-        if (inventory instanceof SpecialPlayerInventory specialPlayerInventory) {
-            getter = specialPlayerInventory::getRawItem;
-        } else {
-            getter = inventory::getItem;
-        }
-
-        for(int i = 0; i < this.getContainerSize(); ++i) {
-            this.setRawItem(i, getter.apply(i));
-        }
-
-        this.selected = inventory.selected;
-    }
-
-    @Override
-    public void clearContent() {
-        for (NonNullList<ItemStack> compartment : this.compartments) {
-            compartment.clear();
-        }
-    }
-
-    @Override
-    public void fillStackedContents(StackedContents stackedContents) {
-        for (ItemStack itemstack : this.items) {
-            stackedContents.accountSimpleStack(itemstack);
-        }
-    }
-
-    @Override
-    public ItemStack removeFromSelected(boolean dropWholeStack) {
-        ItemStack itemstack = this.getSelected();
-        return itemstack.isEmpty() ? ItemStack.EMPTY : this.removeItem(this.selected, dropWholeStack ? itemstack.getCount() : 1);
-    }
-
-}

internal/v1_21_R1/pom.xml

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2011-2023 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>
-    <artifactId>openinvparent</artifactId>
-    <groupId>com.lishid</groupId>
-    <relativePath>../../pom.xml</relativePath>
-    <version>5.0.0</version>
-  </parent>
-
-  <artifactId>openinvadapter1_21_R1</artifactId>
-  <name>OpenInvAdapter1_21_R1</name>
-
-  <properties>
-    <maven.compiler.system>21</maven.compiler.system>
-    <maven.compiler.release>21</maven.compiler.release>
-    <spigot.version>1.21-R0.1-SNAPSHOT</spigot.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>${spigot.version}</version>
-    </dependency>
-    <dependency>
-      <artifactId>spigot</artifactId>
-      <groupId>org.spigotmc</groupId>
-      <scope>provided</scope>
-      <version>${spigot.version}</version>
-      <classifier>remapped-mojang</classifier>
-    </dependency>
-    <dependency>
-      <artifactId>openinvapi</artifactId>
-      <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>openinvcommon</artifactId>
-      <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>annotations</artifactId>
-      <groupId>org.jetbrains</groupId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>net.md-5</groupId>
-        <artifactId>specialsource-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/AnySilentContainer.java

@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2011-2023 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.internal.v1_21_R1.container;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import com.lishid.openinv.internal.v1_21_R1.player.PlayerManager;
-import com.lishid.openinv.util.ReflectionHelper;
-import com.lishid.openinv.util.lang.LanguageManager;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.level.ServerPlayerGameMode;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.SimpleMenuProvider;
-import net.minecraft.world.inventory.ChestMenu;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.inventory.PlayerEnderChestContainer;
-import net.minecraft.world.level.GameType;
-import net.minecraft.world.level.block.BarrelBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.ChestBlock;
-import net.minecraft.world.level.block.ShulkerBoxBlock;
-import net.minecraft.world.level.block.TrappedChestBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
-import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
-
-public class AnySilentContainer implements IAnySilentContainer {
-
-    private final @NotNull Logger logger;
-    private final @NotNull LanguageManager lang;
-    private @Nullable Field serverPlayerGameModeGameType;
-
-    public AnySilentContainer(@NotNull Logger logger, @NotNull LanguageManager lang) {
-        this.logger = logger;
-        this.lang = lang;
-        try {
-            try {
-                this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("b");
-                this.serverPlayerGameModeGameType.setAccessible(true);
-            } catch (NoSuchFieldException e) {
-                logger.warning("ServerPlayerGameMode#gameModeForPlayer's obfuscated name has changed!");
-                logger.warning("Please report this at https://github.com/Jikoo/OpenInv/issues");
-                logger.warning("Attempting to fall through using reflection. Please verify that SilentContainer does not fail.");
-                // N.B. gameModeForPlayer is (for now) declared before previousGameModeForPlayer so silent shouldn't break.
-                this.serverPlayerGameModeGameType = ReflectionHelper.grabFieldByType(ServerPlayerGameMode.class, GameType.class);
-            }
-        } catch (SecurityException e) {
-            logger.warning("Unable to directly write player game mode! SilentContainer will fail.");
-            logger.log(java.util.logging.Level.WARNING, "Error obtaining GameType field", e);
-        }
-    }
-
-    @Override
-    public boolean activateContainer(
-            @NotNull final Player bukkitPlayer,
-            final boolean silentchest,
-            @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        // Silent ender chest is API-only
-        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
-
-        final net.minecraft.world.level.Level level = player.level();
-        final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final BlockEntity blockEntity = level.getBlockEntity(blockPos);
-
-        if (blockEntity == null) {
-            return false;
-        }
-
-        if (blockEntity instanceof EnderChestBlockEntity enderChestTile) {
-            // Anychest ender chest. See net.minecraft.world.level.block.EnderChestBlock
-            PlayerEnderChestContainer enderChest = player.getEnderChestInventory();
-            enderChest.setActiveChest(enderChestTile);
-            player.openMenu(new SimpleMenuProvider((containerCounter, playerInventory, ignored) -> {
-                MenuType<?> containers = OpenContainerMenu.getContainers(enderChest.getContainerSize());
-                int rows = enderChest.getContainerSize() / 9;
-                return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
-            }, Component.translatable("container.enderchest")));
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        if (!(blockEntity instanceof MenuProvider menuProvider)) {
-            return false;
-        }
-
-        BlockState blockState = level.getBlockState(blockPos);
-        Block block = blockState.getBlock();
-
-        if (block instanceof ChestBlock chestBlock) {
-
-            // boolean flag: do not check if chest is blocked
-            menuProvider = chestBlock.getMenuProvider(blockState, level, blockPos, true);
-
-            if (menuProvider == null) {
-                lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-
-            if (block instanceof TrappedChestBlock) {
-                bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
-            } else {
-                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
-            }
-        }
-
-        if (block instanceof ShulkerBoxBlock) {
-            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
-        }
-
-        if (block instanceof BarrelBlock) {
-            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
-        }
-
-        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) {
-            player.openMenu(menuProvider);
-            return true;
-        }
-
-        // SilentChest requires access to setting players' game mode directly.
-        if (this.serverPlayerGameModeGameType == null) {
-            return false;
-        }
-
-        if (blockEntity instanceof RandomizableContainerBlockEntity lootable) {
-            if (lootable.lootTable != null) {
-                lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-        }
-
-        GameType gameType = player.gameMode.getGameModeForPlayer();
-        this.forceGameType(player, GameType.SPECTATOR);
-        player.openMenu(menuProvider);
-        this.forceGameType(player, gameType);
-        return true;
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.serverPlayerGameModeGameType == null || bukkitPlayer.getGameMode() == GameMode.SPECTATOR) {
-            return;
-        }
-
-        ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
-
-        // Force game mode change without informing plugins or players.
-        // Regular game mode set calls GameModeChangeEvent and is cancellable.
-        GameType gameType = player.gameMode.getGameModeForPlayer();
-        this.forceGameType(player, GameType.SPECTATOR);
-
-        // ServerPlayer#closeContainer cannot be called without entering an
-        // infinite loop because this method is called during inventory close.
-        // From ServerPlayer#closeContainer -> CraftEventFactory#handleInventoryCloseEvent
-        player.containerMenu.transferTo(player.inventoryMenu, player.getBukkitEntity());
-        // From ServerPlayer#closeContainer
-        player.doCloseContainer();
-        // Regular inventory close will handle the rest - packet sending, etc.
-
-        // Revert forced game mode.
-        this.forceGameType(player, gameType);
-    }
-
-    private void forceGameType(final ServerPlayer player, final GameType gameMode) {
-        if (this.serverPlayerGameModeGameType == null) {
-            // No need to warn repeatedly, error on startup and lack of function should be enough.
-            return;
-        }
-        try {
-            this.serverPlayerGameModeGameType.setAccessible(true);
-            this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            logger.log(java.util.logging.Level.WARNING, "Error bypassing GameModeChangeEvent", e);
-        }
-    }
-
-}

internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/OpenEnderChestMenu.java

@@ -1,127 +0,0 @@
-package com.lishid.openinv.internal.v1_21_R1.container;
-
-import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotViewOnly;
-import com.lishid.openinv.util.Permissions;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventoryView;
-
-class OpenEnderChestMenu extends OpenContainerMenu {
-
-  private final OpenEnderChest enderChest;
-  private final boolean viewOnly;
-  private final ServerPlayer viewer;
-  private final int topSize;
-  private CraftInventoryView view;
-
-  OpenEnderChestMenu(OpenEnderChest enderChest, ServerPlayer viewer, int containerId) {
-    super(getMenuType(enderChest), containerId);
-    this.enderChest = enderChest;
-    this.viewer = viewer;
-    var bukkitViewer = viewer.getBukkitEntity();
-    viewOnly = !(bukkitViewer.equals(enderChest.getPlayer())
-        ? Permissions.ENDERCHEST_EDIT_SELF
-        : Permissions.ENDERCHEST_OPEN_OTHER)
-        .hasPermission(bukkitViewer);
-    int upperRows = (int) Math.ceil(enderChest.getContainerSize() / 9.0);
-    topSize = upperRows * 9;
-
-    // View's upper inventory - our container
-    for (int row = 0; row < upperRows; ++row) {
-      for (int col = 0; col < 9; ++col) {
-        // x and y for client purposes, but hey, we're thorough here.
-        // Adapted from net.minecraft.world.inventory.ChestMenu
-        int x = 8 + col * 18;
-        int y = 18 + row * 18;
-        int index = row * 9 + col;
-
-        // Guard against weird inventory sizes.
-        if (index >= enderChest.getContainerSize()) {
-          addSlot(new SlotViewOnly(enderChest, index, x, y));
-          continue;
-        }
-
-        addSlot(new Slot(enderChest, index, x, y));
-      }
-    }
-
-    // View's lower inventory - viewer inventory
-    int playerInvPad = (upperRows - 4) * 18;
-    for (int row = 0; row < 3; ++row) {
-      for (int col = 0; col < 9; ++col) {
-        int x = 8 + col * 18;
-        int y = playerInvPad + row * 18 + 103;
-        addSlot(new Slot(viewer.getInventory(), row * 9 + col + 9, x, y));
-      }
-    }
-    // Hotbar
-    for (int col = 0; col < 9; ++col) {
-      int x = 8 + col * 18;
-      int y = playerInvPad + 161;
-      addSlot(new Slot(viewer.getInventory(), col, x, y));
-    }
-  }
-
-  private static MenuType<?> getMenuType(OpenEnderChest enderChest) {
-    return OpenContainerMenu.getContainers(((int) Math.ceil(enderChest.getContainerSize() / 9.0)) * 9);
-  }
-
-  @Override
-  public CraftInventoryView getBukkitView() {
-    if (view == null) {
-      view = new CraftInventoryView(viewer.getBukkitEntity(), enderChest.getBukkitInventory(), this);
-    }
-    return view;
-  }
-
-  @Override
-  protected Slot addSlot(Slot slot) {
-    slot = super.addSlot(slot);
-
-    // If view-only and slot is in upper inventory, wrap it.
-    if (viewOnly && slot.index < enderChest.getContainerSize()) {
-      slot = SlotViewOnly.wrap(slot);
-      slots.set(slot.index, slot);
-    }
-
-    return slot;
-  }
-
-  @Override
-  public ItemStack quickMoveStack(Player player, int index) {
-    // See ChestMenu
-    Slot slot = this.slots.get(index);
-
-    if (slot.isFake() || !slot.hasItem()) {
-      return ItemStack.EMPTY;
-    }
-
-    ItemStack itemStack = slot.getItem();
-    ItemStack original = itemStack.copy();
-
-    if (index < topSize) {
-      if (!this.moveItemStackTo(itemStack, topSize, this.slots.size(), true)) {
-        return ItemStack.EMPTY;
-      }
-    } else if (!this.moveItemStackTo(itemStack, 0, topSize, false)) {
-      return ItemStack.EMPTY;
-    }
-
-    if (itemStack.isEmpty()) {
-      slot.setByPlayer(ItemStack.EMPTY);
-    } else {
-      slot.setChanged();
-    }
-
-    return original;
-  }
-
-  @Override
-  public boolean stillValid(Player entityhuman) {
-    return true;
-  }
-
-}

internal/v1_21_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/OpenInventoryMenu.java

@@ -1,295 +0,0 @@
-package com.lishid.openinv.internal.v1_21_R1.container;
-
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentDrop;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.ContentEquipment;
-import com.lishid.openinv.internal.v1_21_R1.container.slot.SlotViewOnly;
-import com.lishid.openinv.util.Permissions;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftInventoryView;
-import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class OpenInventoryMenu extends OpenContainerMenu {
-
-  private final OpenInventory inventory;
-  private final ServerPlayer viewer;
-  private final int topSize;
-  private final int offset;
-  private final boolean ownInv;
-  private CraftInventoryView bukkitEntity;
-
-  protected OpenInventoryMenu(OpenInventory inventory, ServerPlayer viewer, int i) {
-    super(getMenuType(inventory, viewer), i);
-    this.inventory = inventory;
-    this.viewer = viewer;
-    ownInv = inventory.getOwnerHandle().equals(viewer);
-
-    int upperRows;
-    if (ownInv) {
-      // Disallow duplicate access to own main inventory contents.
-      offset = viewer.getInventory().items.size();
-      upperRows = ((int) Math.ceil((inventory.getContainerSize() - offset) / 9.0));
-    } else {
-      offset = 0;
-      upperRows = inventory.getContainerSize() / 9;
-    }
-
-    boolean viewOnly = !(ownInv ? Permissions.INVENTORY_EDIT_SELF : Permissions.INVENTORY_EDIT_OTHER)
-        .hasPermission(viewer.getBukkitEntity());
-
-    // View's upper inventory - our container
-    for (int row = 0; row < upperRows; ++row) {
-      for (int col = 0; col < 9; ++col) {
-        // x and y for client purposes, but hey, we're thorough here.
-        // Adapted from net.minecraft.world.inventory.ChestMenu
-        int x = 8 + col * 18;
-        int y = 18 + row * 18;
-        int index = offset + row * 9 + col;
-
-        // Guard against weird inventory sizes.
-        if (index >= inventory.getContainerSize()) {
-          addSlot(new SlotViewOnly(inventory, index, x, y));
-          continue;
-        }
-
-        Slot slot = getUpperSlot(index, x, y, ownInv, viewOnly);
-
-        addSlot(slot);
-      }
-    }
-
-    // View's lower inventory - viewer inventory
-    int playerInvPad = (upperRows - 4) * 18;
-    for (int row = 0; row < 3; ++row) {
-      for (int col = 0; col < 9; ++col) {
-        int x = 8 + col * 18;
-        int y = playerInvPad + row * 18 + 103;
-        addSlot(new Slot(viewer.getInventory(), row * 9 + col + 9, x, y));
-      }
-    }
-    // Hotbar
-    for (int col = 0; col < 9; ++col) {
-      int x = 8 + col * 18;
-      int y = playerInvPad + 161;
-      addSlot(new Slot(viewer.getInventory(), col, x, y));
-    }
-
-    this.topSize = slots.size() - 36;
-  }
-
-  private Slot getUpperSlot(int index, int x, int y, boolean ownInv, boolean viewOnly) {
-    Slot slot = inventory.getMenuSlot(index, x, y);
-
-    // If the slot is cannot be interacted with there's nothing to configure.
-    if (slot.getClass().equals(SlotViewOnly.class)) {
-      return slot;
-    }
-
-    // Remove drop slot if viewer is not allowed to use it.
-    if (slot instanceof ContentDrop.SlotDrop
-        && (viewOnly || !Permissions.INVENTORY_SLOT_DROP.hasPermission(viewer.getBukkitEntity()))) {
-      return new SlotViewOnly(inventory, index, x, y);
-    }
-
-    if (slot instanceof ContentEquipment.SlotEquipment equipment) {
-      if (viewOnly) {
-        return SlotViewOnly.wrap(slot);
-      }
-
-      Permissions perm = switch (equipment.getEquipmentSlot()) {
-        case HEAD -> Permissions.INVENTORY_SLOT_HEAD_ANY;
-        case CHEST -> Permissions.INVENTORY_SLOT_CHEST_ANY;
-        case LEGS -> Permissions.INVENTORY_SLOT_LEGS_ANY;
-        case FEET -> Permissions.INVENTORY_SLOT_FEET_ANY;
-        // Off-hand can hold anything, not just equipment.
-        default -> null;
-      };
-
-      // If the viewer doesn't have permission, only allow equipment the viewee can equip in the slot.
-      if (perm != null && !perm.hasPermission(viewer.getBukkitEntity())) {
-        equipment.onlyEquipmentFor(inventory.getOwnerHandle());
-      }
-
-      // Equipment slots are a core part of the inventory, so they will always be shown.
-      return slot;
-    }
-
-    // When viewing own inventory, only allow access to equipment and drop slots (equipment allowed above).
-    if (ownInv && !(slot instanceof ContentDrop.SlotDrop)) {
-      return new SlotViewOnly(inventory, index, x, y);
-    }
-
-    if (viewOnly) {
-      return SlotViewOnly.wrap(slot);
-    }
-
-    return slot;
-  }
-
-  private static MenuType<?> getMenuType(OpenInventory inventory, ServerPlayer viewer) {
-    int size = inventory.getContainerSize();
-    if (inventory.getOwnerHandle().equals(viewer)) {
-      size -= viewer.getInventory().items.size();
-      size = ((int) Math.ceil(size / 9.0)) * 9;
-    }
-
-    return OpenContainerMenu.getContainers(size);
-  }
-
-  @Override
-  public CraftInventoryView getBukkitView() {
-    if (bukkitEntity == null) {
-      org.bukkit.inventory.Inventory bukkitInventory;
-      if (ownInv) {
-        bukkitInventory = new OpenPlayerInventorySelf(inventory, offset);
-      } else {
-        bukkitInventory = inventory.getBukkitInventory();
-      }
-
-      bukkitEntity = new CraftInventoryView(viewer.getBukkitEntity(), bukkitInventory, this) {
-        @Override
-        public org.bukkit.inventory.ItemStack getItem(int index) {
-          if (index < 0) {
-            return null;
-          }
-
-          Slot slot = slots.get(index);
-          return CraftItemStack.asCraftMirror(slot.hasItem() ? slot.getItem() : ItemStack.EMPTY);
-        }
-
-        @Override
-        public boolean isInTop(int rawSlot) {
-          return rawSlot < topSize;
-        }
-
-        @Override
-        public @Nullable Inventory getInventory(int rawSlot) {
-          if (rawSlot < 0) {
-            return super.getInventory(rawSlot);
-          }
-          if (rawSlot > topSize) {
-            return super.getInventory(offset + rawSlot);
-          }
-          Slot slot = slots.get(rawSlot);
-          if (slot.isFake()) {
-            return null;
-          }
-          return getTopInventory();
-        }
-
-        @Override
-        public int convertSlot(int rawSlot) {
-          if (rawSlot < 0) {
-            return rawSlot;
-          }
-          if (rawSlot < topSize) {
-            Slot slot = slots.get(rawSlot);
-            if (slot.isFake()) {
-              return InventoryView.OUTSIDE;
-            }
-            return rawSlot;
-          }
-          return super.convertSlot(offset + rawSlot);
-        }
-
-        @Override
-        public @NotNull InventoryType.SlotType getSlotType(int slot) {
-          if (slot < 0) {
-            return InventoryType.SlotType.OUTSIDE;
-          }
-          if (slot >= topSize) {
-            return super.getSlotType(offset + slot);
-          }
-          return inventory.getSlotType(offset + slot);
-        }
-
-        @Override
-        public int countSlots() {
-          return topSize + getBottomInventory().getSize();
-        }
-      };
-    }
-    return bukkitEntity;
-  }
-
-  @Override
-  public ItemStack quickMoveStack(Player player, int index) {
-    // See ChestMenu and InventoryMenu
-    Slot slot = this.slots.get(index);
-
-    if (!slot.hasItem() || slot.isFake()) {
-      return ItemStack.EMPTY;
-    }
-
-    ItemStack itemStack = slot.getItem();
-    ItemStack originalStack = itemStack.copy();
-
-    if (index < topSize) {
-      // If we're moving top to bottom, do a normal transfer.
-      if (!this.moveItemStackTo(itemStack, topSize, this.slots.size(), true)) {
-        return ItemStack.EMPTY;
-      }
-    } else {
-      EquipmentSlot equipmentSlot = player.getEquipmentSlotForItem(itemStack);
-      boolean movedGear = switch (equipmentSlot) {
-        // If this is gear, try to move it to the correct slot first.
-        case OFFHAND, FEET, LEGS, CHEST, HEAD -> {
-          // Locate the correct slot in the contents following the main inventory.
-          for (int extra = inventory.getOwnerHandle().getInventory().items.size() - offset; extra < topSize; ++extra) {
-            Slot extraSlot = getSlot(extra);
-            if (extraSlot instanceof ContentEquipment.SlotEquipment equipSlot
-                && equipSlot.getEquipmentSlot() == equipmentSlot) {
-              // If we've found a matching slot, try to move to it.
-              // If this succeeds, even partially, we will not attempt to move to other slots.
-              // Otherwise, armor is already occupied, so we'll fall through to main inventory.
-              yield this.moveItemStackTo(itemStack, extra, extra + 1, false);
-            }
-          }
-          yield false;
-        }
-        // Non-gear gets no special treatment.
-        default -> false;
-      };
-
-      // If main inventory is not available, there's nowhere else to move.
-      if (offset != 0) {
-        if (!movedGear) {
-          return ItemStack.EMPTY;
-        }
-      } else {
-        // If we didn't move to a gear slot, try to move to a main inventory slot.
-        if (!movedGear && !this.moveItemStackTo(itemStack, 0, inventory.getOwnerHandle().getInventory().items.size(), true)) {
-          return ItemStack.EMPTY;
-        }
-      }
-    }
-
-    if (itemStack.isEmpty()) {
-      slot.setByPlayer(ItemStack.EMPTY);
-    } else {
-      slot.setChanged();
-    }
-
-    return originalStack;
-  }
-
-  @Override
-  public boolean stillValid(Player player) {
-    return true;
-  }
-
-  @Override
-  public boolean canDragTo(Slot slot) {
-    return !(slot instanceof ContentDrop.SlotDrop || slot instanceof SlotViewOnly);
-  }
-
-}

jitpack.yml

@@ -0,0 +1,6 @@
+before_install:
+  - sdk update
+  - sdk install java 21-tem
+  - sdk use java 21-tem
+install:
+  - ./gradlew :openinvapi:publishJitpackPublicationToMavenLocal

plugin/build.gradle.kts

@@ -0,0 +1,44 @@
+plugins {
+  `openinv-base`
+  alias(libs.plugins.shadow)
+}
+
+repositories {
+  maven("https://jitpack.io")
+}
+
+dependencies {
+  implementation(project(":openinvapi"))
+  implementation(project(":openinvcommon"))
+  implementation(project(":openinvadaptercommon"))
+  implementation(project(":openinvadapterpaper1_21_3"))
+  implementation(project(":openinvadapterpaper1_21_1"))
+  implementation(project(":openinvadapterspigot", configuration = "shadow"))
+  implementation(libs.planarwrappers)
+}
+
+tasks.processResources {
+  expand("version" to version)
+}
+
+tasks.jar {
+  manifest.attributes("paperweight-mappings-namespace" to "mojang")
+}
+
+tasks.shadowJar {
+  dependsOn(":openinvadapterspigot:reobf")
+  minimize {
+    exclude(":openinv**")
+  }
+}
+
+tasks.register<Copy>("distributePlugin") {
+  into(rootProject.layout.projectDirectory.dir("dist"))
+  from(tasks.shadowJar)
+  rename("openinvplugin.*\\.jar", "OpenInv.jar")
+}
+
+tasks.assemble {
+  dependsOn(tasks.shadowJar)
+  dependsOn(tasks.named("distributePlugin"))
+}

plugin/pom.xml

@@ -1,146 +0,0 @@
-<!--
-  ~ Copyright (C) 2011-2022 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>
-    <artifactId>openinvparent</artifactId>
-    <groupId>com.lishid</groupId>
-    <version>5.0.0</version>
-  </parent>
-
-  <artifactId>openinvplugin</artifactId>
-  <name>OpenInvPlugin</name>
-
-  <dependencies>
-    <dependency>
-      <artifactId>spigot-api</artifactId>
-      <groupId>org.spigotmc</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>planarwrappers</artifactId>
-      <groupId>com.github.jikoo</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>openinvapi</artifactId>
-      <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>openinvcommon</artifactId>
-      <groupId>com.lishid</groupId>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvadapter1_21_R1</artifactId>
-      <version>5.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvadapter1_20_R4</artifactId>
-      <version>5.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lishid</groupId>
-      <artifactId>openinvadapter1_20_R3</artifactId>
-      <version>5.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <artifactId>annotations</artifactId>
-      <groupId>org.jetbrains</groupId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <finalName>OpenInv</finalName>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-        <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>
-          <relocations>
-            <relocation>
-              <pattern>com.github.jikoo.planarwrappers</pattern>
-              <shadedPattern>com.github.jikoo.openinv.planarwrappers</shadedPattern>
-            </relocation>
-          </relocations>
-          <minimizeJar>true</minimizeJar>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-final-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.parent.build.directory}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${project.build.directory}</directory>
-                  <includes>
-                    <include>${project.build.finalName}.jar</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>