-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: support 1.21 * chore: add 1.21 to buildtools
- Loading branch information
Showing
6 changed files
with
199 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>net.imprex</groupId> | ||
| <artifactId>zip-nms</artifactId> | ||
| <version>${revision}</version> | ||
| </parent> | ||
|
|
||
| <artifactId>zip-nms-v1_21_R1</artifactId> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>net.imprex</groupId> | ||
| <artifactId>zip-nms-api</artifactId> | ||
| <version>${revision}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.spigotmc</groupId> | ||
| <artifactId>spigot</artifactId> | ||
| <version>1.21-R0.1-SNAPSHOT</version> | ||
| <classifier>remapped-mojang</classifier> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.md-5</groupId> | ||
| <artifactId>specialsource-maven-plugin</artifactId> | ||
| <version>${plugin.specialsource.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>remap</goal> | ||
| </goals> | ||
| <id>remap-obf</id> | ||
| <configuration> | ||
| <srgIn> | ||
| org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:txt:maps-mojang</srgIn> | ||
| <reverse>true</reverse> | ||
| <remappedDependencies> | ||
| org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies> | ||
| <remappedArtifactAttached>true</remappedArtifactAttached> | ||
| <remappedClassifierName>remapped-obf</remappedClassifierName> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>remap</goal> | ||
| </goals> | ||
| <id>remap-spigot</id> | ||
| <configuration> | ||
| <inputFile> | ||
| ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile> | ||
| <srgIn> | ||
| org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn> | ||
| <remappedDependencies> | ||
| org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
116 changes: 116 additions & 0 deletions
116
zip-nms/zip-nms-v1_21_R1/src/main/java/net/imprex/zip/nms/v1_21_R1/ZipNmsManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package net.imprex.zip.nms.v1_21_R1; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.io.ByteArrayOutputStream; | ||
| import java.lang.reflect.Method; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
|
|
||
| import org.bukkit.Material; | ||
| import org.bukkit.craftbukkit.v1_21_R1.CraftRegistry; | ||
| import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack; | ||
| import org.bukkit.inventory.ItemStack; | ||
| import org.bukkit.inventory.meta.SkullMeta; | ||
|
|
||
| import com.mojang.authlib.GameProfile; | ||
| import com.mojang.authlib.properties.Property; | ||
|
|
||
| import net.imprex.zip.common.ReflectionUtil; | ||
| import net.imprex.zip.nms.api.NmsManager; | ||
| import net.minecraft.core.RegistryAccess; | ||
| import net.minecraft.nbt.CompoundTag; | ||
| import net.minecraft.nbt.ListTag; | ||
| import net.minecraft.nbt.NbtAccounter; | ||
| import net.minecraft.nbt.NbtIo; | ||
| import net.minecraft.nbt.Tag; | ||
|
|
||
| public class ZipNmsManager implements NmsManager { | ||
|
|
||
| private static final Class<?> CRAFTMETASKULL_CLASS = ReflectionUtil.getCraftBukkitClass("inventory.CraftMetaSkull"); | ||
| private static final Method CRAFTMETASKULL_SET_PROFILE = ReflectionUtil.getMethod(CRAFTMETASKULL_CLASS, | ||
| "setProfile", GameProfile.class); | ||
|
|
||
| private static final RegistryAccess DEFAULT_REGISTRY = CraftRegistry.getMinecraftRegistry(); | ||
|
|
||
| private static final CompoundTag NBT_EMPTY_ITEMSTACK = new CompoundTag(); | ||
|
|
||
| static { | ||
| NBT_EMPTY_ITEMSTACK.putString("id", "minecraft:air"); | ||
| } | ||
|
|
||
| public byte[] nbtToBinary(CompoundTag compound) { | ||
| try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { | ||
| NbtIo.writeCompressed(compound, outputStream); | ||
| return outputStream.toByteArray(); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public CompoundTag binaryToNBT(byte[] binary) { | ||
| try (ByteArrayInputStream inputStream = new ByteArrayInputStream(binary)) { | ||
| return NbtIo.readCompressed(inputStream, NbtAccounter.unlimitedHeap()); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
| return new CompoundTag(); | ||
| } | ||
|
|
||
| @Override | ||
| public byte[] itemstackToBinary(ItemStack[] items) { | ||
| CompoundTag inventory = new CompoundTag(); | ||
| ListTag list = new ListTag(); | ||
| for (ItemStack itemStack : items) { | ||
| if (itemStack == null || itemStack.getType() == Material.AIR) { | ||
| list.add(NBT_EMPTY_ITEMSTACK); | ||
| } else { | ||
| net.minecraft.world.item.ItemStack craftItem = CraftItemStack.asNMSCopy(itemStack); | ||
| Tag tag = craftItem.save(DEFAULT_REGISTRY); | ||
| list.add(tag); | ||
| } | ||
| } | ||
| inventory.put("i", list); | ||
| return nbtToBinary(inventory); | ||
| } | ||
|
|
||
| @Override | ||
| public List<ItemStack> binaryToItemStack(byte[] binary) { | ||
| CompoundTag nbt = binaryToNBT(binary); | ||
| List<ItemStack> items = new ArrayList<>(); | ||
| if (nbt.contains("i", 9)) { | ||
| ListTag list = nbt.getList("i", 10); | ||
| for (Tag base : list) { | ||
| if (base instanceof CompoundTag itemTag) { | ||
| if (itemTag.getString("id").equals("minecraft:air")) { | ||
| items.add(new ItemStack(Material.AIR)); | ||
| } else { | ||
| Optional<net.minecraft.world.item.ItemStack> optional = net.minecraft.world.item.ItemStack.parse(DEFAULT_REGISTRY, itemTag); | ||
| if (optional.isPresent()) { | ||
| items.add(CraftItemStack.asBukkitCopy(optional.get())); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return items; | ||
| } | ||
|
|
||
| @Override | ||
| public void setSkullProfile(SkullMeta meta, String texture) { | ||
| try { | ||
| GameProfile gameProfile = new GameProfile(UUID.randomUUID(), ""); | ||
| gameProfile.getProperties().put("textures", new Property("textures", texture)); | ||
| CRAFTMETASKULL_SET_PROFILE.invoke(meta, gameProfile); | ||
| } catch (Exception e) { | ||
| throw new ClassCastException("Error by setting skull profile"); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isAir(Material material) { | ||
| return material == null || material == Material.AIR; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters