From 35ad4f6a13136147d7c77415b14ffecd126cd5ec Mon Sep 17 00:00:00 2001 From: mozipi Date: Fri, 4 Jan 2013 19:42:08 +0900 Subject: [PATCH] =?utf8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88=E3=81=9A?= =?utf8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- common/chemicraft/ChemiCraft.java | 46 ++++----- ...positionTable.java => BlockPyrolysisTable.java} | 10 +- ...tionTable.java => ContainerPyrolysisTable.java} | 8 +- ...ompositionTable.java => GuiPyrolysisTable.java} | 12 +-- .../inventory/InventoryPyrolysisTableFuel.java | 112 +++++++++++++++++++++ ...l.java => InventoryPyrolysisTableMaterial.java} | 4 +- ...ult.java => InventoryPyrolysisTableResult.java} | 4 +- common/chemicraft/slot/SlotPyrolysisTableFuel.java | 12 +++ ...terial.java => SlotPyrolysisTableMaterial.java} | 4 +- ...leResult.java => SlotPyrolysisTableResult.java} | 4 +- common/chemicraft/system/CommonProxy.java | 8 +- common/chemicraft/system/PacketHandler.java | 8 +- .../TileEntityChemicalCombinationTable.java | 1 + ...ionTable.java => TileEntityPyrolysisTable.java} | 17 ++-- resources/chemicraft/guis/ChemicalCombination.png | Bin 4148 -> 3445 bytes resources/chemicraft/guis/Decomposition.png | Bin 8495 -> 0 bytes resources/chemicraft/guis/Pyrolysis.png | Bin 0 -> 3445 bytes src/chemicraft/client/ClientProxy.java | 10 +- 18 files changed, 194 insertions(+), 66 deletions(-) rename common/chemicraft/block/{BlockDecompositionTable.java => BlockPyrolysisTable.java} (76%) rename common/chemicraft/container/{ContainerDecompositionTable.java => ContainerPyrolysisTable.java} (57%) rename common/chemicraft/gui/{GuiDecompositionTable.java => GuiPyrolysisTable.java} (51%) create mode 100644 common/chemicraft/inventory/InventoryPyrolysisTableFuel.java rename common/chemicraft/inventory/{InventoryDecompositionTableMaterial.java => InventoryPyrolysisTableMaterial.java} (94%) rename common/chemicraft/inventory/{InventoryDecompositionTableResult.java => InventoryPyrolysisTableResult.java} (94%) create mode 100644 common/chemicraft/slot/SlotPyrolysisTableFuel.java rename common/chemicraft/slot/{SlotDecompositionTableMaterial.java => SlotPyrolysisTableMaterial.java} (50%) rename common/chemicraft/slot/{SlotDecompositionTableResult.java => SlotPyrolysisTableResult.java} (64%) rename common/chemicraft/tileentity/{TileEntityDecompositionTable.java => TileEntityPyrolysisTable.java} (55%) delete mode 100644 resources/chemicraft/guis/Decomposition.png create mode 100644 resources/chemicraft/guis/Pyrolysis.png diff --git a/common/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java index 471e34d..06bbe9a 100644 --- a/common/chemicraft/ChemiCraft.java +++ b/common/chemicraft/ChemiCraft.java @@ -1,5 +1,7 @@ package chemicraft; +import ic2.api.energy.event.EnergyTileEvent; +import ic2.api.energy.event.EnergyTileLoadEvent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -9,7 +11,7 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Property; import chemicraft.block.BlockChemicalCombinationTable; import chemicraft.block.BlockChemicalCraftingTable; -import chemicraft.block.BlockDecompositionTable; +import chemicraft.block.BlockPyrolysisTable; import chemicraft.block.BlockToolAndWeaponCraftingTable; import chemicraft.compounds.CompoundWater; import chemicraft.debug.CommandDeleteItem; @@ -23,7 +25,7 @@ import chemicraft.system.CommonProxy; import chemicraft.system.PacketHandler; import chemicraft.tileentity.TileEntityChemicalCombinationTable; import chemicraft.tileentity.TileEntityChemicalCraftingTable; -import chemicraft.tileentity.TileEntityDecompositionTable; +import chemicraft.tileentity.TileEntityPyrolysisTable; import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; import chemicraft.util.Auxiliary; import chemicraft.util.Auxiliary.ArrayAuxiliary; @@ -45,9 +47,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * */ @Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta") -// ID,名前,バージョン -@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.3.2", channels = "chemicraft", packetHandler = PacketHandler.class) -// クライアント、サーバー共に必要 1.3.2用 +@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class) public class ChemiCraft { public static final String[] ATOMSNAME = { @@ -96,7 +96,7 @@ public class ChemiCraft { /** * BlockID. */ - public int decompositionTableID; + public int pyrolysisTableID; public int chemicalConbinationTableID; public int toolAndWeaponCraftingTableID; public int chemicalCraftingTableID; @@ -104,7 +104,7 @@ public class ChemiCraft { /** * GUIID. */ - public int guiDecompositionTableID; + public int guiPyrolysisTableID; public int guiChemicalCombinationTableID; public int guiToolAndWeaponCraftingTableID; public int guiChemicalCraftingTableID; @@ -112,7 +112,7 @@ public class ChemiCraft { /** * Block型変数. */ - public Block blockDecompositionTable; + public Block blockPyrolysisTable; public Block blockChemicalCombinationTable; public Block blockToolAndWeaponCraftingTable; public Block blockChemicalCraftingTable; @@ -131,8 +131,8 @@ public class ChemiCraft { public String itemAtomsTexture = "/chemicraft/items/Atoms.png"; public String itemCompoundsTexture = "/chemicraft/items/Compounds.png"; public String itemTexture = "/chemicraft/items/items.png"; - public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/CCTable.png"; - public String guiDecompositionTexture = "/chemicraft/guis/Decomposition.png"; + public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/cctable.png"; + public String guiPyrolysisTexture = "/chemicraft/guis/Pyrolysis.png"; public String guiChemicalCombinationTexture = "/chemicraft/guis/ChemicalCombination.png"; public String guiToolAndWeaponCraftingTexture = "/chemicraft/guis/ToolAndWeaponCrafting.png"; public String guiChemicalCraftingTexture = "/chemicraft/guis/MaterialCrafting.png"; @@ -152,7 +152,7 @@ public class ChemiCraft { Configuration cfg = new Configuration(event.getSuggestedConfigurationFile()); cfg.load(); - Property decompositionTableIDProp = cfg.getBlock("DecompositionTable", 2400); + Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400); Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401); Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402); Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403); @@ -162,13 +162,13 @@ public class ChemiCraft { Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002); Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003); - Property guiDecompositionTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1000); + Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000); Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001); Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002); Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003); - this.decompositionTableID = decompositionTableIDProp.getInt(); + this.pyrolysisTableID = pyrolysisTableIDProp.getInt(); this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt(); this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt(); this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt(); @@ -176,7 +176,7 @@ public class ChemiCraft { this.compoundsID = compoundsIDProp.getInt(); this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt(); this.atomGrenadeID = atomGrenadeIDProp.getInt(); - this.guiDecompositionTableID = guiDecompositionTableIDProp.getInt(); + this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt(); this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt(); this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt(); this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt(); @@ -201,11 +201,11 @@ public class ChemiCraft { private void settingProcessing(final FMLPostInitializationEvent event) { // Blockを追加します - this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground). + this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground). setHardness(2.0F). setResistance(0.0F). setStepSound(Block.soundStoneFootstep). - setBlockName("DecompositionTable"); + setBlockName("PyrolysisTable"); this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground). setHardness(2.0F). setResistance(0.0F). @@ -229,14 +229,14 @@ public class ChemiCraft { this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1); // BlockをMinecraftに登録します - GameRegistry.registerBlock(this.blockDecompositionTable, "BlockDecompositionTable"); + GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable"); GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable"); GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable"); GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable"); // Blockの名前を設定します - this.nameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable"); - this.nameAuxiliary.addName(this.blockDecompositionTable, "ja_JP", "分解台"); + this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable"); + this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台"); this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable"); this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台"); this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable"); @@ -253,7 +253,7 @@ public class ChemiCraft { this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾"); // TileEntityを追加します - GameRegistry.registerTileEntity(TileEntityDecompositionTable.class, "DecompositionTable"); + GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable"); GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable"); GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable"); GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable"); @@ -265,13 +265,13 @@ public class ChemiCraft { proxy.registerRenderInformation(); //化学作業台類のレシピを追加します - GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable), + GameRegistry.addRecipe(new ItemStack(this.blockPyrolysisTable), new Object[]{ "XYX", "ZAZ", "ZZZ", Character.valueOf('X'), new ItemStack(Item.ingotIron), Character.valueOf('Y'), new ItemStack(Block.workbench), Character.valueOf('Z'), new ItemStack(Block.stone), - Character.valueOf('A'), new ItemStack(Block.tnt), + Character.valueOf('A'), new ItemStack(Item.bucketLava), }); GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable), new Object[]{ @@ -340,4 +340,4 @@ public class ChemiCraft { private void debug(final FMLPostInitializationEvent event) { } -} \ No newline at end of file +} diff --git a/common/chemicraft/block/BlockDecompositionTable.java b/common/chemicraft/block/BlockPyrolysisTable.java similarity index 76% rename from common/chemicraft/block/BlockDecompositionTable.java rename to common/chemicraft/block/BlockPyrolysisTable.java index d04afa8..686d29f 100644 --- a/common/chemicraft/block/BlockDecompositionTable.java +++ b/common/chemicraft/block/BlockPyrolysisTable.java @@ -6,18 +6,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import chemicraft.ChemiCraft; -import chemicraft.tileentity.TileEntityDecompositionTable; +import chemicraft.tileentity.TileEntityPyrolysisTable; -public class BlockDecompositionTable extends BlockContainer { +public class BlockPyrolysisTable extends BlockContainer { - public BlockDecompositionTable(int par1, int par2, Material par3Material) { + public BlockPyrolysisTable(int par1, int par2, Material par3Material) { super(par1, par2, par3Material); this.setCreativeTab(ChemiCraft.creativeTab); } @Override public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9){ - par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiDecompositionTableID, par1World, par2, par3, par4); + par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiPyrolysisTableID, par1World, par2, par3, par4); return true; } @@ -44,7 +44,7 @@ public class BlockDecompositionTable extends BlockContainer { @Override public TileEntity createNewTileEntity(World var1) { - return new TileEntityDecompositionTable(); + return new TileEntityPyrolysisTable(); } } diff --git a/common/chemicraft/container/ContainerDecompositionTable.java b/common/chemicraft/container/ContainerPyrolysisTable.java similarity index 57% rename from common/chemicraft/container/ContainerDecompositionTable.java rename to common/chemicraft/container/ContainerPyrolysisTable.java index b46340d..15b55d2 100644 --- a/common/chemicraft/container/ContainerDecompositionTable.java +++ b/common/chemicraft/container/ContainerPyrolysisTable.java @@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.world.World; import chemicraft.ChemiCraft; -import chemicraft.tileentity.TileEntityDecompositionTable; +import chemicraft.tileentity.TileEntityPyrolysisTable; -public class ContainerDecompositionTable extends Container { +public class ContainerPyrolysisTable extends Container { private World worldObj; @@ -14,7 +14,7 @@ public class ContainerDecompositionTable extends Container { private int posY; private int posZ; - public ContainerDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2){ + public ContainerPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2){ super(); this.worldObj = par2.worldObj; this.posX = par2.xCoord; @@ -24,7 +24,7 @@ public class ContainerDecompositionTable extends Container { @Override public boolean canInteractWith(EntityPlayer par1EntityPlayer) { - return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.decompositionTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D; + return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.pyrolysisTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D; } } diff --git a/common/chemicraft/gui/GuiDecompositionTable.java b/common/chemicraft/gui/GuiPyrolysisTable.java similarity index 51% rename from common/chemicraft/gui/GuiDecompositionTable.java rename to common/chemicraft/gui/GuiPyrolysisTable.java index 1bef9c4..f4037fe 100644 --- a/common/chemicraft/gui/GuiDecompositionTable.java +++ b/common/chemicraft/gui/GuiPyrolysisTable.java @@ -3,18 +3,18 @@ package chemicraft.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import chemicraft.ChemiCraft; -import chemicraft.container.ContainerDecompositionTable; -import chemicraft.tileentity.TileEntityDecompositionTable; +import chemicraft.container.ContainerPyrolysisTable; +import chemicraft.tileentity.TileEntityPyrolysisTable; -public class GuiDecompositionTable extends GuiContainer{ +public class GuiPyrolysisTable extends GuiContainer{ - public GuiDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2) { - super(new ContainerDecompositionTable(par1EntityPlayer, par2)); + public GuiPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2) { + super(new ContainerPyrolysisTable(par1EntityPlayer, par2)); } @Override protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { - this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiDecompositionTexture)); + this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiPyrolysisTexture)); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); } diff --git a/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java b/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java new file mode 100644 index 0000000..1f4c5be --- /dev/null +++ b/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java @@ -0,0 +1,112 @@ +package chemicraft.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +public class InventoryPyrolysisTableFuel implements IInventory { + + private ItemStack[] inventory = new ItemStack[1]; + private Container eventHandler; + + public void setEventHandler(Container par1){ + this.eventHandler = par1; + } + + @Override + public int getSizeInventory() { + return this.inventory.length; + } + + @Override + public ItemStack getStackInSlot(int var1) { + return this.inventory[var1]; + } + + @Override + public ItemStack decrStackSize(int var1, int var2) { + if (this.inventory[var1] != null) + { + ItemStack var3; + + if (this.inventory[var1].stackSize <= var2) + { + var3 = this.inventory[var1]; + this.inventory[var1] = null; + this.onInventoryChanged(); + return var3; + } + else + { + var3 = this.inventory[var1].splitStack(var2); + + if (this.inventory[var1].stackSize == 0) + { + this.inventory[var1] = null; + } + + this.onInventoryChanged(); + return var3; + } + } + else + { + return null; + } + } + + @Override + public ItemStack getStackInSlotOnClosing(int var1) { + if (this.inventory[var1] != null) + { + ItemStack var2 = this.inventory[var1]; + this.inventory[var1] = null; + return var2; + } + else + { + return null; + } + } + + @Override + public void setInventorySlotContents(int var1, ItemStack var2) { + this.inventory[var1] = var2; + + if (var2 != null && var2.stackSize > this.getInventoryStackLimit()) + { + var2.stackSize = this.getInventoryStackLimit(); + } + + this.onInventoryChanged(); + } + + @Override + public String getInvName() { + return "PyrolysisTableFuel"; + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public void onInventoryChanged() { + if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this); + } + + @Override + public boolean isUseableByPlayer(EntityPlayer var1) { + return true; + } + + @Override + public void openChest() { + } + + @Override + public void closeChest() { + } +} diff --git a/common/chemicraft/inventory/InventoryDecompositionTableMaterial.java b/common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java similarity index 94% rename from common/chemicraft/inventory/InventoryDecompositionTableMaterial.java rename to common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java index 9326cb6..7e7b232 100644 --- a/common/chemicraft/inventory/InventoryDecompositionTableMaterial.java +++ b/common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -public class InventoryDecompositionTableMaterial implements IInventory { +public class InventoryPyrolysisTableMaterial implements IInventory { private ItemStack[] inventory = new ItemStack[16]; private Container eventHandler; @@ -84,7 +84,7 @@ public class InventoryDecompositionTableMaterial implements IInventory { @Override public String getInvName() { - return "DecompositionTableMaterial"; + return "PyrolysisTableMaterial"; } @Override diff --git a/common/chemicraft/inventory/InventoryDecompositionTableResult.java b/common/chemicraft/inventory/InventoryPyrolysisTableResult.java similarity index 94% rename from common/chemicraft/inventory/InventoryDecompositionTableResult.java rename to common/chemicraft/inventory/InventoryPyrolysisTableResult.java index 05bd099..f8ca9fd 100644 --- a/common/chemicraft/inventory/InventoryDecompositionTableResult.java +++ b/common/chemicraft/inventory/InventoryPyrolysisTableResult.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -public class InventoryDecompositionTableResult implements IInventory { +public class InventoryPyrolysisTableResult implements IInventory { private ItemStack[] inventory = new ItemStack[16]; private Container eventHandler; @@ -84,7 +84,7 @@ public class InventoryDecompositionTableResult implements IInventory { @Override public String getInvName() { - return "DecompositionTableResult"; + return "PyrolysisTableResult"; } @Override diff --git a/common/chemicraft/slot/SlotPyrolysisTableFuel.java b/common/chemicraft/slot/SlotPyrolysisTableFuel.java new file mode 100644 index 0000000..a2ab846 --- /dev/null +++ b/common/chemicraft/slot/SlotPyrolysisTableFuel.java @@ -0,0 +1,12 @@ +package chemicraft.slot; + +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; + +public class SlotPyrolysisTableFuel extends Slot { + + public SlotPyrolysisTableFuel(IInventory par1IInventory, int par2, int par3, int par4) { + super(par1IInventory, par2, par3, par4); + } + +} diff --git a/common/chemicraft/slot/SlotDecompositionTableMaterial.java b/common/chemicraft/slot/SlotPyrolysisTableMaterial.java similarity index 50% rename from common/chemicraft/slot/SlotDecompositionTableMaterial.java rename to common/chemicraft/slot/SlotPyrolysisTableMaterial.java index 4925d0d..0d9ae9a 100644 --- a/common/chemicraft/slot/SlotDecompositionTableMaterial.java +++ b/common/chemicraft/slot/SlotPyrolysisTableMaterial.java @@ -3,9 +3,9 @@ package chemicraft.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -public class SlotDecompositionTableMaterial extends Slot { +public class SlotPyrolysisTableMaterial extends Slot { - public SlotDecompositionTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) { + public SlotPyrolysisTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) { super(par1iInventory, par2, par3, par4); } diff --git a/common/chemicraft/slot/SlotDecompositionTableResult.java b/common/chemicraft/slot/SlotPyrolysisTableResult.java similarity index 64% rename from common/chemicraft/slot/SlotDecompositionTableResult.java rename to common/chemicraft/slot/SlotPyrolysisTableResult.java index 1200f4b..29412ea 100644 --- a/common/chemicraft/slot/SlotDecompositionTableResult.java +++ b/common/chemicraft/slot/SlotPyrolysisTableResult.java @@ -4,9 +4,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotDecompositionTableResult extends Slot { +public class SlotPyrolysisTableResult extends Slot { - public SlotDecompositionTableResult(IInventory par1iInventory, int par2, int par3, int par4) { + public SlotPyrolysisTableResult(IInventory par1iInventory, int par2, int par3, int par4) { super(par1iInventory, par2, par3, par4); } diff --git a/common/chemicraft/system/CommonProxy.java b/common/chemicraft/system/CommonProxy.java index a2b686b..98753f2 100644 --- a/common/chemicraft/system/CommonProxy.java +++ b/common/chemicraft/system/CommonProxy.java @@ -5,11 +5,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import chemicraft.container.ContainerChemicalCombinationTable; import chemicraft.container.ContainerChemicalCraftingTable; -import chemicraft.container.ContainerDecompositionTable; +import chemicraft.container.ContainerPyrolysisTable; import chemicraft.container.ContainerToolAndWeaponCraftingTable; import chemicraft.tileentity.TileEntityChemicalCombinationTable; import chemicraft.tileentity.TileEntityChemicalCraftingTable; -import chemicraft.tileentity.TileEntityDecompositionTable; +import chemicraft.tileentity.TileEntityPyrolysisTable; import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; import cpw.mods.fml.common.network.IGuiHandler; @@ -29,8 +29,8 @@ public class CommonProxy implements IGuiHandler { return null; TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - if (tileEntity instanceof TileEntityDecompositionTable) { - return new ContainerDecompositionTable(player, (TileEntityDecompositionTable) tileEntity); + if (tileEntity instanceof TileEntityPyrolysisTable) { + return new ContainerPyrolysisTable(player, (TileEntityPyrolysisTable) tileEntity); }else if(tileEntity instanceof TileEntityChemicalCombinationTable){ return new ContainerChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity); }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){ diff --git a/common/chemicraft/system/PacketHandler.java b/common/chemicraft/system/PacketHandler.java index 6bb2dcb..fa6d9ae 100644 --- a/common/chemicraft/system/PacketHandler.java +++ b/common/chemicraft/system/PacketHandler.java @@ -13,7 +13,7 @@ import net.minecraft.world.World; import chemicraft.ChemiCraft; import chemicraft.tileentity.TileEntityChemicalCombinationTable; import chemicraft.tileentity.TileEntityChemicalCraftingTable; -import chemicraft.tileentity.TileEntityDecompositionTable; +import chemicraft.tileentity.TileEntityPyrolysisTable; import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; import com.google.common.io.ByteArrayDataInput; @@ -53,7 +53,7 @@ public class PacketHandler implements IPacketHandler { var1 = worldClient.getBlockTileEntity(x, y, z); if(var1 instanceof TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi); if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi); - if(var1 instanceof TileEntityDecompositionTable) ((TileEntityDecompositionTable)var1).readPacket(badi); + if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi); if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi); return; } @@ -61,7 +61,7 @@ public class PacketHandler implements IPacketHandler { var1 = worldServer.getBlockTileEntity(x, y, z); if(var1 instanceof TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi); if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi); - if(var1 instanceof TileEntityDecompositionTable) ((TileEntityDecompositionTable)var1).readPacket(badi); + if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi); if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi); } return; @@ -69,7 +69,7 @@ public class PacketHandler implements IPacketHandler { } - public static Packet getPacket(TileEntityDecompositionTable tileEntity) { + public static Packet getPacket(TileEntityPyrolysisTable tileEntity) { ByteArrayOutputStream var1 = new ByteArrayOutputStream(128); DataOutputStream var2 = new DataOutputStream(var1); diff --git a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java b/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java index 35b2dcb..dc90bb7 100644 --- a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java +++ b/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java @@ -368,3 +368,4 @@ public class TileEntityChemicalCombinationTable extends TileEntity { } } + diff --git a/common/chemicraft/tileentity/TileEntityDecompositionTable.java b/common/chemicraft/tileentity/TileEntityPyrolysisTable.java similarity index 55% rename from common/chemicraft/tileentity/TileEntityDecompositionTable.java rename to common/chemicraft/tileentity/TileEntityPyrolysisTable.java index fcb4ee5..696990e 100644 --- a/common/chemicraft/tileentity/TileEntityDecompositionTable.java +++ b/common/chemicraft/tileentity/TileEntityPyrolysisTable.java @@ -1,18 +1,21 @@ package chemicraft.tileentity; +import ic2.api.Direction; +import ic2.api.energy.tile.IEnergySink; + import java.io.DataOutputStream; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import chemicraft.inventory.InventoryDecompositionTableMaterial; -import chemicraft.inventory.InventoryDecompositionTableResult; +import chemicraft.inventory.InventoryPyrolysisTableMaterial; +import chemicraft.inventory.InventoryPyrolysisTableResult; import com.google.common.io.ByteArrayDataInput; -public class TileEntityDecompositionTable extends TileEntity { +public class TileEntityPyrolysisTable extends TileEntity { - private InventoryDecompositionTableMaterial invm = new InventoryDecompositionTableMaterial(); - private InventoryDecompositionTableResult invr = new InventoryDecompositionTableResult(); + private InventoryPyrolysisTableMaterial invm = new InventoryPyrolysisTableMaterial(); + private InventoryPyrolysisTableResult invr = new InventoryPyrolysisTableResult(); @Override public void readFromNBT(NBTTagCompound par1) { @@ -39,11 +42,11 @@ public class TileEntityDecompositionTable extends TileEntity { } } - public InventoryDecompositionTableMaterial getInvMaterial() { + public InventoryPyrolysisTableMaterial getInvMaterial() { return this.invm; } - public InventoryDecompositionTableResult getInvResult() { + public InventoryPyrolysisTableResult getInvResult() { return this.invr; } diff --git a/resources/chemicraft/guis/ChemicalCombination.png b/resources/chemicraft/guis/ChemicalCombination.png index 4c235bc8b651c4c00e10a7369cebfea351b88f04..bfcb41121151a371a442ac904813909dd26ca2e7 100644 GIT binary patch literal 3445 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 VF?ZRR4(ng%x|*(PuF6Bd{{d|7Vq^dS diff --git a/resources/chemicraft/guis/Decomposition.png b/resources/chemicraft/guis/Decomposition.png deleted file mode 100644 index 3d80f10164accddaec92dc83d4d96ebe9dd52e1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8495 zcmeHt_dnI|8~^JJ^H^o?6SA_hBOFD@4xyA|&oZO3j#N~(l+i(vY$q#(gN)2%&+NTN z_V^y_-TU45^TYQK`2OH=oR|B)?(4qB^SZ9*%L^?HB~oGrVgLY0Rg@KO000R0D+nOO z$9)(%r&!`XpjPtg@&NET1h#8}hx<;#MuJSGO@YuDxjgL3wIL{5EHm4B(&!I9suA`Dhl$t5AV+3 zA#lCZ5!nHLjzB#OB4a>z;-M9s^b~c1cIu$HQCCmoY~i3C1d$V7X?!cO0W1|{DA8)@+ZcVgvneHh4xVG@~`u4gl``%7or0-sDL&83@ z`SS8+J}W*dI_V&ypkHDFWs7GVqt&e;$mL0yPPBB^MOwwitpJg zXN#V2n;g?=62pAYH&mH17wq(ZM2vj6Y={*%7N?>8p8OkT(NI%;Bgf{2eP51l!CSrv zbl=VISx)Vpi}~(c?s)B0SILuOUBTg}B>xLq z7cbF_6!mE~h?c%^+wupU#S-LAIn^fE3Q0D{HMS;#CGe)*mEA;N3z@p_oqOi0oH%wE zQ-N-Bka~zvTHPU=>TBNpwK=e}W`EB#!RiYQCugxwzgn@|ebW)>@{>aOU3f5sW&nSc zLHdM4RN>X#b2NU-sZO!g*hY#3KnvgoqMf*ZTBQS?vz2`B&-f)(0d_#Jxjz`u%Jpn* z-RlN!g;-gQ^J6sMrQfuME7?|Uyx#yiP`d8Z05Afi%!9l^BtTosmY}(%^5*rvS{@-C zkgltM0uLzzdF~yGEp4@7pQ6;ghmAR)@YksUsG3Z6hRs?0R9U*Z*jv zXsHJrI(9ud7B#Yt-2?wKM8U8?}o$aD7t zFQG^x)ksXiV5AJ`PP2k8 z%#loqJ4g<9QD>!!7hno3VBIhE!54d9Xznb{dCVg<(Xa%dN)R|X@M1FSHD@JucdB>X zz%uMqc}gLqHaNCcfs%+AvHOqMT+IIxOHKK|#IiE}-(r(pYB%uy$Kubtu)wk4YYW_x z+Q0}c5OiBfbg7H-uHEtas0b+q#9Bv1ZF{K9h!hBaO=>BNt>A3utel<|D~?IgHTGk{#hH)tQqnv%Q&m z_r4ZV0L&^2hf;t-KQE;KQ|alJ@~_UT1`?*wSvRq91GQ++q?_UOrV#>;NJ{uV=c#x5 zBrA-dW!qXHN5xGcxuD=q=r4gxBGD*`?2H~?J3CT9-8V&5t%y$!5AF?WDg6DmDENAC zX+KhcNQ)T^XqQJ|hqceOcoPsK#>dk6?ZCFj0ftFs=X(Ke`IwSoRBMVMDrYGFY^rq| ziu2Kt72VvPo!18PXpk`=rM8d^(55z|<-{r;Rt7ilfN0d0)m0wg%vizAoHHM#h z3p0VjBVn@Kw4$#F()HyA0MXO&0}DYpl0&NE|04~!oS zI<%gBKEptO;`JFE8L`a-0dKJ#KA8TNeMVMnG1I>TR^;5Lc-+nw)V{|zCA$*9npY@N zbV%_Fn*GaVLkac^25*cx!6|2U7Z!})nka$-i~-U6dlp%V;hGF`2xI}!zrRMhVwA`= zhF*7QzYe04km;))D{+>EgS+G&KdX54ue9gXq~pe57!Vj+#{BpMsaPPj6KFnY3qeQt zZ2THu|DkNIc0v4jp6`56PwB*M7c17fJKzAyR>%H_1Nm+xHj zy!<=6WP>djq8zaq9gOq*QB=vwxJQ+zT?LG?VMt9%fi9wlyUUi>G3j-P!JONf z{T5dv(*?QxJs;fwdVT2i%*e>*C-9R1px5z-@$r$;aT2>>k?a5TBan=o6tgqXDDUq4O3z z0u)&FAC}H;10sRkyIawWA=7-iAi7&OOyjnlWViC^L+d4hw@qjvk`_7%7@@2XDfwF+JOb{vbf9p6MOH$s87zn z-e2t~Rsv|D%VzQvCpm^|KcF`|boe6|^YHr^h7Dg<<8JZ$Pih<2lO6H4MBS1?{7xc`5gQRvLc$mno04MU6lh#0pGTPCmvAo zs$wq#?7 zbjLpxGzC4kwx5WPastS)kM*s&OdmKfX6gB?-YOOx!g@-mVniI%^fuK(tQaseG0Mp< zpp&E)6nrOuaecyKgGhp&1Dj07dsjF)*9&TfQ4wCt3bMWqwwZ~ zMM8Ts`G3Jl_T7uOk#2z9wx*8P=0RB3g6uU8@4Fk=v8>7aWb=@2j74em<+i+rua@q2 zb*tqAS&cRw#^(ZIW#?%RmM>pgjERq4?C^H#Ftn&0F5MeY>^iu<@NmwuXkj6}!7JEo zXffxuK&a}XB({HVf30_shz3$|p;16^LOdbE#4w~`G0jX$O1m>*=si7E=kC^BbZd;d zO{U_3(RhPhdc3O?NbDF@6w@b&`MQY$5^4jnE?GOiNCDuxpDYSziA4 ztjo`^hZX!*jDA=TEpgUKUx3LJ@vIzjfoL4Nz5hymzPx5UCsr^CsNy@Vg}C9s7tapZ9wXpcPI^u_ zWaD2>@CZT73_w5huHxB$&|kZYhj8zb4?@@x-0}eG@@=zfM?3Cj(oMn{m*+fu#5SyV zbVf#)O0oF&?q0GqjqoCik(Q)U^%?H)-tOA~jNlX$c?L92(s(HR01Wp|{R>&DQqbyPx z&(F5WTJ=PbDa3AixgdM!!9AZPUrtb5^Ag@wenhPB48e$BOofhvoN4{CTVI!&I<(eg zr41rDU}DR@E(6d8XnX?QYx3$T+?`ty2|0sm@BB_A$MDLka5LS;yLI}syRhdIpfGsN zvZovJIhHInE_Q6Rh)rwv0@$YisE7}in1q#ws};t$Evi9k;_=&$dlLJeLIb4ui0*c5_TBNPc zrf0ZvQ&9j`wxLrt^>k_%M!Yff zgu!3%fLRXPn3cXs7Q@IWh;Q0`;v{LZ(|ZSJHsH~yK}LMk7k$ea=9Kq*=^ozdwUItg z5tnoe-Bls7?o{E*6p&^k*RuQH;{-<>2ZrzlABqo8)#9f~*iu zQU$^*z!`Z`1*Od%o-4nD0_C-UIjVEGDllRtMSoJnR_oRy!7xey4Gz@yyahopGIWd} zd&wpfNrM=`zxt*{c2wxqYR?Tk=i=J!5h0aVXcwLHRooUW=wj0yEEM+~-M@Q(JEKU+ z1Js6mz$^wZ`RSi8T7NVYv&oe2i@bH_U^LDTjQm6>STx<00jlbUo-{mVcD1~|9eHtU zn4Q$%ybr+;R6vr4j3sC!8+0oQYC70%tY3HT_xVOc}S zpZ;;NM~?%8oI?ke72%iY*~hc`MF!RS16{phCG%~SKGm}CEkmC z36et~La=TG%zKoVPGKf7`vjg2#>;6Z0R+6%+Al>#8%X?fM| zO`*=k1{6HRvtyQ;r_E<{y)mP}F71M}Vp(EAzqIDHZeurSAhP6kJTUl#vMIM_3%$>v zb=(5EAQ$m{d%#G|V0p2vx-Tr^GAr;R+@<5HzDJMpyjZ-uImEL{RRv}7lCt|zc2=aY z25w6Wm*_pf+1D|gyw%y7cj(ugiZb=bQTyeeInSCHo)S*AS_VmpbH|D%MT7~-6RO79 zP!H13y?bToS7A5sa4??=6%~sE`ynXKf#(G;yq(Bq#e0$&xGE2}0 znLUvn+7rLHSRZiu>M26KS-l>Z{A-loeFeFV0|BOvJC}dEzK+{tPTP!GAbtr>tCD&` zRyr$XgFkPjJD6V_s2eRarL;HA++MOxkF)AL_(Wk0u#U zS;YIj$*;Po^+X?nDuq;V}6RT#tH^26R|@j;3MKFRy8frTJ~;W?G7 z>$jd(;Es(Snk%-V3v1P=M?NNxCTnENa9P!CP`^T)44YpjapP@g5kz@lbY4_A0b=*? z;$qz7rZWhWj{DG5Wq>#BOca;(G@EIgVAlSHq=-+tIIHTa<3~H? z*`J!#n`h$d&0w2Pi2wqyHqd(Z{Mjtq$_~+rWI&S5BZ{#TXiXo`QclxU<_4$$kt>*F zndpad9c_8ITE`7UHsPD2^fghGll4wylt44SD+h68CP8_5643s%c~A&6^!VsVMYts> zZGjdUF%~-y8G4C0R6`v>4B){BxUg}PH{joF0VB$mFko&c&sA^e1`HCd4v2$Vsh<>{ zl25trUAKI-fi&-#K66LjcI!qCuP0JmiP$ZNc)LrV5Uv2R`zS41b{>3bR5Ugw8VUBfNk%}&k|M=d z4+Re8z>z~o1IJ;D_0N-|!M@C70E{yVH=uI%WL{Qx(vB;~xeCQWbc);$>?UA=ha7A8 z>0H%$*k>PFU*(i^^lYlXbac~jj?-3GufdAwpKV7yobhMZ=YM1$(yx{{{`}9jBhZA= zjuZd0?T8Vjp;e>#OKltj|Cb;fFaMXI)rkqh{|cJ;L4QFgi%@sVR@!8+vy=Lv?X99p zQ=Mbt>uAg$eTmS^)-cNksv?7VYa7nX{$t^28MD`aTUg{%&>wpqSy=4{Gv{B1nHf9x zN3kQ)s$azq?;rmk(?xMYT1YB@7!iI*!yQtkB2Gp=e;ji}v5nTQQ~zUzqtnLBH~un= ztedOgpKXWyhx+<=mOtkoSy(A#O5l%@hs4C;E0RCrs4MCSHx6ZxOH1O&PbM znC#M*&c%yPe-dJPAThE$3g4VTNW}(m!k@@|&Hu|?Yg4^O|GmJ|ThJ zYKwwDPT*X`a$q?2HcRwhMjkJ7CI;$WE69Ju;hTY7>ibwXUH^o`7df~_sj zO!rXD9dR7Id#`bVy}JqTwiGG-W>`t?9H6R%%Nq>G$A>>l5{f0lA^ef<*1+NaMM zJnLZJx(O0~REdZdb_yNSVBo_soMARP&+FIvO@z&69HTGYd)gQydt;)JiGS5HB&?+9 zQVxzFGmMhc#=*;*O2wia`#MoW96)80ax6wo zd2m=>V0BBTJZA^!iD|8Il; h_c+iJIkV|=byoN5jgn|t+YD>)1~Q_i&~r$yvYMxjtbo0Ll9kP$U3**l|l8OIbOc3dik zw$s)drgm+oY&3EjiS2wEilQ)li~YXu_kGv*{qtSdcU|jx*1DecJnOmd-+lk?-@THK zP#h%06vO}k5>AeGZU8{&BLr|F=*=hmQ4l(B;bdpyafQccxn5NCRBGf_-YWuOTfV z!jY0|X-^fp@)&t`@X;V?^`d`F177nYHOWqZJXG|rgeX+X9>pY+Sg*K z4b;{s<5SJ>cgPMh%sg7VR@%P1+ZE)lo46Qn_&*yOZCk8G?RY9nKtV+N~5s$%bhe2qnG{kldy}c>xD~~D7#ehJJk>?JgH=yvsy@X;KlE7 zDL%pGwn_5!_4Pa4rC~8=fXLzz_g*6$LbCntul-=tQW6mdh=2s(O&=lDLq!~dpWTjy ziTPBoNP3d#S*Qt+X6(LSI)Whqe@O%;A!`eL2G;j^^s9gMRNw#v8;E$jW1|MHmffMa zdt2sNOdn1)ncJ9uN+Jc%)h)KM?;%y$za5||<^5S{olhU$kI1HjuJdLKPxk#O z7k{oO!aO)2<_Fs%dHJ#E+-dp=g*&Zg8WEsmH0_#su#fa4Js=?FO!PDA16Mrpq~@5k zW3Pz{hhIG-^sB4V-PrzlGC){uIQ8AY8QDJUxLbI@*h9OCxBgz~h72MDR$3?Hg#@!T ziZ#R95Kir~iwafp!1zr-YCM8Df`K3G(92jkf$5-1gU=~agW=*4AX*m^dxa%%-O-4Q z1B471YT!C<2m4er7-sBxENgdqy8C1^DBta-3FTjHkWzlXlCZO68!Q5gfP}-zSeSD= zSQ5>Fl6NyWk^#nF7SW^8s@v4_6qha{_x#KQ?PB+V3=rk7*M@_Pug zQ4a^zKyQ4$tqrxLboyJwgvfEw3cYr74pVxO7ZwwCv~$}wo}d0SyXzRs*XLb@0jI>; zulCV}nVBTIW&|MT2qB-jwR#;U26Y7)CtUR2yoniGIKyA0(?88U*MR^;Q0Sj;xqA7$ zv){d(!>0Yrg2HdnmL}%6(6s)X%~_xOb*A6xgKkO2?u0?{IkCXnKw)@FApziqhr+(G z$EpwKW$10x>hy;0sR=DQerq0++u&l8cyQ-$!e=EB0^r)etQ%Oc<*siR4f=hbu!ayx z2w|ju$R2v}S;1lb$LDfq%ZT7|Hbi*Ay_62p0W&~*lQ4};hzY@MCSYX`1~_k41dB}Y zdB92>$+#BNDQPImY?1LleLBDR58eG$_U16YBO+yPcgD)(gcVxu+H%MTKF2h@f1hLZ zr7&3H33@u zw`YFEff#eqAt&E^Lr?^`Cl73}y zl<8tOx;@V;<**Ge%28LjZE0EI$IjGE_mbRBW|r1z$~9hxI2`>xvtYrWv$0ygz3q+D zleq2FP=tj6*2u!}l^flQ*Ha#w>nWzrY!-^!t$n)o2NLGD6gtGLYe;qabT%VDUdL=& zkXfvBTgAdyBR)tc!mKwc&Q3SI!uqZap6IUVRJh+=`_PvvqEVn7sMciHDJb&A$Nu~S zzOBMgeIt`MsD|VQLSMQ<+_b9>sj?jeRU0=33toMFIT-dm7FN+>ng;?^ht<|Va6Ej5 zYrcVhP@_)}P0K0Ak=hOMR~|+qM5rb*B$sk%B-qS#!6Biss^|AZLZ0Gn*o!{+Sc6-b zkAw)%6k(VcH5nLdn00Y?mL>aOcfES4 zcY_SBZ*S@F3LQ25(EX63-gkRQdpfyb)%>DQ$Y5j8-n1_*?N<)oNbpoll8q-w9M)mN z6+zX-CzDHjjRcVqbhDaY!brlTSBfA4SmHX)84k@{u(2GlNc7b%y!O#ALu|F`3&DP5 zSS8M*ZzF+}Tme3{Ld4fQm#e~$nDmN z76q_~P{m=gV6P?w$F5g6FrdJdED=;YP#%vePB3gnQI~OqSYv={)uvc+lM4w9D^Zvj z|I!t0TecR$-{t*1r&^pac(Z<|H!92JjEppW`o0(un5dd25*i*@_7;t)YPKA}{7duz z7Tt~>V-LE$G1AAjHbrIo1>csWp*Pzw*Ys#$me#82uId zG}FCzGs9GGbx=p*<>CRJ34uWBNB4STQ9#ZW%9~gFw=)0Rh)t{gj|jie*^+71TcJu| z2Vg=(oH1y+AOa8C0~imSGC+p2y@`oQiuI4QbBQt}Ru+eIt-*<_rTgI0s>5;YFD%o_ zZPjWW51yP2WOpTStbe~wI*NUIdC6YO>A@P$G9Tk#sKA?wGC!?{5&Sh_&_XVv)?bmr zI6lDwN4<1lgx~5S^f#L#abz|_288=yI-;b3p(t7>PzwS9DmQ_EnM^?HZvj;3v>|k8 z0w}6zfmGQ6(Dn&vfFl@mK)v1pUf+eDx=HX0@>!G}0K>QwJ=dqjQdeTtari3U(hM56 zgVK8wE>fYpwUOx?D$5llM_H(KV+pV2v~0NmKLTElZ_ri-HW#_7#M!oy1w(5>I8+{+ zMijRW+l*thEJ#EC*AB>E5@ZQ&>goT8It&a+7=Mhp2t>4NQp*u0385t&lTxsCAh$yj z<0!fK+JHiKT4_kWBaOC=*12Sj3v6Z18cF;*3P&r1vh0N-+GRB*f+pW>dmt~ltSxt* zyhsP1{9~6o(=