-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add marker manipulation & nbt sanitization
- Loading branch information
Showing
9 changed files
with
345 additions
and
16 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| package com.moulberry.axiom; | ||
|
|
||
| import net.minecraft.nbt.CompoundTag; | ||
| import net.minecraft.nbt.ListTag; | ||
| import net.minecraft.nbt.Tag; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| public class NbtSanitization { | ||
|
|
||
| private static final Set<String> ALLOWED_KEYS = Set.of( | ||
| "id", // entity id | ||
| // generic | ||
| "Pos", | ||
| "Rotation", | ||
| "Invulnerable", | ||
| "CustomName", | ||
| "CustomNameVisible", | ||
| "Silent", | ||
| "NoGravity", | ||
| "Glowing", | ||
| "Tags", | ||
| "Passengers", | ||
| // marker | ||
| "data", | ||
| // display entity | ||
| "transformation", | ||
| "interpolation_duration", | ||
| "start_interpolation", | ||
| "teleport_duration", | ||
| "billboard", | ||
| "view_range", | ||
| "shadow_radius", | ||
| "shadow_strength", | ||
| "width", | ||
| "height", | ||
| "glow_color_override", | ||
| "brightness", | ||
| "line_width", | ||
| "text_opacity", | ||
| "background", | ||
| "shadow", | ||
| "see_through", | ||
| "default_background", | ||
| "alignment", | ||
| "text", | ||
| "block_state", | ||
| "item", | ||
| "item_display" | ||
| ); | ||
|
|
||
| public static void sanitizeEntity(CompoundTag entityRoot) { | ||
| entityRoot.getAllKeys().retainAll(ALLOWED_KEYS); | ||
|
|
||
| if (entityRoot.contains("Passengers", Tag.TAG_LIST)) { | ||
| ListTag listTag = entityRoot.getList("Passengers", Tag.TAG_COMPOUND); | ||
| for (Tag tag : listTag) { | ||
| sanitizeEntity((CompoundTag) tag); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
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
105 changes: 105 additions & 0 deletions
105
src/main/java/com/moulberry/axiom/marker/MarkerData.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,105 @@ | ||
| package com.moulberry.axiom.marker; | ||
|
|
||
| import net.minecraft.nbt.CompoundTag; | ||
| import net.minecraft.nbt.ListTag; | ||
| import net.minecraft.nbt.Tag; | ||
| import net.minecraft.network.FriendlyByteBuf; | ||
| import net.minecraft.world.entity.Marker; | ||
| import net.minecraft.world.level.block.entity.BlockEntity; | ||
| import net.minecraft.world.level.chunk.LevelChunk; | ||
| import net.minecraft.world.phys.Vec3; | ||
| import org.jetbrains.annotations.Nullable; | ||
| import xyz.jpenilla.reflectionremapper.ReflectionRemapper; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.lang.reflect.Method; | ||
| import java.util.UUID; | ||
|
|
||
| public record MarkerData(UUID uuid, Vec3 position, @Nullable String name, @Nullable Vec3 minRegion, @Nullable Vec3 maxRegion) { | ||
| public static MarkerData read(FriendlyByteBuf friendlyByteBuf) { | ||
| UUID uuid = friendlyByteBuf.readUUID(); | ||
| Vec3 position = new Vec3(friendlyByteBuf.readDouble(), friendlyByteBuf.readDouble(), friendlyByteBuf.readDouble()); | ||
| String name = friendlyByteBuf.readNullable(FriendlyByteBuf::readUtf); | ||
|
|
||
| Vec3 minRegion = null; | ||
| Vec3 maxRegion = null; | ||
| if (friendlyByteBuf.readBoolean()) { | ||
| minRegion = new Vec3(friendlyByteBuf.readDouble(), friendlyByteBuf.readDouble(), friendlyByteBuf.readDouble()); | ||
| maxRegion = new Vec3(friendlyByteBuf.readDouble(), friendlyByteBuf.readDouble(), friendlyByteBuf.readDouble()); | ||
| } | ||
|
|
||
| return new MarkerData(uuid, position, name, minRegion, maxRegion); | ||
| } | ||
|
|
||
| public static void write(FriendlyByteBuf friendlyByteBuf, MarkerData markerData) { | ||
| friendlyByteBuf.writeUUID(markerData.uuid); | ||
| friendlyByteBuf.writeDouble(markerData.position.x); | ||
| friendlyByteBuf.writeDouble(markerData.position.y); | ||
| friendlyByteBuf.writeDouble(markerData.position.z); | ||
| friendlyByteBuf.writeNullable(markerData.name, FriendlyByteBuf::writeUtf); | ||
|
|
||
| if (markerData.minRegion != null && markerData.maxRegion != null) { | ||
| friendlyByteBuf.writeBoolean(true); | ||
| friendlyByteBuf.writeDouble(markerData.minRegion.x); | ||
| friendlyByteBuf.writeDouble(markerData.minRegion.y); | ||
| friendlyByteBuf.writeDouble(markerData.minRegion.z); | ||
| friendlyByteBuf.writeDouble(markerData.maxRegion.x); | ||
| friendlyByteBuf.writeDouble(markerData.maxRegion.y); | ||
| friendlyByteBuf.writeDouble(markerData.maxRegion.z); | ||
| } else { | ||
| friendlyByteBuf.writeBoolean(false); | ||
| } | ||
| } | ||
|
|
||
| private static final Field dataField; | ||
| static { | ||
| ReflectionRemapper reflectionRemapper = ReflectionRemapper.forReobfMappingsInPaperJar(); | ||
| String fieldName = reflectionRemapper.remapFieldName(Marker.class, "data"); | ||
|
|
||
| try { | ||
| dataField = Marker.class.getDeclaredField(fieldName); | ||
| dataField.setAccessible(true); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| public static CompoundTag getData(Marker marker) { | ||
| try { | ||
| return (CompoundTag) dataField.get(marker); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| public static MarkerData createFrom(Marker marker) { | ||
| Vec3 position = marker.position(); | ||
| CompoundTag data = getData(marker); | ||
|
|
||
| String name = data.getString("name").trim(); | ||
| if (name.isEmpty()) name = null; | ||
|
|
||
| Vec3 minRegion = null; | ||
| Vec3 maxRegion = null; | ||
| if (data.contains("min", Tag.TAG_LIST) && data.contains("max", Tag.TAG_LIST)) { | ||
| ListTag min = data.getList("min", Tag.TAG_DOUBLE); | ||
| ListTag max = data.getList("max", Tag.TAG_DOUBLE); | ||
|
|
||
| if (min.size() == 3 && max.size() == 3) { | ||
| double minX = min.getDouble(0); | ||
| double minY = min.getDouble(1); | ||
| double minZ = min.getDouble(2); | ||
| double maxX = max.getDouble(0); | ||
| double maxY = max.getDouble(1); | ||
| double maxZ = max.getDouble(2); | ||
| minRegion = new Vec3(minX, minY, minZ); | ||
| maxRegion = new Vec3(maxX, maxY, maxZ); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| return new MarkerData(marker.getUUID(), position, name, minRegion, maxRegion); | ||
| } | ||
| } |
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
Oops, something went wrong.