diff --git a/src/main/java/techreborn/blocks/BlockPlateCuttingMachine.java b/src/main/java/techreborn/blocks/BlockPlateCuttingMachine.java index 344f417d3..97aadca81 100644 --- a/src/main/java/techreborn/blocks/BlockPlateCuttingMachine.java +++ b/src/main/java/techreborn/blocks/BlockPlateCuttingMachine.java @@ -18,6 +18,7 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileBlastFurnace; import techreborn.tiles.TileMachineCasing; +import techreborn.tiles.TilePlateCuttingMachine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -47,6 +48,22 @@ public class BlockPlateCuttingMachine extends BlockMachineBase { this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) + { + return new TilePlateCuttingMachine(); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, + EntityPlayer player, int side, float hitX, float hitY, float hitZ) + { + if (!player.isSneaking()) + player.openGui(Core.INSTANCE, GuiHandler.platecuttingmachineID, world, x, y, + z); + return true; + } @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index d29dc25a8..41f9cbd6e 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -11,6 +11,7 @@ import techreborn.client.container.ContainerGrinder; import techreborn.client.container.ContainerImplosionCompressor; import techreborn.client.container.ContainerLathe; import techreborn.client.container.ContainerMatterFabricator; +import techreborn.client.container.ContainerPlateCuttingMachine; import techreborn.client.container.ContainerQuantumChest; import techreborn.client.container.ContainerQuantumTank; import techreborn.client.container.ContainerRollingMachine; @@ -24,6 +25,7 @@ import techreborn.client.gui.GuiGrinder; import techreborn.client.gui.GuiImplosionCompressor; import techreborn.client.gui.GuiLathe; import techreborn.client.gui.GuiMatterFabricator; +import techreborn.client.gui.GuiPlateCuttingMachine; import techreborn.client.gui.GuiQuantumChest; import techreborn.client.gui.GuiQuantumTank; import techreborn.client.gui.GuiRollingMachine; @@ -38,6 +40,7 @@ import techreborn.tiles.TileGrinder; import techreborn.tiles.TileImplosionCompressor; import techreborn.tiles.TileLathe; import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.TilePlateCuttingMachine; import techreborn.tiles.TileQuantumChest; import techreborn.tiles.TileQuantumTank; import techreborn.tiles.TileRollingMachine; @@ -60,6 +63,8 @@ public class GuiHandler implements IGuiHandler { public static final int chunkloaderID = 11; public static final int assemblingmachineID = 12; public static final int latheID = 13; + public static final int platecuttingmachineID = 14; + @Override @@ -118,6 +123,10 @@ public class GuiHandler implements IGuiHandler { { return new ContainerLathe( (TileLathe) world.getTileEntity(x, y, z), player); + } else if (ID == platecuttingmachineID) + { + return new ContainerPlateCuttingMachine( + (TilePlateCuttingMachine) world.getTileEntity(x, y, z), player); } else if (ID == pdaID) { return null; @@ -182,6 +191,10 @@ public class GuiHandler implements IGuiHandler { { return new GuiLathe(player, (TileLathe) world.getTileEntity(x, y, z)); + } else if (ID == platecuttingmachineID) + { + return new GuiPlateCuttingMachine(player, + (TilePlateCuttingMachine) world.getTileEntity(x, y, z)); } else if (ID == pdaID) { return new GuiPda(player); diff --git a/src/main/java/techreborn/client/container/ContainerPlateCuttingMachine.java b/src/main/java/techreborn/client/container/ContainerPlateCuttingMachine.java new file mode 100644 index 000000000..95e93cc1e --- /dev/null +++ b/src/main/java/techreborn/client/container/ContainerPlateCuttingMachine.java @@ -0,0 +1,56 @@ +package techreborn.client.container; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import techreborn.client.SlotOutput; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileLathe; +import techreborn.tiles.TilePlateCuttingMachine; + +public class ContainerPlateCuttingMachine extends TechRebornContainer { + + EntityPlayer player; + + TilePlateCuttingMachine platecuttingmachine; + + @Override + public boolean canInteractWith(EntityPlayer player) + { + return true; + } + + public int tickTime; + + public ContainerPlateCuttingMachine(TilePlateCuttingMachine tileplatecuttingmachine, + EntityPlayer player) + { + platecuttingmachine = tileplatecuttingmachine; + this.player = player; + + // input + this.addSlotToContainer(new Slot(tileplatecuttingmachine.inventory, 0, 56, 17)); + // outputs + this.addSlotToContainer(new SlotOutput(tileplatecuttingmachine.inventory, 2, 116, 35)); + // power + this.addSlotToContainer(new Slot(tileplatecuttingmachine.inventory, 1, 56, 53)); + + int i; + + for (i = 0; i < 3; ++i) + { + for (int j = 0; j < 9; ++j) + { + this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (i = 0; i < 9; ++i) + { + this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, + 142)); + } + } + +} diff --git a/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java b/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java new file mode 100644 index 000000000..5a4ca1d55 --- /dev/null +++ b/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java @@ -0,0 +1,62 @@ +package techreborn.client.gui; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import techreborn.client.container.ContainerAlloySmelter; +import techreborn.client.container.ContainerBlastFurnace; +import techreborn.client.container.ContainerLathe; +import techreborn.client.container.ContainerPlateCuttingMachine; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileLathe; +import techreborn.tiles.TilePlateCuttingMachine; + +public class GuiPlateCuttingMachine extends GuiContainer { + + private static final ResourceLocation texture = new ResourceLocation( + "techreborn", "textures/gui/plate_cutting_machine.png"); + + TilePlateCuttingMachine platecuttingmachine; + + public GuiPlateCuttingMachine(EntityPlayer player, + TilePlateCuttingMachine tileplatecuttingmachine) + { + super(new ContainerPlateCuttingMachine(tileplatecuttingmachine, player)); + this.xSize = 176; + this.ySize = 167; + platecuttingmachine = tileplatecuttingmachine; + } + + @Override + public void initGui() { + + this.buttonList.clear(); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.buttonList.add(new GuiButton(0, k + 4, l + 4, 20, 20, "R")); + super.initGui(); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, + int p_146976_2_, int p_146976_3_) + { + this.mc.getTextureManager().bindTexture(texture); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + } + + protected void drawGuiContainerForegroundLayer(int p_146979_1_, + int p_146979_2_) + { + this.fontRendererObj.drawString(StatCollector.translateToLocal("tile.techreborn.lathe.name"), 60, 6, 4210752); + this.fontRendererObj.drawString( + I18n.format("container.inventory", new Object[0]), 8, + this.ySize - 96 + 2, 4210752); + } +} diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 2c6b70a78..7ea7d7beb 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -61,6 +61,7 @@ import techreborn.tiles.TileImplosionCompressor; import techreborn.tiles.TileLathe; import techreborn.tiles.TileMachineCasing; import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.TilePlateCuttingMachine; import techreborn.tiles.TileQuantumChest; import techreborn.tiles.TileQuantumTank; import techreborn.tiles.TileRollingMachine; @@ -220,6 +221,7 @@ public class ModBlocks { platecuttingmachine = new BlockPlateCuttingMachine(Material.rock); GameRegistry.registerBlock(platecuttingmachine, "platecuttingmachine"); + GameRegistry.registerTileEntity(TilePlateCuttingMachine.class, "TilePlateCuttingMachine"); Idsu = new BlockIDSU(Material.rock); GameRegistry.registerBlock(Idsu, "idsu"); diff --git a/src/main/java/techreborn/recipes/PlateCuttingMachineRecipe.java b/src/main/java/techreborn/recipes/PlateCuttingMachineRecipe.java new file mode 100644 index 000000000..c9820fddc --- /dev/null +++ b/src/main/java/techreborn/recipes/PlateCuttingMachineRecipe.java @@ -0,0 +1,16 @@ +package techreborn.recipes; + +import net.minecraft.item.ItemStack; +import techreborn.api.recipe.BaseRecipe; + +public class PlateCuttingMachineRecipe extends BaseRecipe { + + public PlateCuttingMachineRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick) + { + super("plateCuttingMachineRecipe", tickTime, euPerTick); + if(input1 != null) + inputs.add(input1); + if(output1 != null) + outputs.add(output1); + } +} diff --git a/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java b/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java new file mode 100644 index 000000000..a934aa9a2 --- /dev/null +++ b/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java @@ -0,0 +1,79 @@ +package techreborn.tiles; + +import ic2.api.energy.prefab.BasicSink; +import ic2.api.tile.IWrenchable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import techreborn.api.recipe.RecipeCrafter; +import techreborn.config.ConfigTechReborn; +import techreborn.init.ModBlocks; +import techreborn.util.Inventory; + +public class TilePlateCuttingMachine extends TileMachineBase implements IWrenchable { + + public int tickTime; + public BasicSink energy; + public Inventory inventory = new Inventory(3, "TilePlateCuttingMachine", 64); + public RecipeCrafter crafter; + + public TilePlateCuttingMachine() + { + //TODO configs + energy = new BasicSink(this, 1000, 2); + //Input slots + int[] inputs = new int[1]; + inputs[0] = 0; + int[] outputs = new int[1]; + outputs[0] = 2; + crafter = new RecipeCrafter("plateCuttingMachineRecipe", this, energy, 2, 2, inventory, inputs, outputs); + } + + @Override + public void updateEntity() + { + super.updateEntity(); + energy.updateEntity(); + crafter.updateEntity(); + } + + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) + { + return false; + } + + @Override + public short getFacing() + { + return 0; + } + + @Override + public void setFacing(short facing) + { + } + + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) + { + return true; + } + + @Override + public float getWrenchDropRate() + { + return 1.0F; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) + { + return new ItemStack(ModBlocks.platecuttingmachine, 1); + } + + public boolean isComplete() + { + return false; + } + +} diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 9ca4c36ae..382a2f343 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -17,6 +17,7 @@ tile.techreborn.grinder.name=Industrial Grinder tile.techreborn.chunkloader.name=Industrial Chunkloader tile.techreborn.assemblinmachine.name=Assembling Machine tile.techreborn.lathe.name=Lathe +tile.techreborn.platecuttingmachine.name=Plate Cutting Machine #Ores