Configurable barrel rows (Implements #623)

PurpurMC · Aug 31, 2021 · 8f80451 · 8f80451
1 parent 2b4f3af
commit 8f80451
Show file tree

Hide file tree

Showing 23 changed files with 119 additions and 60 deletions.
diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch
@@ -190,8 +190,8 @@ index 0000000000000000000000000000000000000000..6903706219a146146a213710a5f83af3
 +        commands = new HashMap<>();
 +        commands.put("purpur", new PurpurCommand("purpur"));
 +
-+        version = getInt("config-version", 19);
-+        set("config-version", 19);
++        version = getInt("config-version", 20);
++        set("config-version", 20);
 +
 +        readConfig(PurpurConfig.class, null);
 +    }

diff --git a/patches/server/0010-Barrels-and-enderchests-6-rows.patch b/patches/server/0010-Barrels-and-enderchests-6-rows.patch
@@ -112,45 +112,81 @@ index 7e45c97acce83a9fe8ada486e9fcdafe58769736..e3c84ad3fad4ee479bb00b7dc02a2502
                  }, CONTAINER_TITLE));
                  player.awardStat(Stats.OPEN_ENDERCHEST);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index f494063ead9c6303fb3ca880aba2a877ae8d83ab..3b027111ed933856ae86ad5f62aac744021f8880 100644
+index f494063ead9c6303fb3ca880aba2a877ae8d83ab..91667ef99f5e962a3c77334ce040261c753edce1 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-@@ -68,7 +68,7 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+@@ -16,6 +16,7 @@ import net.minecraft.world.entity.player.Inventory;
+ import net.minecraft.world.entity.player.Player;
+ import net.minecraft.world.inventory.AbstractContainerMenu;
+ import net.minecraft.world.inventory.ChestMenu;
++import net.minecraft.world.inventory.MenuType;
+ import net.minecraft.world.item.ItemStack;
+ import net.minecraft.world.level.Level;
+ import net.minecraft.world.level.block.BarrelBlock;
+@@ -68,7 +69,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
 
      public BarrelBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.BARREL, pos, state);
 -        this.items = NonNullList.withSize(27, ItemStack.EMPTY);
