diff --git a/src/main/java/com/hbm/blocks/network/CraneBoxer.java b/src/main/java/com/hbm/blocks/network/CraneBoxer.java index 5c66aee95..c9cd865bc 100644 --- a/src/main/java/com/hbm/blocks/network/CraneBoxer.java +++ b/src/main/java/com/hbm/blocks/network/CraneBoxer.java @@ -2,15 +2,18 @@ package com.hbm.blocks.network; import com.hbm.lib.RefStrings; import com.hbm.tileentity.network.TileEntityCraneBoxer; +import com.hbm.tileentity.network.TileEntityCraneInserter; import api.hbm.conveyor.IConveyorItem; import api.hbm.conveyor.IConveyorPackage; import api.hbm.conveyor.IEnterableBlock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; @@ -70,6 +73,22 @@ public class CraneBoxer extends BlockCraneBase implements IEnterableBlock { world.spawnEntityInWorld(drop); } } + + @Override + public boolean hasComparatorInputOverride() { + return true; + } + + @Override + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + return Container.calcRedstoneFromInventory((TileEntityCraneInserter)world.getTileEntity(x, y, z)); + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + this.dropContents(world, x, y, z, block, meta, 0, 21); + super.breakBlock(world, x, y, z, block, meta); + } @Override public boolean canPackageEnter(World world, int x, int y, int z, ForgeDirection dir, IConveyorPackage entity) { diff --git a/src/main/java/com/hbm/blocks/network/CraneUnboxer.java b/src/main/java/com/hbm/blocks/network/CraneUnboxer.java index 499ee0903..530a4b248 100644 --- a/src/main/java/com/hbm/blocks/network/CraneUnboxer.java +++ b/src/main/java/com/hbm/blocks/network/CraneUnboxer.java @@ -8,6 +8,7 @@ import api.hbm.conveyor.IConveyorPackage; import api.hbm.conveyor.IEnterableBlock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; @@ -53,6 +54,12 @@ public class CraneUnboxer extends BlockCraneBase implements IEnterableBlock { return 0; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + this.dropContents(world, x, y, z, block, meta, 0, 23); + super.breakBlock(world, x, y, z, block, meta); + } + @Override public boolean canItemEnter(World world, int x, int y, int z, ForgeDirection dir, IConveyorItem entity) { return false; diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 1e07e6614..87b8ca254 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -937,6 +937,9 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.crane_inserter, amount), new Object[] { "CCC", "C C", "CBC", 'C', casing, 'B', ModBlocks.conveyor }); addRecipeAuto(new ItemStack(ModBlocks.crane_extractor, amount), new Object[] { "CCC", "CPC", "CBC", 'C', casing, 'B', ModBlocks.conveyor, 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_PNEUMATIC) }); } + + addRecipeAuto(new ItemStack(ModBlocks.crane_boxer), new Object[] { "WWW", "WPW", "CCC", 'W', KEY_PLANKS, 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_PNEUMATIC), 'C', ModBlocks.conveyor }); + addRecipeAuto(new ItemStack(ModBlocks.crane_unboxer), new Object[] { "WWW", "WPW", "CCC", 'W', KEY_STICK, 'P', Items.shears, 'C', ModBlocks.conveyor }); addShapelessAuto(DictFrame.fromOne(ModItems.parts_legendary, EnumLegendaryType.TIER1), new Object[] { ModItems.ingot_chainsteel, ASBESTOS.ingot(), ModItems.gem_alexandrite }); addShapelessAuto(DictFrame.fromOne(ModItems.parts_legendary, EnumLegendaryType.TIER1, 3), new Object[] { DictFrame.fromOne(ModItems.parts_legendary, EnumLegendaryType.TIER2) }); diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityCraneUnboxer.java b/src/main/java/com/hbm/tileentity/network/TileEntityCraneUnboxer.java index 785257787..68b0c9070 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityCraneUnboxer.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityCraneUnboxer.java @@ -37,8 +37,8 @@ public class TileEntityCraneUnboxer extends TileEntityMachineBase implements IGU int delay = 20; - if(slots[19] != null && slots[19].getItem() == ModItems.upgrade_ejector) { - switch(slots[19].getItemDamage()) { + if(slots[22] != null && slots[22].getItem() == ModItems.upgrade_ejector) { + switch(slots[22].getItemDamage()) { case 0: delay = 10; break; case 1: delay = 5; break; case 2: delay = 2; break; @@ -57,8 +57,8 @@ public class TileEntityCraneUnboxer extends TileEntityMachineBase implements IGU if(worldObj.getTotalWorldTime() % delay == 0 && !worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) { int amount = 1; - if(slots[18] != null && slots[18].getItem() == ModItems.upgrade_stack) { - switch(slots[18].getItemDamage()) { + if(slots[21] != null && slots[18].getItem() == ModItems.upgrade_stack) { + switch(slots[21].getItemDamage()) { case 0: amount = 4; break; case 1: amount = 16; break; case 2: amount = 64; break; @@ -74,7 +74,7 @@ public class TileEntityCraneUnboxer extends TileEntityMachineBase implements IGU IConveyorBelt belt = (IConveyorBelt) b; - for(int i = 9; i < 18; i++) { + for(int i = 0; i < 21; i++) { ItemStack stack = slots[i]; if(stack != null){ diff --git a/src/main/resources/assets/hbm/textures/gui/generators/gui_flare_stack.png b/src/main/resources/assets/hbm/textures/gui/generators/gui_flare_stack.png index 69e2c398b..d8f47ead0 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/generators/gui_flare_stack.png and b/src/main/resources/assets/hbm/textures/gui/generators/gui_flare_stack.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/machine/gui_firebox.png b/src/main/resources/assets/hbm/textures/gui/machine/gui_firebox.png index 8674655ef..e0aa18f12 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/machine/gui_firebox.png and b/src/main/resources/assets/hbm/textures/gui/machine/gui_firebox.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/machine/gui_oilburner.png b/src/main/resources/assets/hbm/textures/gui/machine/gui_oilburner.png index 38ca42375..a9dcb88af 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/machine/gui_oilburner.png and b/src/main/resources/assets/hbm/textures/gui/machine/gui_oilburner.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge_gas.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge_gas.png index 418254967..b829d877d 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge_gas.png and b/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge_gas.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_electrolyser.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_electrolyser.png index e5f10bc5b..7a250f025 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/processing/gui_electrolyser.png and b/src/main/resources/assets/hbm/textures/gui/processing/gui_electrolyser.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_liquefactor.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_liquefactor.png index a0878acab..cd38f0c68 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/processing/gui_liquefactor.png and b/src/main/resources/assets/hbm/textures/gui/processing/gui_liquefactor.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_solidifier.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_solidifier.png index c98d96837..ebd80168f 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/processing/gui_solidifier.png and b/src/main/resources/assets/hbm/textures/gui/processing/gui_solidifier.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_box_router.png b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_box_router.png new file mode 100644 index 000000000..3c65f82da Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_box_router.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_ejector.png b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_ejector.png index fccf0e790..a8905fe30 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_ejector.png and b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_ejector.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_inserter.png b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_inserter.png index a80472273..114a1561a 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_inserter.png and b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_inserter.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_router.png b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_router.png new file mode 100644 index 000000000..767966144 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_router.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_unboxer.png b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_unboxer.png index 63f293eb8..3860f14ff 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_unboxer.png and b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_unboxer.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage.png b/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage.png index e5f502989..d0934251e 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage.png and b/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage.png differ