From 44d852ee9b15cddb2aefbcb38bd6bee8b162f195 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 15 Sep 2014 02:11:55 +0100 Subject: [PATCH] I accidentally a linear autominer. Might make a really basic laser redirection block next - none of the refined controls of the Amplifier, none of the collection abilities of the Tractor Beam. --- .../java/mekanism/client/ClientProxy.java | 8 +- .../client/gui/GuiLaserAmplifier.java | 2 +- .../client/gui/GuiLaserTractorBeam.java | 42 ++++ .../render/block/MachineRenderingHandler.java | 8 + .../tileentity/RenderLaserAmplifier.java | 20 +- .../tileentity/RenderLaserTractorBeam.java | 65 ++++++ .../java/mekanism/common/CommonProxy.java | 9 +- .../java/mekanism/common/LaserManager.java | 1 - .../mekanism/common/block/BlockMachine.java | 17 +- .../container/ContainerLaserTractorBeam.java | 58 +++++ .../mekanism/common/tile/TileEntityLaser.java | 2 - .../common/tile/TileEntityLaserAmplifier.java | 13 +- .../tile/TileEntityLaserTractorBeam.java | 204 ++++++++++++++++++ .../mekanism/common/util/InventoryUtils.java | 12 ++ .../assets/mekanism/gui/GuiFullInv.png | Bin 0 -> 2018 bytes .../resources/assets/mekanism/lang/en_US.lang | 6 +- .../assets/mekanism/render/LaserAmplifier.png | Bin 4765 -> 3489 bytes .../mekanism/render/LaserTractorBeam.png | Bin 0 -> 3446 bytes 18 files changed, 437 insertions(+), 30 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java create mode 100644 src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java create mode 100644 src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java create mode 100644 src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java create mode 100644 src/main/resources/assets/mekanism/gui/GuiFullInv.png create mode 100644 src/main/resources/assets/mekanism/render/LaserTractorBeam.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 5bce6bbc5..3221267e4 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -32,6 +32,7 @@ import mekanism.client.gui.GuiFactory; import mekanism.client.gui.GuiFluidicPlenisher; import mekanism.client.gui.GuiGasTank; import mekanism.client.gui.GuiLaserAmplifier; +import mekanism.client.gui.GuiLaserTractorBeam; import mekanism.client.gui.GuiMetallurgicInfuser; import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiPRC; @@ -82,6 +83,7 @@ import mekanism.client.render.tileentity.RenderFluidicPlenisher; import mekanism.client.render.tileentity.RenderGasTank; import mekanism.client.render.tileentity.RenderLaser; import mekanism.client.render.tileentity.RenderLaserAmplifier; +import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderObsidianTNT; @@ -137,6 +139,7 @@ import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; +import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityMultiblock; @@ -304,6 +307,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); + ClientRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam", new RenderLaserTractorBeam()); GameRegistry.registerTileEntity(TileEntityAmbientAccumulator.class, "AmbientAccumulator"); } @@ -467,9 +471,11 @@ public class ClientProxy extends CommonProxy case 44: return new GuiLaserAmplifier(player.inventory, (TileEntityLaserAmplifier)tileEntity); case 45: - return new GuiEntangledBlock(player.inventory, (TileEntityEntangledBlock)tileEntity); + return new GuiLaserTractorBeam(player.inventory, (TileEntityLaserTractorBeam)tileEntity); case 46: return new GuiAmbientAccumulator(player, (TileEntityAmbientAccumulator)tileEntity); + case 47: + return new GuiEntangledBlock(player.inventory, (TileEntityEntangledBlock)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index c7533e2cb..50c8dd187 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -60,7 +60,7 @@ public class GuiLaserAmplifier extends GuiMekanism { return "Stored: " + MekanismUtils.getEnergyDisplay(level); } - }, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 6, 16)); + }, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 6, 10)); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java new file mode 100644 index 000000000..2823c707c --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java @@ -0,0 +1,42 @@ +package mekanism.client.gui; + +import mekanism.common.inventory.container.ContainerLaserTractorBeam; +import mekanism.common.tile.TileEntityLaserTractorBeam; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; + +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; + +public class GuiLaserTractorBeam extends GuiMekanism +{ + public TileEntityLaserTractorBeam tileEntity; + + public GuiLaserTractorBeam(InventoryPlayer inventory, TileEntityLaserTractorBeam tentity) + { + super(tentity, new ContainerLaserTractorBeam(inventory, tentity)); + tileEntity = tentity; + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiFullInv.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 8d469627f..98f6e7f98 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -203,6 +203,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); laserAmplifier.render(0.0560F); } + else if(type == MachineType.LASER_TRACTOR_BEAM) + { + 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, "LaserTractorBeam.png")); + laserAmplifier.render(0.0560F); + } else { MekanismRenderer.renderItem(renderer, metadata, block); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java index eb7024820..0c60be021 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java @@ -33,29 +33,29 @@ public class RenderLaserAmplifier extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 0: + case 0: GL11.glTranslatef(0.0F, -2.0F, 0.0F); - GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); break; - case 5: + 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); + GL11.glRotatef(90, 0.0F, 0.0F, -1.0F); break; - case 4: + 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); + GL11.glRotatef(90, 0.0F, 0.0F, 1.0F); break; - case 2: + 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); + GL11.glRotatef(90, -1.0F, 0.0F, 0.0F); break; - case 3: + 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); + GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); break; } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java new file mode 100644 index 000000000..6c154f603 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java @@ -0,0 +1,65 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelLaserAmplifier; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.tile.TileEntityLaserTractorBeam; +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; + +public class RenderLaserTractorBeam extends TileEntitySpecialRenderer +{ + private ModelLaserAmplifier model = new ModelLaserAmplifier(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityLaserTractorBeam)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntityLaserTractorBeam 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, "LaserTractorBeam.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); + MekanismRenderer.blendOn(); + model.render(0.0625F); + MekanismRenderer.blendOff(); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index c1a5496ad..da8411390 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -28,6 +28,8 @@ import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerFluidicPlenisher; import mekanism.common.inventory.container.ContainerGasTank; +import mekanism.common.inventory.container.ContainerLaserAmplifier; +import mekanism.common.inventory.container.ContainerLaserTractorBeam; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.inventory.container.ContainerPRC; @@ -73,6 +75,7 @@ import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; +import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityMultiblock; @@ -150,7 +153,8 @@ public class CommonProxy GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); GameRegistry.registerTileEntity(TileEntityLaser.class, "Laser"); GameRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier"); - GameRegistry.registerTileEntityWithAlternatives(TileEntityAmbientAccumulator.class, "AmbientAccumulator"); + GameRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam"); + GameRegistry.registerTileEntity(TileEntityAmbientAccumulator.class, "AmbientAccumulator"); } /** @@ -415,8 +419,11 @@ public class CommonProxy case 43: return new ContainerUpgradeManagement(player.inventory, (IUpgradeTile)tileEntity); case 44: + return new ContainerLaserAmplifier(player.inventory, (TileEntityLaserAmplifier)tileEntity); case 45: + return new ContainerLaserTractorBeam(player.inventory, (TileEntityLaserTractorBeam)tileEntity); case 46: + case 47: return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); } diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index 5e24644b5..651a16559 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -7,7 +7,6 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; import mekanism.api.lasers.ILaserReceptor; -import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 81fd1e1df..cf5f98b6e 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -55,6 +55,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; +import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityOsmiumCompressor; @@ -135,8 +136,9 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider; * 1:12: Fluidic Plenisher * 1:13: Laser * 1:14: Laser Amplifier - * 1:15: Entangled Block - * 2:0: Ambient Accumulator + * 1:15: Laser Tractor Beam + * 2:0: Entangled Block + * 2:1: Ambient Accumulator * @author AidanBrady * */ @@ -199,10 +201,10 @@ 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[15][0] = register.registerIcon("mekanism:SteelCasing"); break; case MACHINE_BLOCK_3: icons[0][0] = register.registerIcon("mekanism:AmbientAccumulator"); + icons[1][0] = register.registerIcon("mekanism:SteelCasing"); break; } @@ -1065,8 +1067,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer FLUIDIC_PLENISHER(MachineBlock.MACHINE_BLOCK_2, 12, "FluidicPlenisher", 42, TileEntityFluidicPlenisher.class, true, true, false), LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false), LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false), - ENTANGLED_BLOCK(MachineBlock.MACHINE_BLOCK_2, 15, "EntangledBlock", 45, TileEntityEntangledBlock.class, true, false, false), - AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 0, "AmbientAccumulator", 46, TileEntityAmbientAccumulator.class, true, false, false); + LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false), + AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 0, "AmbientAccumulator", 46, TileEntityAmbientAccumulator.class, true, false, false), + ENTANGLED_BLOCK(MachineBlock.MACHINE_BLOCK_3, 1, "EntangledBlock", 47, TileEntityEntangledBlock.class, true, false, false); public MachineBlock typeBlock; public int meta; @@ -1191,10 +1194,12 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer return usage.laserUsage; case LASER_AMPLIFIER: return 0; - case ENTANGLED_BLOCK: + case LASER_TRACTOR_BEAM: return 0; case AMBIENT_ACCUMULATOR: return 0; + case ENTANGLED_BLOCK: + return 0; default: return 0; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java b/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java new file mode 100644 index 000000000..868f854ba --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java @@ -0,0 +1,58 @@ +package mekanism.common.inventory.container; + +import mekanism.common.tile.TileEntityLaserTractorBeam; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; + +public class ContainerLaserTractorBeam extends Container +{ + private TileEntityLaserTractorBeam tileEntity; + + public ContainerLaserTractorBeam(InventoryPlayer inventory, TileEntityLaserTractorBeam tentity) + { + tileEntity = tentity; + int slotX; + + for (slotX = 0; slotX < 9; slotX++) + { + for (int slotY = 0; slotY < 3; slotY++) + { + addSlotToContainer(new Slot(tentity, slotX + slotY * 9, 8 + slotX * 18, 16 + slotY * 18)); + } + } + + for(slotX = 0; slotX < 9; slotX++) + { + for(int slotY = 0; slotY < 3; slotY++) + { + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); + } + } + + for(slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 9381716bc..19c36f55e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -12,8 +12,6 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 0a5145a36..ef75ec81a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.lasers.ILaserReceptor; import mekanism.common.LaserManager; import mekanism.common.Mekanism; @@ -62,7 +61,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { if(on) { - LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), toFire(), worldObj); + LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), lastFired, worldObj); } } else @@ -80,14 +79,15 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement if(shouldFire() && toFire() > 0) { - if(!on || toFire() != lastFired) + double firing = toFire(); + + if(!on || firing != lastFired) { on = true; + lastFired = firing; Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D)); } - double firing = toFire(); - MovingObjectPosition mop =LaserManager.fireLaser(this, ForgeDirection.getOrientation(facing), firing, worldObj); Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ); @@ -122,7 +122,6 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } setEnergy(getEnergy() - firing); - lastFired = firing; } else if(on) { @@ -186,6 +185,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement data.add(threshold); data.add(time); data.add(collectedEnergy); + data.add(lastFired); return data; } @@ -204,6 +204,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement threshold = dataStream.readDouble(); time = dataStream.readInt(); collectedEnergy = dataStream.readDouble(); + lastFired = dataStream.readDouble(); return; } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java new file mode 100644 index 000000000..d9e5537cf --- /dev/null +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -0,0 +1,204 @@ +package mekanism.common.tile; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; +import mekanism.api.lasers.ILaserReceptor; +import mekanism.api.util.StackUtils; +import mekanism.common.LaserManager; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.InventoryUtils; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraftforge.common.util.ForgeDirection; + +import io.netty.buffer.ByteBuf; + +public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor +{ + public static final double MAX_ENERGY = 5E9; + public double collectedEnergy = 0; + public double lastFired = 0; + + public boolean on = false; + + public Coord4D digging; + public double diggingProgress; + + public static int[] availableSlotIDs = InventoryUtils.getIntRange(0, 26); + + public TileEntityLaserTractorBeam() + { + super("LaserTractorBeam"); + inventory = new ItemStack[27]; + } + + @Override + public void receiveLaserEnergy(double energy, ForgeDirection side) + { + setEnergy(getEnergy() + energy); + } + + @Override + public boolean canLasersDig() + { + return false; + } + + @Override + public void onUpdate() + { + if(worldObj.isRemote) + { + if(on) + { + LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), lastFired, worldObj); + } + } + else + { + if(collectedEnergy > 0) + { + double firing = collectedEnergy; + + if(!on || firing != lastFired) + { + on = true; + lastFired = firing; + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D)); + } + + MovingObjectPosition mop = LaserManager.fireLaser(this, ForgeDirection.getOrientation(facing), firing, worldObj); + Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ); + + if(hitCoord == null || !hitCoord.equals(digging)) + { + digging = hitCoord; + diggingProgress = 0; + } + + if(hitCoord != null) + { + Block blockHit = hitCoord.getBlock(worldObj); + TileEntity tileHit = hitCoord.getTileEntity(worldObj); + float hardness = blockHit.getBlockHardness(worldObj, hitCoord.xCoord, hitCoord.yCoord, hitCoord.zCoord); + if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) + { + diggingProgress += firing; + + if(diggingProgress >= hardness * general.laserEnergyNeededPerHardness) + { + List drops = blockHit.getDrops(worldObj, hitCoord.xCoord, hitCoord.yCoord, hitCoord.zCoord, hitCoord.getMetadata(worldObj), 0); + if(drops != null) receiveDrops(drops); + blockHit.breakBlock(worldObj, hitCoord.xCoord, hitCoord.yCoord, hitCoord.zCoord, blockHit, hitCoord.getMetadata(worldObj)); + worldObj.setBlockToAir(hitCoord.xCoord, hitCoord.yCoord, hitCoord.zCoord); + diggingProgress = 0; + Minecraft.getMinecraft().effectRenderer.addBlockDestroyEffects(hitCoord.xCoord, hitCoord.yCoord, hitCoord.zCoord, blockHit, hitCoord.getMetadata(worldObj)); + } + else + { + Minecraft.getMinecraft().effectRenderer.addBlockHitEffects(hitCoord.xCoord, hitCoord.yCoord, hitCoord.zCoord, mop); + } + } + } + + setEnergy(getEnergy() - firing); + } + else if(on) + { + on = false; + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D)); + } + } + } + + public void setEnergy(double energy) + { + collectedEnergy = Math.max(0, Math.min(energy, MAX_ENERGY)); + } + + public double getEnergy() + { + return collectedEnergy; + } + + public void receiveDrops(List drops) + { + outer: + for(ItemStack drop : drops) + { + for(int i = 0; i < inventory.length; i++) + { + if(inventory[i] == null) + { + inventory[i] = drop; + continue outer; + } + ItemStack slot = inventory[i]; + if(StackUtils.equalsWildcardWithNBT(slot, drop)) + { + int change = Math.min(drop.stackSize, slot.getMaxStackSize() - slot.stackSize); + slot.stackSize += change; + drop.stackSize -= change; + if(drop.stackSize <= 0) continue outer; + } + } + dropItem(drop); + } + } + + public void dropItem(ItemStack stack) + { + EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1, zCoord + 0.5, stack); + item.motionX = worldObj.rand.nextGaussian() * 0.05; + item.motionY = worldObj.rand.nextGaussian() * 0.05 + 0.2; + item.motionZ = worldObj.rand.nextGaussian() * 0.05; + item.delayBeforeCanPickup = 10; + worldObj.spawnEntityInWorld(item); + } + + public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) + { + return false; + } + + public int[] getAccessibleSlotsFromSide(int p_94128_1_) + { + return availableSlotIDs; + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(on); + data.add(collectedEnergy); + data.add(lastFired); + + return data; + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + if(worldObj.isRemote) + { + super.handlePacketData(dataStream); + + on = dataStream.readBoolean(); + collectedEnergy = dataStream.readDouble(); + lastFired = dataStream.readDouble(); + + return; + } + } +} diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index 13cbe1bca..f92fa4227 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -20,6 +20,18 @@ public final class InventoryUtils { public static final int[] EMPTY = new int[] {}; + public static int[] getIntRange(int start, int end) + { + int[] ret = new int[1 + end - start]; + + for(int i = start; i <= end; i++) + { + ret[i - start] = i; + } + + return ret; + } + public static IInventory checkChestInv(IInventory inv) { if(inv instanceof TileEntityChest) diff --git a/src/main/resources/assets/mekanism/gui/GuiFullInv.png b/src/main/resources/assets/mekanism/gui/GuiFullInv.png new file mode 100644 index 0000000000000000000000000000000000000000..1ae2552afe5c95d2a861301fbf63a42d88a2e870 GIT binary patch literal 2018 zcmcJP2~ZPO8pmH!OhTxEpn^hNB59QdN^4aJawIVvK`g}63OFk&aZ4(%xA@m zq%N-``?W-WFDlPo99nI@lk=3E7vM%Q4JwbAkiK|(fL%UcYY{fL>4=;VD{|(yC38aR{0iPoBNp5B$kX@}C64U7T(>=_GGcvlC3Y zb$?K4{7DSU`+OQsn8p#zCaobW_Bpfo{w-lb6Dsi-5B06h>e9VKI=30ncUU^}Sz|AO z^(PUHyz&Jb2~apG=`y4h$p7fayT_HHr|`v%>ty#iq{} znUdZbYlP2k^O?LI_(ghxgKA2W_2iubUs%8%k9{er)2Le+%|7UB33bSW&QJFHKm>%zlykMR>U|XjmVeMzoHu9F$Y+J+Un}tkp1ZjC$54P85uHbSTfhPk~qJU z`KTnT^Zj?5M`A2DE+~Q(D@nyaPG$2m`49Q?)eox~e7#D(T)aaDm)%m_Ra~6nxxUU+ zjAl868!otVtDBF>CARV%RbEyB^}eXftDTpj8PR_rm9Zam<_EMx34 zT`tod%$9BUx}AhMceaaBEr$;BX0&4;pFmQ1wSDc^7{dAnQmwfCRLw*h7-|@6zbH#A zAto|wW#8weZLO6JoYruh7w?PZbtc3yFZ?v;-*yGDLUj9TT`KD9+w3N}v*mLQUxLu6 z!E^Xfp=zZir(JJu}uA{TsDeJceFxC~L+hHaANh4eO}IPxYzM z_6w&`PZHlCGA!G;RVzg8wUSfzDyYS`o!x^*9a9<0LUXn!kkexAK#iJ{H>NdLI)Y&q z6il1rt)Ku35C99<;P(L=5TF{MkX*X~*6TAvF=?L77-nhzLr-{|$B$k(j@dC$^cdpJ z%XrUlcmd`M$+!Qrq|9`Z5{r->5*x^{F-g^((fP@Z z=}G>7qng7LDv^@p!${HFVdO0Cm!9bvlM!22Gm^8NUvxYocm#^J)SVV(5lnrLZ{X}! mI96ZZT+?{HK@I%Bmfi#$GA5B}#L;-$CG2fz)(=j2ee*MV89s&p literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 33e069979..1e3e60c66 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -117,6 +117,7 @@ tile.MachineBlock2.PortableTank.name=Portable Tank tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Laser Amplifier +tile.MachineBlock2.LaserTractorBeam.name=Laser Tractor Beam //Plastic tile.PlasticBlock.name=Plastic Block @@ -574,8 +575,9 @@ 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.LaserAmplifier=A block that can be used to both merge !nand amplify laser beams. +tooltip.Laser=An advanced form of linear energy!ntransfer that utilizes an extremely!ncollimated beam of light. +tooltip.LaserAmplifier=A block that can be used to merge,!nredirect and amplify laser beams,!nwith fine controls over when to fire +tooltip.LaserTractorBeam=A block used to merge and!nredirect laser beams. Collects!ndrops from blocks it has broken. 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. diff --git a/src/main/resources/assets/mekanism/render/LaserAmplifier.png b/src/main/resources/assets/mekanism/render/LaserAmplifier.png index 1982a3fd090ad330eff6ea9bf7710f5513d3d618..1443543969b655b460abbfce15aeaca578732218 100644 GIT binary patch literal 3489 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 diff --git a/src/main/resources/assets/mekanism/render/LaserTractorBeam.png b/src/main/resources/assets/mekanism/render/LaserTractorBeam.png new file mode 100644 index 0000000000000000000000000000000000000000..92350a98d29e1419d6b81fa1eadc8e60fa659711 GIT binary patch literal 3446 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 literal 0 HcmV?d00001