OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement Hopper block state and inventory methods. Adds BUKKIT-3749

Browse source
This commit is contained in:
Michael Limiero 2013-03-16 00:46:35 -04:00 committed by Travis Watkins
parent 6f68fc4ba4
commit d802168cd5
4 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View file

@ -249,6 +249,8 @@ public class CraftBlock implements Block {
return new CraftFurnace(this);
case DISPENSER:
return new CraftDispenser(this);
case HOPPER:
return new CraftHopper(this);
case MOB_SPAWNER:
return new CraftCreatureSpawner(this);
case NOTE_BLOCK:

35
src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java Normal file
View file

@ -0,0 +1,35 @@
package org.bukkit.craftbukkit.block;
import net.minecraft.server.TileEntityHopper;
import org.bukkit.block.Block;
import org.bukkit.block.Hopper;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
public class CraftHopper extends CraftBlockState implements Hopper {
private final CraftWorld world;
private final TileEntityHopper hopper;
public CraftHopper(final Block block) {
super(block);
world = (CraftWorld) block.getWorld();
hopper = (TileEntityHopper) world.getTileEntityAt(getX(), getY(), getZ());
}
public Inventory getInventory() {
return new CraftInventory(hopper);
}
@Override
public boolean update(boolean force) {
boolean result = super.update(force);
if (result) {
hopper.update();
}
return result;
}
}

8
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View file

@ -10,6 +10,7 @@ import net.minecraft.server.Packet101CloseWindow;
import net.minecraft.server.TileEntityBrewingStand;
import net.minecraft.server.TileEntityDispenser;
import net.minecraft.server.TileEntityFurnace;
import net.minecraft.server.TileEntityHopper;
import org.bukkit.GameMode;
import org.bukkit.Location;
@ -215,7 +216,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
}
break;
case ENCHANTING:
openCustomInventory(inventory, player, 4);
openCustomInventory(inventory, player, 4);
break;
case HOPPER:
if (craftinv.getInventory() instanceof TileEntityHopper) {
getHandle().openHopper((TileEntityHopper)craftinv.getInventory());
}
break;
case CREATIVE:
case CRAFTING:

3
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View file

@ -15,6 +15,7 @@ import net.minecraft.server.TileEntityBeacon;
import net.minecraft.server.TileEntityBrewingStand;
import net.minecraft.server.TileEntityDispenser;
import net.minecraft.server.TileEntityFurnace;
import net.minecraft.server.TileEntityHopper;
import org.apache.commons.lang.Validate;
import org.bukkit.entity.HumanEntity;
@ -444,6 +445,8 @@ public class CraftInventory implements Inventory {
return InventoryType.BEACON;
} else if (inventory instanceof ContainerAnvilInventory) {
return InventoryType.ANVIL;
} else if (inventory instanceof TileEntityHopper) {
return InventoryType.HOPPER;
} else {
return InventoryType.CHEST;
}