From 3773cfdcbe282872f001f69350f56857534a7da5 Mon Sep 17 00:00:00 2001 From: jss2a98aj Date: Wed, 3 Nov 2021 19:19:12 -0400 Subject: [PATCH] More work on the slot API --- .../api/expanded/BaubleExpandedSlots.java | 51 ++++++-- .../baubles/api/expanded/IBaubleExpanded.java | 2 - .../baubles/client/gui/GuiPlayerExpanded.java | 18 +-- .../container/ContainerPlayerExpanded.java | 123 ++++++++---------- .../common/container/InventoryBaubles.java | 20 +-- .../baubles/common/container/SlotBauble.java | 50 +++---- .../textures/gui/expanded_inventory.png | Bin 7696 -> 6456 bytes 7 files changed, 116 insertions(+), 148 deletions(-) diff --git a/src/main/java/baubles/api/expanded/BaubleExpandedSlots.java b/src/main/java/baubles/api/expanded/BaubleExpandedSlots.java index 75970fb..587abac 100644 --- a/src/main/java/baubles/api/expanded/BaubleExpandedSlots.java +++ b/src/main/java/baubles/api/expanded/BaubleExpandedSlots.java @@ -1,20 +1,33 @@ package baubles.api.expanded; +import baubles.api.BaubleType; + public class BaubleExpandedSlots { public static final int slotLimit = 20; private static String[] slots = new String[slotLimit]; private static int newSlotsRemaining = slotLimit; - + + public static final String ringType = "ring"; + public static final String amuletType = "amulet"; + public static final String beltType = "belt"; + static { - requestAddSlot("AMULET"); - requestAddSlot("RING"); - requestAddSlot("RING"); - requestAddSlot("BELT"); + tryAddSlot(amuletType); + tryAddSlot(ringType); + tryAddSlot(ringType); + tryAddSlot(beltType); + + tryAddSlot(ringType); + tryAddSlot(ringType); + tryAddSlot(ringType); + tryAddSlot(ringType); + tryAddSlot(ringType); + tryAddSlot(ringType); } - - public static boolean requestAddSlot(String type) { + + public static boolean tryAddSlot(String type) { //TODO: block after GUI init if(newSlotsRemaining >= 1) { slots[slotLimit - newSlotsRemaining] = type; @@ -25,7 +38,7 @@ public class BaubleExpandedSlots { return false; } - public static boolean requestRemoveSlot(String type) { + public static boolean tryRemoveSlot(String type) { //TODO: block after GUI init for(int slotToCheck = 0; slotToCheck < slotLimit; slotToCheck++) { if(slots[slotToCheck].equals(type)) { @@ -39,8 +52,8 @@ public class BaubleExpandedSlots { } return false; } - - public static int totalCurrentSlotsForType(String type) { + + public static int totalCurrentSlotsOfType(String type) { int total = 0; for(int slotToCheck = 0; slotToCheck < slotLimit; slotToCheck++) { if(slots[slotToCheck].equals(type)) { @@ -49,12 +62,12 @@ public class BaubleExpandedSlots { } return total; } - + public static int getTotalSlots() { return slotLimit - newSlotsRemaining; } - - public static String getTypeInSlot(int slot) { + + public static String getSlotType(int slot) { if (slot > 0 & slot < slotLimit) { return slots[slot]; } else { @@ -62,4 +75,16 @@ public class BaubleExpandedSlots { } } + public static String getTypeStringFromBaubleType(BaubleType type) { + switch(type) { + case RING: + return ringType; + case AMULET: + return amuletType; + case BELT: + return beltType; + } + return "unknown"; + } + } diff --git a/src/main/java/baubles/api/expanded/IBaubleExpanded.java b/src/main/java/baubles/api/expanded/IBaubleExpanded.java index 0c330d3..5437c94 100644 --- a/src/main/java/baubles/api/expanded/IBaubleExpanded.java +++ b/src/main/java/baubles/api/expanded/IBaubleExpanded.java @@ -3,9 +3,7 @@ package baubles.api.expanded; import baubles.api.IBauble; import net.minecraft.item.ItemStack; - /** - * * This interface should be extended by items that can be worn in bauble slots. * Supports multiple original and expanded slot types. * diff --git a/src/main/java/baubles/client/gui/GuiPlayerExpanded.java b/src/main/java/baubles/client/gui/GuiPlayerExpanded.java index dba459f..8293f3c 100644 --- a/src/main/java/baubles/client/gui/GuiPlayerExpanded.java +++ b/src/main/java/baubles/client/gui/GuiPlayerExpanded.java @@ -16,6 +16,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import baubles.api.expanded.BaubleExpandedSlots; import baubles.common.Baubles; import baubles.common.container.ContainerPlayerExpanded; @@ -56,15 +57,6 @@ public class GuiPlayerExpanded extends InventoryEffectRenderer { super.initGui(); } - /** - * Draw the foreground layer for the GuiContainer (everything in front of the items) - */ - /*@Override - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) - { - this.fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 104, 7, 4210752);//106 -> 104, 16 -> 7 - }*/ - /** * Draws the screen and all the components in it. */ @@ -80,12 +72,10 @@ public class GuiPlayerExpanded extends InventoryEffectRenderer { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); this.drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize); - - for (int i1 = 0; i1 < this.inventorySlots.inventorySlots.size(); ++i1) { + + for (int i1 = 4; i1 < BaubleExpandedSlots.getTotalSlots() + 4; ++i1) { Slot slot = (Slot)this.inventorySlots.inventorySlots.get(i1); - if (slot.getHasStack() && slot.getSlotStackLimit() == 1) { - this.drawTexturedModalRect(guiLeft + slot.xDisplayPosition, guiTop + slot.yDisplayPosition, 200, 0, 16, 16); - } + this.drawTexturedModalRect(guiLeft + slot.xDisplayPosition - 1, guiTop + slot.yDisplayPosition - 1, 200, 0, 18, 18); } drawPlayerModel(guiLeft + 51, guiTop + 75, 30, (float)(guiLeft + 51) - this.xSizeFloat, (float)(guiTop + 75 - 50) - this.ySizeFloat, this.mc.thePlayer); } diff --git a/src/main/java/baubles/common/container/ContainerPlayerExpanded.java b/src/main/java/baubles/common/container/ContainerPlayerExpanded.java index 7d81eb3..dd96262 100644 --- a/src/main/java/baubles/common/container/ContainerPlayerExpanded.java +++ b/src/main/java/baubles/common/container/ContainerPlayerExpanded.java @@ -12,13 +12,16 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.util.IIcon; import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.api.expanded.BaubleExpandedSlots; +import baubles.api.expanded.IBaubleExpanded; import baubles.common.lib.PlayerHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ContainerPlayerExpanded extends Container { - public IInventory craftResult = new InventoryCraftResult(); public InventoryBaubles baubles; private final EntityPlayer thePlayer; @@ -28,7 +31,7 @@ public class ContainerPlayerExpanded extends Container { baubles = new InventoryBaubles(player); baubles.setEventHandler(this); if (!player.worldObj.isRemote) { - baubles.stackList = PlayerHandler.getPlayerBaubles(player).stackList; + baubles.stackList = PlayerHandler.getPlayerBaubles(player).stackList; } int i; @@ -40,22 +43,28 @@ public class ContainerPlayerExpanded extends Container { this.addSlotToContainer(new Slot(playerInv, playerInv.getSizeInventory() - 1 - i, 8, 8 + i * 18) { @Override public int getSlotStackLimit() { return 1; } + @Override public boolean isItemValid(ItemStack itemStack) { if (itemStack == null) return false; return itemStack.getItem().isValidArmor(itemStack, k, thePlayer); } + + @SideOnly(Side.CLIENT) + public IIcon getBackgroundIconIndex() { + return ItemArmor.func_94602_b(k); + } }); } final int slotOffset = 18; final int slotStartX = 80; final int slotStartY = 8; - final int baubleSlots = BaubleExpandedSlots.getTotalSlots(); + final int totalBaubleSlots = BaubleExpandedSlots.getTotalSlots(); //bauble slots - for(i = 0; i < baubleSlots; i++) { - addSlotToContainer(new SlotBauble(baubles, BaubleExpandedSlots.getTypeInSlot(i), i, slotStartX + (slotOffset * (i / 4)), slotStartY + (slotOffset * (i % 4)))); + for(i = 0; i < totalBaubleSlots; i++) { + addSlotToContainer(new SlotBauble(baubles, BaubleExpandedSlots.getSlotType(i), i, slotStartX + (slotOffset * (i / 4)), slotStartY + (slotOffset * (i % 4)))); } //inventory slots @@ -84,65 +93,44 @@ public class ContainerPlayerExpanded extends Container { public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { ItemStack itemstack = null; Slot slot = (Slot)inventorySlots.get(slotIndex); - final int baubleSlots = BaubleExpandedSlots.getTotalSlots(); + final int totalBaubleSlots = BaubleExpandedSlots.getTotalSlots(); if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); Item item = itemstack.getItem(); - if (slotIndex >= 5 && slotIndex < 4) { - if (!this.mergeItemStack(itemstack1, 4 + baubleSlots, 40 + baubleSlots, false)) { - return null; - } - } else if (item instanceof ItemArmor && !((Slot)inventorySlots.get(((ItemArmor)item).armorType)).getHasStack()) { + if (item instanceof ItemArmor && !((Slot)inventorySlots.get(((ItemArmor)item).armorType)).getHasStack()) { int j = ((ItemArmor)item).armorType; - if (!this.mergeItemStack(itemstack1, j, j + 1, false)) { + if (!mergeItemStack(itemstack1, j, j + 1, false)) { return null; } - //TODO: rewrite bauble shift clicking - } else if (item instanceof IBauble && - ((IBauble)item).getBaubleType(itemstack)==BaubleType.AMULET && - ((IBauble)item).canEquip(itemstack, thePlayer) && - !((Slot)this.inventorySlots.get(4)).getHasStack()) - { - int j = 4; - if (!this.mergeItemStack(itemstack1, j, j + 1, false)) { + } else if (slotIndex >= 4 + totalBaubleSlots && item instanceof IBauble && ((IBauble)item).canEquip(itemstack, thePlayer)) { + for(int baubleSlot = 4; baubleSlot < 4 + totalBaubleSlots; baubleSlot++) { + if(!((Slot)inventorySlots.get(baubleSlot)).getHasStack()) { + String[] types; + if(item instanceof IBaubleExpanded) { + types = ((IBaubleExpanded)item).getBaubleTypes(itemstack); + } else { + BaubleType legacyType = ((IBauble)item).getBaubleType(itemstack); + types = new String[] {BaubleExpandedSlots.getTypeStringFromBaubleType(legacyType)}; + } + for(String type : types) { + if(type.equals(BaubleExpandedSlots.getSlotType(baubleSlot - 4)) && !mergeItemStack(itemstack1, baubleSlot, baubleSlot + 1, false)) { + return null; + } + } + } + } + } else if (slotIndex >= 4 + totalBaubleSlots && slotIndex < 31 + totalBaubleSlots) { + if (!mergeItemStack(itemstack1, 31 + totalBaubleSlots, 40 + totalBaubleSlots, false)) { return null; } - } else if (slotIndex>11 && item instanceof IBauble && - ((IBauble)item).getBaubleType(itemstack)==BaubleType.RING && - ((IBauble)item).canEquip(itemstack, thePlayer) && - !((Slot)this.inventorySlots.get(5)).getHasStack()) { - int j = 5; - if (!this.mergeItemStack(itemstack1, j, j + 1, false)) { + } else if (slotIndex >= 31 + totalBaubleSlots && slotIndex < 40 + totalBaubleSlots) { + if (!mergeItemStack(itemstack1, 4 + totalBaubleSlots, 31 + totalBaubleSlots, false)) { return null; } - } else if (slotIndex>11 && item instanceof IBauble && - ((IBauble)item).getBaubleType(itemstack)==BaubleType.RING && - ((IBauble)item).canEquip(itemstack, thePlayer) && - !((Slot)this.inventorySlots.get(6)).getHasStack()) { - int j = 6; - if (!this.mergeItemStack(itemstack1, j, j + 1, false)) { - return null; - } - } else if (item instanceof IBauble && - ((IBauble)item).getBaubleType(itemstack)==BaubleType.BELT && - ((IBauble)item).canEquip(itemstack, thePlayer) && - !((Slot)this.inventorySlots.get(7)).getHasStack()) { - int j = 7; - if (!this.mergeItemStack(itemstack1, j, j + 1, false)) { - return null; - } - } else if (slotIndex >= 4 + baubleSlots && slotIndex < 31 + baubleSlots) { - if (!this.mergeItemStack(itemstack1, 31 + baubleSlots, 40 + baubleSlots, false)) { - return null; - } - } else if (slotIndex >= 31 + baubleSlots && slotIndex < 40 + baubleSlots) { - if (!this.mergeItemStack(itemstack1, 4 + baubleSlots, 31 + baubleSlots, false)) { - return null; - } - } else if (!this.mergeItemStack(itemstack1, 4 + baubleSlots, 40 + baubleSlots, false, slot)) { + } else if (!mergeItemStack(itemstack1, 4 + totalBaubleSlots, 40 + totalBaubleSlots, false, slot)) { return null; } @@ -163,18 +151,18 @@ public class ContainerPlayerExpanded extends Container { } private void unequipBauble(ItemStack stack) { -// if (stack.getItem() instanceof IBauble) { -// ((IBauble)stack.getItem()).onUnequipped(stack, thePlayer); -// } +// if (stack.getItem() instanceof IBauble) { +// ((IBauble)stack.getItem()).onUnequipped(stack, thePlayer); +// } } @Override - public void putStacksInSlots(ItemStack[] p_75131_1_) { - baubles.blockEvents=true; - super.putStacksInSlots(p_75131_1_); - } + public void putStacksInSlots(ItemStack[] p_75131_1_) { + baubles.blockEvents=true; + super.putStacksInSlots(p_75131_1_); + } - protected boolean mergeItemStack(ItemStack itemStack, int par2, int par3, boolean par4, Slot ss) { + protected boolean mergeItemStack(ItemStack itemStack, int par2, int par3, boolean par4, Slot ss) { boolean flag1 = false; int k = par2; @@ -187,19 +175,19 @@ public class ContainerPlayerExpanded extends Container { if (itemStack.isStackable()) { while (itemStack.stackSize > 0 && (!par4 && k < par3 || par4 && k >= par2)) { - slot = (Slot)this.inventorySlots.get(k); + slot = (Slot)inventorySlots.get(k); itemstack1 = slot.getStack(); if (itemstack1 != null && itemstack1.getItem() == itemStack.getItem() && (!itemStack.getHasSubtypes() || itemStack.getItemDamage() == itemstack1.getItemDamage()) && ItemStack.areItemStackTagsEqual(itemStack, itemstack1)) { int l = itemstack1.stackSize + itemStack.stackSize; if (l <= itemStack.getMaxStackSize()) { - if (ss instanceof SlotBauble) unequipBauble(itemStack); - itemStack.stackSize = 0; + if (ss instanceof SlotBauble) unequipBauble(itemStack); + itemStack.stackSize = 0; itemstack1.stackSize = l; slot.onSlotChanged(); flag1 = true; } else if (itemstack1.stackSize < itemStack.getMaxStackSize()) { - if (ss instanceof SlotBauble) unequipBauble(itemStack); + if (ss instanceof SlotBauble) unequipBauble(itemStack); itemStack.stackSize -= itemStack.getMaxStackSize() - itemstack1.stackSize; itemstack1.stackSize = itemStack.getMaxStackSize(); slot.onSlotChanged(); @@ -223,11 +211,11 @@ public class ContainerPlayerExpanded extends Container { } while (!par4 && k < par3 || par4 && k >= par2) { - slot = (Slot)this.inventorySlots.get(k); + slot = (Slot)inventorySlots.get(k); itemstack1 = slot.getStack(); if (itemstack1 == null) { - if (ss instanceof SlotBauble) unequipBauble(itemStack); + if (ss instanceof SlotBauble) unequipBauble(itemStack); slot.putStack(itemStack.copy()); slot.onSlotChanged(); itemStack.stackSize = 0; @@ -245,9 +233,4 @@ public class ContainerPlayerExpanded extends Container { return flag1; } - @Override - public boolean func_94530_a(ItemStack itemStack, Slot slot) { - return slot.inventory != this.craftResult && super.func_94530_a(itemStack, slot); - } - } diff --git a/src/main/java/baubles/common/container/InventoryBaubles.java b/src/main/java/baubles/common/container/InventoryBaubles.java index bd2b12b..79eb6cd 100644 --- a/src/main/java/baubles/common/container/InventoryBaubles.java +++ b/src/main/java/baubles/common/container/InventoryBaubles.java @@ -138,7 +138,7 @@ public class InventoryBaubles implements IInventory { @Override public void setInventorySlotContents(int slot, ItemStack stack) { if(!blockEvents && this.stackList[slot] != null) { - ((IBauble)stackList[slot].getItem()).onUnequipped(stackList[slot], player.get()); + ((IBauble)stackList[slot].getItem()).onUnequipped(stackList[slot], player.get()); } this.stackList[slot] = stack; if (!blockEvents && stack != null && stack.getItem() instanceof IBauble) { @@ -195,7 +195,7 @@ public class InventoryBaubles implements IInventory { */ @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { - String slotType = BaubleExpandedSlots.getTypeInSlot(slot); + String slotType = BaubleExpandedSlots.getSlotType(slot); if (stack == null || slotType == null) { return false; } @@ -210,21 +210,7 @@ public class InventoryBaubles implements IInventory { types = ((IBaubleExpanded)item).getBaubleTypes(stack); } else { BaubleType legacyType = ((IBauble)item).getBaubleType(stack); - String type; - switch(legacyType) { - case RING: - type = "RING"; - break; - case AMULET: - type = "AMULET"; - break; - case BELT: - type = "BELT"; - break; - default: - type = "UNKNOWN"; - } - types = new String[] {type}; + types = new String[] {BaubleExpandedSlots.getTypeStringFromBaubleType(legacyType)}; } for(String type : types) { diff --git a/src/main/java/baubles/common/container/SlotBauble.java b/src/main/java/baubles/common/container/SlotBauble.java index 7af0b63..65023db 100644 --- a/src/main/java/baubles/common/container/SlotBauble.java +++ b/src/main/java/baubles/common/container/SlotBauble.java @@ -4,36 +4,30 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import baubles.api.BaubleType; import baubles.api.IBauble; +import baubles.api.expanded.BaubleExpandedSlots; import baubles.api.expanded.IBaubleExpanded; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class SlotBauble extends Slot { - String slotType; + private final String slotType; @Deprecated public SlotBauble(IInventory inventory, BaubleType legacyType, int slot, int x, int y) { super(inventory, slot, x, y); - switch(legacyType) { - case RING: - slotType = "RING"; - break; - case AMULET: - slotType = "AMULET"; - break; - case BELT: - slotType = "BELT"; - break; - default: - slotType = "UNKNOWN"; - } + slotType = BaubleExpandedSlots.getTypeStringFromBaubleType(legacyType); + } public SlotBauble(IInventory inventory, String type, int slot, int x, int y) { super(inventory, slot, x, y); - this.slotType = type; + slotType = type; } /** @@ -46,7 +40,7 @@ public class SlotBauble extends Slot { } Item item = stack.getItem(); - if(!(item instanceof IBauble) || !((IBauble) item).canEquip(stack, ((InventoryBaubles)inventory).player.get())) { + if(!(item instanceof IBauble) || !((IBauble)item).canEquip(stack, ((InventoryBaubles)inventory).player.get())) { return false; } @@ -55,21 +49,7 @@ public class SlotBauble extends Slot { types = ((IBaubleExpanded)item).getBaubleTypes(stack); } else { BaubleType legacyType = ((IBauble)item).getBaubleType(stack); - String type; - switch(legacyType) { - case RING: - type = "RING"; - break; - case AMULET: - type = "AMULET"; - break; - case BELT: - type = "BELT"; - break; - default: - type = "UNKNOWN"; - } - types = new String[] {type}; + types = new String[] {BaubleExpandedSlots.getTypeStringFromBaubleType(legacyType)}; } for(String type : types) { @@ -83,12 +63,18 @@ public class SlotBauble extends Slot { @Override public boolean canTakeStack(EntityPlayer player) { - return this.getStack()!=null && ((IBauble)this.getStack().getItem()).canUnequip(this.getStack(), player); + ItemStack itemStack = getStack(); + return itemStack != null && ((IBauble)itemStack.getItem()).canUnequip(itemStack, player); } @Override public int getSlotStackLimit() { return 1; } + + /*@SideOnly(Side.CLIENT) + public IIcon getBackgroundIconIndex() { + return null; + }*/ } diff --git a/src/main/resources/assets/baubles/textures/gui/expanded_inventory.png b/src/main/resources/assets/baubles/textures/gui/expanded_inventory.png index a00dbd1963532739931e9958000be2ad18267b06..1e127703136018a7572e25c0f5ab4e20821e27db 100644 GIT binary patch literal 6456 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 U;3kFz{U1J56f~iga+dG@1EvMUIsgCw literal 7696 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≪B`N~AxB6P ze~%oX1nv*;J@9lf6h6M(RKL`{bv>-%rFdkc>nHO001b;6X|~yY1C6AIMilP_REpmh zKJI=^(a1ryE?0ZpYw+`OYOYUIya_x^jOq#gdS4@_eJ3m>}wh4(`O@FkCLJaaKI2IDE?yK;9;($ zZAK<}TV31r7FyP?9F91zRtsyS71p?)o6&y#g)D0Bx6LIiOmXNUP*_yNGH3ts z;AtHLzyZ{F-~>Mj{id@)PACrM-Pd<*ICfx70_c{s$dEZdFI;)!|aZOb_J*;1`b6t*gPU@$~aC-=KKwrKl^Ic*`*xS+oG5dmY6b z5KYtoEYk*WZkqL{MP|8xUA@5Y{nr8u?=o0)gUJw_iGg`ok;9c*+_^VG&WP8`V(oa}r@xOiUbkn&zar+3v?5-?sO4+z{n?w?^?2v{PrU>H8nLQD=Qk4l(&C4o}sPkO6zLw8)Ufl z=3(s5>G?%Xs51xjYDTk4O{@j68_4d0@n5LiRz1|!)!FaOmb~@2upkq3vk62)G{U9xT?- zvKw@gF(_tyr=f8<{z*?!o)fKwx^4#)352QSV zlXDRl78YhRp2kz-eSfuBYbuu^;w!9Psryo+Qa7wG1lu*~{;SOc@2HQ5NY>h=$0v@z z#HZpczb5XDuaePEMep_-u3rF*T40-%Mz)nEm;pCQlxCximTt2hbu`(#X`zz%tt_)7 z?^9)o*SK5`=3XM_&Vn}&u;7db1mLs%tEorrs_REjxNqlm;u~PQHS;$wku%tzx~obT z#JP|)uTL~01I;13z)r*h2>kCpLPBLxyE*Br!$r@pW5PvQ36u~50Kf)>Vz+tNIkD?o zwcr4=fp_ly z6~UAD`bWmn57aeK?s@aiVVsu{Fv@-@q!n`U@Tj#+JgcphqoEnC^$ky9mKS@;ojx8K zYSEyb$rZ^4Q2qN09IHB}UjJ`P+Eoq@uqx_2EKX~e08QN@Z~Z7iDt{?yi z&pzS@JiE|;i2pIP|AD}O-gCY<7h3j@p)BZKhEN91&!nlJ(St~C40;O