diff --git a/IF/pom.xml b/IF/pom.xml index a57f7e58..31e020bd 100644 --- a/IF/pom.xml +++ b/IF/pom.xml @@ -145,7 +145,7 @@ com.github.stefvanschie.inventoryframework - 1_20_3 + 1_20_3-4 ${project.version} compile diff --git a/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/Version.java b/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/Version.java index 56d54efa..1c5ba69d 100644 --- a/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/Version.java +++ b/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/Version.java @@ -135,18 +135,18 @@ public enum Version { V1_20_2, /** - * Version 1.20.3 + * Version 1.20.3 - 1.20.4 * * @since 0.10.13 */ - V1_20_3; + V1_20_3_4; /** * A collection of versions on which modern smithing tables are available. */ private static final Collection MODERN_SMITHING_TABLE_VERSIONS = EnumSet.of( V1_19_4, - V1_20_0_1, V1_20_2, V1_20_3 + V1_20_0_1, V1_20_2, V1_20_3_4 ); /** @@ -240,7 +240,8 @@ public static Version getVersion() { case "1.20.2": return V1_20_2; case "1.20.3": - return V1_20_3; + case "1.20.4": + return V1_20_3_4; default: throw new UnsupportedVersionException("The server version provided is not supported"); } diff --git a/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/VersionMatcher.java b/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/VersionMatcher.java index 7cd5015a..8b6eae33 100644 --- a/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/VersionMatcher.java +++ b/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/VersionMatcher.java @@ -309,7 +309,7 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers com.github.stefvanschie.inventoryframework.nms.v1_20_0_1.AnvilInventoryImpl.class); ANVIL_INVENTORIES.put(Version.V1_20_2, com.github.stefvanschie.inventoryframework.nms.v1_20_2.AnvilInventoryImpl.class); - ANVIL_INVENTORIES.put(Version.V1_20_3, + ANVIL_INVENTORIES.put(Version.V1_20_3_4, com.github.stefvanschie.inventoryframework.nms.v1_20_3.AnvilInventoryImpl.class); BEACON_INVENTORIES = new EnumMap<>(Version.class); @@ -347,7 +347,7 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers com.github.stefvanschie.inventoryframework.nms.v1_20_0_1.BeaconInventoryImpl.class); BEACON_INVENTORIES.put(Version.V1_20_2, com.github.stefvanschie.inventoryframework.nms.v1_20_2.BeaconInventoryImpl.class); - BEACON_INVENTORIES.put(Version.V1_20_3, + BEACON_INVENTORIES.put(Version.V1_20_3_4, com.github.stefvanschie.inventoryframework.nms.v1_20_3.BeaconInventoryImpl.class); CARTOGRAPHY_TABLE_INVENTORIES = new EnumMap<>(Version.class); @@ -385,7 +385,7 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers com.github.stefvanschie.inventoryframework.nms.v1_20_0_1.CartographyTableInventoryImpl.class); CARTOGRAPHY_TABLE_INVENTORIES.put(Version.V1_20_2, com.github.stefvanschie.inventoryframework.nms.v1_20_2.CartographyTableInventoryImpl.class); - CARTOGRAPHY_TABLE_INVENTORIES.put(Version.V1_20_3, + CARTOGRAPHY_TABLE_INVENTORIES.put(Version.V1_20_3_4, com.github.stefvanschie.inventoryframework.nms.v1_20_3.CartographyTableInventoryImpl.class); ENCHANTING_TABLE_INVENTORIES = new EnumMap<>(Version.class); @@ -423,7 +423,7 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers com.github.stefvanschie.inventoryframework.nms.v1_20_0_1.EnchantingTableInventoryImpl.class); ENCHANTING_TABLE_INVENTORIES.put(Version.V1_20_2, com.github.stefvanschie.inventoryframework.nms.v1_20_2.EnchantingTableInventoryImpl.class); - ENCHANTING_TABLE_INVENTORIES.put(Version.V1_20_3, + ENCHANTING_TABLE_INVENTORIES.put(Version.V1_20_3_4, com.github.stefvanschie.inventoryframework.nms.v1_20_3.EnchantingTableInventoryImpl.class); GRINDSTONE_INVENTORIES = new EnumMap<>(Version.class); @@ -461,7 +461,7 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers com.github.stefvanschie.inventoryframework.nms.v1_20_0_1.GrindstoneInventoryImpl.class); GRINDSTONE_INVENTORIES.put(Version.V1_20_2, com.github.stefvanschie.inventoryframework.nms.v1_20_2.GrindstoneInventoryImpl.class); - GRINDSTONE_INVENTORIES.put(Version.V1_20_3, + GRINDSTONE_INVENTORIES.put(Version.V1_20_3_4, com.github.stefvanschie.inventoryframework.nms.v1_20_3.GrindstoneInventoryImpl.class); MERCHANT_INVENTORIES = new EnumMap<>(Version.class); @@ -499,7 +499,7 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers com.github.stefvanschie.inventoryframework.nms.v1_20_0_1.MerchantInventoryImpl.class); MERCHANT_INVENTORIES.put(Version.V1_20_2, com.github.stefvanschie.inventoryframework.nms.v1_20_2.MerchantInventoryImpl.class); - MERCHANT_INVENTORIES.put(Version.V1_20_3, + MERCHANT_INVENTORIES.put(Version.V1_20_3_4, com.github.stefvanschie.inventoryframework.nms.v1_20_3.MerchantInventoryImpl.class); SMITHING_TABLE_INVENTORIES = new EnumMap<>(Version.class); @@ -509,7 +509,7 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers com.github.stefvanschie.inventoryframework.nms.v1_20_0_1.SmithingTableInventoryImpl.class); SMITHING_TABLE_INVENTORIES.put(Version.V1_20_2, com.github.stefvanschie.inventoryframework.nms.v1_20_2.SmithingTableInventoryImpl.class); - SMITHING_TABLE_INVENTORIES.put(Version.V1_20_3, + SMITHING_TABLE_INVENTORIES.put(Version.V1_20_3_4, com.github.stefvanschie.inventoryframework.nms.v1_20_3.SmithingTableInventoryImpl.class); LEGACY_SMITHING_TABLE_INVENTORIES = new EnumMap<>(Version.class); @@ -575,7 +575,7 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers com.github.stefvanschie.inventoryframework.nms.v1_20_0_1.StonecutterInventoryImpl.class); STONECUTTER_INVENTORIES.put(Version.V1_20_2, com.github.stefvanschie.inventoryframework.nms.v1_20_2.StonecutterInventoryImpl.class); - STONECUTTER_INVENTORIES.put(Version.V1_20_3, + STONECUTTER_INVENTORIES.put(Version.V1_20_3_4, com.github.stefvanschie.inventoryframework.nms.v1_20_3.StonecutterInventoryImpl.class); } } diff --git a/nms/1_20_3/pom.xml b/nms/1_20_3-4/pom.xml similarity index 98% rename from nms/1_20_3/pom.xml rename to nms/1_20_3-4/pom.xml index c44e8825..eb34aa23 100644 --- a/nms/1_20_3/pom.xml +++ b/nms/1_20_3-4/pom.xml @@ -10,7 +10,7 @@ ../../pom.xml - 1_20_3 + 1_20_3-4 true diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/AnvilInventoryImpl.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/AnvilInventoryImpl.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/AnvilInventoryImpl.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/AnvilInventoryImpl.java diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/BeaconInventoryImpl.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/BeaconInventoryImpl.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/BeaconInventoryImpl.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/BeaconInventoryImpl.java diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/CartographyTableInventoryImpl.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/CartographyTableInventoryImpl.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/CartographyTableInventoryImpl.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/CartographyTableInventoryImpl.java diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/EnchantingTableInventoryImpl.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/EnchantingTableInventoryImpl.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/EnchantingTableInventoryImpl.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/EnchantingTableInventoryImpl.java diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/GrindstoneInventoryImpl.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/GrindstoneInventoryImpl.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/GrindstoneInventoryImpl.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/GrindstoneInventoryImpl.java diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/MerchantInventoryImpl.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/MerchantInventoryImpl.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/MerchantInventoryImpl.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/MerchantInventoryImpl.java diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/SmithingTableInventoryImpl.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/SmithingTableInventoryImpl.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/SmithingTableInventoryImpl.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/SmithingTableInventoryImpl.java diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/StonecutterInventoryImpl.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/StonecutterInventoryImpl.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/StonecutterInventoryImpl.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/StonecutterInventoryImpl.java diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/util/CustomInventoryUtil.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/util/CustomInventoryUtil.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/util/CustomInventoryUtil.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/util/CustomInventoryUtil.java diff --git a/nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/util/TextHolderUtil.java b/nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/util/TextHolderUtil.java similarity index 100% rename from nms/1_20_3/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/util/TextHolderUtil.java rename to nms/1_20_3-4/src/main/java/com/github/stefvanschie/inventoryframework/nms/v1_20_3/util/TextHolderUtil.java diff --git a/pom.xml b/pom.xml index b9dc16ee..35edd4ea 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ IF nms/abstraction - nms/1_20_3 + nms/1_20_3-4 nms/1_20_2 nms/1_20_0-1 nms/1_19_4