From 156e89e490c555d47c86eec98ba4ae13ce2682ea Mon Sep 17 00:00:00 2001 From: TheMode Date: Wed, 30 Jun 2021 01:19:17 +0200 Subject: [PATCH] Add Component title constructor for inventory types --- .../minestom/server/inventory/type/AnvilInventory.java | 8 +++++++- .../minestom/server/inventory/type/BeaconInventory.java | 8 +++++++- .../server/inventory/type/BrewingStandInventory.java | 8 +++++++- .../server/inventory/type/EnchantmentTableInventory.java | 8 +++++++- .../minestom/server/inventory/type/FurnaceInventory.java | 8 +++++++- .../minestom/server/inventory/type/VillagerInventory.java | 8 +++++++- 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minestom/server/inventory/type/AnvilInventory.java b/src/main/java/net/minestom/server/inventory/type/AnvilInventory.java index fe0dc537d..8a7c9f2c1 100644 --- a/src/main/java/net/minestom/server/inventory/type/AnvilInventory.java +++ b/src/main/java/net/minestom/server/inventory/type/AnvilInventory.java @@ -1,14 +1,20 @@ package net.minestom.server.inventory.type; +import net.kyori.adventure.text.Component; import net.minestom.server.inventory.Inventory; import net.minestom.server.inventory.InventoryProperty; import net.minestom.server.inventory.InventoryType; +import org.jetbrains.annotations.NotNull; public class AnvilInventory extends Inventory { private short repairCost; - public AnvilInventory(String title) { + public AnvilInventory(@NotNull Component title) { + super(InventoryType.ANVIL, title); + } + + public AnvilInventory(@NotNull String title) { super(InventoryType.ANVIL, title); } diff --git a/src/main/java/net/minestom/server/inventory/type/BeaconInventory.java b/src/main/java/net/minestom/server/inventory/type/BeaconInventory.java index e63cc9466..0c84abbcd 100644 --- a/src/main/java/net/minestom/server/inventory/type/BeaconInventory.java +++ b/src/main/java/net/minestom/server/inventory/type/BeaconInventory.java @@ -1,9 +1,11 @@ package net.minestom.server.inventory.type; +import net.kyori.adventure.text.Component; import net.minestom.server.inventory.Inventory; import net.minestom.server.inventory.InventoryProperty; import net.minestom.server.inventory.InventoryType; import net.minestom.server.potion.PotionEffect; +import org.jetbrains.annotations.NotNull; public class BeaconInventory extends Inventory { @@ -11,7 +13,11 @@ public class BeaconInventory extends Inventory { private PotionEffect firstPotionEffect; private PotionEffect secondPotionEffect; - public BeaconInventory(String title) { + public BeaconInventory(@NotNull Component title) { + super(InventoryType.BEACON, title); + } + + public BeaconInventory(@NotNull String title) { super(InventoryType.BEACON, title); } diff --git a/src/main/java/net/minestom/server/inventory/type/BrewingStandInventory.java b/src/main/java/net/minestom/server/inventory/type/BrewingStandInventory.java index 6177f183a..ed0bc7d78 100644 --- a/src/main/java/net/minestom/server/inventory/type/BrewingStandInventory.java +++ b/src/main/java/net/minestom/server/inventory/type/BrewingStandInventory.java @@ -1,15 +1,21 @@ package net.minestom.server.inventory.type; +import net.kyori.adventure.text.Component; import net.minestom.server.inventory.Inventory; import net.minestom.server.inventory.InventoryProperty; import net.minestom.server.inventory.InventoryType; +import org.jetbrains.annotations.NotNull; public class BrewingStandInventory extends Inventory { private short brewTime; private short fuelTime; - public BrewingStandInventory(String title) { + public BrewingStandInventory(@NotNull Component title) { + super(InventoryType.BREWING_STAND, title); + } + + public BrewingStandInventory(@NotNull String title) { super(InventoryType.BREWING_STAND, title); } diff --git a/src/main/java/net/minestom/server/inventory/type/EnchantmentTableInventory.java b/src/main/java/net/minestom/server/inventory/type/EnchantmentTableInventory.java index 7b5ef2aab..349af72c3 100644 --- a/src/main/java/net/minestom/server/inventory/type/EnchantmentTableInventory.java +++ b/src/main/java/net/minestom/server/inventory/type/EnchantmentTableInventory.java @@ -1,9 +1,11 @@ package net.minestom.server.inventory.type; +import net.kyori.adventure.text.Component; import net.minestom.server.inventory.Inventory; import net.minestom.server.inventory.InventoryProperty; import net.minestom.server.inventory.InventoryType; import net.minestom.server.item.Enchantment; +import org.jetbrains.annotations.NotNull; public class EnchantmentTableInventory extends Inventory { @@ -12,7 +14,11 @@ public class EnchantmentTableInventory extends Inventory { private final short[] enchantmentShown = new short[EnchantmentSlot.values().length]; private final short[] enchantmentLevel = new short[EnchantmentSlot.values().length]; - public EnchantmentTableInventory(String title) { + public EnchantmentTableInventory(@NotNull Component title) { + super(InventoryType.ENCHANTMENT, title); + } + + public EnchantmentTableInventory(@NotNull String title) { super(InventoryType.ENCHANTMENT, title); } diff --git a/src/main/java/net/minestom/server/inventory/type/FurnaceInventory.java b/src/main/java/net/minestom/server/inventory/type/FurnaceInventory.java index 6943fb8ce..9e357da99 100644 --- a/src/main/java/net/minestom/server/inventory/type/FurnaceInventory.java +++ b/src/main/java/net/minestom/server/inventory/type/FurnaceInventory.java @@ -1,8 +1,10 @@ package net.minestom.server.inventory.type; +import net.kyori.adventure.text.Component; import net.minestom.server.inventory.Inventory; import net.minestom.server.inventory.InventoryProperty; import net.minestom.server.inventory.InventoryType; +import org.jetbrains.annotations.NotNull; public class FurnaceInventory extends Inventory { @@ -11,7 +13,11 @@ public class FurnaceInventory extends Inventory { private short progressArrow; private short maximumProgress; - public FurnaceInventory(String title) { + public FurnaceInventory(@NotNull Component title) { + super(InventoryType.FURNACE, title); + } + + public FurnaceInventory(@NotNull String title) { super(InventoryType.FURNACE, title); } diff --git a/src/main/java/net/minestom/server/inventory/type/VillagerInventory.java b/src/main/java/net/minestom/server/inventory/type/VillagerInventory.java index e7a521376..5db943fd4 100644 --- a/src/main/java/net/minestom/server/inventory/type/VillagerInventory.java +++ b/src/main/java/net/minestom/server/inventory/type/VillagerInventory.java @@ -1,5 +1,6 @@ package net.minestom.server.inventory.type; +import net.kyori.adventure.text.Component; import net.minestom.server.entity.Player; import net.minestom.server.inventory.Inventory; import net.minestom.server.inventory.InventoryType; @@ -11,7 +12,12 @@ public class VillagerInventory extends Inventory { protected TradeListPacket tradeListPacket; - public VillagerInventory(String title) { + public VillagerInventory(@NotNull Component title) { + super(InventoryType.MERCHANT, title); + setupPacket(); + } + + public VillagerInventory(@NotNull String title) { super(InventoryType.MERCHANT, title); setupPacket(); }