From c8f183c08c11ebdce3ff537799b091bdda892c7b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 17 Jan 2018 00:47:06 -0600 Subject: [PATCH] use new baubles packetsync constructor. bump baubles dep. Closes #2509 --- .../vazkii/botania/client/gui/box/ContainerBaubleBox.java | 4 ++-- .../botania/common/core/handler/InternalMethodHandler.java | 6 ++++-- src/main/java/vazkii/botania/common/lib/LibMisc.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 634435ddd..4d5bdef45 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.gui.box; +import baubles.api.BaublesApi; import baubles.api.IBauble; -import baubles.api.cap.BaublesCapabilities; import baubles.api.cap.IBaublesItemHandler; import baubles.common.container.SlotBauble; import net.minecraft.entity.player.EntityPlayer; @@ -40,7 +40,7 @@ public class ContainerBaubleBox extends Container { IInventory playerInv = player.inventory; baubleBoxInv = boxInv; - baubles = player.getCapability(BaublesCapabilities.CAPABILITY_BAUBLES, null); + baubles = BaublesApi.getBaublesHandler(player); addSlotToContainer(new SlotBauble(player, baubles, 0, 8, 8 + 0 * 18)); addSlotToContainer(new SlotBauble(player, baubles, 1, 8, 8 + 1 * 18)); diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 719f5d024..079dc96b1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -257,10 +257,12 @@ public class InternalMethodHandler extends DummyMethodHandler { return block instanceof BlockModFlower || block instanceof BlockFloatingFlower || block instanceof ISpecialFlower; } + // todo use our own sync packet or use the autosync system @Override public void sendBaubleUpdatePacket(EntityPlayer player, int slot) { - if(player instanceof EntityPlayerMP) - PacketHandler.INSTANCE.sendTo(new PacketSync(player, slot), (EntityPlayerMP) player); + if(player instanceof EntityPlayerMP) { + PacketHandler.INSTANCE.sendTo(new PacketSync(player, slot, BaublesApi.getBaublesHandler(player).getStackInSlot(slot)), (EntityPlayerMP) player); + } } @Override diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 445979799..50973f8f9 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ public final class LibMisc { public static final String MOD_NAME = "Botania"; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:baubles;after:thaumcraft"; + public static final String DEPENDENCIES = "required-after:baubles@[1.5.2,);after:thaumcraft"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID;