diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 948fd7ec2..2f25a1301 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1047,6 +1047,8 @@ public class ModBlocks { public static Block machine_storage_drum; public static final int guiID_storage_drum = 118; + public static Block machine_autocrafter; + public static Block anvil_iron; public static Block anvil_lead; public static Block anvil_steel; @@ -2166,6 +2168,8 @@ public class ModBlocks { machine_electrolyser = new MachineElectrolyser().setBlockName("machine_electrolyser").setHardness(10.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel_machine"); + machine_autocrafter = new MachineAutocrafter().setBlockName("machine_autocrafter").setCreativeTab(MainRegistry.machineTab); + anvil_iron = new NTMAnvil(Material.iron, 1).setBlockName("anvil_iron").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_iron"); anvil_lead = new NTMAnvil(Material.iron, 1).setBlockName("anvil_lead").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_lead"); anvil_steel = new NTMAnvil(Material.iron, 2).setBlockName("anvil_steel").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_steel"); @@ -2917,6 +2921,8 @@ public class ModBlocks { //GameRegistry.registerBlock(observer_off, observer_off.getUnlocalizedName()); //GameRegistry.registerBlock(observer_on, observer_on.getUnlocalizedName()); + GameRegistry.registerBlock(machine_autocrafter, ItemBlockBase.class, machine_autocrafter.getUnlocalizedName()); + GameRegistry.registerBlock(anvil_iron, ItemBlockBase.class, anvil_iron.getUnlocalizedName()); GameRegistry.registerBlock(anvil_lead, ItemBlockBase.class, anvil_lead.getUnlocalizedName()); GameRegistry.registerBlock(anvil_steel, ItemBlockBase.class, anvil_steel.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/MachineAutocrafter.java b/src/main/java/com/hbm/blocks/machine/MachineAutocrafter.java new file mode 100644 index 000000000..7bb318c6a --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/MachineAutocrafter.java @@ -0,0 +1,65 @@ +package com.hbm.blocks.machine; + +import com.hbm.items.ModItems; +import com.hbm.items.tool.ItemLock; +import com.hbm.lib.RefStrings; +import com.hbm.main.MainRegistry; +import com.hbm.tileentity.machine.TileEntityMachineAutocrafter; +import com.hbm.tileentity.machine.storage.TileEntityCrateBase; + +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class MachineAutocrafter extends BlockContainer { + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public MachineAutocrafter() { + super(Material.iron); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_autocrafter_top"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_autocrafter_side"); + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_autocrafter_bottom"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) { + return side == 1 ? this.iconTop : (side == 0 ? this.iconBottom : this.blockIcon); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileEntityMachineAutocrafter(); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if(world.isRemote) { + return true; + } else if(!player.isSneaking()) { + TileEntity entity = world.getTileEntity(x, y, z); + if(entity instanceof TileEntityMachineAutocrafter) { + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); + } + return true; + } else { + return false; + } + } +} diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index 6a539da64..73d9c279a 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -246,6 +246,7 @@ public class TileMappings { } private static void putMachines() { + put(TileEntityMachineAutocrafter.class, "tileentity_autocrafter"); put(TileEntityDiFurnaceRTG.class, "tileentity_rtg_difurnace"); put(TileEntityMachineRadiolysis.class, "tileentity_radiolysis"); put(TileEntityUVLamp.class, "tileentity_uv_lamp"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutocrafter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutocrafter.java new file mode 100644 index 000000000..388ef2ef9 --- /dev/null +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutocrafter.java @@ -0,0 +1,20 @@ +package com.hbm.tileentity.machine; + +import com.hbm.tileentity.TileEntityMachineBase; + +public class TileEntityMachineAutocrafter extends TileEntityMachineBase { + + public TileEntityMachineAutocrafter() { + super(21); + } + + @Override + public String getName() { + return "container.autocrafter"; + } + + @Override + public void updateEntity() { + + } +} diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 950c219b3..6f579507d 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -261,6 +261,7 @@ container.machineSolidifier=Verfestiger container.machineTurbine=Dampfturbine container.machineTurbofan=Turbofan container.machine_schrabidium_transmutator=Schrabidium-Transmutationsgerät +container.massStorage=Speicher container.microwave=Mikrowelle container.miningDrill=Automatischer Minenbohrer container.miningLaser=Bergbaulaser @@ -3404,6 +3405,7 @@ tile.machine_waste_drum.name=Abklingbecken-Trommel tile.machine_well.name=Ölbohrturm tile.machine_zirnox.name=ZIRNOX Atomreaktor tile.marker_structure.name=Multiblock-Strukturvorlage +tile.mass_storage.name=Massenspeicher tile.meteor_battery.name=Stermenmetall-Elektrostatikgenerator tile.meteor_brick.name=Meteoritenziegel tile.meteor_brick_chiseled.name=Gemeißelter Meteoritenziegel diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index dc3f6b587..31e3ec3b9 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -437,6 +437,7 @@ container.machineSolidifier=Solidifier container.machineTurbine=Steam Turbine container.machineTurbofan=Turbofan container.machine_schrabidium_transmutator=Schrabidium Transmutation Device +container.massStorage=Storage container.microwave=Microwave container.miningDrill=Automatic Mining Drill container.miningLaser=Mining Laser @@ -3797,6 +3798,7 @@ tile.machine_waste_drum.name=Spent Fuel Pool Drum tile.machine_well.name=Oil Derrick tile.machine_zirnox.name=ZIRNOX Nuclear Reactor tile.marker_structure.name=Multiblock Structure Marker +tile.mass_storage.name=Mass Storage Unit tile.meteor_battery.name=Starmetal Static Electricity Generator tile.meteor_brick.name=Meteor Bricks tile.meteor_brick_chiseled.name=Chiseled Meteor Bricks diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_autocrafter_bottom.png b/src/main/resources/assets/hbm/textures/blocks/machine_autocrafter_bottom.png new file mode 100644 index 000000000..d737646cf Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/machine_autocrafter_bottom.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_autocrafter_side.png b/src/main/resources/assets/hbm/textures/blocks/machine_autocrafter_side.png new file mode 100644 index 000000000..5f88cdcb8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/machine_autocrafter_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_autocrafter_top.png b/src/main/resources/assets/hbm/textures/blocks/machine_autocrafter_top.png new file mode 100644 index 000000000..f22794800 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/machine_autocrafter_top.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_autocrafter.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_autocrafter.png new file mode 100644 index 000000000..bffd26401 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/processing/gui_autocrafter.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage_double.png b/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage_double.png deleted file mode 100644 index 65d532788..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage_double.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage_triple.png b/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage_triple.png deleted file mode 100644 index aa9a3cc40..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/storage/gui_mass_storage_triple.png and /dev/null differ