Skip to content

Converted the if/else block in getType() to a series of helper methods. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EmmaIreland wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Converted the if/else block in getType() to a series of helper methods. #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be59618
Converted the if/else block in getType() to a series of helper methods.
EmmaIreland Apr 23, 2014
3a18623
Corrected the CraftInventoryCustom case that Eclipse so helpfully
EmmaIreland Apr 24, 2014
63db698
Moved an import that Eclipse moved out of place.
EmmaIreland Apr 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 59 additions & 30 deletions src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,37 +424,66 @@ public String getTitle() {
return inventory.getInventoryName();
}


// Thanks to Droppers extending Dispensers, order is important for getTypeHelper.
public InventoryType getTypeHelper(InventoryCrafting inventory) {
return inventory.getSize() >= 9 ? InventoryType.WORKBENCH : InventoryType.CRAFTING;
}

public InventoryType getTypeHelper(PlayerInventory inventory) {
return InventoryType.PLAYER;
}

public InventoryType getTypeHelper(TileEntityDropper inventory) {
return InventoryType.DROPPER;
}

public InventoryType getTypeHelper(TileEntityDispenser inventory) {
return InventoryType.DISPENSER;
}

public InventoryType getTypeHelper(TileEntityFurnace inventory) {
return InventoryType.FURNACE;
}

public InventoryType getTypeHelper(ContainerEnchantTableInventory inventory) {
return InventoryType.ENCHANTING;
}

public InventoryType getTypeHelper(TileEntityBrewingStand inventory) {
return InventoryType.BREWING;
}

public InventoryType getTypeHelper(CraftInventoryCustom.MinecraftInventory inventory) {
return ((CraftInventoryCustom.MinecraftInventory) inventory).getType();
}

public InventoryType getTypeHelper(InventoryEnderChest inventory) {
return InventoryType.ENDER_CHEST;
}

public InventoryType getTypeHelper(InventoryMerchant inventory) {
return InventoryType.MERCHANT;
}

public InventoryType getTypeHelper(TileEntityBeacon inventory) {
return InventoryType.BEACON;
}

public InventoryType getTypeHelper(ContainerAnvilInventory inventory) {
return InventoryType.ANVIL;
}

public InventoryType getTypeHelper(IHopper inventory) {
return InventoryType.HOPPER;
}

public InventoryType getTypeHelper(IInventory inventory) {
return InventoryType.CHEST;
}

public InventoryType getType() {
// Thanks to Droppers extending Dispensers, order is important.
if (inventory instanceof InventoryCrafting) {
return inventory.getSize() >= 9 ? InventoryType.WORKBENCH : InventoryType.CRAFTING;
} else if (inventory instanceof PlayerInventory) {
return InventoryType.PLAYER;
} else if (inventory instanceof TileEntityDropper) {
return InventoryType.DROPPER;
} else if (inventory instanceof TileEntityDispenser) {
return InventoryType.DISPENSER;
} else if (inventory instanceof TileEntityFurnace) {
return InventoryType.FURNACE;
} else if (inventory instanceof ContainerEnchantTableInventory) {
return InventoryType.ENCHANTING;
} else if (inventory instanceof TileEntityBrewingStand) {
return InventoryType.BREWING;
} else if (inventory instanceof CraftInventoryCustom.MinecraftInventory) {
return ((CraftInventoryCustom.MinecraftInventory) inventory).getType();
} else if (inventory instanceof InventoryEnderChest) {
return InventoryType.ENDER_CHEST;
} else if (inventory instanceof InventoryMerchant) {
return InventoryType.MERCHANT;
} else if (inventory instanceof TileEntityBeacon) {
return InventoryType.BEACON;
} else if (inventory instanceof ContainerAnvilInventory) {
return InventoryType.ANVIL;
} else if (inventory instanceof IHopper) {
return InventoryType.HOPPER;
} else {
return InventoryType.CHEST;
}
return getTypeHelper(inventory);
}

public InventoryHolder getHolder() {
Expand Down