Bump version to 4.1.9 for release

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Create CurseForge Release
         uses: itsmeow/curseforge-upload@v3
         with:
-          token: ${{ secrets.CURSEFORGE_TOKEN }}
+          token: "${{ secrets.CURSEFORGE_TOKEN }}"
           project_id: 31432
           game_endpoint: minecraft
           file_path: ./OpenInv.jar

api/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <version>4.1.9-SNAPSHOT</version>
+    <version>4.1.9</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>

assembly/pom.xml

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

internal/v1_17_R1/pom.xml

@@ -23,7 +23,7 @@
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
     <relativePath>../../pom.xml</relativePath>
-    <version>4.1.9-SNAPSHOT</version>
+    <version>4.1.9</version>
   </parent>
 
   <artifactId>openinvadapter1_17_R1</artifactId>

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

@@ -24,7 +24,7 @@ import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
@@ -147,7 +147,7 @@ public class AnySilentContainer implements IAnySilentContainer {
                 MenuType<?> containers = PlayerDataManager.getContainers(enderChest.getContainerSize());
                 int rows = enderChest.getContainerSize() / 9;
                 return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
-            }, new TextComponent("container.enderchest")));
+            }, new TranslatableComponent("container.enderchest")));
             bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
             return true;
         }
@@ -161,8 +161,8 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         if (block instanceof ChestBlock chestBlock) {
 
-            // boolean flag: check if chest is blocked
-            Optional<MenuProvider> menuOptional = chestBlock.combine(blockState, level, blockPos, false).apply(
+            // boolean flag: do not check if chest is blocked
+            Optional<MenuProvider> menuOptional = chestBlock.combine(blockState, level, blockPos, true).apply(
                     // Combiner is a copy of private ChestBlock.MENU_PROVIDER_COMBINER
                     new DoubleBlockCombiner.Combiner<ChestBlockEntity, Optional<MenuProvider>>() {
                         @Override

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

@@ -19,6 +19,7 @@ package com.lishid.openinv.internal.v1_17_R1;
 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -113,11 +114,33 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     }
 
     private @NotNull ItemStack getRawItem(int i) {
-        return super.getItem(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) {
-        super.setItem(i, 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 static record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}

internal/v1_18_R1/pom.xml

@@ -23,7 +23,7 @@
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
     <relativePath>../../pom.xml</relativePath>
-    <version>4.1.9-SNAPSHOT</version>
+    <version>4.1.9</version>
   </parent>
 
   <artifactId>openinvadapter1_18_R1</artifactId>
@@ -32,7 +32,7 @@
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <spigot.version>1.18-pre5-R0.1-SNAPSHOT</spigot.version>
+    <spigot.version>1.18-R0.1-SNAPSHOT</spigot.version>
   </properties>
 
   <dependencies>

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

@@ -24,7 +24,7 @@ import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
@@ -140,14 +140,14 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         if (blockEntity instanceof EnderChestBlockEntity enderChestTile) {
-            // Anychest ender chest. See net.minecraft.world.level.block.BlockEnderChest
+            // 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 = PlayerDataManager.getContainers(enderChest.getContainerSize());
                 int rows = enderChest.getContainerSize() / 9;
                 return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
-            }, new TextComponent("container.enderchest")));
+            }, new TranslatableComponent("container.enderchest")));
             bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
             return true;
         }
@@ -161,8 +161,8 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         if (block instanceof ChestBlock chestBlock) {
 
-            // boolean flag: check if chest is blocked
-            Optional<MenuProvider> menuOptional = chestBlock.combine(blockState, level, blockPos, false).apply(
+            // boolean flag: do not check if chest is blocked
+            Optional<MenuProvider> menuOptional = chestBlock.combine(blockState, level, blockPos, true).apply(
                     // Combiner is a copy of private ChestBlock.MENU_PROVIDER_COMBINER
                     new DoubleBlockCombiner.Combiner<ChestBlockEntity, Optional<MenuProvider>>() {
                         @Override

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

@@ -19,6 +19,7 @@ package com.lishid.openinv.internal.v1_18_R1;
 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -113,11 +114,33 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
     }
 
     private @NotNull ItemStack getRawItem(int i) {
-        return super.getItem(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) {
-        super.setItem(i, 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 static record IndexedCompartment(@Nullable NonNullList<ItemStack> compartment, int index) {}

plugin/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <version>4.1.9-SNAPSHOT</version>
+    <version>4.1.9</version>
   </parent>
 
   <artifactId>openinvplugincore</artifactId>

pom.xml

@@ -21,7 +21,7 @@
   <artifactId>openinvparent</artifactId>
   <name>OpenInv</name>
   <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.1.9-SNAPSHOT</version>
+  <version>4.1.9</version>
 
   <packaging>pom</packaging>
 
@@ -81,13 +81,13 @@
         <artifactId>openinvapi</artifactId>
         <groupId>com.lishid</groupId>
         <scope>compile</scope>
-        <version>4.1.9-SNAPSHOT</version>
+        <version>4.1.9</version>
       </dependency>
       <dependency>
         <artifactId>openinvplugincore</artifactId>
         <groupId>com.lishid</groupId>
         <scope>compile</scope>
-        <version>4.1.9-SNAPSHOT</version>
+        <version>4.1.9</version>
       </dependency>
     </dependencies>
   </dependencyManagement>