From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 23 May 2019 21:50:37 -0500 Subject: [PATCH] Barrels and enderchests 6 rows diff --git a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java index 59acb1aab21e2dce0f046942f124b50ac1cb8d0f..a26cb4e4e4e23a06c970ea3c42c1060108708568 100644 --- a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java +++ b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java @@ -29,11 +29,34 @@ public class PlayerEnderChestContainer extends SimpleContainer { } public PlayerEnderChestContainer(Player owner) { - super(27); + super(net.pl3x.purpur.PurpurConfig.enderChestSixRows ? 54 : 27); // Purpur this.owner = owner; // CraftBukkit end } + // Purpur start + @Override + public int getContainerSize() { + if (net.pl3x.purpur.PurpurConfig.enderChestSixRows && net.pl3x.purpur.PurpurConfig.enderChestPermissionRows && owner != null && owner.getGameProfile() != null) { + org.bukkit.craftbukkit.entity.CraftHumanEntity bukkit = owner.getBukkitEntity(); + if (bukkit.hasPermission("purpur.enderchest.rows.six")) { + return 54; + } else if (bukkit.hasPermission("purpur.enderchest.rows.five")) { + return 45; + } else if (bukkit.hasPermission("purpur.enderchest.rows.four")) { + return 36; + } else if (bukkit.hasPermission("purpur.enderchest.rows.three")) { + return 27; + } else if (bukkit.hasPermission("purpur.enderchest.rows.two")) { + return 18; + } else if (bukkit.hasPermission("purpur.enderchest.rows.one")) { + return 9; + } + } + return super.getContainerSize(); + } + // Purpur end + public void setActiveChest(EnderChestBlockEntity blockEntity) { this.activeChest = blockEntity; } diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java index 70d10c492b6ba893d56a463c0e71ac6aa8707f81..34ea9d2aeb9d606d487be796283c9d5ed614a6af 100644 --- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java +++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java @@ -81,6 +82,27 @@ public class EnderChestBlock extends AbstractChestBlock i inventoryenderchest.a(tileentityenderchest); entityhuman.openContainer(new TileInventory((i, playerinventory, entityhuman1) -> { + // Purpur start + if (net.pl3x.purpur.PurpurConfig.enderChestSixRows) { + if (net.pl3x.purpur.PurpurConfig.enderChestPermissionRows) { + org.bukkit.craftbukkit.entity.CraftHumanEntity player = entityhuman.getBukkitEntity(); + if (player.hasPermission("purpur.enderchest.rows.six")) { + return new ContainerChest(Containers.GENERIC_9X6, i, playerinventory, inventoryenderchest, 6); + } else if (player.hasPermission("purpur.enderchest.rows.five")) { + return new ContainerChest(Containers.GENERIC_9X5, i, playerinventory, inventoryenderchest, 5); + } else if (player.hasPermission("purpur.enderchest.rows.four")) { + return new ContainerChest(Containers.GENERIC_9X4, i, playerinventory, inventoryenderchest, 4); + } else if (player.hasPermission("purpur.enderchest.rows.three")) { + return new ContainerChest(Containers.GENERIC_9X3, i, playerinventory, inventoryenderchest, 3); + } else if (player.hasPermission("purpur.enderchest.rows.two")) { + return new ContainerChest(Containers.GENERIC_9X2, i, playerinventory, inventoryenderchest, 2); + } else if (player.hasPermission("purpur.enderchest.rows.one")) { + return new ContainerChest(Containers.GENERIC_9X1, i, playerinventory, inventoryenderchest, 1); + } + } + return new ContainerChest(Containers.GENERIC_9X6, i, playerinventory, inventoryenderchest, 6); + } + // Purpur end return ContainerChest.a(i, playerinventory, inventoryenderchest); }, BlockEnderChest.e)); entityhuman.a(StatisticList.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 --- 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 { 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 this.openersCounter = new ContainerOpenersCounter() { @Override protected void onOpen(Level world, BlockPos pos, BlockState state) { @@ -120,7 +120,7 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity { @Override public int getContainerSize() { - return 27; + return net.pl3x.purpur.PurpurConfig.barrelSixRows ? 54 : 27; // Purpur } @Override @@ -140,6 +140,7 @@ 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); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java index 108be36fc37c04eece6ccb93d19e58a31326ceb0..2f329bae9f09d0ed21a4538fba6b95919ec35887 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -7,6 +7,7 @@ import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.event.inventory.InventoryType; import java.io.File; import java.io.IOException; @@ -133,4 +134,23 @@ public class PurpurConfig { timingsUrl = getString("settings.timings.url", timingsUrl); if (!TimingsManager.hiddenConfigs.contains("server-ip")) TimingsManager.hiddenConfigs.add("server-ip"); } + + public static boolean barrelSixRows = false; + public static boolean enderChestSixRows = false; + public static boolean enderChestPermissionRows = false; + private static void blockSettings() { + if (version < 3) { + boolean oldValue = getBoolean("settings.barrel.packed-barrels", true); + set("settings.blocks.barrel.six-rows", oldValue); + set("settings.packed-barrels", null); + oldValue = getBoolean("settings.large-ender-chests", true); + set("settings.blocks.ender_chest.six-rows", oldValue); + set("settings.large-ender-chests", null); + } + barrelSixRows = getBoolean("settings.blocks.barrel.six-rows", barrelSixRows); + InventoryType.BARREL.setDefaultSize(barrelSixRows ? 54 : 27); + enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows); + 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..dc8b034bbb50789d707968fa5a05434a31696a33 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java @@ -165,8 +165,10 @@ public class CraftContainer extends AbstractContainerMenu { case PLAYER: case CHEST: case ENDER_CHEST: + this.delegate = new ChestMenu(net.pl3x.purpur.PurpurConfig.enderChestSixRows ? MenuType.GENERIC_9x6 : MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9); // Purpur + break; // Purpur 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); // Purpur break; case DISPENSER: case DROPPER: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java index 01701e50dd0ce1c46dcc27ea7da8f51d45899a8c..6aa3838ad534dc49b0f591719e395598ad1183bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -80,7 +80,7 @@ public class CraftInventory implements Inventory { @Override public void setContents(ItemStack[] items) { - if (this.getSize() < items.length) { + if (false && this.getSize() < items.length) { // Purpur throw new IllegalArgumentException("Invalid inventory size; expected " + this.getSize() + " or less"); }