summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhibo98 <hibo98.niklas@gmail.com>2016-07-10 18:07:13 +0200
committermd_5 <git@md-5.net>2016-07-15 17:31:01 +1000
commite73ec6b833d245ce3c984d6da1cccb22fbe9f3e5 (patch)
tree4fc6802724d7a29be8076d6a987a6ec2a92654fd /src
parent19b3d5ef4cd3cc4cef246dd9dba02199e19f5daf (diff)
downloadbukkit-e73ec6b833d245ce3c984d6da1cccb22fbe9f3e5.tar
bukkit-e73ec6b833d245ce3c984d6da1cccb22fbe9f3e5.tar.gz
bukkit-e73ec6b833d245ce3c984d6da1cccb22fbe9f3e5.tar.lz
bukkit-e73ec6b833d245ce3c984d6da1cccb22fbe9f3e5.tar.xz
bukkit-e73ec6b833d245ce3c984d6da1cccb22fbe9f3e5.zip
Update inventory properties to match current protocol
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/inventory/InventoryView.java62
1 files changed, 55 insertions, 7 deletions
diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java
index 27f98081..2677e94d 100644
--- a/src/main/java/org/bukkit/inventory/InventoryView.java
+++ b/src/main/java/org/bukkit/inventory/InventoryView.java
@@ -23,17 +23,21 @@ public abstract class InventoryView {
*/
BREW_TIME(0, InventoryType.BREWING),
/**
- * The progress of the right-pointing arrow in a furnace inventory.
- */
- COOK_TIME(0, InventoryType.FURNACE),
- /**
* The progress of the flame in a furnace inventory.
*/
- BURN_TIME(1, InventoryType.FURNACE),
+ BURN_TIME(0, InventoryType.FURNACE),
/**
* How many total ticks the current fuel should last.
*/
- TICKS_FOR_CURRENT_FUEL(2, InventoryType.FURNACE),
+ TICKS_FOR_CURRENT_FUEL(1, InventoryType.FURNACE),
+ /**
+ * The progress of the right-pointing arrow in a furnace inventory.
+ */
+ COOK_TIME(2, InventoryType.FURNACE),
+ /**
+ * How many total ticks the current smelting should last.
+ */
+ TICKS_FOR_CURRENT_SMELTING(3, InventoryType.FURNACE),
/**
* In an enchanting inventory, the top button's experience level
* value.
@@ -48,7 +52,51 @@ public abstract class InventoryView {
* In an enchanting inventory, the bottom button's experience level
* value.
*/
- ENCHANT_BUTTON3(2, InventoryType.ENCHANTING);
+ ENCHANT_BUTTON3(2, InventoryType.ENCHANTING),
+ /**
+ * In an enchanting inventory, the first four bits of the player's xpSeed.
+ */
+ ENCHANT_XP_SEED(3, InventoryType.ENCHANTING),
+ /**
+ * In an enchanting inventory, the top button's enchantment's id
+ */
+ ENCHANT_ID1(4, InventoryType.ENCHANTING),
+ /**
+ * In an enchanting inventory, the middle button's enchantment's id
+ */
+ ENCHANT_ID2(5, InventoryType.ENCHANTING),
+ /**
+ * In an enchanting inventory, the bottom button's enchantment's id
+ */
+ ENCHANT_ID3(6, InventoryType.ENCHANTING),
+ /**
+ * In an enchanting inventory, the top button's level value.
+ */
+ ENCHANT_LEVEL1(7, InventoryType.ENCHANTING),
+ /**
+ * In an enchanting inventory, the middle button's level value.
+ */
+ ENCHANT_LEVEL2(8, InventoryType.ENCHANTING),
+ /**
+ * In an enchanting inventory, the bottom button's level value.
+ */
+ ENCHANT_LEVEL3(9, InventoryType.ENCHANTING),
+ /**
+ * In an beacon inventory, the levels of the beacon
+ */
+ LEVELS(0, InventoryType.BEACON),
+ /**
+ * In an beacon inventory, the primary potion effect
+ */
+ PRIMARY_EFFECT(1, InventoryType.BEACON),
+ /**
+ * In an beacon inventory, the secondary potion effect
+ */
+ SECONDARY_EFFECT(2, InventoryType.BEACON),
+ /**
+ * The repair's cost in xp levels
+ */
+ REPAIR_COST(0, InventoryType.ANVIL);
int id;
InventoryType style;
private Property(int id, InventoryType appliesTo) {