From 98fbcebfd950c9db6faf7b713c0b6b5b58c38ab8 Mon Sep 17 00:00:00 2001
From: Jikoo <jikoo.games@gmail.com>
Date: Thu, 2 Dec 2021 15:44:19 -0500
Subject: [PATCH] Fix non-translatable component, wrong flag value

---
 .../openinv/internal/v1_17_R1/AnySilentContainer.java  |  8 ++++----
 internal/v1_18_R1/pom.xml                              |  2 +-
 .../openinv/internal/v1_18_R1/AnySilentContainer.java  | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java
index 514aa92..53feec8 100644
--- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java
+++ b/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
diff --git a/internal/v1_18_R1/pom.xml b/internal/v1_18_R1/pom.xml
index 8629e1e..e702bb0 100644
--- a/internal/v1_18_R1/pom.xml
+++ b/internal/v1_18_R1/pom.xml
@@ -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>
diff --git a/internal/v1_18_R1/src/main/java/com/lishid/openinv/internal/v1_18_R1/AnySilentContainer.java b/internal/v1_18_R1/src/main/java/com/lishid/openinv/internal/v1_18_R1/AnySilentContainer.java
index a1d8272..793283b 100644
--- a/internal/v1_18_R1/src/main/java/com/lishid/openinv/internal/v1_18_R1/AnySilentContainer.java
+++ b/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