From 22b3097d15185a2394a4e731ed323bb06dab99e0 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Thu, 24 Jul 2014 23:02:30 -0400 Subject: [PATCH] Laser model! Also added some new Reactor Block assets. --- .../java/mekanism/client/ClientProxy.java | 5 +- .../mekanism/client/model/ModelLaser.java | 179 ++++++++++++++++++ .../render/block/MachineRenderingHandler.java | 10 + .../client/render/tileentity/RenderLaser.java | 65 +++++++ .../mekanism/common/block/BlockMachine.java | 18 +- .../common/item/ItemBlockMachine.java | 2 + .../generators/common/MekanismGenerators.java | 5 +- .../generators/common/block/BlockReactor.java | 100 +++++----- .../common/item/ItemBlockReactor.java | 4 +- .../resources/assets/mekanism/lang/en_US.lang | 10 + .../assets/mekanism/render/Laser.png | Bin 4788 -> 6074 bytes .../mekanism/textures/blocks/ReactorFrame.png | Bin 1203 -> 1814 bytes .../mekanism/textures/blocks/ReactorGlass.png | Bin 1230 -> 3040 bytes .../mekanism/textures/blocks/ReactorPort.png | Bin 1283 -> 1847 bytes 14 files changed, 332 insertions(+), 66 deletions(-) create mode 100644 src/main/java/mekanism/client/model/ModelLaser.java create mode 100644 src/main/java/mekanism/client/render/tileentity/RenderLaser.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 79f20f899..771ff981f 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -74,6 +74,7 @@ import mekanism.client.render.tileentity.RenderElectrolyticSeparator; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidicPlenisher; import mekanism.client.render.tileentity.RenderGasTank; +import mekanism.client.render.tileentity.RenderLaser; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderObsidianTNT; @@ -154,7 +155,6 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -311,8 +311,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderPressurizedReactionChamber()); ClientRegistry.registerTileEntity(TileEntityPortableTank.class, "PortableTank", new RenderPortableTank()); ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); - //TODO needs a model, I think. - GameRegistry.registerTileEntity(TileEntityLaser.class, "Laser"); + ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); } @Override diff --git a/src/main/java/mekanism/client/model/ModelLaser.java b/src/main/java/mekanism/client/model/ModelLaser.java new file mode 100644 index 000000000..8e5226712 --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelLaser.java @@ -0,0 +1,179 @@ +package mekanism.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelLaser extends ModelBase +{ + ModelRenderer LeftOuterRail; + ModelRenderer LowerCache; + ModelRenderer LeftInnerRail; + ModelRenderer RightInnerRail; + ModelRenderer RightOuterRail; + ModelRenderer RightTopDecor; + ModelRenderer Base; + ModelRenderer LeftTopDecor; + ModelRenderer RightBottomDecor; + ModelRenderer LeftBottomDecor; + ModelRenderer HigherCache; + ModelRenderer LaserTip; + ModelRenderer LaserCable1; + ModelRenderer LaserCable2; + ModelRenderer LaserCable3; + ModelRenderer LaserCable4; + ModelRenderer LaserBase; + ModelRenderer LaserDecor; + ModelRenderer LaserDecor2; + + public ModelLaser() + { + textureWidth = 64; + textureHeight = 64; + + LeftOuterRail = new ModelRenderer(this, 22, 29); + LeftOuterRail.addBox(0F, 0F, 0F, 1, 2, 14); + LeftOuterRail.setRotationPoint(-7F, 18F, -7F); + LeftOuterRail.setTextureSize(64, 64); + LeftOuterRail.mirror = true; + setRotation(LeftOuterRail, 0F, 0F, 0F); + LowerCache = new ModelRenderer(this, 0, 18); + LowerCache.addBox(0F, -4F, 0F, 12, 1, 10); + LowerCache.setRotationPoint(-6F, 23F, -5F); + LowerCache.setTextureSize(64, 64); + LowerCache.mirror = true; + setRotation(LowerCache, 0F, 0F, 0F); + LeftInnerRail = new ModelRenderer(this, 22, 29); + LeftInnerRail.addBox(0F, 0F, 0F, 1, 2, 14); + LeftInnerRail.setRotationPoint(-5F, 18F, -7F); + LeftInnerRail.setTextureSize(64, 64); + LeftInnerRail.mirror = true; + setRotation(LeftInnerRail, 0F, 0F, 0F); + RightInnerRail = new ModelRenderer(this, 22, 29); + RightInnerRail.addBox(0F, 0F, 0F, 1, 2, 14); + RightInnerRail.setRotationPoint(4F, 18F, -7F); + RightInnerRail.setTextureSize(64, 64); + RightInnerRail.mirror = true; + setRotation(RightInnerRail, 0F, 0F, 0F); + RightOuterRail = new ModelRenderer(this, 22, 29); + RightOuterRail.addBox(0F, 0F, 0F, 1, 2, 14); + RightOuterRail.setRotationPoint(6F, 18F, -7F); + RightOuterRail.setTextureSize(64, 64); + RightOuterRail.mirror = true; + setRotation(RightOuterRail, 0F, 0F, 0F); + RightTopDecor = new ModelRenderer(this, 0, 43); + RightTopDecor.addBox(0F, 0F, 0F, 1, 1, 8); + RightTopDecor.setRotationPoint(7F, 19F, -4F); + RightTopDecor.setTextureSize(64, 64); + RightTopDecor.mirror = true; + setRotation(RightTopDecor, 0F, 0F, 0F); + Base = new ModelRenderer(this, 0, 0); + Base.addBox(0F, 0F, 0F, 14, 4, 14); + Base.setRotationPoint(-7F, 20F, -7F); + Base.setTextureSize(64, 64); + Base.mirror = true; + setRotation(Base, 0F, 0F, 0F); + LeftTopDecor = new ModelRenderer(this, 0, 43); + LeftTopDecor.addBox(0F, 0F, 0F, 1, 1, 8); + LeftTopDecor.setRotationPoint(-8F, 19F, -4F); + LeftTopDecor.setTextureSize(64, 64); + LeftTopDecor.mirror = true; + setRotation(LeftTopDecor, 0F, 0F, 0F); + RightBottomDecor = new ModelRenderer(this, 0, 29); + RightBottomDecor.addBox(0F, 0F, 0F, 1, 4, 10); + RightBottomDecor.setRotationPoint(7F, 20F, -5F); + RightBottomDecor.setTextureSize(64, 64); + RightBottomDecor.mirror = true; + setRotation(RightBottomDecor, 0F, 0F, 0F); + LeftBottomDecor = new ModelRenderer(this, 0, 29); + LeftBottomDecor.addBox(0F, 0F, 0F, 1, 4, 10); + LeftBottomDecor.setRotationPoint(-8F, 20F, -5F); + LeftBottomDecor.setTextureSize(64, 64); + LeftBottomDecor.mirror = true; + setRotation(LeftBottomDecor, 0F, 0F, 0F); + HigherCache = new ModelRenderer(this, 0, 18); + HigherCache.addBox(0F, -4F, 0F, 12, 1, 10); + HigherCache.setRotationPoint(-6F, 21.5F, -5F); + HigherCache.setTextureSize(64, 64); + HigherCache.mirror = true; + setRotation(HigherCache, 0F, 0F, 0F); + LaserTip = new ModelRenderer(this, 30, 45); + LaserTip.addBox(0F, -4F, 0F, 2, 3, 2); + LaserTip.setRotationPoint(-1F, 13.5F, -1F); + LaserTip.setTextureSize(64, 64); + LaserTip.mirror = true; + setRotation(LaserTip, 0F, 0F, 0F); + LaserCable1 = new ModelRenderer(this, 22, 45); + LaserCable1.addBox(0F, 0F, 0F, 1, 1, 3); + LaserCable1.setRotationPoint(1F, 11.5F, -3F); + LaserCable1.setTextureSize(64, 64); + LaserCable1.mirror = true; + setRotation(LaserCable1, 0F, 0F, 0F); + LaserCable2 = new ModelRenderer(this, 18, 43); + LaserCable2.addBox(0F, -4F, 0F, 1, 6, 1); + LaserCable2.setRotationPoint(1F, 15.5F, -4F); + LaserCable2.setTextureSize(64, 64); + LaserCable2.mirror = true; + setRotation(LaserCable2, 0F, 0F, 0F); + LaserCable3 = new ModelRenderer(this, 22, 45); + LaserCable3.addBox(0F, 0F, 0F, 1, 1, 3); + LaserCable3.setRotationPoint(-2F, 11.5F, -3F); + LaserCable3.setTextureSize(64, 64); + LaserCable3.mirror = true; + setRotation(LaserCable3, 0F, 0F, 0F); + LaserCable4 = new ModelRenderer(this, 18, 43); + LaserCable4.addBox(0F, -4F, 0F, 1, 6, 1); + LaserCable4.setRotationPoint(-2F, 15.5F, -4F); + LaserCable4.setTextureSize(64, 64); + LaserCable4.mirror = true; + setRotation(LaserCable4, 0F, 0F, 0F); + LaserBase = new ModelRenderer(this, 0, 52); + LaserBase.addBox(0F, -4F, 0F, 6, 5, 6); + LaserBase.setRotationPoint(-3F, 16.5F, -3F); + LaserBase.setTextureSize(64, 64); + LaserBase.mirror = true; + setRotation(LaserBase, 0F, 0F, 0F); + LaserDecor = new ModelRenderer(this, 44, 18); + LaserDecor.addBox(-0.5F, 0F, 0F, 1, 4, 4); + LaserDecor.setRotationPoint(2.5F, 14.7F, -2F); + LaserDecor.setTextureSize(64, 64); + LaserDecor.mirror = true; + setRotation(LaserDecor, 0F, 0F, -0.6320361F); + LaserDecor2 = new ModelRenderer(this, 44, 18); + LaserDecor2.addBox(-0.5F, 0F, 0F, 1, 4, 4); + LaserDecor2.setRotationPoint(-2.5F, 14.7F, -2F); + LaserDecor2.setTextureSize(64, 64); + LaserDecor2.mirror = true; + setRotation(LaserDecor2, 0F, 0F, 0.6320364F); + } + + public void render(float size) + { + LeftOuterRail.render(size); + LowerCache.render(size); + LeftInnerRail.render(size); + RightInnerRail.render(size); + RightOuterRail.render(size); + RightTopDecor.render(size); + Base.render(size); + LeftTopDecor.render(size); + RightBottomDecor.render(size); + LeftBottomDecor.render(size); + HigherCache.render(size); + LaserTip.render(size); + LaserCable1.render(size); + LaserCable2.render(size); + LaserCable3.render(size); + LaserCable4.render(size); + LaserBase.render(size); + LaserDecor.render(size); + LaserDecor2.render(size); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index a8c3cbe7a..d555431d5 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -11,6 +11,7 @@ import mekanism.client.model.ModelDigitalMiner; import mekanism.client.model.ModelElectricPump; import mekanism.client.model.ModelElectrolyticSeparator; import mekanism.client.model.ModelFluidicPlenisher; +import mekanism.client.model.ModelLaser; import mekanism.client.model.ModelLogisticalSorter; import mekanism.client.model.ModelMetallurgicInfuser; import mekanism.client.model.ModelPressurizedReactionChamber; @@ -49,6 +50,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public ModelSeismicVibrator seismicVibrator = new ModelSeismicVibrator(); public ModelPressurizedReactionChamber pressurizedReactionChamber = new ModelPressurizedReactionChamber(); public ModelFluidicPlenisher fluidicPlenisher = new ModelFluidicPlenisher(); + public ModelLaser laser = new ModelLaser(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -183,6 +185,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); fluidicPlenisher.render(0.0560F); } + else if(type == MachineType.LASER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.0F, -0.85F, 0.0F); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); + laser.render(0.0560F); + } else { MekanismRenderer.renderItem(renderer, metadata, block); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java new file mode 100644 index 000000000..406512407 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java @@ -0,0 +1,65 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelLaser; +import mekanism.common.tile.TileEntityLaser; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderLaser extends TileEntitySpecialRenderer +{ + private ModelLaser model = new ModelLaser(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityLaser)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntityLaser tileEntity, double x, double y, double z, float partialTick) + { + GL11.glPushMatrix(); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); + + switch(tileEntity.facing) + { + case 0: + GL11.glTranslatef(0.0F, -2.0F, 0.0F); + GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); + break; + case 5: + GL11.glTranslatef(0.0F, -1.0F, 0.0F); + GL11.glTranslatef(1.0F, 0.0F, 0.0F); + GL11.glRotatef(90, 0.0F, 0.0F, -1.0F); + break; + case 4: + GL11.glTranslatef(0.0F, -1.0F, 0.0F); + GL11.glTranslatef(-1.0F, 0.0F, 0.0F); + GL11.glRotatef(90, 0.0F, 0.0F, 1.0F); + break; + case 2: + GL11.glTranslatef(0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, -1.0F); + GL11.glRotatef(90, -1.0F, 0.0F, 0.0F); + break; + case 3: + GL11.glTranslatef(0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, 1.0F); + GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); + break; + } + + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + model.render(0.0625F); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index ae62106cf..d0d9cf292 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -124,7 +124,7 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider; * 1:10: Pressurized Reaction Chamber * 1:11: Portable Tank * 1:12: Fluidic Plenisher - * 1:13; Laser + * 1:13: Laser * @author AidanBrady * */ @@ -185,8 +185,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer icons[5][0] = register.registerIcon("mekanism:PrecisionSawmillFrontOff"); icons[5][1] = register.registerIcon("mekanism:PrecisionSawmillFrontOn"); icons[5][2] = register.registerIcon("mekanism:SteelCasing"); - icons[13][0] = register.registerIcon("mekanism:SteelCasing"); - icons[13][1] = register.registerIcon("mekanism:Laser"); } } @@ -462,16 +460,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer return icons[meta][0]; } } - else if(meta == 13) - { - if(side == 3) - { - return icons[meta][0]; - } - else { - return icons[meta][1]; - } - } } return null; @@ -605,7 +593,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer return icons[metadata][2]; } } - else if(metadata == 9 || metadata == 13) + else if(metadata == 9) { if(side == tileEntity.facing) { @@ -1285,7 +1273,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer PRESSURIZED_REACTION_CHAMBER(Mekanism.MachineBlock2, 10, "PressurizedReactionChamber", 40, 20000, TileEntityPRC.class, true, true, false), PORTABLE_TANK(Mekanism.MachineBlock2, 11, "PortableTank", 41, 0, TileEntityPortableTank.class, false, true, false), FLUIDIC_PLENISHER(Mekanism.MachineBlock2, 12, "FluidicPlenisher", 42, 10000, TileEntityFluidicPlenisher.class, true, true, false), - LASER(Mekanism.MachineBlock2, 13, "Laser", -1, 100000, TileEntityLaser.class, true, false, false); + LASER(Mekanism.MachineBlock2, 13, "Laser", -1, 100000, TileEntityLaser.class, true, true, false); public Block typeBlock; public int meta; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 81e13b300..3a57222ea 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -104,6 +104,8 @@ import cpw.mods.fml.relauncher.SideOnly; * 1:9: Seismic Vibrator * 1:10: Pressurized Reaction Chamber * 1:11: Portable Tank + * 1:12: Fluidic Plenisher + * 1:13: Laser * @author AidanBrady * */ diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 496f9ca7b..fd3b4d8b1 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -16,7 +16,6 @@ import mekanism.generators.common.block.BlockGenerator; import mekanism.generators.common.block.BlockReactor; import mekanism.generators.common.item.ItemBlockGenerator; import mekanism.generators.common.item.ItemBlockReactor; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -27,7 +26,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import buildcraft.api.fuels.IronEngineFuel; - import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -59,6 +57,7 @@ public class MekanismGenerators implements IModule //Blocks public static Block Generator; public static Block Reactor; + public static Block ReactorGlass; //Generation Configuration public static double advancedSolarGeneration; @@ -144,9 +143,11 @@ public class MekanismGenerators implements IModule //Declarations Generator = new BlockGenerator().setBlockName("Generator"); Reactor = new BlockReactor().setBlockName("Reactor"); + ReactorGlass = new BlockReactor().setBlockName("ReactorGlass"); GameRegistry.registerBlock(Generator, ItemBlockGenerator.class, "Generator"); GameRegistry.registerBlock(Reactor, ItemBlockReactor.class, "Reactor"); + GameRegistry.registerBlock(ReactorGlass, ItemBlockReactor.class, "ReactorGlass"); } public void addItems() diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index c481e8551..71e5fbb11 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -3,19 +3,11 @@ package mekanism.generators.common.block; import java.util.List; import java.util.Random; -import mekanism.api.energy.IEnergizedItem; -import mekanism.common.IActiveState; -import mekanism.common.IBoundingBlock; -import mekanism.common.ISustainedInventory; -import mekanism.common.ISustainedTank; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; -import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; -import mekanism.generators.client.GeneratorsClientProxy; import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.reactor.TileEntityReactorBlock; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorFrame; @@ -23,30 +15,24 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorGlass; import mekanism.generators.common.tile.reactor.TileEntityReactorLaserFocusMatrix; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorPort; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.tools.IToolWrench; - public class BlockReactor extends BlockContainer { public IIcon[][] icons = new IIcon[16][16]; @@ -69,10 +55,13 @@ public class BlockReactor extends BlockContainer icons[0][1] = register.registerIcon("mekanism:ReactorControllerOn"); icons[0][2] = register.registerIcon("mekanism:ReactorFrame"); icons[1][0] = register.registerIcon("mekanism:ReactorFrame"); - icons[2][0] = register.registerIcon("mekanism:ReactorGlass"); - icons[3][0] = register.registerIcon("mekanism:ReactorLaserFocus"); - icons[4][0] = register.registerIcon("mekanism:ReactorNeutronCapture"); - icons[5][0] = register.registerIcon("mekanism:ReactorPort"); + icons[2][0] = register.registerIcon("mekanism:ReactorLaserFocus"); + icons[3][0] = register.registerIcon("mekanism:ReactorNeutronCapture"); + icons[4][0] = register.registerIcon("mekanism:ReactorPort"); + } + else if(this == MekanismGenerators.ReactorGlass) + { + icons[0][0] = register.registerIcon("mekanism:ReactorGlass"); } } @@ -86,11 +75,14 @@ public class BlockReactor extends BlockContainer { return icons[0][side == 6 ? 0 : 2]; } - else - { + else { return icons[meta][0]; } } + else if(this == MekanismGenerators.ReactorGlass) + { + return icons[meta][0]; + } return null; } @@ -114,11 +106,14 @@ public class BlockReactor extends BlockContainer return icons[0][2]; } } - else - { + else { return icons[metadata][0]; } } + else if(this == MekanismGenerators.ReactorGlass) + { + return icons[metadata][0]; + } return null; } @@ -185,12 +180,12 @@ public class BlockReactor extends BlockContainer { if(!entityplayer.isSneaking()) { - entityplayer.openGui(MekanismGenerators.instance, ReactorBlockType.getFromMetadata(metadata).guiId, world, x, y, z); + entityplayer.openGui(MekanismGenerators.instance, ReactorBlockType.get(this, metadata).guiId, world, x, y, z); } - else - { + else { ((TileEntityReactorController)tileEntity).formMultiblock(); } + return true; } @@ -199,14 +194,15 @@ public class BlockReactor extends BlockContainer @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item i, CreativeTabs creativetabs, List list) + public void getSubBlocks(Item item, CreativeTabs creativetabs, List list) { - list.add(new ItemStack(i, 1, 0)); - list.add(new ItemStack(i, 1, 1)); - list.add(new ItemStack(i, 1, 2)); - list.add(new ItemStack(i, 1, 3)); - list.add(new ItemStack(i, 1, 4)); - list.add(new ItemStack(i, 1, 5)); + for(ReactorBlockType type : ReactorBlockType.values()) + { + if(type.typeBlock == this) + { + list.add(new ItemStack(item, 1, type.meta)); + } + } } @Override @@ -218,7 +214,7 @@ public class BlockReactor extends BlockContainer @Override public TileEntity createTileEntity(World world, int metadata) { - ReactorBlockType type = ReactorBlockType.getFromMetadata(metadata); + ReactorBlockType type = ReactorBlockType.get(this, metadata); if(type != null) { @@ -239,6 +235,12 @@ public class BlockReactor extends BlockContainer { return false; } + + @Override + public int getRenderBlockPass() + { + return this == MekanismGenerators.Reactor ? 0 : 1; + } @Override public boolean isOpaqueCube() @@ -255,35 +257,45 @@ public class BlockReactor extends BlockContainer public static enum ReactorBlockType { - CONTROLLER(0, "ReactorController", 10, TileEntityReactorController.class), - FRAME(1, "ReactorFrame", -1, TileEntityReactorFrame.class), - GLASS(2, "ReactorGlass", -1, TileEntityReactorGlass.class), - LASER_FOCUS_MATRIX(3, "ReactorLaserFocusMatrix", -1, TileEntityReactorLaserFocusMatrix.class), - NEUTRON_CAPTURE(4, "ReactorNeutronCapturePlate", 11, TileEntityReactorNeutronCapture.class), - PORT(5, "ReactorInOutPort", -1, TileEntityReactorPort.class); + CONTROLLER(MekanismGenerators.Reactor, 0, "ReactorController", 10, TileEntityReactorController.class), + FRAME(MekanismGenerators.Reactor, 1, "ReactorFrame", -1, TileEntityReactorFrame.class), + LASER_FOCUS_MATRIX(MekanismGenerators.Reactor, 2, "ReactorLaserFocusMatrix", -1, TileEntityReactorLaserFocusMatrix.class), + NEUTRON_CAPTURE(MekanismGenerators.Reactor, 3, "ReactorNeutronCapturePlate", 11, TileEntityReactorNeutronCapture.class), + PORT(MekanismGenerators.Reactor, 4, "ReactorInOutPort", -1, TileEntityReactorPort.class), + GLASS(MekanismGenerators.ReactorGlass, 0, "ReactorGlass", -1, TileEntityReactorGlass.class); + public Block typeBlock; public int meta; public String name; public int guiId; public Class tileEntityClass; - private ReactorBlockType(int i, String s, int j, Class tileClass) + private ReactorBlockType(Block b, int i, String s, int j, Class tileClass) { + typeBlock = b; meta = i; name = s; guiId = j; tileEntityClass = tileClass; } - public static ReactorBlockType getFromMetadata(int meta) + public static ReactorBlockType get(Block block, int meta) { for(ReactorBlockType type : values()) { - if(type.meta == meta) + if(type.typeBlock == block && type.meta == meta) + { return type; + } } + return null; } + + public static ReactorBlockType get(ItemStack stack) + { + return get(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()); + } public TileEntity create() { @@ -303,7 +315,7 @@ public class BlockReactor extends BlockContainer public ItemStack getStack() { - return new ItemStack(MekanismGenerators.Reactor, 1, meta); + return new ItemStack(typeBlock, 1, meta); } @Override diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java index af0fd857e..84e03ab09 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java @@ -41,14 +41,14 @@ public class ItemBlockReactor extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemstack) { - return getUnlocalizedName() + "." + ReactorBlockType.getFromMetadata(itemstack.getItemDamage()).name; + return getUnlocalizedName() + "." + ReactorBlockType.get(itemstack).name; } @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - ReactorBlockType type = ReactorBlockType.getFromMetadata(itemstack.getItemDamage()); + ReactorBlockType type = ReactorBlockType.get(itemstack); if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 038f0cb34..c09209b45 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -115,6 +115,7 @@ tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC tile.MachineBlock2.PortableTank.name=Portable Tank tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher +tile.MachineBlock2.Laser.name=Laser //Plastic tile.PlasticBlock.name=Plastic Block @@ -570,6 +571,7 @@ tooltip.SeismicVibrator=A machine that uses seismic vibrations to !nprovide info tooltip.PressurizedReactionChamber=An advanced machine that processes a !nsolid, liquid and gaseous mixture and !ncreates both a gaseous and solid product. tooltip.PortableTank=A handy, portable tank that lets you !ncarry 14 buckets of fluid wherever you !nplease. Also doubles as a bucket! tooltip.FluidicPlenisher=A machine that is capable of creating entire !nlakes by filling ravines with fluids. +tooltip.Laser=An advanced form of linear energy transfer that utilizes !nan extremely compressed beam of !nlight. tooltip.HeatGenerator=A generator that uses the heat of lava or !nother burnable resources to produce energy. tooltip.SolarGenerator=A generator that uses the power !nof the sun to produce energy. @@ -661,6 +663,14 @@ tile.Generator.BioGenerator.name=Bio-Generator tile.Generator.AdvancedSolarGenerator.name=Advanced Solar Generator tile.Generator.WindTurbine.name=Wind Turbine +tile.Reactor.ReactorController=Reactor Controller +tile.Reactor.ReactorFrame=Reactor Frame +tile.Reactor.ReactorLaserFocusMatrix=Laser Focus Matrix +tile.Reactor.ReactorNeutronCapturePlate=Neutron Capture Plate +tile.Reactor.ReactorInOutPort=Reactor Port + +tile.ReactorGlass.ReactorGlass.name=Reactor Glass + //Gui text gui.heatGenerator.fuel=Fuel gui.solarGenerator.sun=Sun diff --git a/src/main/resources/assets/mekanism/render/Laser.png b/src/main/resources/assets/mekanism/render/Laser.png index 90ae57dd90453887be0c3dbe9a82132c7112c24c..161cd258deb0b8263a0edd1354190ac6d55ded7b 100644 GIT binary patch literal 6074 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

