Remove deprecated NBT methods with legacy naming

NucleoidMC · Dec 9, 2022 · 0f713e4 · 0f713e4
1 parent 9d5727f
commit 0f713e4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 42 deletions.
diff --git a/src/main/java/xyz/nucleoid/map_templates/MapEntity.java b/src/main/java/xyz/nucleoid/map_templates/MapEntity.java
@@ -33,14 +33,6 @@ public NbtCompound createEntityNbt(BlockPos origin) {
         return nbt;
     }
 
-    /**
-     * @deprecated use {@link #createEntityNbt(BlockPos)}
-     */
-    @Deprecated(forRemoval = true)
-    public NbtCompound createEntityTag(BlockPos origin) {
-        return createEntityNbt(origin);
-    }
-
     public void createEntities(World world, BlockPos origin, Consumer<Entity> consumer) {
         var nbt = this.createEntityNbt(origin);
         EntityType.loadEntityWithPassengers(nbt, world, entity -> {
@@ -83,14 +75,6 @@ public static MapEntity fromNbt(ChunkSectionPos sectionPos, NbtCompound nbt) {
         return new MapEntity(globalPos, nbt);
     }
 
-    /**
-     * @deprecated use {@link #fromNbt(ChunkSectionPos, NbtCompound)}
-     */
-    @Deprecated(forRemoval = true)
-    public static MapEntity fromTag(ChunkSectionPos sectionPos, NbtCompound nbt) {
-        return fromNbt(sectionPos, nbt);
-    }
-
     MapEntity transformed(MapTransform transform) {
         var resultPosition = transform.transformedPoint(this.position);
         var resultNbt = this.nbt.copy();

diff --git a/src/main/java/xyz/nucleoid/map_templates/MapTemplate.java b/src/main/java/xyz/nucleoid/map_templates/MapTemplate.java
@@ -116,14 +116,6 @@ public void setBlockEntityNbt(BlockPos pos, @Nullable NbtCompound entityNbt) {
         }
     }
 
-    /**
-     * @deprecated use {@link #setBlockEntityNbt(BlockPos, NbtCompound)}
-     */
-    @Deprecated(forRemoval = true)
-    public void setBlockEntityTag(BlockPos pos, @Nullable NbtCompound entityNbt) {
-        setBlockEntityNbt(pos, entityNbt);
-    }
-
     public BlockState getBlockState(BlockPos pos) {
         var chunk = this.chunks.get(chunkPos(pos));
         if (chunk != null) {
@@ -150,24 +142,6 @@ public NbtCompound getBlockEntityNbt(BlockPos localPos, BlockPos worldPos) {
         return null;
     }
 
-    /**
-     * @deprecated use {@link #getBlockEntityNbt(BlockPos)}
-     */
-    @Nullable
-    @Deprecated(forRemoval = true)
-    public NbtCompound getBlockEntityTag(BlockPos localPos) {
-        return getBlockEntityNbt(localPos);
-    }
-
-    /**
-     * @deprecated use {@link #getBlockEntityNbt(BlockPos, BlockPos)}
-     */
-    @Nullable
-    @Deprecated(forRemoval = true)
-    public NbtCompound getBlockEntityTag(BlockPos localPos, BlockPos worldPos) {
-        return getBlockEntityNbt(localPos, worldPos);
-    }
-
     /**
      * Adds an entity to the map template.
      * <p>