From 4d9f300087f4bf3dd62a4ea110b8d432ac5513da Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 11 Oct 2016 16:28:05 +0100 Subject: [PATCH] Updated for the new version of baubles. Runs, not done yet. --- build.gradle | 2 +- .../core/handler/BaubleRenderHandler.java | 8 ++-- .../client/core/handler/HUDHandler.java | 6 +-- .../client/gui/box/ContainerBaubleBox.java | 40 ++++++++++-------- .../botania/client/gui/box/GuiBaubleBox.java | 5 ++- .../core/handler/InternalMethodHandler.java | 11 +++-- .../common/core/handler/PixieHandler.java | 6 +-- .../botania/common/entity/EntitySpark.java | 10 ++++- .../item/equipment/bauble/ItemBauble.java | 6 +-- .../item/equipment/bauble/ItemDivaCharm.java | 4 +- .../equipment/bauble/ItemFlightTiara.java | 6 +-- .../equipment/bauble/ItemGoldenLaurel.java | 6 +-- .../item/equipment/bauble/ItemHolyCloak.java | 6 +-- .../item/equipment/bauble/ItemItemFinder.java | 9 ++-- .../item/equipment/bauble/ItemMagnetRing.java | 6 +-- .../item/equipment/bauble/ItemMonocle.java | 4 +- .../item/equipment/bauble/ItemTravelBelt.java | 8 ++-- .../item/equipment/bauble/ItemWaterRing.java | 4 +- .../common/item/relic/ItemLokiRing.java | 24 ++++------- .../common/item/relic/ItemOdinRing.java | 6 +-- .../common/item/relic/ItemThorRing.java | 6 +-- .../assets/botania/textures/gui/baubleBox.png | Bin 2891 -> 16589 bytes 22 files changed, 93 insertions(+), 90 deletions(-) diff --git a/build.gradle b/build.gradle index dbc7f4a84..1c14f9311 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,7 @@ configurations { dependencies { compile files( - 'Baubles-deobf.jar' + 'Baubles-1.10.2-1.3.BETA8-deobf.jar' ) deobfCompile "mezz.jei:jei_1.10.2:3.7.8.234" diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index be3b7ebf7..79aaee9b9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -14,8 +14,7 @@ import javax.annotation.Nonnull; import org.lwjgl.opengl.GL11; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -25,6 +24,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IBaubleRender; @@ -43,7 +43,7 @@ public final class BaubleRenderHandler implements LayerRenderer { if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.INVISIBILITY) != null) return; - InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); + IInventory inv = BaublesApi.getBaubles(player); dispatchRenders(inv, player, RenderType.BODY, partialTicks); if(inv.getStackInSlot(3) != null) @@ -66,7 +66,7 @@ public final class BaubleRenderHandler implements LayerRenderer { GlStateManager.popMatrix(); } - private void dispatchRenders(InventoryBaubles inv, EntityPlayer player, RenderType type, float partialTicks) { + private void dispatchRenders(IInventory inv, EntityPlayer player, RenderType type, float partialTicks) { for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack != null) { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index b7ca46099..7f78602da 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -17,7 +17,7 @@ import java.util.Map.Entry; import org.lwjgl.opengl.GL11; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -88,7 +88,7 @@ public final class HUDHandler { if(event.getType() == ElementType.HEALTH) { profiler.startSection("botania-hud"); - IInventory baublesInv = PlayerHandler.getPlayerBaubles(mc.thePlayer); + IInventory baublesInv = BaublesApi.getBaubles(mc.thePlayer); ItemStack amulet = baublesInv.getStackInSlot(0); if(amulet != null && amulet.getItem() == ModItems.flightTiara) { profiler.startSection("flugelTiara"); @@ -204,7 +204,7 @@ public final class HUDHandler { boolean creative = false; IInventory mainInv = player.inventory; - IInventory baublesInv = PlayerHandler.getPlayerBaubles(player); + IInventory baublesInv = BaublesApi.getBaubles(player); int invSize = mainInv.getSizeInventory(); int size = invSize; 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 74e2cc268..cdd8d6037 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -13,10 +13,11 @@ package vazkii.botania.client.gui.box; import javax.annotation.Nonnull; import baubles.api.BaubleType; +import baubles.api.BaublesApi; import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; +import baubles.api.cap.BaublesCapabilities; +import baubles.api.cap.IBaublesItemHandler; import baubles.common.container.SlotBauble; -import baubles.common.lib.PlayerHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -29,7 +30,7 @@ import vazkii.botania.client.gui.SlotLocked; public class ContainerBaubleBox extends Container { private final InventoryBaubleBox baubleBoxInv; - private final InventoryBaubles baubles; + public IBaublesItemHandler baubles; public ContainerBaubleBox(EntityPlayer player, InventoryBaubleBox boxInv) { int i; @@ -38,15 +39,16 @@ public class ContainerBaubleBox extends Container { IInventory playerInv = player.inventory; baubleBoxInv = boxInv; - baubles = new InventoryBaubles(player); - baubles.setEventHandler(this); - if(!player.worldObj.isRemote) - baubles.stackList = PlayerHandler.getPlayerBaubles(player).stackList; + baubles = player.getCapability(BaublesCapabilities.CAPABILITY_BAUBLES, null); - addSlotToContainer(new SlotBauble(baubles, BaubleType.AMULET, 0, 8, 8 + 0 * 18)); - addSlotToContainer(new SlotBauble(baubles, BaubleType.RING, 1, 8, 8 + 1 * 18)); - addSlotToContainer(new SlotBauble(baubles, BaubleType.RING, 2, 8, 8 + 2 * 18)); - addSlotToContainer(new SlotBauble(baubles, BaubleType.BELT, 3, 8, 8 + 3 * 18)); + addSlotToContainer(new SlotBauble(player, baubles, 0, 8, 8 + 0 * 18)); + addSlotToContainer(new SlotBauble(player, baubles, 1, 8, 8 + 1 * 18)); + addSlotToContainer(new SlotBauble(player, baubles, 2, 8, 8 + 2 * 18)); + addSlotToContainer(new SlotBauble(player, baubles, 3, 8, 8 + 3 * 18)); + + addSlotToContainer(new SlotBauble(player, baubles, 4, 27, 8 + 0 * 18)); + addSlotToContainer(new SlotBauble(player, baubles, 5, 27, 8 + 1 * 18)); + addSlotToContainer(new SlotBauble(player, baubles, 6, 27, 8 + 2 * 18)); for(i = 0; i < 4; ++i) for(j = 0; j < 6; ++j) { @@ -75,14 +77,12 @@ public class ContainerBaubleBox extends Container { @Override public void onContainerClosed(EntityPlayer player) { super.onContainerClosed(player); - - if(!player.worldObj.isRemote) - PlayerHandler.setPlayerBaubles(player, baubles); + // TODO do we need anything here? } @Override public void putStacksInSlots(ItemStack[] arr) { - baubles.blockEvents = true; + baubles.setEventBlock(true); super.putStacksInSlots(arr); } @@ -95,11 +95,15 @@ public class ContainerBaubleBox extends Container { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - if(slotIndex < 28) { - if(!mergeItemStack(itemstack1, 28, 64, true)) + int boxStart = 7; + int boxEnd = boxStart + 24; + int invEnd = boxEnd + 36; + + if(slotIndex < boxEnd) { + if(!mergeItemStack(itemstack1, boxEnd, invEnd, true)) return null; } else { - if(itemstack1 != null && (itemstack1.getItem() instanceof IBauble || itemstack1.getItem() instanceof IManaItem) && !mergeItemStack(itemstack1, 4, 28, false)) + if(itemstack1 != null && (itemstack1.getItem() instanceof IBauble || itemstack1.getItem() instanceof IManaItem) && !mergeItemStack(itemstack1, boxStart, boxEnd, false)) return null; } diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index f22b752d7..19043e884 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.gui.box; +import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.InventoryEffectRenderer; @@ -18,7 +19,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; -public class GuiBaubleBox extends InventoryEffectRenderer { +public class GuiBaubleBox extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_BAUBLE_BOX); @@ -38,7 +39,7 @@ public class GuiBaubleBox extends InventoryEffectRenderer { drawTexturedModalRect(guiLeft+slot.xDisplayPosition, guiTop+slot.yDisplayPosition, 200, 0, 16, 16); } - GuiInventory.drawEntityOnScreen(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - mouseX, guiTop + 45 - 30 - mouseY, mc.thePlayer); +// GuiInventory.drawEntityOnScreen(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - mouseX, guiTop + 45 - 30 - mouseY, mc.thePlayer); } } 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 0001cf3fd..d19dd7f50 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -13,9 +13,9 @@ package vazkii.botania.common.core.handler; import java.util.ArrayList; import java.util.List; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; +import baubles.common.network.PacketSync; import buildcraft.api.transport.IPipeTile; import net.minecraft.block.Block; import net.minecraft.client.gui.ScaledResolution; @@ -184,7 +184,7 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public IInventory getBaublesInventory(EntityPlayer player) { - return PlayerHandler.getPlayerBaubles(player); + return BaublesApi.getBaubles(player); } @Override @@ -263,10 +263,9 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public void sendBaubleUpdatePacket(EntityPlayer player, int slot) { if(player instanceof EntityPlayerMP) - PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); + PacketHandler.INSTANCE.sendTo(new PacketSync(player, slot), (EntityPlayerMP) player); } - - + @Override public List wrapInventory(List inventories) { List arrayList = new ArrayList(); diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index c46996666..e7fc9f616 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -1,10 +1,10 @@ package vazkii.botania.common.core.handler; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -37,7 +37,7 @@ public final class PixieHandler { for (ItemStack element : player.inventory.armorInventory) chance += getChance(element); - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); + IInventory baubles = BaublesApi.getBaubles(player); for(int i = 0; i < baubles.getSizeInventory(); i++) chance += getChance(baubles.getStackInSlot(i)); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 07cd42193..b46a0bf01 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -23,11 +23,12 @@ import java.util.WeakHashMap; import javax.annotation.Nonnull; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; @@ -110,7 +111,12 @@ public class EntitySpark extends Entity implements ISparkEntity { List stacks = new ArrayList<>(); stacks.addAll(Arrays.asList(player.inventory.mainInventory)); stacks.addAll(Arrays.asList(player.inventory.armorInventory)); - stacks.addAll(Arrays.asList(PlayerHandler.getPlayerBaubles(player).stackList)); + + IInventory baubles = BaublesApi.getBaubles(player); + ItemStack[] baubleStacks = new ItemStack[baubles.getSizeInventory()]; + for(int i = 0; i < baubleStacks.length; i++) + baubleStacks[i] = baubles.getStackInSlot(i); + stacks.addAll(Arrays.asList(baubleStacks)); for(ItemStack stack : stacks) { if(stack == null || !(stack.getItem() instanceof IManaItem)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 7535f824e..e5ca7ae34 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -16,13 +16,13 @@ import java.util.UUID; import javax.annotation.Nonnull; import baubles.api.BaubleType; +import baubles.api.BaublesApi; import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ActionResult; @@ -66,7 +66,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt toEquip.stackSize = 1; if(canEquip(toEquip, player)) { - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); + IInventory baubles = BaublesApi.getBaubles(player); for(int i = 0; i < baubles.getSizeInventory(); i++) { if(baubles.isItemValidForSlot(i, toEquip)) { ItemStack stackInSlot = baubles.getStackInSlot(i); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 222760af3..9e594ff8a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -15,7 +15,7 @@ import java.util.List; import com.google.common.base.Predicates; import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -54,7 +54,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble public void onEntityDamaged(LivingHurtEvent event) { if(event.getSource().getEntity() instanceof EntityPlayer && event.getEntityLiving() instanceof EntityLiving && !event.getEntityLiving().worldObj.isRemote && Math.random() < 0.6F) { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); - ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + ItemStack amulet = BaublesApi.getBaubles(player).getStackInSlot(0); if(amulet != null && amulet.getItem() == this) { final int cost = 250; if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 9cf266834..d40545712 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import org.lwjgl.opengl.GL11; import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; @@ -213,7 +213,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub public void updatePlayerFlyStatus(LivingUpdateEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - ItemStack tiara = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + ItemStack tiara = BaublesApi.getBaubles(player).getStackInSlot(0); int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME); if(playersWithFlight.contains(playerStr(player))) { @@ -311,7 +311,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } private boolean shouldPlayerHaveFlight(EntityPlayer player) { - ItemStack armor = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + ItemStack armor = BaublesApi.getBaubles(player).getStackInSlot(0); if(armor != null && armor.getItem() == this) { int left = ItemNBTHelper.getInt(armor, TAG_TIME_LEFT, MAX_FLY_TIME); boolean flying = ItemNBTHelper.getBoolean(armor, TAG_FLYING, false); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index 0c6ac8b96..40dad732a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -11,7 +11,7 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -44,7 +44,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { public void onPlayerDeath(LivingDeathEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + ItemStack amulet = BaublesApi.getBaubles(player).getStackInSlot(0); if(amulet != null && amulet.getItem() == this) { event.setCanceled(true); @@ -52,7 +52,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { player.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 300, 6)); player.addChatMessage(new TextComponentTranslation("botaniamisc.savedByLaurel")); player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.goldenLaurel, SoundCategory.PLAYERS, 1F, 0.3F); - PlayerHandler.getPlayerBaubles(player).setInventorySlotContents(0, null); + BaublesApi.getBaubles(player).setInventorySlotContents(0, null); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index d8a5296b9..0e06899e9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -11,14 +11,14 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; @@ -59,7 +59,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { public void onPlayerDamage(LivingHurtEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); + IInventory baubles = BaublesApi.getBaubles(player); ItemStack belt = baubles.getStackInSlot(3); if(belt != null && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) { ItemHolyCloak cloak = (ItemHolyCloak) belt.getItem(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index f2af40f00..6188fad3b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -15,9 +15,7 @@ import java.util.Arrays; import java.util.List; import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; +import baubles.api.BaublesApi; import gnu.trove.list.array.TIntArrayList; import gnu.trove.list.array.TLongArrayList; import net.minecraft.client.Minecraft; @@ -43,6 +41,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -117,7 +116,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { if(!blocksEqual) setBlockPositions(stack, currentBlocks); if(!entsEqual || !blocksEqual) - PacketHandler.INSTANCE.sendToAll(new PacketSyncBauble(player, 0)); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, 0); } private void scanForStack(ItemStack pstack, EntityPlayer player, TIntArrayList entIdBuilder, TLongArrayList blockPosBuilder) { @@ -146,7 +145,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } else if(e instanceof EntityPlayer) { EntityPlayer player_ = (EntityPlayer) e; IItemHandler playerInv = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); - IItemHandler binv = new InvWrapper(PlayerHandler.getPlayerBaubles(player_)); + IItemHandler binv = new InvWrapper(BaublesApi.getBaubles(player_)); if(scanInventory(binv, pstack) || scanInventory(playerInv, pstack)) entIdBuilder.add(player_.getEntityId()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 2282b5ba1..f65600b92 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -15,10 +15,10 @@ import java.util.List; import com.google.common.collect.ImmutableList; import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; +import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -59,7 +59,7 @@ public class ItemMagnetRing extends ItemBauble { @SubscribeEvent public void onTossItem(ItemTossEvent event) { - InventoryBaubles inv = PlayerHandler.getPlayerBaubles(event.getPlayer()); + IInventory inv = BaublesApi.getBaubles(event.getPlayer()); for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack != null && stack.getItem() instanceof ItemMagnetRing) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index a9c558ee3..91eb0b39c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -11,7 +11,7 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneComparator; import net.minecraft.block.BlockRedstoneRepeater; @@ -104,7 +104,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm public static boolean hasMonocle(EntityPlayer player) { for(int i = 0; i < 4; i++) { - ItemStack stack = PlayerHandler.getPlayerBaubles(player).getStackInSlot(i); + ItemStack stack = BaublesApi.getBaubles(player).getStackInSlot(i); if(stack != null) { Item item = stack.getItem(); if(item instanceof IBurstViewerBauble) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 9332fb126..0adf4c375 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; @@ -73,7 +73,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs EntityPlayer player = (EntityPlayer) event.getEntityLiving(); String s = playerStr(player); - ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); + ItemStack belt = BaublesApi.getBaubles(player).getStackInSlot(3); if(playersWithStepup.contains(s)) { if(shouldPlayerHaveStepup(player)) { ItemTravelBelt beltItem = (ItemTravelBelt) belt.getItem(); @@ -116,7 +116,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs public void onPlayerJump(LivingJumpEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); + ItemStack belt = BaublesApi.getBaubles(player).getStackInSlot(3); if(belt != null && belt.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(belt, player, COST, false)) { player.motionY += ((ItemTravelBelt) belt.getItem()).jump; @@ -126,7 +126,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs } private boolean shouldPlayerHaveStepup(EntityPlayer player) { - ItemStack armor = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); + ItemStack armor = BaublesApi.getBaubles(player).getStackInSlot(3); return armor != null && armor.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(armor, player, COST, false); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java index 8cc1e6c87..ed7330796 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java @@ -11,7 +11,7 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -37,7 +37,7 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { if(player.isInsideOfMaterial(Material.WATER)) { if(player instanceof EntityPlayer) { - ItemStack firstRing = PlayerHandler.getPlayerBaubles((EntityPlayer) player).getStackInSlot(1); + ItemStack firstRing = BaublesApi.getBaubles((EntityPlayer) player).getStackInSlot(1); if(firstRing != null && firstRing.getItem() instanceof ItemWaterRing && firstRing != stack) { return; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index d5c9f70b7..e155858f5 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -16,18 +16,15 @@ import java.util.List; import com.google.common.collect.ImmutableList; import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; +import baubles.api.BaublesApi; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Enchantments; +import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -40,6 +37,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.mana.IManaUsingItem; @@ -74,7 +72,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat return; int slot = -1; - InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); + IInventory inv = BaublesApi.getBaubles(player); for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack == lokiRing) { @@ -95,13 +93,11 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat if(originCoords.getY() == -1 && lookPos != null && lookPos.getBlockPos() != null) { setOriginPos(lokiRing, lookPos.getBlockPos()); setCursorList(lokiRing, null); - if(player instanceof EntityPlayerMP) - PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); } else if(lookPos != null && lookPos.getBlockPos() != null) { if(originCoords.equals(lookPos.getBlockPos())) { setOriginPos(lokiRing, new BlockPos(0, -1, 0)); - if(player instanceof EntityPlayerMP) - PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); } else { addCursor : { BlockPos relPos = lookPos.getBlockPos().add(new BlockPos(-originCoords.getX(), -originCoords.getY(), -originCoords.getZ())); @@ -110,14 +106,12 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat if(cursor.equals(relPos)) { cursors.remove(cursor); setCursorList(lokiRing, cursors); - if(player instanceof EntityPlayerMP) - PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); break addCursor; } addCursor(lokiRing, relPos); - if(player instanceof EntityPlayerMP) - PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); } } } @@ -197,7 +191,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } private static ItemStack getLokiRing(EntityPlayer player) { - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); + IInventory baubles = BaublesApi.getBaubles(player); ItemStack stack1 = baubles.getStackInSlot(1); ItemStack stack2 = baubles.getStackInSlot(2); return isLokiRing(stack1) ? stack1 : isLokiRing(stack2) ? stack2 : null; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 80241ead6..d58e40c23 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -17,12 +17,12 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; @@ -75,7 +75,7 @@ public class ItemOdinRing extends ItemRelicBauble { } public static ItemStack getOdinRing(EntityPlayer player) { - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); + IInventory baubles = BaublesApi.getBaubles(player); ItemStack stack1 = baubles.getStackInSlot(1); ItemStack stack2 = baubles.getStackInSlot(2); return isOdinRing(stack1) ? stack1 : isOdinRing(stack2) ? stack2 : null; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java index 2294378f1..a110a23f9 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java @@ -11,9 +11,9 @@ package vazkii.botania.common.item.relic; import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; +import baubles.api.BaublesApi; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -30,7 +30,7 @@ public class ItemThorRing extends ItemRelicBauble { } public static ItemStack getThorRing(EntityPlayer player) { - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); + IInventory baubles = BaublesApi.getBaubles(player); ItemStack stack1 = baubles.getStackInSlot(1); ItemStack stack2 = baubles.getStackInSlot(2); return isThorRing(stack1) ? stack1 : isThorRing(stack2) ? stack2 : null; diff --git a/src/main/resources/assets/botania/textures/gui/baubleBox.png b/src/main/resources/assets/botania/textures/gui/baubleBox.png index 74ca676033495eae059b658e5b7c130258902b3b..effa770e6b35f0702f90f5ef0b84ed8f4d017821 100644 GIT binary patch literal 16589 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