-+        this.items = NonNullList.withSize(net.pl3x.purpur.PurpurConfig.barrelSixRows ? 54 : 27, ItemStack.EMPTY); // Purpur
++        // Purpur start
++        this.items = NonNullList.withSize(switch (net.pl3x.purpur.PurpurConfig.barrelRows) {
++            case 6 -> 54;
++            case 5 -> 45;
++            case 4 -> 36;
++            case 2 -> 18;
++            case 1 -> 9;
++            default -> 27;
++        }, ItemStack.EMPTY);
++        // Purpur end
          this.openersCounter = new ContainerOpenersCounter() {
              @Override
              protected void onOpen(Level world, BlockPos pos, BlockState state) {
-@@ -120,7 +120,7 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+@@ -120,7 +130,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
 
      @Override
      public int getContainerSize() {
 -        return 27;
-+        return net.pl3x.purpur.PurpurConfig.barrelSixRows ? 54 : 27; // Purpur
++        // Purpur start
++        return switch (net.pl3x.purpur.PurpurConfig.barrelRows) {
++            case 6 -> 54;
++            case 5 -> 45;
++            case 4 -> 36;
++            case 2 -> 18;
++            case 1 -> 9;
++            default -> 27;
++        };
++        // Purpur end
      }
 
      @Override
-@@ -140,6 +140,7 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+@@ -140,7 +159,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
 
      @Override
      protected AbstractContainerMenu createMenu(int syncId, Inventory playerInventory) {
-+        if (net.pl3x.purpur.PurpurConfig.barrelSixRows) return ChestMenu.sixRows(syncId, playerInventory, (Container) this); // Purpur
-         return ChestMenu.threeRows(syncId, playerInventory, (Container) this);
+-        return ChestMenu.threeRows(syncId, playerInventory, (Container) this);
++        // Purpur start
++        return switch (net.pl3x.purpur.PurpurConfig.barrelRows) {
++            case 6 -> ChestMenu.sixRows(syncId, playerInventory, this);
++            case 5 -> ChestMenu.fiveRows(syncId, playerInventory, this);
++            case 4 -> ChestMenu.fourRows(syncId, playerInventory, this);
++            case 2 -> ChestMenu.twoRows(syncId, playerInventory, this);
++            case 1 -> ChestMenu.oneRow(syncId, playerInventory, this);
++            default -> ChestMenu.threeRows(syncId, playerInventory, this);
++        };
++        // Purpur end
      }
 
+     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b634d1a67b741feadf3f8fda5439a501fef3d132..e9c2ad24aea7861d8d3c1f8879f70e8fa514fa05 100644
+index b634d1a67b741feadf3f8fda5439a501fef3d132..57b90d6f12f58ea4297cc45985151598e6c390ab 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -174,4 +174,23 @@ public class PurpurConfig {
+@@ -174,4 +174,39 @@ public class PurpurConfig {
          }
          if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
      }
 +
-+    public static boolean barrelSixRows = false;
++    public static int barrelRows = 3;
 +    public static boolean enderChestSixRows = false;
 +    public static boolean enderChestPermissionRows = false;
 +    private static void blockSettings() {
@@ -162,18 +198,34 @@ index b634d1a67b741feadf3f8fda5439a501fef3d132..e9c2ad24aea7861d8d3c1f8879f70e8f
 +            set("settings.blocks.ender_chest.six-rows", oldValue);
 +            set("settings.large-ender-chests", null);
 +        }
-+        barrelSixRows = getBoolean("settings.blocks.barrel.six-rows", barrelSixRows);
-+        org.bukkit.event.inventory.InventoryType.BARREL.setDefaultSize(barrelSixRows ? 54 : 27);
++        if (version < 20) {
++            boolean oldValue = getBoolean("settings.blocks.barrel.six-rows", false);
++            set("settings.blocks.barrel.rows", oldValue ? 6 : 3);
++            set("settings.blocks.barrel.six-rows", null);
++        }
++        barrelRows = getInt("settings.blocks.barrel.rows", barrelRows);
++        if (barrelRows < 1 || barrelRows > 6) {
++            Bukkit.getLogger().severe("settings.blocks.barrel.rows must be 1-6, resetting to default");
++            barrelRows = 3;
++        }
++        org.bukkit.event.inventory.InventoryType.BARREL.setDefaultSize(switch (barrelRows) {
++            case 6 -> 54;
++            case 5 -> 45;
++            case 4 -> 36;
++            case 2 -> 18;
++            case 1 -> 9;
++            default -> 27;
++        });
 +        enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
 +        org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
 +        enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 99d52dc4a3619200e8eb864e8ed8f4a6e469b443..613a0bcb4268f5d3256a871d47ae079ba5d92525 100644
+index 99d52dc4a3619200e8eb864e8ed8f4a6e469b443..1f752673b590f5a3a676db7e04be2c7602de0f51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -165,8 +165,12 @@ public class CraftContainer extends AbstractContainerMenu {
+@@ -165,8 +165,19 @@ public class CraftContainer extends AbstractContainerMenu {
              case PLAYER:
              case CHEST:
              case ENDER_CHEST:
@@ -182,7 +234,14 @@ index 99d52dc4a3619200e8eb864e8ed8f4a6e469b443..613a0bcb4268f5d3256a871d47ae079b
 +                break;
              case BARREL:
 -                this.delegate = new ChestMenu(MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
-+                this.delegate = new ChestMenu(net.pl3x.purpur.PurpurConfig.barrelSixRows ? MenuType.GENERIC_9x6 : MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
++                this.delegate = new ChestMenu(switch (net.pl3x.purpur.PurpurConfig.barrelRows) {
++                    case 6 -> MenuType.GENERIC_9x6;
++                    case 5 -> MenuType.GENERIC_9x5;
++                    case 4 -> MenuType.GENERIC_9x4;
++                    case 2 -> MenuType.GENERIC_9x2;
++                    case 1 -> MenuType.GENERIC_9x1;
++                    default -> MenuType.GENERIC_9x3;
++                }, windowId, bottom, top, top.getContainerSize() / 9);
 +                // Purpur end
                  break;
              case DISPENSER:

diff --git a/patches/server/0017-Lagging-threshold.patch b/patches/server/0017-Lagging-threshold.patch
@@ -25,7 +25,7 @@ index be32f41d1ec6f8a4f8c6835fe262c3d86f163f34..41eccbed6dda81f7d50c6ccb3539db39
                      }
                      // Paper - replace logic
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e0a7010c6d1499499d0b5b305306897061e5b640..2553768892562869efdad56e31c4db17e3d86b39 100644
+index d7d2604fd324f1bfc9136a3a34ea217ff458a26a..1a68b4b5c8ea498ef1fdc507a9a8e8dfaa64b4c1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -188,6 +188,11 @@ public class PurpurConfig {
@@ -37,7 +37,7 @@ index e0a7010c6d1499499d0b5b305306897061e5b640..2553768892562869efdad56e31c4db17
 +        laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
 +    }
 +
-     public static boolean barrelSixRows = false;
+     public static int barrelRows = 3;
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java

diff --git a/patches/server/0024-Alternative-Keepalive-Handling.patch b/patches/server/0024-Alternative-Keepalive-Handling.patch
@@ -56,7 +56,7 @@ index 8ea53a2c6f62c6e65257fa7eb094187529e6525b..cf10b1025fa3c6da91cfefbf8b31b83e
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 2553768892562869efdad56e31c4db17e3d86b39..20f57abd6420466002e2413a59482c0af224d830 100644
+index 1a68b4b5c8ea498ef1fdc507a9a8e8dfaa64b4c1..47c0fde3000fd5c016ffb4c70d9a58086890162b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -193,6 +193,11 @@ public class PurpurConfig {
@@ -68,6 +68,6 @@ index 2553768892562869efdad56e31c4db17e3d86b39..20f57abd6420466002e2413a59482c0a
 +        useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
 +    }
 +
-     public static boolean barrelSixRows = false;
+     public static int barrelRows = 3;
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
diff --git a/patches/server/0028-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0028-Logger-settings-suppressing-pointless-logs.patch
@@ -29,10 +29,10 @@ index 63a4fa2408edf84b490ca39e824977135d78eff0..461796c9c559f43bd2e0126b12a46bfc
                  } else {
                      handler.accept((Recipe) optional.get());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 20f57abd6420466002e2413a59482c0af224d830..a91f51f80e8c19cfca75086ff7a1a9f71abc4647 100644
+index db286d3c0d37603e5f06cfff4642b321e879e6b4..62396ba628de428c05d4e803e489503607391e9b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -216,4 +216,13 @@ public class PurpurConfig {
+@@ -232,4 +232,13 @@ public class PurpurConfig {
          org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
      }

diff --git a/patches/server/0035-Dont-send-useless-entity-packets.patch b/patches/server/0035-Dont-send-useless-entity-packets.patch
@@ -43,7 +43,7 @@ diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net
 index a91f51f80e8c19cfca75086ff7a1a9f71abc4647..bfe334678aef01738a834b4b281bed34d8e71a23 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -217,6 +217,11 @@ public class PurpurConfig {
+@@ -233,6 +233,11 @@ public class PurpurConfig {
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
      }
 

diff --git a/patches/server/0057-Configurable-TPS-Catchup.patch b/patches/server/0057-Configurable-TPS-Catchup.patch
@@ -24,10 +24,10 @@ index 41eccbed6dda81f7d50c6ccb3539db3927b96021..88038c8286e46a89eed94169db9de5b8
                      this.profiler.pop();
                      this.endMetricsRecordingTick();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bfe334678aef01738a834b4b281bed34d8e71a23..e80ef21d6bd16f4d1ed9f2b47875fbc306b80e54 100644
+index 0e9699da061abb2a959f5b7a3c9723faafb2a14a..b0bd6e19b40850aea2c79a627f33ce8b78bc794b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -230,4 +230,9 @@ public class PurpurConfig {
+@@ -246,4 +246,9 @@ public class PurpurConfig {
          loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
          loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
      }

diff --git a/patches/server/0082-Add-allow-water-in-end-world-option.patch b/patches/server/0082-Add-allow-water-in-end-world-option.patch
@@ -71,7 +71,7 @@ diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net
 index e98257697af84bf7501ee40db0683ab8b9880ee6..a35d10d864418c06b8f4543d886ac14a1ba76a76 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -228,6 +228,11 @@ public class PurpurConfig {
+@@ -244,6 +244,11 @@ public class PurpurConfig {
          dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
      }
 

diff --git a/patches/server/0093-Add-option-to-disable-certain-block-updates.patch b/patches/server/0093-Add-option-to-disable-certain-block-updates.patch
@@ -120,7 +120,7 @@ diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net
 index 15ce3d3f1f95f232203f5fe10a754c21ae88f729..568e119f599397b8bd5c5e41603f692a8fc848f5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -355,6 +355,15 @@ public class PurpurConfig {
+@@ -371,6 +371,15 @@ public class PurpurConfig {
          allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
      }
 

diff --git a/patches/server/0098-Short-enderman-height.patch b/patches/server/0098-Short-enderman-height.patch
@@ -31,10 +31,10 @@ index a36313c321f9057350a9edb8b0959fd49a8e21a3..10c3a0c49579fbd9f1fe7ec82eebd42b
              if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
              for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6522045a99d93fc756571d8f43949a050cefb246..336a6afbcd5359a1e82d8bac23cd8bfac5e4cd1e 100644
+index 316ac05a6d0dde3f2a192d4fbdbe90fbf58f7d79..d7dec624a7ea4b3a977728f42bcb78210dcd64ec 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -345,6 +345,12 @@ public class PurpurConfig {
+@@ -361,6 +361,12 @@ public class PurpurConfig {
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
      }
 

diff --git a/patches/server/0101-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0101-Crying-obsidian-valid-for-portal-frames.patch
@@ -18,18 +18,18 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
      private final LevelAccessor level;
      private final Direction.Axis axis;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 336a6afbcd5359a1e82d8bac23cd8bfac5e4cd1e..8065d13f4036d62e39aa1f8f081a2cf80edef708 100644
+index d7dec624a7ea4b3a977728f42bcb78210dcd64ec..2dbdd6e4feb38bc67f1258bc9ef72c349bef6807 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -329,6 +329,7 @@ public class PurpurConfig {
-     public static boolean barrelSixRows = false;
+     public static int barrelRows = 3;
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 +    public static boolean cryingObsidianValidForPortalFrame = false;
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -343,6 +344,7 @@ public class PurpurConfig {
+@@ -359,6 +360,7 @@ public class PurpurConfig {
          enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
          org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);

diff --git a/patches/server/0115-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0115-Allow-infinite-and-mending-enchantments-together.patch
@@ -17,10 +17,10 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8065d13f4036d62e39aa1f8f081a2cf80edef708..b87478ce6f9ed3ef0f329622268e9133930ae7b8 100644
+index 2dbdd6e4feb38bc67f1258bc9ef72c349bef6807..e7215ede4286ee5a1047d8c94b0c42f3dfae9dcf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -347,6 +347,16 @@ public class PurpurConfig {
+@@ -363,6 +363,16 @@ public class PurpurConfig {
          cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
      }
 

diff --git a/patches/server/0133-EMC-Configurable-disable-give-dropping.patch b/patches/server/0133-EMC-Configurable-disable-give-dropping.patch
@@ -20,7 +20,7 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12
                          itemStack.setCount(1);
                          ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b87478ce6f9ed3ef0f329622268e9133930ae7b8..c727654feb472518bdeaa780ba885ec85616902e 100644
+index e7215ede4286ee5a1047d8c94b0c42f3dfae9dcf..76e84ae0a91808a40b6cfe888134de07c87087c6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -326,6 +326,11 @@ public class PurpurConfig {
@@ -32,6 +32,6 @@ index b87478ce6f9ed3ef0f329622268e9133930ae7b8..c727654feb472518bdeaa780ba885ec8
 +        disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
 +    }
 +
-     public static boolean barrelSixRows = false;
+     public static int barrelRows = 3;
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
diff --git a/patches/server/0142-Implement-TPSBar.patch b/patches/server/0142-Implement-TPSBar.patch
@@ -105,7 +105,7 @@ index e17c61e3b807dbc1a7bca4952349145617204154..cf016f139895690d5a0e0ef2709e31ea
 
          entityplayer.awardStat(Stats.LEAVE_GAME);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c727654feb472518bdeaa780ba885ec85616902e..a51de18eee2caf87b710e3ab863b7157d093859c 100644
+index 76e84ae0a91808a40b6cfe888134de07c87087c6..624af72fbef2255c7a164a04cf795475433329fd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -331,6 +331,29 @@ public class PurpurConfig {
@@ -135,7 +135,7 @@ index c727654feb472518bdeaa780ba885ec85616902e..a51de18eee2caf87b710e3ab863b7157
 +        commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
 +    }
 +
-     public static boolean barrelSixRows = false;
+     public static int barrelRows = 3;
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/net/pl3x/purpur/command/TPSBarCommand.java b/src/main/java/net/pl3x/purpur/command/TPSBarCommand.java