rz3hv$<;@UQg|7 zdf67~vif&*z*dMNK<-R^bXM{@|K_5xedAo4|DT-eVUa)o4E)3?#BO|g@0!ipvUF_3 zkFzIw9_^#%#+>cg{`-8enU@8PGoKr+m zUTHk*j;#9|`RQS(U!IHW`IWzO9l7#cQ)!waSnsoN`)a>6k|F)~_oqxyvmv@UD zb(d>#{*iqY7xuTmk&R}Pk@Gc?tJ(|q_Gw0)8d*7u3fpr36A!&oyY)oLAHqGj_U*CN zv~AX^a&-H0dh$H`w|(C341YYKaC~>c(e@4O!!`zYcfGstYd`10{3o8gvnfJAz++A? zrozT$E>NNLvo-_zlU$@XL4DM)03swJLP1^q+ zEdma`nm=P0W0SFg4j(uu;q4dZEJ8tSDVoo@Al@li|Lg}neX U<9pvQ_fHZqF)}l((RYdaADNZ6`~Uy| diff --git a/src/main/resources/assets/mekanism/textures/blocks/ReactorFrame.png b/src/main/resources/assets/mekanism/textures/blocks/ReactorFrame.png index dd31e613d0964452ba61fad026b6f4ad3b18ea0b..aa259c2692e56e00b5058c25ca530ae9f4be5084 100644 GIT binary patch literal 1814 zcmeIy`#02S7y$6G6p>AaZYpCKV_e3#&bS+9#*DdrZ}XjDjEupcO^o|(+GrKEn?e^A zmD*NUT_klls>MOII+Dw-O`)`w!fvd{e*F{s(|*qLyw7>xU!HT`_q^OZXPyTRIb9|ba8+HVOv^S z5(oqk$z-yfogIZjvA4H(aBy&RbaZlZqEe~O&dxL%&BevV z)z#I_&CT82-NVDf)6uT1O^5&nam(eaBwgu zgvDa9*=!CbB!tc3hH$wYu7Jzs@_4*Z44)s$7w`oFo<}R;g4mF)^{Rv2k&6YPC8cAt5m_ zF(oA>Jv}`uD+_z3|NWOYu-bZtkM&!V%neJ$;nHa|cSnF1Cs`ocy3<>bE9sdaPvKY!6u>n^v3KD}jMAO7?@ zdiB;&{J{5|$4MXNpK z?*msi61lA7O|NAGMSK!`n^85NUe`ok*5)sD-RPs!XODONlb1dBN1I(m=jc@R9&)6v z+2n!lxuR+<)!R^-R|j*p8wIqV#*QuGT$&FlPmCZp5O zsNAQ2BA>Q3(w?W9X@%3DL_ccW5be+B-T2CI$iRR8qbi#sIWMZZ{Jb>kh^FFlYXry7 z!fbGSs3G8W8~0()kssTu*VL}sC~(}+GvB@1L3m($bB(ikjm8^YTr#>A8^lodjBN{u z|F$=2E7S3gDWv#ebbk6`sbk!sx{f!b_k(B0&u=2BrAND_Thl%*mBKt4KR!~q*)plH zzycpsmEiQEH~ubTiIXgv@!RZjJA2fodaC&#(VEuC6>NFg-e))?EI4Lw~>9 zrbdQa(W&X)*&9{0@MVQwr0s|P88tRS{zAf<-b5((Do~KG=Eb}qgKR((}JWLKv zsJ$IQX4W5QO>2AP6xBOo<4e>W?ZC&a9m7-L$}7cP z&6UmC(5^MV`trB&7IDY(kae_JFZ%++wXY6836>{IuU(Mi4A}rZ7{a2a# z+ljQV?OPJ(9^o|a&K|^X8eKM74R+6Jir1Uls5Q5><2C*37PKeSAxyJ}ghQrhz|*1q zPJ8R)`iz3xr%l>yib{K04v)x^xzJQbV$`k&7W?dqbT>UV2-=4?%Pzzb^-|TB^w5c2 zH*%Bj?di7E^HUG6U1 zjrrpy99CUH?2pksyN=aM9L-+7?31<(HdRF5yra{y=SAJZ?PMZDzA`U(Y!T~vP*lOc D*SS|3 delta 1194 zcmV;b1XcT%4zmf68Gi-<0047(dh`GQ1N3P_Lr_UWLm*IcZ)Rz1WdHzp+KrUYZxm%1 z$3MIC&a4SI2U7uy!HGYBkV3X#kOo0_yUVsv%VyhR+nAW`?AzV3)7kNz+43VjanT#7 ze}IY{JeYVg!Cw(Bz(E5EK|^dvOgNPIBSaD|hSbAMcL!+2_kZ-v^M0T2_xn8WlYz|V zRo{2h7R-8~s+989_{5}@xj~v|SVK2!s&?S#%H<(|s_(lza_;?13gFuImGA%atf|Ss zhSU>4vliI1kU9psYx^n$;})>zXy}KKc^2qW;}esR$pT&VC@uh9Q&Bt)bg9uwKV)3M zv>VkLWafdMseeSio`@q40Cbh4CzWGcl~Ud+tLC)h%7op=T>sBA>$aBlHUVpcnUO=l zR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca=bm z=R~7_IO5UNJJo|_pc}OJRkLz9@~oYaZmAOSYZv{n9DC3fJ$HC0;uNL~iX+SUurWFi z)r#Gr8jWkkWh};At*T-v;t_vKZ!G52H`JI*=cAMv2T1YG^93g+YyS25W zcT&CW*jG;7d7!%ah-bO%CpiHEX4=T@$^I|Re}A{3!*N}ld+XZTOY};n7Us9#EY2PIq^1>?^14 z$oGct4Rf-mlg<8;{WE(#`)T%U_V9}@3pVBZ?qq=wDZ~p?Fa3m_NDf1 z;(x7H-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v3+Bf5yCwCKy*NzZ zwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh4$IhP^clUzK_l1k zXKXPFMxU|8C_b=t_9`971S;9*cBYU7%zvP8m_ywPGJ$pxwRdroUIrT;uSV{&`&B@vh#wRAN=ofvrLJCN&yVA*pZ@|94K)c$>O}5~R z0M@_U$!+b1r$2^syX}^mi~sql)K3sh@7fuCt<8geb7|@BX2^U9_di%#`sd8j(trKW zKwE(G?!Q?8ad_2KDscb+00v@9M??Vs0RI60puMM)00009a7bBm000XU000XU0RWnu z7ytkO2XskIMF-vo4iPvubKac!0000$Nkl#7_80000003!eZ000000000mlGJ?2AN*hkvMuTofdBvi07*qo IM6N<$f>xzZGynhq diff --git a/src/main/resources/assets/mekanism/textures/blocks/ReactorGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ReactorGlass.png index 8a7b4dcde07e9362b9919d75a3da8e4172c11267..a2e5a07eeff93c0b47d15712c83fa7c32a816520 100644 GIT binary patch delta 3035 zcmV<13ncW;3E&ryBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D02y>eSaefwW^{L9a%BKeVQFr3E>1;MAa*k@H7+$tiu~XJ01Hq_ zL_t(oM?IHkZyQ$@hV`?8AOX^Qb$Wnw?1|l*yQ)j>HPJ;<+{4-@%*-@DE67(?-<2mjz%=u+_)iTE0-8fiJ5_OZ|Bm>5QCq^iDY zD&?EG-G5j2uUxru5DM9*Ff>N+*z2{A6~%AG;}NV0VOhA8$;8U48mk5Z0V@*mqBzot zL_AhF?CwUR>+N{l)zUOiHIZ2#ok{Ia-Y>5DJEn8)M(dLZDm91h2(%jMb%g+fzB zQHIH6bOZxqRaN?`8gChfj*H@B!%+I!Y_?Y{>VFNxFbb?}wOTbYnM^L3Ou|gIl1L<) zUa!~UcOxA3v;o{qrGk}GNzWOEmQ&SW`L)+xn=c6sLRYb<4THhpZZPP>&!KIEj7p`F zrDv3X6d z*|1=M4CoVFvtZCW({=wioz}Vt=^{WZhJT%6w_GlF5#DJwn{sWT+~VFEkH^;b_I4Ez z^bhFU<&t?}K$L4*q%5htB&p!{UnNjB`kLnJ8b-KZ zE*ovJT$DiJ7M9OU)10+hEeqw-cDp_9bUI^shO(Ks#Imdb??=K4duo8L!BX~r@qdvq z&76_XYq@-0&*pME45)=qKmByRB!S@ZTpg3UJzZBUeANYgAIdiownJbYBJ3J~_F!Sq z?RKYFzRA737XZ7xUUkfMilR+G4OkuSB|yu? zYXkujz$3ttrg{OO0MLkjwIB?T=E6c|Q3qaq^;G~|*&??GrBZs@?>G7YIKa2Ze0+-V zyI6e4v)$ovxQ(y(MLF~y0uE+!6H*K2j6UunhI9cp5w`%Q&1%4AoeU^R7JuaPDg>us zLe0MO&O7rZso_rN>JZ;s<#K+j-)|qF5}H=Fg8q<>!~6Q>A;sf3>5+i$=9 zn1Na?J+-XdA4KahNN=$Og#5loY}_-9#3{5sKp>HyeSp$4fIXu1-t%}odoVF$FYQ+A zOB_U_(Saz(sgzB_peUy& z1WPZ!{PN=<%;z&V8;#0Qsg(Z%=^WmEFdP%Ha9mPQV;I({zTqKB9XsQ^Z-j? z$GE}XLuft#$QIW=&zP?C0^kh+fIE3)5O_(-vRZ%v8h=u_Ai9@cc;SV)Y32{BRY^5N zEWg9YH>r9@)PvhlcuMg(!zJSTGnAeI@PzAauHvpgq4*~I4!JG>5IeNqtn_bb%hHfY zzXUEx(V`>eY&K4Z3>FsvWMZZF@0zBuBW?ikEvBIvLXNn6AaKVsbjpjbYY{Q%gJN=daSP-f{NJIH%@DfJ{cUJ`h_Ht! zKP4@X*|$ZHkU0Ru`_lQQC?CU)d|zf&F`^-}A>VZv%cziQGo6mmlp;*hzRF@Edg`gC z=FETtRSh!_=snPaQWF6dOQs)*@Efd~0Fes0i(5uS`czVnK$G6z#o7V+-({ff;zEYk zRDT6|G833A`hd5E z4wkijKIdRWCH~!nGD$3Q4*K3<_w3^0Zfg#7XVKy7+D~hw7 zOu9La$@y>tf4ZCD@CMJkJ&(uUV}HKjc(&1Yxz>At*;!dRf4ICX0Dim%usy$jc@hdO z59DCGU?3iMpv+b?j1XPQM*s#&a-dYzjXD_;L6AU_g7cXAexp3iM*Uz8-Cm?>lCJeaUKXbnPrT6~(?^HiN7YGRP zhb);?B|l|YmH3ciAw!E)E$N(cmFg*V{K@Yp$8mWkW0nY(VMC7bB3pFGUdcF-CGSPg dxpU{{{{>Xy6{Qhe{x|>t002ovPDHLkV1mPJ?1caT delta 1211 zcmV;s1VsDb7tRTgBYy+*X+uL$Nkc;*P;zf(X>4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+ z0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8nCoMPiX1$ccrw9X z5iY<%0|`MxY)DKvl=ve=5-x_+!%TMvXvO#R%=3Pq@AvyW?|+kl%;#0#cheTkdZDV6 z^49poq?NfrnrB!;H*2bP;OENaA%LpyyF7C4{Y(nr+V++2|MRS=$-sux6F{>T*t3v2 z2D)qeDg@&eu;*y#hmd&|=u+bolaR>*UG*p~09{j2JPvfJ(MmsLT)?y&)f!~xfu5;E zzMhC94*+zPq<<%sV_TI{-YTo+wByQz-N#)2&ok?`mi0CPYlE4QL%>!@9c!q8N*sS; zSBoRSi;%kPhxrPy8B%|=X2x>BHb_4;tqzPu`1GqM8l!Il>mXfo!okrvf5Mv@J{;Ai z&&)IrRbtF#JLsPTo`>|!h8!G<{Ako=UrMzEGir!f4aN1wWD`Zz3tdnPThH+ zy7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq+J8&)9Ddw<^;`O)eqFz%-_RF22>n-m zL0`~ski*5Lj${^zgNGzYI7s$z0hf>}F2CW?OyC|+oc2z4cW&$}r|!u2hVKn?vZs^H z{*wJOdp-MU_H6d|ho-#Zl(dhuue9&AueEQqAF;Ia+6CG5FBd?h$)M+oe%73Pujg*k<$@y~aT!*YRg;F$zYXvBfAp zuyyt-9moVK+2?kqkOa)2aF|2l5+Fl)EPn*(Z~DiTQ*VUU&TRG-E9d*Jv<5wUM~_u? zT}wIjMi^L122#z*+78AiCavffeYZjiNUgil$%SvgzP~`b+R06};EMp(zud`f?S`j6 zhI6~^mYR$I`Ki=T5KQmd8GWtIgMM>q>F#F8ddOlA^b zd#U{;FpmzkLj?eJN2ncAsV~4t05kvq00000000000HE+HdUa{HSbi?w4wKY0yB^c? Z`~<_Z4Xrogre6R6002ovPDHLkV1kYcS;_za diff --git a/src/main/resources/assets/mekanism/textures/blocks/ReactorPort.png b/src/main/resources/assets/mekanism/textures/blocks/ReactorPort.png index bafa1a584b93aa99a48007eadbcc8716f6d5e1e1..cc6294ea363b6d206ad5d185acb985f22d77ae44 100644 GIT binary patch literal 1847 zcmd_q`B#!@6bEoJZL~zm9dOHJQ&~h1TyP5#lpQn?_dvuN&4iRTTP-PZs?l+>vL?pN zN~5EtHI><-lWCS|IhmT;YG&54#kP6h=FgbV`QCfad47A&dG1ppEQwlpW1xFJ*Jt zY&HiJ!-)aJ#>8+rTppV*;DUHO9-qet2x535jzAJCkO~Asj!-NR3VA|_5F`?b#3Hd+ zECEO*QXtEupt!jBcxn7Hu{0q*L6!iLC4%G$@}vZLa-uvn36PweoB~KqOH0eh$WSO0 zN~Kbv%mk=ZDz#djot>SRm#5Wg3kwU+XnfCUv6pq&RxR$D7TZ>Y@6cg8i^$zYw2rNm z?#!}CF;E# z3hT|4jyKO(m)4!oE4R-(Iliu#yU&#q!Mx2=)9=`DI`iKF0pnm`C>u(!EzP?`;{-xQiW7FoY z?$Uykf}xtZci->6y`yi5{M74j=Z2v#L$N;ISxLi%)B4$&)bD2xmVKT+V!Y5&^hQP; ziTHb^MN>hluG=Z+>w7_GzheFKDjxY&t~NWgV>I)x=^=8%Z}s1&Rkk?sjIg~fIgdbH z0aHNV_9HzWw3(*I?AzNVV-ieFjY?HRuGr9bVLu&aEU!#LyNG6ECnf^dv=w`uf(4vF zD)Jjtot``PWv(CSclQaMxkWCEZ&Ip7S(R$JZSE^A$((!8`ggH>92=SAO7}*f_1MB#=}>rS@me zsFTy_u*s~Zp_ErkTGvhTN8(EF?JHa1tGeBQgH`B|T@UImwmjVBiETD6As{-Jugtj~ zy6&6KG22V^yV~!e$K;19rSNnyK4Xz?H}Bm)ElmNA&0agZx8FKZ7cl6y)C;yMJg?lY zD&v`X^VzyA@|G=`!upf8uZP?%3iEe;oY%>9c%i>!+-+u;Slim@3!j>@Mwr3+*0`R} zc){E}S{>G8dE{E8D1%&+^}gWzB};l~;~&j!{PER;S8s8As;j%6CJ>G;NGv#pET6Mu z?;0kIcJRnEvL^3P*PWxEpVXW-$S*!{j+j?GdHDG0UiHg81JMBkNr(0myPu&Q2TJyN zJ4EnL(k6SH(e09G5AL6aEvBCgn-;gDmH1|-cJ0ERwLNdl4yMDu^bQ9%)XuU6#jwZs z*EifW>#k*$cEB%oZ?7&|_RO2-UV`$*ot;Q8w_uHL^R{w(V*ENm%(}7Ca`CCVT`9XX z;nsMkaYt9?o~dk&%ybPt7&3GDdRNNez{@_~!g18#PPW~crs610-}oA7Z?`Y=u*q}B zZpcHvw$UVd#~9APO0sTKP$XrD`3tZW_qEW-UZFOw7gevQEjHA_j(7BY)J5Dm%CAty rY|kheyU7i#I`)E6e%lBy#tZKiQ5n8zlB4vliI1kU9psYx^n$;})>zXy}KKc^2qW;}esR$pT&VC@uh9Q&Bt)bg9uwKV)3M zv>VkLWafdMseeSio`@q40Cbh4CzWGcl~Ud+tLC)h%7op=T>sBA>$aBlHUVpcnUO=l zR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca=bm z=R~7_IO5UNJJo|_pc}OJRkLz9@~oYaZmAOSYZv{n9DC3fJ$HC0;uNL~iX+SUurWFi z)r#Gr8jWkkWh};At*T-v;t_vKZ!G52H`JI*=cAMv2T1YG^93g+YyS25W zcT&CW*jG;7d7!%ah-bO%CpiHEX4=T@$^I|Re}A{3!*N}ld+XZTOY};n7Us9#EY2PIq^1>?^14 z$oGct4Rf-mlg<8;{WE(#`)T%U_V9}@3pVBZ?qq=wDZ~p?Fa3m_NDf1 z;(x7H-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v3+Bf5yCwCKy*NzZ zwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh4$IhP^clUzK_l1k zXKXPFMxU|8C_b=t_9`971S;9*cBYU7%zvP8m_ywPGJ$pxwRdroUIrT;uSV{&`&B@vh#wRAN=ofvrLJCN&yVA*pZ@|94K)c$>O}5~R z0M@_U$!+b1r$2^syX}^mi~sql)K3sh@7fuCt<8geb7|@BX2^U9_di%#`sd8j(trKW zKwE(G?!Q?8ad_2KDscb+00v@9M??Vs0RI60puMM)00009a7bBm000XU000XU0RWnu z7ytkO2XskIMF-vo4iPyVv3_K30001xNkl