diff --git a/InvUI/pom.xml b/InvUI/pom.xml index cb937e6..94509a1 100644 --- a/InvUI/pom.xml +++ b/InvUI/pom.xml @@ -45,42 +45,42 @@ de.studiocode.invui - abstraction + IA 0.1-SNAPSHOT de.studiocode.invui - 1_14_R1 + IA-R1 0.1-SNAPSHOT de.studiocode.invui - 1_15_R1 + IA-R2 0.1-SNAPSHOT de.studiocode.invui - 1_16_R1 + IA-R3 0.1-SNAPSHOT de.studiocode.invui - 1_16_R2 + IA-R4 0.1-SNAPSHOT de.studiocode.invui - 1_16_R3 + IA-R5 0.1-SNAPSHOT de.studiocode.invui - 1_17_R1 + IA-R6 0.1-SNAPSHOT de.studiocode.invui - 1_17_R2 + IA-R7 0.1-SNAPSHOT diff --git a/InventoryAccess/1_14_R1/pom.xml b/InventoryAccess/IA-R1/pom.xml similarity index 92% rename from InventoryAccess/1_14_R1/pom.xml rename to InventoryAccess/IA-R1/pom.xml index 1519fc8..b25ef4f 100644 --- a/InventoryAccess/1_14_R1/pom.xml +++ b/InventoryAccess/IA-R1/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - 1_14_R1 + IA-R1 8 @@ -26,7 +26,7 @@ de.studiocode.invui - abstraction + IA ${project.parent.version} diff --git a/InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/inventory/AnvilInventoryImpl.java b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/inventory/AnvilInventoryImpl.java similarity index 97% rename from InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/inventory/AnvilInventoryImpl.java rename to InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/inventory/AnvilInventoryImpl.java index 12f54ea..6417caf 100644 --- a/InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/inventory/AnvilInventoryImpl.java +++ b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/inventory/AnvilInventoryImpl.java @@ -1,8 +1,8 @@ -package de.studiocode.inventoryaccess.v1_14_R1.inventory; +package de.studiocode.inventoryaccess.r1.inventory; import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; import de.studiocode.inventoryaccess.util.ReflectionUtils; -import de.studiocode.inventoryaccess.v1_14_R1.util.InventoryUtilsImpl; +import de.studiocode.inventoryaccess.r1.util.InventoryUtilsImpl; import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.server.v1_14_R1.*; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; diff --git a/InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/util/InventoryUtilsImpl.java b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/InventoryUtilsImpl.java similarity index 98% rename from InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/util/InventoryUtilsImpl.java rename to InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/InventoryUtilsImpl.java index 04535a6..9164500 100644 --- a/InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/util/InventoryUtilsImpl.java +++ b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/InventoryUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_14_R1.util; +package de.studiocode.inventoryaccess.r1.util; import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/util/ItemUtilsImpl.java b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/ItemUtilsImpl.java similarity index 98% rename from InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/util/ItemUtilsImpl.java rename to InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/ItemUtilsImpl.java index 588cd84..ebe7cbf 100644 --- a/InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/ItemUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_14_R1.util; +package de.studiocode.inventoryaccess.r1.util; import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; import de.studiocode.inventoryaccess.util.ReflectionRegistry; diff --git a/InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/PlayerUtilsImpl.java similarity index 96% rename from InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/util/PlayerUtilsImpl.java rename to InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/PlayerUtilsImpl.java index 56ac378..5759085 100644 --- a/InventoryAccess/1_14_R1/src/main/java/de/studiocode/inventoryaccess/v1_14_R1/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/PlayerUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_14_R1.util; +package de.studiocode.inventoryaccess.r1.util; import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; import de.studiocode.inventoryaccess.util.ReflectionUtils; diff --git a/InventoryAccess/1_15_R1/pom.xml b/InventoryAccess/IA-R2/pom.xml similarity index 92% rename from InventoryAccess/1_15_R1/pom.xml rename to InventoryAccess/IA-R2/pom.xml index 9652c97..d70afd3 100644 --- a/InventoryAccess/1_15_R1/pom.xml +++ b/InventoryAccess/IA-R2/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - 1_15_R1 + IA-R2 8 @@ -26,7 +26,7 @@ de.studiocode.invui - abstraction + IA ${project.parent.version} diff --git a/InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/inventory/AnvilInventoryImpl.java b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/inventory/AnvilInventoryImpl.java similarity index 97% rename from InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/inventory/AnvilInventoryImpl.java rename to InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/inventory/AnvilInventoryImpl.java index 3f96618..6dac27c 100644 --- a/InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/inventory/AnvilInventoryImpl.java +++ b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/inventory/AnvilInventoryImpl.java @@ -1,8 +1,8 @@ -package de.studiocode.inventoryaccess.v1_15_R1.inventory; +package de.studiocode.inventoryaccess.r2.inventory; import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; +import de.studiocode.inventoryaccess.r2.util.InventoryUtilsImpl; import de.studiocode.inventoryaccess.util.ReflectionUtils; -import de.studiocode.inventoryaccess.v1_15_R1.util.InventoryUtilsImpl; import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.server.v1_15_R1.*; import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; diff --git a/InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/util/InventoryUtilsImpl.java b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/InventoryUtilsImpl.java similarity index 98% rename from InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/util/InventoryUtilsImpl.java rename to InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/InventoryUtilsImpl.java index 4dc93e8..7668eb7 100644 --- a/InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/util/InventoryUtilsImpl.java +++ b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/InventoryUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_15_R1.util; +package de.studiocode.inventoryaccess.r2.util; import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/util/ItemUtilsImpl.java b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/ItemUtilsImpl.java similarity index 98% rename from InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/util/ItemUtilsImpl.java rename to InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/ItemUtilsImpl.java index 2825ebb..e59f78f 100644 --- a/InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/ItemUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_15_R1.util; +package de.studiocode.inventoryaccess.r2.util; import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; import de.studiocode.inventoryaccess.util.ReflectionRegistry; diff --git a/InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/PlayerUtilsImpl.java similarity index 96% rename from InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/util/PlayerUtilsImpl.java rename to InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/PlayerUtilsImpl.java index d029aea..97d76ac 100644 --- a/InventoryAccess/1_15_R1/src/main/java/de/studiocode/inventoryaccess/v1_15_R1/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/PlayerUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_15_R1.util; +package de.studiocode.inventoryaccess.r2.util; import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; import de.studiocode.inventoryaccess.util.ReflectionUtils; diff --git a/InventoryAccess/1_16_R1/pom.xml b/InventoryAccess/IA-R3/pom.xml similarity index 92% rename from InventoryAccess/1_16_R1/pom.xml rename to InventoryAccess/IA-R3/pom.xml index a1a55e9..16a02cd 100644 --- a/InventoryAccess/1_16_R1/pom.xml +++ b/InventoryAccess/IA-R3/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - 1_16_R1 + IA-R3 8 @@ -26,7 +26,7 @@ de.studiocode.invui - abstraction + IA ${project.parent.version} diff --git a/InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/inventory/AnvilInventoryImpl.java b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/inventory/AnvilInventoryImpl.java similarity index 97% rename from InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/inventory/AnvilInventoryImpl.java rename to InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/inventory/AnvilInventoryImpl.java index 3f9d299..ae2031f 100644 --- a/InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/inventory/AnvilInventoryImpl.java +++ b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/inventory/AnvilInventoryImpl.java @@ -1,7 +1,7 @@ -package de.studiocode.inventoryaccess.v1_16_R1.inventory; +package de.studiocode.inventoryaccess.r3.inventory; import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.v1_16_R1.util.InventoryUtilsImpl; +import de.studiocode.inventoryaccess.r3.util.InventoryUtilsImpl; import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.server.v1_16_R1.*; import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer; diff --git a/InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/util/InventoryUtilsImpl.java b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/InventoryUtilsImpl.java similarity index 98% rename from InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/util/InventoryUtilsImpl.java rename to InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/InventoryUtilsImpl.java index c57391c..469661b 100644 --- a/InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/util/InventoryUtilsImpl.java +++ b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/InventoryUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_16_R1.util; +package de.studiocode.inventoryaccess.r3.util; import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/util/ItemUtilsImpl.java b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/ItemUtilsImpl.java similarity index 98% rename from InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/util/ItemUtilsImpl.java rename to InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/ItemUtilsImpl.java index aab156e..c57d335 100644 --- a/InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/ItemUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_16_R1.util; +package de.studiocode.inventoryaccess.r3.util; import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; import de.studiocode.inventoryaccess.util.ReflectionRegistry; diff --git a/InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/PlayerUtilsImpl.java similarity index 96% rename from InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/util/PlayerUtilsImpl.java rename to InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/PlayerUtilsImpl.java index be5cad8..ae0cc5d 100644 --- a/InventoryAccess/1_16_R1/src/main/java/de/studiocode/inventoryaccess/v1_16_R1/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/PlayerUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_16_R1.util; +package de.studiocode.inventoryaccess.r3.util; import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; import de.studiocode.inventoryaccess.util.ReflectionUtils; diff --git a/InventoryAccess/1_16_R2/pom.xml b/InventoryAccess/IA-R4/pom.xml similarity index 92% rename from InventoryAccess/1_16_R2/pom.xml rename to InventoryAccess/IA-R4/pom.xml index d16811e..d28d855 100644 --- a/InventoryAccess/1_16_R2/pom.xml +++ b/InventoryAccess/IA-R4/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - 1_16_R2 + IA-R4 8 @@ -26,7 +26,7 @@ de.studiocode.invui - abstraction + IA ${project.parent.version} diff --git a/InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/inventory/AnvilInventoryImpl.java b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/inventory/AnvilInventoryImpl.java similarity index 97% rename from InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/inventory/AnvilInventoryImpl.java rename to InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/inventory/AnvilInventoryImpl.java index a54c996..f6ac757 100644 --- a/InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/inventory/AnvilInventoryImpl.java +++ b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/inventory/AnvilInventoryImpl.java @@ -1,7 +1,7 @@ -package de.studiocode.inventoryaccess.v1_16_R2.inventory; +package de.studiocode.inventoryaccess.r4.inventory; import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.v1_16_R2.util.InventoryUtilsImpl; +import de.studiocode.inventoryaccess.r4.util.InventoryUtilsImpl; import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.server.v1_16_R2.*; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; diff --git a/InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/util/InventoryUtilsImpl.java b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/InventoryUtilsImpl.java similarity index 98% rename from InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/util/InventoryUtilsImpl.java rename to InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/InventoryUtilsImpl.java index 95f2428..b84a4e8 100644 --- a/InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/util/InventoryUtilsImpl.java +++ b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/InventoryUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_16_R2.util; +package de.studiocode.inventoryaccess.r4.util; import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/util/ItemUtilsImpl.java b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/ItemUtilsImpl.java similarity index 98% rename from InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/util/ItemUtilsImpl.java rename to InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/ItemUtilsImpl.java index 8b4941b..8ad6581 100644 --- a/InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/ItemUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_16_R2.util; +package de.studiocode.inventoryaccess.r4.util; import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; import de.studiocode.inventoryaccess.util.ReflectionRegistry; diff --git a/InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/PlayerUtilsImpl.java similarity index 96% rename from InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/util/PlayerUtilsImpl.java rename to InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/PlayerUtilsImpl.java index 39af093..e049938 100644 --- a/InventoryAccess/1_16_R2/src/main/java/de/studiocode/inventoryaccess/v1_16_R2/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/PlayerUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_16_R2.util; +package de.studiocode.inventoryaccess.r4.util; import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; import de.studiocode.inventoryaccess.util.ReflectionUtils; diff --git a/InventoryAccess/1_16_R3/pom.xml b/InventoryAccess/IA-R5/pom.xml similarity index 92% rename from InventoryAccess/1_16_R3/pom.xml rename to InventoryAccess/IA-R5/pom.xml index 82696b6..fbbbeee 100644 --- a/InventoryAccess/1_16_R3/pom.xml +++ b/InventoryAccess/IA-R5/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - 1_16_R3 + IA-R5 8 @@ -26,7 +26,7 @@ de.studiocode.invui - abstraction + IA ${project.parent.version} diff --git a/InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/inventory/AnvilInventoryImpl.java b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/inventory/AnvilInventoryImpl.java similarity index 97% rename from InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/inventory/AnvilInventoryImpl.java rename to InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/inventory/AnvilInventoryImpl.java index 4136d52..d5cad92 100644 --- a/InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/inventory/AnvilInventoryImpl.java +++ b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/inventory/AnvilInventoryImpl.java @@ -1,7 +1,7 @@ -package de.studiocode.inventoryaccess.v1_16_R3.inventory; +package de.studiocode.inventoryaccess.r5.inventory; import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.v1_16_R3.util.InventoryUtilsImpl; +import de.studiocode.inventoryaccess.r5.util.InventoryUtilsImpl; import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.server.v1_16_R3.*; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; diff --git a/InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/util/InventoryUtilsImpl.java b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/InventoryUtilsImpl.java similarity index 98% rename from InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/util/InventoryUtilsImpl.java rename to InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/InventoryUtilsImpl.java index 16df54e..780f977 100644 --- a/InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/util/InventoryUtilsImpl.java +++ b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/InventoryUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_16_R3.util; +package de.studiocode.inventoryaccess.r5.util; import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/util/ItemUtilsImpl.java b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/ItemUtilsImpl.java similarity index 98% rename from InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/util/ItemUtilsImpl.java rename to InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/ItemUtilsImpl.java index 933c27d..269ca8f 100644 --- a/InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/ItemUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_16_R3.util; +package de.studiocode.inventoryaccess.r5.util; import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; import de.studiocode.inventoryaccess.util.ReflectionRegistry; diff --git a/InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/PlayerUtilsImpl.java similarity index 96% rename from InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/util/PlayerUtilsImpl.java rename to InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/PlayerUtilsImpl.java index f87c36c..17d25d7 100644 --- a/InventoryAccess/1_16_R3/src/main/java/de/studiocode/inventoryaccess/v1_16_R3/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/PlayerUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_16_R3.util; +package de.studiocode.inventoryaccess.r5.util; import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; import de.studiocode.inventoryaccess.util.ReflectionUtils; diff --git a/InventoryAccess/1_17_R1/pom.xml b/InventoryAccess/IA-R6/pom.xml similarity index 97% rename from InventoryAccess/1_17_R1/pom.xml rename to InventoryAccess/IA-R6/pom.xml index b16efd1..5c73d00 100644 --- a/InventoryAccess/1_17_R1/pom.xml +++ b/InventoryAccess/IA-R6/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - 1_17_R1 + IA-R6 16 @@ -28,7 +28,7 @@ de.studiocode.invui - abstraction + IA ${project.parent.version} diff --git a/InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/inventory/AnvilInventoryImpl.java b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/inventory/AnvilInventoryImpl.java similarity index 97% rename from InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/inventory/AnvilInventoryImpl.java rename to InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/inventory/AnvilInventoryImpl.java index caf639f..39ab2c8 100644 --- a/InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/inventory/AnvilInventoryImpl.java +++ b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/inventory/AnvilInventoryImpl.java @@ -1,7 +1,7 @@ -package de.studiocode.inventoryaccess.v1_17_R1.inventory; +package de.studiocode.inventoryaccess.r6.inventory; import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.v1_17_R1.util.InventoryUtilsImpl; +import de.studiocode.inventoryaccess.r6.util.InventoryUtilsImpl; import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; diff --git a/InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/util/InventoryUtilsImpl.java b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/InventoryUtilsImpl.java similarity index 98% rename from InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/util/InventoryUtilsImpl.java rename to InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/InventoryUtilsImpl.java index 9acb739..d3aff50 100644 --- a/InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/util/InventoryUtilsImpl.java +++ b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/InventoryUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_17_R1.util; +package de.studiocode.inventoryaccess.r6.util; import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/util/ItemUtilsImpl.java b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/ItemUtilsImpl.java similarity index 98% rename from InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/util/ItemUtilsImpl.java rename to InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/ItemUtilsImpl.java index 60abcd1..46ad558 100644 --- a/InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/ItemUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_17_R1.util; +package de.studiocode.inventoryaccess.r6.util; import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; import de.studiocode.inventoryaccess.util.ReflectionRegistry; diff --git a/InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/PlayerUtilsImpl.java similarity index 96% rename from InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/util/PlayerUtilsImpl.java rename to InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/PlayerUtilsImpl.java index 15ce8b6..8c4853c 100644 --- a/InventoryAccess/1_17_R1/src/main/java/de/studiocode/inventoryaccess/v1_17_R1/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/PlayerUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_17_R1.util; +package de.studiocode.inventoryaccess.r6.util; import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; import de.studiocode.inventoryaccess.util.ReflectionUtils; diff --git a/InventoryAccess/1_17_R2/pom.xml b/InventoryAccess/IA-R7/pom.xml similarity index 97% rename from InventoryAccess/1_17_R2/pom.xml rename to InventoryAccess/IA-R7/pom.xml index 838900a..74a4d60 100644 --- a/InventoryAccess/1_17_R2/pom.xml +++ b/InventoryAccess/IA-R7/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - 1_17_R2 + IA-R7 16 @@ -28,7 +28,7 @@ de.studiocode.invui - abstraction + IA ${project.parent.version} diff --git a/InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/inventory/AnvilInventoryImpl.java b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/inventory/AnvilInventoryImpl.java similarity index 98% rename from InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/inventory/AnvilInventoryImpl.java rename to InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/inventory/AnvilInventoryImpl.java index 2804158..581dc8f 100644 --- a/InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/inventory/AnvilInventoryImpl.java +++ b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/inventory/AnvilInventoryImpl.java @@ -1,7 +1,7 @@ -package de.studiocode.inventoryaccess.v1_17_R2.inventory; +package de.studiocode.inventoryaccess.r7.inventory; import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.v1_17_R2.util.InventoryUtilsImpl; +import de.studiocode.inventoryaccess.r7.util.InventoryUtilsImpl; import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; diff --git a/InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/util/InventoryUtilsImpl.java b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/InventoryUtilsImpl.java similarity index 98% rename from InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/util/InventoryUtilsImpl.java rename to InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/InventoryUtilsImpl.java index 7254dcd..fcbe49f 100644 --- a/InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/util/InventoryUtilsImpl.java +++ b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/InventoryUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_17_R2.util; +package de.studiocode.inventoryaccess.r7.util; import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/util/ItemUtilsImpl.java b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/ItemUtilsImpl.java similarity index 98% rename from InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/util/ItemUtilsImpl.java rename to InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/ItemUtilsImpl.java index 8389b5a..b89dca1 100644 --- a/InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/ItemUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_17_R2.util; +package de.studiocode.inventoryaccess.r7.util; import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; import de.studiocode.inventoryaccess.util.ReflectionRegistry; diff --git a/InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/PlayerUtilsImpl.java similarity index 96% rename from InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/util/PlayerUtilsImpl.java rename to InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/PlayerUtilsImpl.java index e785cea..a4add80 100644 --- a/InventoryAccess/1_17_R2/src/main/java/de/studiocode/inventoryaccess/v1_17_R2/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/PlayerUtilsImpl.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.v1_17_R2.util; +package de.studiocode.inventoryaccess.r7.util; import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; import de.studiocode.inventoryaccess.util.ReflectionUtils; diff --git a/InventoryAccess/abstraction/pom.xml b/InventoryAccess/IA/pom.xml similarity index 95% rename from InventoryAccess/abstraction/pom.xml rename to InventoryAccess/IA/pom.xml index 9e25dfa..b78cbaf 100644 --- a/InventoryAccess/abstraction/pom.xml +++ b/InventoryAccess/IA/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - abstraction + IA 8 diff --git a/InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/AnvilInventory.java b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/AnvilInventory.java similarity index 100% rename from InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/AnvilInventory.java rename to InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/AnvilInventory.java diff --git a/InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/abstraction/util/InventoryUtils.java b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/abstraction/util/InventoryUtils.java similarity index 100% rename from InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/abstraction/util/InventoryUtils.java rename to InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/abstraction/util/InventoryUtils.java diff --git a/InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/abstraction/util/ItemUtils.java b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/abstraction/util/ItemUtils.java similarity index 100% rename from InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/abstraction/util/ItemUtils.java rename to InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/abstraction/util/ItemUtils.java diff --git a/InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/abstraction/util/PlayerUtils.java b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/abstraction/util/PlayerUtils.java similarity index 100% rename from InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/abstraction/util/PlayerUtils.java rename to InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/abstraction/util/PlayerUtils.java diff --git a/InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/util/ReflectionRegistry.java b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/util/ReflectionRegistry.java similarity index 95% rename from InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/util/ReflectionRegistry.java rename to InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/util/ReflectionRegistry.java index efc24b2..3f14361 100644 --- a/InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/util/ReflectionRegistry.java +++ b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/util/ReflectionRegistry.java @@ -8,7 +8,6 @@ import static de.studiocode.inventoryaccess.util.ReflectionUtils.*; public class ReflectionRegistry { public static final int VERSION = getVersionNumber(); - public static final String INV_ACCESS_VERSION = getInventoryAccessVersion(); public static final String CRAFT_BUKKIT_PACKAGE_PATH = getCB(); public static final String BUKKIT_PACKAGE_PATH = "org.bukkit."; diff --git a/InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/util/ReflectionUtils.java b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/util/ReflectionUtils.java similarity index 86% rename from InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/util/ReflectionUtils.java rename to InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/util/ReflectionUtils.java index 2d5a7b2..c47fd23 100644 --- a/InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/util/ReflectionUtils.java +++ b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/util/ReflectionUtils.java @@ -1,5 +1,6 @@ package de.studiocode.inventoryaccess.util; +import de.studiocode.inventoryaccess.version.InventoryAccessRevision; import org.bukkit.Bukkit; import java.lang.reflect.Constructor; @@ -7,7 +8,8 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import static de.studiocode.inventoryaccess.util.ReflectionRegistry.*; +import static de.studiocode.inventoryaccess.util.ReflectionRegistry.BUKKIT_PACKAGE_PATH; +import static de.studiocode.inventoryaccess.util.ReflectionRegistry.CRAFT_BUKKIT_PACKAGE_PATH; @SuppressWarnings({"unchecked", "unused"}) public class ReflectionUtils { @@ -24,24 +26,14 @@ public class ReflectionUtils { return Integer.parseInt(version.split("\\.")[1]); } - protected static String getInventoryAccessVersion() { - String version = Bukkit.getVersion(); - version = version.substring(version.indexOf("MC: "), version.length() - 1).substring(4); - - if (version.equals("1.17.1")) { - return "v1_17_R2"; // TODO: find a better solution - } else { - String path = Bukkit.getServer().getClass().getPackage().getName(); - return path.substring(path.lastIndexOf(".") + 1); - } - } - public static Class getImplClass(String path) { try { - return (Class) Class.forName("de.studiocode.inventoryaccess." + INV_ACCESS_VERSION + "." + path); + return (Class) Class.forName("de.studiocode.inventoryaccess." + InventoryAccessRevision.REQUIRED_REVISION.getPackageName() + "." + path); } catch (ClassNotFoundException e) { - throw new UnsupportedOperationException("Your version (" + INV_ACCESS_VERSION + ") is not supported by InventoryAccess"); + e.printStackTrace(); } + + return null; } public static Class getBukkitClass(String path) { diff --git a/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/util/VersionUtils.java b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/util/VersionUtils.java new file mode 100644 index 0000000..db8acdc --- /dev/null +++ b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/util/VersionUtils.java @@ -0,0 +1,89 @@ +package de.studiocode.inventoryaccess.util; + +import com.google.common.base.Preconditions; +import org.bukkit.Bukkit; + +public class VersionUtils { + + private static final int major; + private static final int minor; + private static final int patch; + + static { + String version = Bukkit.getVersion(); + version = version.substring(version.indexOf(':') + 2, version.lastIndexOf(')')); + + int[] parts = toMajorMinorPatch(version); + major = parts[0]; + minor = parts[1]; + patch = parts[2]; + } + + /** + * Converts a version string like "1.17.1" or "1.17" to an array of three ints. + * + * @param version The version to check against + * @return The version as an array of three ints. + * @throws NumberFormatException If an invalid version string is provided. + */ + public static int[] toMajorMinorPatch(String version) { + String[] parts = version.split("\\."); + + int major = parts.length > 0 ? Integer.parseInt(parts[0]) : 0; + int minor = parts.length > 1 ? Integer.parseInt(parts[1]) : 0; + int patch = parts.length > 2 ? Integer.parseInt(parts[2]) : 0; + + return new int[] {major, minor, patch}; + } + + /** + * Returns if the given version is higher or equal to the one currently running on the server. + * + * @param version The version to check against + * @return If the given version is running on this server or a newer one. + */ + public static boolean isHigherOrEqualThanServer(String version) { + return isHigherOrEqualThanServer(toMajorMinorPatch(version)); + } + + /** + * Returns if the given version is higher or equal to the one currently running on the server. + * + * @param version The version to check against + * @return If the given version is running on this server or a newer one. + * @throws IllegalArgumentException If the version array does not have a size of 3 + */ + public static boolean isHigherOrEqualThanServer(int... version) { + Preconditions.checkArgument(version.length == 3); + + return version[0] > major + || (version[0] == major && version[1] > minor) + || (version[0] == major && version[1] == minor && version[2] >= patch); + } + + /** + * Returns if the server is on this or a newer version of Minecraft. + * + * @param version The version to check against + * @return If the server is running this exact or a newer version of Minecraft. + */ + public static boolean isServerHigherOrEqual(String version) { + return isServerHigherOrEqual(toMajorMinorPatch(version)); + } + + /** + * Returns if the server is on this or a newer version of Minecraft. + * + * @param version The version to check against + * @return If the server is running this exact or a newer version of Minecraft. + * @throws IllegalArgumentException If the version array does not have a size of 3 + */ + public static boolean isServerHigherOrEqual(int... version) { + Preconditions.checkArgument(version.length == 3); + + return major > version[0] + || (major == version[0] && minor > version[1]) + || (major == version[0] && minor == version[1] && patch >= version[2]); + } + +} diff --git a/InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccess.java b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccess.java similarity index 100% rename from InventoryAccess/abstraction/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccess.java rename to InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccess.java diff --git a/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccessRevision.java b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccessRevision.java new file mode 100644 index 0000000..2dc594d --- /dev/null +++ b/InventoryAccess/IA/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccessRevision.java @@ -0,0 +1,41 @@ +package de.studiocode.inventoryaccess.version; + +import de.studiocode.inventoryaccess.util.VersionUtils; + +public enum InventoryAccessRevision { + + // this order is required + R7("r7", "1.17.1"), + R6("r6", "1.17.0"), + R5("r5", "1.16.4"), + R4("r4", "1.16.2"), + R3("r3", "1.16.0"), + R2("r2", "1.15.0"), + R1("r1", "1.14.0"); + + public static final InventoryAccessRevision REQUIRED_REVISION = getRequiredRevision(); + + private final String packageName; + private final int[] since; + + InventoryAccessRevision(String packageName, String since) { + this.packageName = packageName; + this.since = VersionUtils.toMajorMinorPatch(since); + } + + public String getPackageName() { + return packageName; + } + + public int[] getSince() { + return since; + } + + private static InventoryAccessRevision getRequiredRevision() { + for (InventoryAccessRevision revision : values()) + if (VersionUtils.isServerHigherOrEqual(revision.getSince())) return revision; + + throw new UnsupportedOperationException("Your version of Minecraft is not supported by InventoryAccess"); + } + +} diff --git a/pom.xml b/pom.xml index f7e80c5..f273973 100644 --- a/pom.xml +++ b/pom.xml @@ -29,15 +29,15 @@ - InventoryAccess/1_14_R1 - InventoryAccess/1_15_R1 - InventoryAccess/1_16_R1 - InventoryAccess/1_16_R2 - InventoryAccess/1_16_R3 - InventoryAccess/1_17_R1 - InventoryAccess/1_17_R2 + InventoryAccess/IA-R1 + InventoryAccess/IA-R2 + InventoryAccess/IA-R3 + InventoryAccess/IA-R4 + InventoryAccess/IA-R5 + InventoryAccess/IA-R6 + InventoryAccess/IA-R7 + InventoryAccess/IA InvUI - InventoryAccess/abstraction