Skip to content

Commit 5d055bf

Browse files
committed
Added brewing stand bottle slot meta support.
Brewing stands only had support for fuel and ingredient meta, this adds support for the 3 remaining bottle slots.
1 parent 9575c85 commit 5d055bf

3 files changed

Lines changed: 54 additions & 0 deletions

File tree

src/main/java/com/laytonsmith/abstraction/MCBrewerInventory.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55
public interface MCBrewerInventory extends MCInventory {
66
MCItemStack getFuel();
77
MCItemStack getIngredient();
8+
MCItemStack getLeftBottle();
9+
MCItemStack getMiddleBottle();
10+
MCItemStack getRightBottle();
811
void setFuel(MCItemStack stack);
912
void setIngredient(MCItemStack stack);
13+
void setLeftBottle(MCItemStack stack);
14+
void setMiddleBottle(MCItemStack stack);
15+
void setRightBottle(MCItemStack stack);
1016
@Override
1117
MCBrewingStand getHolder();
1218
}

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCBrewerInventory.java

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,21 @@ public MCItemStack getIngredient() {
2828
return new BukkitMCItemStack(this.inv.getIngredient());
2929
}
3030

31+
@Override
32+
public MCItemStack getLeftBottle() {
33+
return new BukkitMCItemStack(this.inv.getItem(0));
34+
}
35+
36+
@Override
37+
public MCItemStack getMiddleBottle() {
38+
return new BukkitMCItemStack(this.inv.getItem(1));
39+
}
40+
41+
@Override
42+
public MCItemStack getRightBottle() {
43+
return new BukkitMCItemStack(this.inv.getItem(2));
44+
}
45+
3146
@Override
3247
public void setFuel(MCItemStack stack) {
3348
this.inv.setFuel((ItemStack) stack.getHandle());
@@ -38,6 +53,21 @@ public void setIngredient(MCItemStack stack) {
3853
this.inv.setIngredient((ItemStack) stack.getHandle());
3954
}
4055

56+
@Override
57+
public void setLeftBottle(MCItemStack stack) {
58+
this.inv.setItem(0, (ItemStack) stack.getHandle());
59+
}
60+
61+
@Override
62+
public void setMiddleBottle(MCItemStack stack) {
63+
this.inv.setItem(1, (ItemStack) stack.getHandle());
64+
}
65+
66+
@Override
67+
public void setRightBottle(MCItemStack stack) {
68+
this.inv.setItem(2, (ItemStack) stack.getHandle());
69+
}
70+
4171
@Override
4272
public MCBrewingStand getHolder() {
4373
return new BukkitMCBrewingStand((BrewingStand) this.inv.getHolder());

src/main/java/com/laytonsmith/core/ObjectGenerator.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,15 @@ public Construct itemMeta(MCItemStack is, Target t) {
412412
if(inv.getIngredient() != null) {
413413
invData.set("ingredient", ObjectGenerator.GetGenerator().item(inv.getIngredient(), t), t);
414414
}
415+
if(inv.getLeftBottle() != null) {
416+
invData.set("leftbottle", ObjectGenerator.GetGenerator().item(inv.getLeftBottle(), t), t);
417+
}
418+
if(inv.getMiddleBottle() != null) {
419+
invData.set("middlebottle", ObjectGenerator.GetGenerator().item(inv.getMiddleBottle(), t), t);
420+
}
421+
if(inv.getRightBottle() != null) {
422+
invData.set("rightbottle", ObjectGenerator.GetGenerator().item(inv.getRightBottle(), t), t);
423+
}
415424
ma.set("inventory", invData, t);
416425
} else if(bs instanceof MCFurnace) {
417426
MCFurnace furnace = (MCFurnace) bs;
@@ -693,6 +702,15 @@ public MCItemMeta itemMeta(Construct c, MCMaterial mat, Target t) throws ConfigR
693702
if(invData.containsKey("ingredient")) {
694703
inv.setIngredient(ObjectGenerator.GetGenerator().item(invData.get("ingredient", t), t));
695704
}
705+
if(invData.containsKey("leftbottle")) {
706+
inv.setLeftBottle(ObjectGenerator.GetGenerator().item(invData.get("leftbottle", t), t));
707+
}
708+
if(invData.containsKey("middlebottle")) {
709+
inv.setMiddleBottle(ObjectGenerator.GetGenerator().item(invData.get("middlebottle", t), t));
710+
}
711+
if(invData.containsKey("rightbottle")) {
712+
inv.setRightBottle(ObjectGenerator.GetGenerator().item(invData.get("rightbottle", t), t));
713+
}
696714
}
697715
bsm.setBlockState(bs);
698716
} else if(bs instanceof MCFurnace) {

0 commit comments

Comments
 (0)