Skip to content

Commit

Permalink
Clean up the last little bit of NBT deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
octylFractal committed Jul 16, 2022
1 parent 59fcef8 commit b7301a6
Show file tree
Hide file tree
Showing 8 changed files with 730 additions and 683 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Expand Up @@ -19,14 +19,14 @@

package com.sk89q.worldedit.bukkit.adapter.impl.v1_17_R1_2;

import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
import com.sk89q.worldedit.util.SideEffect;
import com.sk89q.worldedit.util.SideEffectSet;
import com.sk89q.worldedit.world.block.BlockState;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
import net.minecraft.server.level.ChunkHolder;
import net.minecraft.server.level.ServerLevel;
Expand Down Expand Up @@ -110,8 +110,8 @@ public boolean updateTileEntity(BlockPos position, LinCompoundTag tag) {
if (tileEntity == null) {
return false;
}
Tag nativeTag = adapter.fromNative(new CompoundTag(tag));
PaperweightAdapter.readTagIntoTileEntity((net.minecraft.nbt.CompoundTag) nativeTag, tileEntity);
Tag nativeTag = adapter.fromNative(tag);
PaperweightAdapter.readTagIntoTileEntity((CompoundTag) nativeTag, tileEntity);
return true;
}

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Expand Up @@ -19,14 +19,14 @@

package com.sk89q.worldedit.bukkit.adapter.impl.v1_18_R2;

import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
import com.sk89q.worldedit.util.SideEffect;
import com.sk89q.worldedit.util.SideEffectSet;
import com.sk89q.worldedit.world.block.BlockState;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
import net.minecraft.server.level.ChunkHolder;
import net.minecraft.server.level.ServerLevel;
Expand Down Expand Up @@ -110,8 +110,8 @@ public boolean updateTileEntity(BlockPos position, LinCompoundTag tag) {
if (tileEntity == null) {
return false;
}
Tag nativeTag = adapter.fromNative(new CompoundTag(tag));
PaperweightAdapter.readTagIntoTileEntity((net.minecraft.nbt.CompoundTag) nativeTag, tileEntity);
Tag nativeTag = adapter.fromNative(tag);
PaperweightAdapter.readTagIntoTileEntity((CompoundTag) nativeTag, tileEntity);
return true;
}

Expand Down

Large diffs are not rendered by default.

Expand Up @@ -26,6 +26,7 @@
import com.sk89q.worldedit.util.SideEffectSet;
import com.sk89q.worldedit.world.block.BlockState;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
import net.minecraft.server.level.ChunkHolder;
import net.minecraft.server.level.ServerLevel;
Expand Down Expand Up @@ -110,7 +111,7 @@ public boolean updateTileEntity(BlockPos position, LinCompoundTag tag) {
return false;
}
Tag nativeTag = adapter.fromNative(tag);
PaperweightAdapter.readTagIntoTileEntity((net.minecraft.nbt.CompoundTag) nativeTag, tileEntity);
PaperweightAdapter.readTagIntoTileEntity((CompoundTag) nativeTag, tileEntity);
return true;
}

Expand Down

0 comments on commit b7301a6

Please sign in to comment.