diff --git a/core/pom.xml b/core/pom.xml index 2f1450b0..94fe8943 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -8,7 +8,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 diff --git a/dist/pom.xml b/dist/pom.xml index b2c563e9..dbd75792 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -7,7 +7,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 @@ -58,20 +58,6 @@ jar compile - - ${project.groupId} - beautyquests-v1_10_R1 - ${project.version} - jar - compile - - - ${project.groupId} - beautyquests-v1_11_R1 - ${project.version} - jar - compile - ${project.groupId} beautyquests-v1_12_R1 @@ -79,20 +65,6 @@ jar compile - - ${project.groupId} - beautyquests-v1_13_R2 - ${project.version} - jar - compile - - - ${project.groupId} - beautyquests-v1_14_R1 - ${project.version} - jar - compile - ${project.groupId} beautyquests-v1_15_R1 @@ -142,5 +114,12 @@ jar compile + + ${project.groupId} + beautyquests-v1_19_R1 + ${project.version} + jar + compile + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c61c3525..b11452d1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 pom beautyquests @@ -16,7 +16,7 @@ 1.8 1.8 unknown - 0.19.6 + 0.19.7 @@ -30,11 +30,7 @@ core v1_9_R1 v1_9_R2 - v1_10_R1 - v1_11_R1 v1_12_R1 - v1_13_R2 - v1_14_R1 v1_15_R1 v1_16_R1 v1_16_R2 @@ -42,6 +38,7 @@ v1_17_R1 v1_18_R1 v1_18_R2 + v1_19_R1 dist \ No newline at end of file diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml deleted file mode 100644 index e9d5552b..00000000 --- a/v1_10_R1/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - jar - beautyquests-v1_10_R1 - - fr.skytasul - beautyquests-parent - 0.19.6 - - - true - - - - org.spigotmc - spigot - 1.10.2-R0.1-SNAPSHOT - provided - - - fr.skytasul - beautyquests-core - ${project.version} - - - diff --git a/v1_10_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_10_R1.java b/v1_10_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_10_R1.java deleted file mode 100644 index 0b1f2092..00000000 --- a/v1_10_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_10_R1.java +++ /dev/null @@ -1,43 +0,0 @@ -package fr.skytasul.quests.utils.nms; - -import org.apache.commons.lang.Validate; -import org.bukkit.craftbukkit.v1_10_R1.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; - -import net.minecraft.server.v1_10_R1.EnumChatFormat; -import net.minecraft.server.v1_10_R1.IChatBaseComponent; -import net.minecraft.server.v1_10_R1.Packet; -import net.minecraft.server.v1_10_R1.PacketDataSerializer; -import net.minecraft.server.v1_10_R1.PacketPlayOutCustomPayload; - -import io.netty.buffer.ByteBuf; - -public class v1_10_R1 extends NMS{ - - @Override - public Object bookPacket(ByteBuf buf){ - return new PacketPlayOutCustomPayload("MC|BOpen", new PacketDataSerializer(buf)); - } - - @Override - public void sendPacket(Player p, Object packet){ - Validate.isTrue(packet instanceof Packet, "The object specified is not a packet."); - ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet) packet); - } - - @Override - public double entityNameplateHeight(LivingEntity en){ - return ((CraftLivingEntity) en).getHandle().length; - } - - public Object getIChatBaseComponent(String text){ - return IChatBaseComponent.ChatSerializer.b(text); - } - - public Object getEnumChatFormat(int value){ - return EnumChatFormat.a(value); - } - -} \ No newline at end of file diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml deleted file mode 100644 index 28076c0b..00000000 --- a/v1_11_R1/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - jar - beautyquests-v1_11_R1 - - fr.skytasul - beautyquests-parent - 0.19.6 - - - true - - - - org.spigotmc - spigot - 1.11-R0.1-SNAPSHOT - provided - - - fr.skytasul - beautyquests-core - ${project.version} - - - diff --git a/v1_11_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_11_R1.java b/v1_11_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_11_R1.java deleted file mode 100644 index 4d8e6950..00000000 --- a/v1_11_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_11_R1.java +++ /dev/null @@ -1,43 +0,0 @@ -package fr.skytasul.quests.utils.nms; - -import org.apache.commons.lang.Validate; -import org.bukkit.craftbukkit.v1_11_R1.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; - -import net.minecraft.server.v1_11_R1.EnumChatFormat; -import net.minecraft.server.v1_11_R1.IChatBaseComponent; -import net.minecraft.server.v1_11_R1.Packet; -import net.minecraft.server.v1_11_R1.PacketDataSerializer; -import net.minecraft.server.v1_11_R1.PacketPlayOutCustomPayload; - -import io.netty.buffer.ByteBuf; - -public class v1_11_R1 extends NMS{ - - @Override - public Object bookPacket(ByteBuf buf){ - return new PacketPlayOutCustomPayload("MC|BOpen", new PacketDataSerializer(buf)); - } - - @Override - public void sendPacket(Player p, Object packet){ - Validate.isTrue(packet instanceof Packet, "The object specified is not a packet."); - ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet) packet); - } - - @Override - public double entityNameplateHeight(LivingEntity en){ - return ((CraftLivingEntity) en).getHandle().length; - } - - public Object getIChatBaseComponent(String text){ - return IChatBaseComponent.ChatSerializer.b(text); - } - - public Object getEnumChatFormat(int value){ - return EnumChatFormat.a(value); - } - -} \ No newline at end of file diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml index 3a3ef060..ea1eb229 100644 --- a/v1_12_R1/pom.xml +++ b/v1_12_R1/pom.xml @@ -7,7 +7,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 true diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml deleted file mode 100644 index f2a7f25a..00000000 --- a/v1_13_R2/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - jar - beautyquests-v1_13_R2 - - fr.skytasul - beautyquests-parent - 0.19.6 - - - true - - - - org.spigotmc - spigot - 1.13.2-R0.1-SNAPSHOT - provided - - - fr.skytasul - beautyquests-core - ${project.version} - - - diff --git a/v1_13_R2/src/main/java/fr/skytasul/quests/utils/nms/v1_13_R2.java b/v1_13_R2/src/main/java/fr/skytasul/quests/utils/nms/v1_13_R2.java deleted file mode 100644 index acaf0d76..00000000 --- a/v1_13_R2/src/main/java/fr/skytasul/quests/utils/nms/v1_13_R2.java +++ /dev/null @@ -1,54 +0,0 @@ -package fr.skytasul.quests.utils.nms; - -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.commons.lang.Validate; -import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; - -import net.minecraft.server.v1_13_R2.*; - -import io.netty.buffer.ByteBuf; - -public class v1_13_R2 extends NMS{ - - @Override - public Object bookPacket(ByteBuf buf){ - return new PacketPlayOutCustomPayload(PacketPlayOutCustomPayload.c, new PacketDataSerializer(buf)); - } - - @Override - public void sendPacket(Player p, Object packet){ - Validate.isTrue(packet instanceof Packet, "The object specified is not a packet."); - ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet) packet); - } - - @Override - public double entityNameplateHeight(LivingEntity en){ - return en.getHeight(); - } - - public Object getIChatBaseComponent(String text){ - return new ChatComponentText(text); - } - - public Object getEnumChatFormat(int value){ - return EnumChatFormat.a(value); - } - - @Override - public List getAvailableBlockProperties(Material material) { - Block block = IRegistry.BLOCK.get(new MinecraftKey(material.getKey().getKey())); - BlockStateList stateList = block.getStates(); - return stateList.d().stream().map(IBlockState::a).collect(Collectors.toList()); - } - - @Override - public List getAvailableBlockTags() { - return MinecraftServer.getServer().getTagRegistry().a().a().stream().map(MinecraftKey::toString).collect(Collectors.toList()); - } - -} \ No newline at end of file diff --git a/v1_14_R1/pom.xml b/v1_14_R1/pom.xml deleted file mode 100644 index b85ce47e..00000000 --- a/v1_14_R1/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - jar - beautyquests-v1_14_R1 - - fr.skytasul - beautyquests-parent - 0.19.6 - - - true - - - - org.spigotmc - spigot - 1.14.4-R0.1-SNAPSHOT - provided - - - fr.skytasul - beautyquests-core - ${project.version} - - - diff --git a/v1_14_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_14_R1.java b/v1_14_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_14_R1.java deleted file mode 100644 index 6d33ee24..00000000 --- a/v1_14_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_14_R1.java +++ /dev/null @@ -1,54 +0,0 @@ -package fr.skytasul.quests.utils.nms; - -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.commons.lang.Validate; -import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; - -import net.minecraft.server.v1_14_R1.*; - -import io.netty.buffer.ByteBuf; - -public class v1_14_R1 extends NMS{ - - @Override - public Object bookPacket(ByteBuf buf){ - return new PacketPlayOutOpenBook(EnumHand.MAIN_HAND); - } - - @Override - public void sendPacket(Player p, Object packet){ - Validate.isTrue(packet instanceof Packet, "The object specified is not a packet."); - ((CraftPlayer) p).getHandle().playerConnection.sendPacket((Packet) packet); - } - - @Override - public double entityNameplateHeight(LivingEntity en){ - return en.getHeight(); - } - - public Object getIChatBaseComponent(String text){ - return new ChatComponentText(text); - } - - public Object getEnumChatFormat(int value){ - return EnumChatFormat.a(value); - } - - @Override - public List getAvailableBlockProperties(Material material) { - Block block = IRegistry.BLOCK.get(new MinecraftKey(material.getKey().getKey())); - BlockStateList stateList = block.getStates(); - return stateList.d().stream().map(IBlockState::a).collect(Collectors.toList()); - } - - @Override - public List getAvailableBlockTags() { - return MinecraftServer.getServer().getTagRegistry().getBlockTags().a().stream().map(MinecraftKey::toString).collect(Collectors.toList()); - } - -} \ No newline at end of file diff --git a/v1_15_R1/pom.xml b/v1_15_R1/pom.xml index 23b5b094..ff3b9267 100644 --- a/v1_15_R1/pom.xml +++ b/v1_15_R1/pom.xml @@ -7,7 +7,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 true diff --git a/v1_16_R1/pom.xml b/v1_16_R1/pom.xml index 96de1b81..bbc89c21 100644 --- a/v1_16_R1/pom.xml +++ b/v1_16_R1/pom.xml @@ -7,7 +7,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 true diff --git a/v1_16_R2/pom.xml b/v1_16_R2/pom.xml index 3219c8ae..7650a22e 100644 --- a/v1_16_R2/pom.xml +++ b/v1_16_R2/pom.xml @@ -7,7 +7,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 true diff --git a/v1_16_R3/pom.xml b/v1_16_R3/pom.xml index f9ef8980..b41becc3 100644 --- a/v1_16_R3/pom.xml +++ b/v1_16_R3/pom.xml @@ -7,7 +7,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 true diff --git a/v1_17_R1/pom.xml b/v1_17_R1/pom.xml index cbb24008..cf781063 100644 --- a/v1_17_R1/pom.xml +++ b/v1_17_R1/pom.xml @@ -8,7 +8,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 diff --git a/v1_18_R1/pom.xml b/v1_18_R1/pom.xml index 2f96ae08..f4f208ef 100644 --- a/v1_18_R1/pom.xml +++ b/v1_18_R1/pom.xml @@ -8,7 +8,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 diff --git a/v1_18_R2/pom.xml b/v1_18_R2/pom.xml index 7a0c9587..c4d677e5 100644 --- a/v1_18_R2/pom.xml +++ b/v1_18_R2/pom.xml @@ -8,7 +8,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 diff --git a/v1_19_R1/pom.xml b/v1_19_R1/pom.xml new file mode 100644 index 00000000..eedf00a5 --- /dev/null +++ b/v1_19_R1/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + jar + beautyquests-v1_19_R1 + + fr.skytasul + beautyquests-parent + 0.19.7 + + + + true + 17 + 17 + + + + + fr.skytasul + beautyquests-core + ${project.version} + + + org.spigotmc + spigot + 1.19-R0.1-SNAPSHOT + remapped-mojang + provided + + + + + + + net.md-5 + specialsource-maven-plugin + 1.2.4 + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:txt:maps-mojang + true + org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-mojang + true + remapped-obf + + + + package + + remap + + remap-spigot + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:csrg:maps-spigot + org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-obf + + + + + + + diff --git a/v1_19_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_19_R1.java b/v1_19_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_19_R1.java new file mode 100644 index 00000000..06295bc7 --- /dev/null +++ b/v1_19_R1/src/main/java/fr/skytasul/quests/utils/nms/v1_19_R1.java @@ -0,0 +1,53 @@ +package fr.skytasul.quests.utils.nms; + +import java.util.List; + +import org.apache.commons.lang.Validate; +import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; + +import net.minecraft.core.Registry; +import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.game.ClientboundOpenBookPacket; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.Property; + +import io.netty.buffer.ByteBuf; + +public class v1_19_R1 extends NMS{ + + @Override + public Object bookPacket(ByteBuf buf){ + return new ClientboundOpenBookPacket(InteractionHand.MAIN_HAND); + } + + @Override + public void sendPacket(Player p, Object packet){ + Validate.isTrue(packet instanceof Packet, "The object specified is not a packet."); + ((CraftPlayer) p).getHandle().connection.send((Packet) packet); + } + + @Override + public double entityNameplateHeight(LivingEntity en){ + return en.getHeight(); + } + + @Override + public List getAvailableBlockProperties(Material material) { + Block block = Registry.BLOCK.get(new ResourceLocation(material.getKey().getKey())); + StateDefinition stateList = block.getStateDefinition(); + return stateList.getProperties().stream().map(Property::getName).toList(); + } + + @Override + public List getAvailableBlockTags() { + return Registry.BLOCK.getTags().map(x -> x.getFirst().location().toString()).toList(); + } + +} \ No newline at end of file diff --git a/v1_9_R1/pom.xml b/v1_9_R1/pom.xml index 6c5cdf20..16b1b7c8 100644 --- a/v1_9_R1/pom.xml +++ b/v1_9_R1/pom.xml @@ -7,7 +7,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 true diff --git a/v1_9_R2/pom.xml b/v1_9_R2/pom.xml index b7b7bcec..3773c909 100644 --- a/v1_9_R2/pom.xml +++ b/v1_9_R2/pom.xml @@ -7,7 +7,7 @@ fr.skytasul beautyquests-parent - 0.19.6 + 0.19.7 true