Use the correct Map<String, Tag> when writing enchantments

This commit is contained in:
zml2008 2012-03-03 16:46:51 -08:00
parent 4e91f4e988
commit 40aa6aca60
4 changed files with 17 additions and 17 deletions

View File

@ -117,7 +117,7 @@ public class ChestBlock extends BaseBlock implements TileEntityBlock, ContainerB
ListTag enchlist = new ListTag("ench", CompoundTag.class, list);
for(Entry<Integer, Integer> entry : item.getEnchantments().entrySet()) {
Map<String, Tag> enchantment = new HashMap<String, Tag>();
CompoundTag enchantcompound = new CompoundTag(null, ench);
CompoundTag enchantcompound = new CompoundTag(null, enchantment);
enchantment.put("id", new ShortTag("id", entry.getKey().shortValue()));
enchantment.put("lvl", new ShortTag("lvl", entry.getValue().shortValue()));
list.add(enchantcompound);
@ -178,7 +178,7 @@ public class ChestBlock extends BaseBlock implements TileEntityBlock, ContainerB
itemstack.getEnchantments().put((int) enchid, (int)enchlvl);
}
}
newItems[slot] = itemstack;
}
}

View File

@ -85,7 +85,7 @@ public class DispenserBlock extends BaseBlock implements TileEntityBlock, Contai
/**
* Get the tile entity ID.
*
*
* @return
*/
public String getTileEntityID() {
@ -117,7 +117,7 @@ public class DispenserBlock extends BaseBlock implements TileEntityBlock, Contai
ListTag enchlist = new ListTag("ench", CompoundTag.class, list);
for(Entry<Integer, Integer> entry : item.getEnchantments().entrySet()) {
Map<String, Tag> enchantment = new HashMap<String, Tag>();
CompoundTag enchantcompound = new CompoundTag(null, ench);
CompoundTag enchantcompound = new CompoundTag(null, enchantment);
enchantment.put("id", new ShortTag("id", entry.getKey().shortValue()));
enchantment.put("lvl", new ShortTag("lvl", entry.getValue().shortValue()));
list.add(enchantcompound);
@ -178,7 +178,7 @@ public class DispenserBlock extends BaseBlock implements TileEntityBlock, Contai
itemstack.getEnchantments().put((int) enchid, (int)enchlvl);
}
}
newItems[slot] = itemstack;
}
}

View File

@ -50,8 +50,8 @@ public class FurnaceBlock extends BaseBlock implements TileEntityBlock, Containe
/**
* Construct the chest block.
*
* @param type
*
* @param type
*/
public FurnaceBlock(int type) {
super(type);
@ -61,7 +61,7 @@ public class FurnaceBlock extends BaseBlock implements TileEntityBlock, Containe
/**
* Construct the chest block.
*
* @param type
* @param type
* @param data
*/
public FurnaceBlock(int type, int data) {
@ -72,7 +72,7 @@ public class FurnaceBlock extends BaseBlock implements TileEntityBlock, Containe
/**
* Construct the chest block.
*
* @param type
* @param type
* @param data
* @param items
*/
@ -127,7 +127,7 @@ public class FurnaceBlock extends BaseBlock implements TileEntityBlock, Containe
/**
* Get the tile entity ID.
*
*
* @return
*/
public String getTileEntityID() {
@ -159,7 +159,7 @@ public class FurnaceBlock extends BaseBlock implements TileEntityBlock, Containe
ListTag enchlist = new ListTag("ench", CompoundTag.class, list);
for(Entry<Integer, Integer> entry : item.getEnchantments().entrySet()) {
Map<String, Tag> enchantment = new HashMap<String, Tag>();
CompoundTag enchantcompound = new CompoundTag(null, ench);
CompoundTag enchantcompound = new CompoundTag(null, enchantment);
enchantment.put("id", new ShortTag("id", entry.getKey().shortValue()));
enchantment.put("lvl", new ShortTag("lvl", entry.getValue().shortValue()));
list.add(enchantcompound);
@ -222,7 +222,7 @@ public class FurnaceBlock extends BaseBlock implements TileEntityBlock, Containe
itemstack.getEnchantments().put((int) enchid, (int)enchlvl);
}
}
newItems[slot] = itemstack;
}
}

View File

@ -32,7 +32,7 @@ public interface TileEntityBlock {
/**
* Return the name of the title entity ID.
*
* @return title entity ID
* @return tile entity ID
*/
public String getTileEntityID();
@ -40,16 +40,16 @@ public interface TileEntityBlock {
* Store additional tile entity data.
*
* @return map of values
* @throws DataException
* @throws DataException When invalid data is encountered
*/
public Map<String, Tag> toTileEntityNBT()
throws DataException;
/**
* Get additional information from the title entity data.
* Get additional information from the tile entity data.
*
* @param values
* @throws DataException
* @param values map of data
* @throws DataException When invalid data is encountered
*/
public void fromTileEntityNBT(Map<String, Tag> values)
throws DataException;