diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineExcavator.java b/src/main/java/com/hbm/inventory/container/ContainerMachineExcavator.java new file mode 100644 index 000000000..757abbd67 --- /dev/null +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineExcavator.java @@ -0,0 +1,48 @@ +package com.hbm.inventory.container; + +import com.hbm.inventory.SlotMachineOutput; +import com.hbm.tileentity.machine.TileEntityMachineExcavator; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; + +public class ContainerMachineExcavator extends Container { + + TileEntityMachineExcavator excavator; + + public ContainerMachineExcavator(InventoryPlayer invPlayer, TileEntityMachineExcavator tile) { + this.excavator = tile; + + //Battery + this.addSlotToContainer(new Slot(tile, 0, 220, 72)); + //Fluid ID + this.addSlotToContainer(new Slot(tile, 1, 202, 72)); + //Upgrades + for(int i = 0; i < 3; i++) { + this.addSlotToContainer(new Slot(tile, 2 + i, 136 + i * 18, 75)); + } + + for(int i = 0; i < 3; i++) { + for(int j = 0; j < 3; j++) { + this.addSlotToContainer(new SlotMachineOutput(tile, 5 + j + i * 3, 136 + j * 18, 5 + i * 18)); + } + } + + for(int i = 0; i < 3; i++) { + for(int j = 0; j < 9; j++) { + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 41 + j * 18, 122 + i * 18)); + } + } + + for(int i = 0; i < 9; i++) { + this.addSlotToContainer(new Slot(invPlayer, i, 41 + i * 18, 180)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return false; + } +} diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineExcavator.java b/src/main/java/com/hbm/inventory/gui/GUIMachineExcavator.java new file mode 100644 index 000000000..27d5047ac --- /dev/null +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineExcavator.java @@ -0,0 +1,18 @@ +package com.hbm.inventory.gui; + +import com.hbm.inventory.container.ContainerMachineExcavator; +import com.hbm.tileentity.machine.TileEntityMachineExcavator; + +import net.minecraft.entity.player.InventoryPlayer; + +public class GUIMachineExcavator extends GuiInfoContainer { + + public GUIMachineExcavator(InventoryPlayer inventory, TileEntityMachineExcavator tile) { + super(new ContainerMachineExcavator(inventory, tile)); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float interp, int x, int y) { + + } +} diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index 98410e1f9..18169762c 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -253,7 +253,7 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(ModBlocks.steel_wall, new ItemStack(ModItems.powder_steel_tiny, 13)); ShredderRecipes.setRecipe(ModBlocks.steel_corner, new ItemStack(ModItems.powder_steel_tiny, 26)); ShredderRecipes.setRecipe(ModBlocks.steel_beam, new ItemStack(ModItems.powder_steel_tiny, 3)); - ShredderRecipes.setRecipe(ModBlocks.steel_scaffold, new ItemStack(ModItems.powder_steel_tiny, 7)); + ShredderRecipes.setRecipe(new ItemStack(ModBlocks.steel_scaffold, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.powder_steel_tiny, 7)); ShredderRecipes.setRecipe(ModItems.coil_copper, new ItemStack(ModItems.powder_red_copper, 1)); ShredderRecipes.setRecipe(ModItems.coil_copper_torus, new ItemStack(ModItems.powder_red_copper, 2)); ShredderRecipes.setRecipe(ModItems.coil_advanced_alloy, new ItemStack(ModItems.powder_advanced_alloy, 1)); @@ -273,6 +273,7 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(ModBlocks.oil_duct_solid, new ItemStack(ModItems.powder_steel_tiny, 3)); ShredderRecipes.setRecipe(ModBlocks.gas_duct, new ItemStack(ModItems.powder_steel, 1)); ShredderRecipes.setRecipe(ModBlocks.gas_duct_solid, new ItemStack(ModItems.powder_steel, 1)); + ShredderRecipes.setRecipe(ModBlocks.machine_fluidtank, new ItemStack(ModItems.powder_steel, 32)); /* Sellafite scrapping */ ShredderRecipes.setRecipe(ModBlocks.sellafield_slaked, new ItemStack(Blocks.gravel)); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java index c9f1c58cc..13ebe282f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineExcavator.java @@ -1,8 +1,18 @@ package com.hbm.tileentity.machine; +import com.hbm.inventory.container.ContainerMachineExcavator; +import com.hbm.inventory.gui.GUIMachineExcavator; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; -public class TileEntityMachineExcavator extends TileEntityMachineBase { +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.world.World; + +public class TileEntityMachineExcavator extends TileEntityMachineBase implements IGUIProvider { public boolean enableDrill = false; public boolean enableCrusher = false; @@ -23,4 +33,15 @@ public class TileEntityMachineExcavator extends TileEntityMachineBase { public void updateEntity() { } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineExcavator(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineExcavator(player.inventory, this); + } } diff --git a/src/main/resources/assets/hbm/textures/gui/machine/gui_mining_drill.png b/src/main/resources/assets/hbm/textures/gui/machine/gui_mining_drill.png index 962a14cb9..77a0ad4be 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/machine/gui_mining_drill.png and b/src/main/resources/assets/hbm/textures/gui/machine/gui_mining_drill.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drilbit_base.png b/src/main/resources/assets/hbm/textures/items/drilbit_base.png new file mode 100644 index 000000000..4640a5af6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drilbit_base.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drilbit_desh.png b/src/main/resources/assets/hbm/textures/items/drilbit_desh.png new file mode 100644 index 000000000..cbb75ddad Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drilbit_desh.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drilbit_desh_diamond.png b/src/main/resources/assets/hbm/textures/items/drilbit_desh_diamond.png new file mode 100644 index 000000000..d0ff38bf8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drilbit_desh_diamond.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drilbit_hss.png b/src/main/resources/assets/hbm/textures/items/drilbit_hss.png new file mode 100644 index 000000000..f3a0892b8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drilbit_hss.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drilbit_hss_diamond.png b/src/main/resources/assets/hbm/textures/items/drilbit_hss_diamond.png new file mode 100644 index 000000000..cb3a1a72b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drilbit_hss_diamond.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drilbit_steel.png b/src/main/resources/assets/hbm/textures/items/drilbit_steel.png new file mode 100644 index 000000000..8e17be7e9 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drilbit_steel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/drilbit_steel_diamond.png b/src/main/resources/assets/hbm/textures/items/drilbit_steel_diamond.png new file mode 100644 index 000000000..abb1a2f83 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/drilbit_steel_diamond.png differ