From 885b48c15e566addd047cc86c26fd3095391cf04 Mon Sep 17 00:00:00 2001 From: sk89q Date: Fri, 24 Aug 2012 06:43:24 -0700 Subject: [PATCH] Updated Bukkit dependency to 1.3.1-R2.0, added backwards support for NBT access. --- pom.xml | 4 +- .../com/sk89q/worldedit/bukkit/NmsBlock.java | 39 ++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index da0b1a186..4e5cd4a53 100644 --- a/pom.xml +++ b/pom.xml @@ -58,13 +58,13 @@ org.bukkit bukkit - 1.2.5-R4.1-SNAPSHOT + 1.3.1-R2.0 true org.bukkit craftbukkit - 1.2.5-R4.1-SNAPSHOT + 1.3.1-R2.0 true diff --git a/src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java b/src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java index 63b09aa93..1b0dbedce 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java @@ -18,10 +18,13 @@ package com.sk89q.worldedit.bukkit; +import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Logger; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagByte; @@ -70,6 +73,8 @@ import com.sk89q.worldedit.foundation.Block; */ class NmsBlock extends BaseBlock implements TileEntityBlock { + private static final Logger logger = Logger.getLogger(NmsBlock.class.getCanonicalName()); + private static Field compoundMapField; private NBTTagCompound nbtData = null; /** @@ -247,13 +252,45 @@ class NmsBlock extends BaseBlock implements TileEntityBlock { * @param foreign non-native NMS NBT structure * @return native WorldEdit NBT structure */ + @SuppressWarnings("unchecked") private static Tag toNative(NBTBase foreign) { if (foreign == null) { return null; } if (foreign instanceof NBTTagCompound) { Map values = new HashMap(); - for (Object obj : ((NBTTagCompound) foreign).d()) { + Collection foreignValues = null; + + if (compoundMapField == null) { + try { + // Method name may change! + foreignValues = ((NBTTagCompound) foreign).c(); + } catch (Throwable t) { + try { + logger.warning("WorldEdit: Couldn't get NBTTagCompound.c(), " + + "so we're going to try to get at the 'map' field directly from now on"); + + if (compoundMapField == null) { + compoundMapField = NBTTagCompound.class.getDeclaredField("map"); + compoundMapField.setAccessible(true); + } + } catch (Throwable e) { + // Can't do much beyond this + throw new RuntimeException(e); + } + } + } + + if (compoundMapField != null) { + try { + foreignValues = ((HashMap) compoundMapField.get(foreign)).values(); + } catch (Throwable e) { + // Can't do much beyond this + throw new RuntimeException(e); + } + } + + for (Object obj : foreignValues) { NBTBase base = (NBTBase) obj; values.put(base.getName(), toNative(base)); }