SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Added support for cloth color with the super pickaxe drops.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
sk89q 2011-01-17 20:30:54 -08:00
Ursprung 75c21623da
Commit a63ffc2fe4
5 geänderte Dateien mit 43 neuen und 59 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

70
src/com/sk89q/worldedit/LocalWorld.java
Datei anzeigen

@ -150,9 +150,9 @@ public abstract class LocalWorld {
* @param count
* @param times
*/
public void dropItem(Vector pt, int type, int count, int times) {
public void dropItem(Vector pt,BaseItemStack item, int times) {
for (int i = 0; i < times; i++) {
dropItem(pt, type, count);
dropItem(pt, item);
}
}
@ -160,22 +160,11 @@ public abstract class LocalWorld {
* Drop an item.
*
* @param pt
* @param type
* @param item
* @param count
* @param times
*/
public abstract void dropItem(Vector pt, int type,
int count);
/**
* Drop an item.
*
* @param pt
* @param type
* @param count
* @param times
*/
public abstract void dropItem(Vector pt, int type);
public abstract void dropItem(Vector pt, BaseItemStack item);
/**
* Simulate a block being mined.
@ -186,53 +175,54 @@ public abstract class LocalWorld {
int type = getBlockType(pt);
//setBlockType(pt, 0);
if (type == 1) { dropItem(pt, 4); } // Stone
else if (type == 2) { dropItem(pt, 3); } // Grass
if (type == 1) { dropItem(pt, new BaseItemStack(4)); } // Stone
else if (type == 2) { dropItem(pt, new BaseItemStack(3)); } // Grass
else if (type == 7) { } // Bedrock
else if (type == 8) { } // Water
else if (type == 9) { } // Water
else if (type == 10) { } // Lava
else if (type == 11) { } // Lava
else if (type == 13) { // Gravel
dropItem(pt, type);
dropItem(pt, new BaseItemStack(type));
if (random.nextDouble() >= 0.9) {
dropItem(pt, 318);
dropItem(pt, new BaseItemStack(318));
}
}
else if (type == 16) { dropItem(pt, 263); } // Coal ore
else if (type == 16) { dropItem(pt, new BaseItemStack(263)); } // Coal ore
else if (type == 18) { // Leaves
if (random.nextDouble() > 0.95) {
dropItem(pt, 6);
dropItem(pt, new BaseItemStack(6));
}
}
else if (type == 20) { } // Glass
else if (type == 43) { dropItem(pt, 44); } // Double step
else if (type == 35) { dropItem(pt, new BaseItemStack(35, 1, (short)getBlockData(pt))); } // Cloth
else if (type == 43) { dropItem(pt, new BaseItemStack(44)); } // Double step
else if (type == 47) { } // Bookshelves
else if (type == 51) { } // Fire
else if (type == 52) { } // Mob spawner
else if (type == 53) { dropItem(pt, 5); } // Wooden stairs
else if (type == 55) { dropItem(pt, 331); } // Redstone wire
else if (type == 56) { dropItem(pt, 264); } // Diamond ore
else if (type == 59) { dropItem(pt, 295); } // Crops
else if (type == 60) { dropItem(pt, 3); } // Soil
else if (type == 62) { dropItem(pt, 61); } // Furnace
else if (type == 63) { dropItem(pt, 323); } // Sign post
else if (type == 64) { dropItem(pt, 324); } // Wood door
else if (type == 67) { dropItem(pt, 4); } // Cobblestone stairs
else if (type == 68) { dropItem(pt, 323); } // Wall sign
else if (type == 71) { dropItem(pt, 330); } // Iron door
else if (type == 73) { dropItem(pt, 331, 1, 4); } // Redstone ore
else if (type == 74) { dropItem(pt, 331, 1, 4); } // Glowing redstone ore
else if (type == 75) { dropItem(pt, 76); } // Redstone torch
else if (type == 53) { dropItem(pt, new BaseItemStack(5)); } // Wooden stairs
else if (type == 55) { dropItem(pt, new BaseItemStack(331)); } // Redstone wire
else if (type == 56) { dropItem(pt, new BaseItemStack(264)); } // Diamond ore
else if (type == 59) { dropItem(pt, new BaseItemStack(295)); } // Crops
else if (type == 60) { dropItem(pt, new BaseItemStack(3)); } // Soil
else if (type == 62) { dropItem(pt, new BaseItemStack(61)); } // Furnace
else if (type == 63) { dropItem(pt, new BaseItemStack(323)); } // Sign post
else if (type == 64) { dropItem(pt, new BaseItemStack(324)); } // Wood door
else if (type == 67) { dropItem(pt, new BaseItemStack(4)); } // Cobblestone stairs
else if (type == 68) { dropItem(pt, new BaseItemStack(323)); } // Wall sign
else if (type == 71) { dropItem(pt, new BaseItemStack(330)); } // Iron door
else if (type == 73) { dropItem(pt, new BaseItemStack(331), 4); } // Redstone ore
else if (type == 74) { dropItem(pt, new BaseItemStack(331), 4); } // Glowing redstone ore
else if (type == 75) { dropItem(pt, new BaseItemStack(76)); } // Redstone torch
else if (type == 78) { } // Snow
else if (type == 79) { } // Ice
else if (type == 82) { dropItem(pt, 337, 1, 4); } // Clay
else if (type == 83) { dropItem(pt, 338); } // Reed
else if (type == 89) { dropItem(pt, 348); } // Lightstone
else if (type == 82) { dropItem(pt, new BaseItemStack(337), 4); } // Clay
else if (type == 83) { dropItem(pt, new BaseItemStack(338)); } // Reed
else if (type == 89) { dropItem(pt, new BaseItemStack(348)); } // Lightstone
else if (type == 90) { } // Portal
else if (type != 0) {
dropItem(pt, type);
dropItem(pt, new BaseItemStack(type));
}
}

10
src/com/sk89q/worldedit/blocks/BaseItem.java
Datei anzeigen

@ -28,7 +28,7 @@ public class BaseItem {
/**
* Item ID.
*/
private short id;
private int id;
/**
* Item damage.
*/
@ -39,7 +39,7 @@ public class BaseItem {
*
* @param id
*/
public BaseItem(short id) {
public BaseItem(int id) {
this.id = id;
this.damage = 0;
}
@ -49,7 +49,7 @@ public class BaseItem {
*
* @param id
*/
public BaseItem(short id, short damage) {
public BaseItem(int id, short damage) {
this.id = id;
this.damage = damage;
}
@ -57,14 +57,14 @@ public class BaseItem {
/**
* @return the id
*/
public short getID() {
public int getType() {
return id;
}
/**
* @param id the id to set
*/
public void setID(short id) {
public void setType(int id) {
this.id = id;
}

6
src/com/sk89q/worldedit/blocks/BaseItemStack.java
Datei anzeigen

@ -35,7 +35,7 @@ public class BaseItemStack extends BaseItem {
*
* @param id
*/
public BaseItemStack(short id) {
public BaseItemStack(int id) {
super(id);
}
@ -44,7 +44,7 @@ public class BaseItemStack extends BaseItem {
*
* @param id
*/
public BaseItemStack(short id, int amount) {
public BaseItemStack(int id, int amount) {
super(id);
this.amount = amount;
}
@ -54,7 +54,7 @@ public class BaseItemStack extends BaseItem {
*
* @param id
*/
public BaseItemStack(short id, int amount, short damage) {
public BaseItemStack(int id, int amount, short damage) {
super(id, damage);
this.amount = amount;
}

2
src/com/sk89q/worldedit/blocks/ChestBlock.java
Datei anzeigen

@ -107,7 +107,7 @@ public class ChestBlock extends BaseBlock implements TileEntityBlock {
if (item != null) {
Map<String,Tag> data = new HashMap<String,Tag>();
CompoundTag itemTag = new CompoundTag("Items", data);
data.put("id", new ShortTag("id", item.getID()));
data.put("id", new ShortTag("id", (short)item.getType()));
data.put("Damage", new ShortTag("Damage", item.getDamage()));
data.put("Count", new ByteTag("Count", (byte)item.getAmount()));
data.put("Slot", new ByteTag("Slot", (byte)i));

14
src/com/sk89q/worldedit/bukkit/BukkitWorld.java
Datei anzeigen

@ -157,16 +157,10 @@ public class BukkitWorld extends LocalWorld {
}
@Override
public void dropItem(Vector pt, int type, int count) {
ItemStack item = new ItemStack(type, count);
world.dropItemNaturally(toLocation(pt), item);
}
@Override
public void dropItem(Vector pt, int type) {
ItemStack item = new ItemStack(type, 1);
world.dropItemNaturally(toLocation(pt), item);
public void dropItem(Vector pt, BaseItemStack item) {
ItemStack bukkitItem = new ItemStack(item.getType(), item.getAmount(),
(byte)item.getDamage());
world.dropItemNaturally(toLocation(pt), bukkitItem);
}