diff --git a/VanillaCustomizer-core/pom.xml b/VanillaCustomizer-core/pom.xml index 6a7ccf4..90404a9 100644 --- a/VanillaCustomizer-core/pom.xml +++ b/VanillaCustomizer-core/pom.xml @@ -64,7 +64,7 @@ org.spigotmc - spigot + spigot-api 1.21.1-R0.1-SNAPSHOT provided diff --git a/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/nms/Nms.java b/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/nms/NMS.java similarity index 97% rename from VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/nms/Nms.java rename to VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/nms/NMS.java index 006943d..f1e0a67 100644 --- a/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/nms/Nms.java +++ b/VanillaCustomizer-core/src/main/java/dev/lone/vanillacustomizer/nms/NMS.java @@ -1,7 +1,6 @@ package dev.lone.vanillacustomizer.nms; import org.jetbrains.annotations.Nullable; -import dev.lone.LoneLibs.nbt.nbtapi.utils.MinecraftVersion; import dev.lone.vanillacustomizer.Main; import lonelibs.dev.lone.fastnbt.nms.Version; import org.bukkit.Bukkit; diff --git a/VanillaCustomizer-jar/pom.xml b/VanillaCustomizer-jar/pom.xml index e128c84..2242ca9 100644 --- a/VanillaCustomizer-jar/pom.xml +++ b/VanillaCustomizer-jar/pom.xml @@ -85,6 +85,11 @@ 1.0 + + dev.lone + VanillaCustomizer-nms-v1_21_3 + 1.0 + dev.lone VanillaCustomizer-nms-v1_21_1 diff --git a/VanillaCustomizer-nms-v1_20_R3/pom.xml b/VanillaCustomizer-nms-v1_20_R3/pom.xml index 2d9b9e7..6294285 100644 --- a/VanillaCustomizer-nms-v1_20_R3/pom.xml +++ b/VanillaCustomizer-nms-v1_20_R3/pom.xml @@ -22,7 +22,7 @@ ca.bkaw paper-nms-maven-plugin - 1.3.2 + 1.4.5 process-classes @@ -40,7 +40,7 @@ ca.bkaw paper-nms - 1.20.3-SNAPSHOT + 1.20.4-SNAPSHOT provided diff --git a/VanillaCustomizer-nms-v1_21_1/pom.xml b/VanillaCustomizer-nms-v1_21_1/pom.xml index 023be91..22cad87 100644 --- a/VanillaCustomizer-nms-v1_21_1/pom.xml +++ b/VanillaCustomizer-nms-v1_21_1/pom.xml @@ -16,13 +16,12 @@ 21 - ca.bkaw paper-nms-maven-plugin - 1.4.4 + 1.4.5 process-classes diff --git a/VanillaCustomizer-nms-v1_21_3/pom.xml b/VanillaCustomizer-nms-v1_21_3/pom.xml new file mode 100644 index 0000000..6fc900e --- /dev/null +++ b/VanillaCustomizer-nms-v1_21_3/pom.xml @@ -0,0 +1,54 @@ + + + + VanillaCustomizer + dev.lone + 1.0 + + 4.0.0 + + VanillaCustomizer-nms-v1_21_3 + + + 21 + 21 + + + + + + ca.bkaw + paper-nms-maven-plugin + 1.4.5 + + + process-classes + + remap + + + + + + + + + + + ca.bkaw + paper-nms + 1.21.3-SNAPSHOT + provided + + + + dev.lone + VanillaCustomizer-core + 1.0 + provided + + + + \ No newline at end of file diff --git a/VanillaCustomizer-nms-v1_21_3/src/main/java/dev/lone/vanillacustomizer/nms/items/impl/v1_21_3.java b/VanillaCustomizer-nms-v1_21_3/src/main/java/dev/lone/vanillacustomizer/nms/items/impl/v1_21_3.java new file mode 100644 index 0000000..877a976 --- /dev/null +++ b/VanillaCustomizer-nms-v1_21_3/src/main/java/dev/lone/vanillacustomizer/nms/items/impl/v1_21_3.java @@ -0,0 +1,48 @@ +package dev.lone.vanillacustomizer.nms.items.impl; + +import dev.lone.vanillacustomizer.nms.items.IItemsNms; +import dev.lone.vanillacustomizer.nms.items.Rarity; +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.food.FoodProperties; +import net.minecraft.world.level.block.Block; +import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.inventory.ItemStack; + +@SuppressWarnings("unused") +public class v1_21_3 implements IItemsNms +{ + @Override + public Rarity getRarity(ItemStack bukkitItem) + { + net.minecraft.world.item.ItemStack item = CraftItemStack.asNMSCopy(bukkitItem); + return Rarity.values()[item.getRarity().ordinal()]; + } + + @Override + public float getDestroySpeed(ItemStack bukkitItem) + { + Block block = CraftMagicNumbers.getBlock(bukkitItem.getType()); + return block.defaultBlockState().destroySpeed; + } + + @Override + public int getNutrition(ItemStack bukkitItem) + { + net.minecraft.world.item.ItemStack itemStack = CraftItemStack.asNMSCopy(bukkitItem); + FoodProperties foodProperties = itemStack.get(DataComponents.FOOD); + if(foodProperties != null) + return foodProperties.nutrition(); + return 0; + } + + @Override + public float getSaturation(ItemStack bukkitItem) + { + net.minecraft.world.item.ItemStack itemStack = CraftItemStack.asNMSCopy(bukkitItem); + FoodProperties foodProperties = itemStack.get(DataComponents.FOOD); + if(foodProperties != null) + return foodProperties.saturation(); + return 0; + } +} diff --git a/pom.xml b/pom.xml index 524f376..ebdb2af 100644 --- a/pom.xml +++ b/pom.xml @@ -16,12 +16,13 @@ UTF-8 16 16 - C:/Progetti/Minecraft/Spigot/_jars + E:/GitHub/Libs VanillaCustomizer-core VanillaCustomizer-jar + VanillaCustomizer-nms-v1_21_3 VanillaCustomizer-nms-v1_21_1 VanillaCustomizer-nms-v1_20_6 VanillaCustomizer-nms-v1_20_R3 @@ -46,7 +47,7 @@ org.apache.maven.extensions maven-build-cache-extension - 1.0.1-SNAPSHOT-unofficial-1.0.0 + 1.2.0 co.leantechniques