diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 717e31c06..225e7b11e 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -2255,10 +2255,10 @@ item.ams_muzzle.name=Strahlenemissions-Mündung item.ams_lens.name=Stabilisierer-Linse -item.ams_core_sing.name=Vibrierende Singularität (AMS-Kern) -item.ams_core_wormhole.name=Winziges Wurmloch (AMS-Kern) -item.ams_core_eyeofharmony.name=Auge der Harmonie (AMS-Kern) -item.ams_core_thingy.name=Dings (AMS-Kern) +item.ams_core_sing.name=Vibrierende Singularität (AMS/DFC-Kern) +item.ams_core_wormhole.name=Winziges Wurmloch (AMS/DFC-Kern) +item.ams_core_eyeofharmony.name=Auge der Harmonie (AMS/DFC-Kern) +item.ams_core_thingy.name=Dings (AMS/DFC-Kern) item.crystal_energy.name=Energiekristall item.pellet_coolant.name=Kühlcluster diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 37a4af8f1..bc2caba4d 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -2255,10 +2255,10 @@ item.ams_muzzle.name=Ray-Emission Muzzle item.ams_lens.name=Stabilizer Lens -item.ams_core_sing.name=Vibrant Singularity (AMS Core) -item.ams_core_wormhole.name=Tiny Wormhole (AMS Core) -item.ams_core_eyeofharmony.name=Eye of Harmony (AMS Core) -item.ams_core_thingy.name=Thingy (AMS Core) +item.ams_core_sing.name=Vibrant Singularity (AMS/DFC Core) +item.ams_core_wormhole.name=Tiny Wormhole (AMS/DFC Core) +item.ams_core_eyeofharmony.name=Eye of Harmony (AMS/DFC Core) +item.ams_core_thingy.name=Thingy (AMS/DFC Core) item.crystal_energy.name=Energy Crystal item.pellet_coolant.name=Coolant Cluster diff --git a/assets/hbm/textures/blocks/barrel_Iron.png b/assets/hbm/textures/blocks/barrel_Iron.png new file mode 100644 index 000000000..9d731cbf6 Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_Iron.png differ diff --git a/assets/hbm/textures/blocks/barrel_antimatter.png b/assets/hbm/textures/blocks/barrel_antimatter.png new file mode 100644 index 000000000..0af2f9c60 Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_antimatter.png differ diff --git a/assets/hbm/textures/blocks/barrel_corroded.png b/assets/hbm/textures/blocks/barrel_corroded.png new file mode 100644 index 000000000..be6deafca Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_corroded.png differ diff --git a/assets/hbm/textures/blocks/barrel_plastic.png b/assets/hbm/textures/blocks/barrel_plastic.png new file mode 100644 index 000000000..0d3dd9543 Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_plastic.png differ diff --git a/assets/hbm/textures/blocks/barrel_red.png b/assets/hbm/textures/blocks/barrel_red.png index f933ed52c..6789cd942 100644 Binary files a/assets/hbm/textures/blocks/barrel_red.png and b/assets/hbm/textures/blocks/barrel_red.png differ diff --git a/assets/hbm/textures/blocks/barrel_steel.png b/assets/hbm/textures/blocks/barrel_steel.png new file mode 100644 index 000000000..db69798a5 Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_steel.png differ diff --git a/assets/hbm/textures/blocks/barrel_yellow.png b/assets/hbm/textures/blocks/barrel_yellow.png index 9ec39f50b..4194c2bea 100644 Binary files a/assets/hbm/textures/blocks/barrel_yellow.png and b/assets/hbm/textures/blocks/barrel_yellow.png differ diff --git a/assets/hbm/textures/gui/storage/gui_barrel.png b/assets/hbm/textures/gui/storage/gui_barrel.png new file mode 100644 index 000000000..322db0b1e Binary files /dev/null and b/assets/hbm/textures/gui/storage/gui_barrel.png differ diff --git a/assets/hbm/textures/gui/gui_battery.png b/assets/hbm/textures/gui/storage/gui_battery.png similarity index 100% rename from assets/hbm/textures/gui/gui_battery.png rename to assets/hbm/textures/gui/storage/gui_battery.png diff --git a/assets/hbm/textures/gui/gui_tank.png b/assets/hbm/textures/gui/storage/gui_tank.png similarity index 100% rename from assets/hbm/textures/gui/gui_tank.png rename to assets/hbm/textures/gui/storage/gui_tank.png diff --git a/assets/hbm/textures/items/ingot_aluminium.png b/assets/hbm/textures/items/ingot_aluminium.png index 1cdce6dfc..963b869d4 100644 Binary files a/assets/hbm/textures/items/ingot_aluminium.png and b/assets/hbm/textures/items/ingot_aluminium.png differ diff --git a/assets/hbm/textures/items/ingot_copper.png b/assets/hbm/textures/items/ingot_copper.png index 86c00337d..8f771cf7a 100644 Binary files a/assets/hbm/textures/items/ingot_copper.png and b/assets/hbm/textures/items/ingot_copper.png differ diff --git a/assets/hbm/textures/items/neutron_reflector.png b/assets/hbm/textures/items/neutron_reflector.png index ce45a91ba..804f105a8 100644 Binary files a/assets/hbm/textures/items/neutron_reflector.png and b/assets/hbm/textures/items/neutron_reflector.png differ diff --git a/assets/hbm/textures/items/plate2grayscale.png b/assets/hbm/textures/items/plate2grayscale.png new file mode 100644 index 000000000..06b7ea0a9 Binary files /dev/null and b/assets/hbm/textures/items/plate2grayscale.png differ diff --git a/assets/hbm/textures/items/plate_aluminium.png b/assets/hbm/textures/items/plate_aluminium.png deleted file mode 100644 index 0222abc00..000000000 Binary files a/assets/hbm/textures/items/plate_aluminium.png and /dev/null differ diff --git a/assets/hbm/textures/items/plate_aluminium_old.png b/assets/hbm/textures/items/plate_aluminium_old.png deleted file mode 100644 index c89c63253..000000000 Binary files a/assets/hbm/textures/items/plate_aluminium_old.png and /dev/null differ diff --git a/assets/hbm/textures/items/plate_aluminum.png b/assets/hbm/textures/items/plate_aluminum.png new file mode 100644 index 000000000..8d7e1da0a Binary files /dev/null and b/assets/hbm/textures/items/plate_aluminum.png differ diff --git a/assets/hbm/textures/items/plate_copper.png b/assets/hbm/textures/items/plate_copper.png index 770e03a4c..b2ea38cd8 100644 Binary files a/assets/hbm/textures/items/plate_copper.png and b/assets/hbm/textures/items/plate_copper.png differ diff --git a/assets/hbm/textures/items/plate_desh.png b/assets/hbm/textures/items/plate_desh.png index e7fe1ba83..e7648722b 100644 Binary files a/assets/hbm/textures/items/plate_desh.png and b/assets/hbm/textures/items/plate_desh.png differ diff --git a/assets/hbm/textures/items/plate_dineutronium.png b/assets/hbm/textures/items/plate_dineutronium.png index ef3708302..d22b37b34 100644 Binary files a/assets/hbm/textures/items/plate_dineutronium.png and b/assets/hbm/textures/items/plate_dineutronium.png differ diff --git a/assets/hbm/textures/items/plate_euphemium.png b/assets/hbm/textures/items/plate_euphemium.png index 72f6214cb..b0ea33c24 100644 Binary files a/assets/hbm/textures/items/plate_euphemium.png and b/assets/hbm/textures/items/plate_euphemium.png differ diff --git a/assets/hbm/textures/items/plate_kevlar.png b/assets/hbm/textures/items/plate_kevlar.png index cf32dbb30..5c7efbb19 100644 Binary files a/assets/hbm/textures/items/plate_kevlar.png and b/assets/hbm/textures/items/plate_kevlar.png differ diff --git a/assets/hbm/textures/items/plate_mixed.png b/assets/hbm/textures/items/plate_mixed.png index 8a5273f53..768dff6af 100644 Binary files a/assets/hbm/textures/items/plate_mixed.png and b/assets/hbm/textures/items/plate_mixed.png differ diff --git a/assets/hbm/textures/items/plate_polymer.png b/assets/hbm/textures/items/plate_polymer.png index a1a901356..38e9215fb 100644 Binary files a/assets/hbm/textures/items/plate_polymer.png and b/assets/hbm/textures/items/plate_polymer.png differ diff --git a/assets/hbm/textures/items/plate_steel_old.png b/assets/hbm/textures/items/plate_steel_old.png deleted file mode 100644 index 502eafcc0..000000000 Binary files a/assets/hbm/textures/items/plate_steel_old.png and /dev/null differ diff --git a/assets/hbm/textures/items/plate_titanium_old.png b/assets/hbm/textures/items/plate_titanium_old.png deleted file mode 100644 index c42e7a74e..000000000 Binary files a/assets/hbm/textures/items/plate_titanium_old.png and /dev/null differ diff --git a/assets/hbm/textures/items/powder_copper.png b/assets/hbm/textures/items/powder_copper.png index 15e48cb01..6587c3915 100644 Binary files a/assets/hbm/textures/items/powder_copper.png and b/assets/hbm/textures/items/powder_copper.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 598206b8b..606259b15 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -6,6 +6,7 @@ import com.hbm.blocks.fluid.*; import com.hbm.blocks.machine.*; import com.hbm.blocks.test.*; import com.hbm.items.bomb.ItemPrototypeBlock; +import com.hbm.items.special.ItemBlockLore; import com.hbm.items.special.ItemOreBlock; import com.hbm.items.special.ItemPlasmaBlock; import com.hbm.items.special.ItemSchrabidiumBlock; @@ -395,6 +396,13 @@ public class ModBlocks { public static Block gas_duct; public static Block fluid_duct; + public static Block barrel_plastic; + public static Block barrel_corroded; + public static Block barrel_iron; + public static Block barrel_steel; + public static Block barrel_antimatter; + public static final int guiID_barrel = 18; + public static Block machine_transformer; public static Block machine_transformer_20; public static Block machine_transformer_dnt; @@ -838,7 +846,7 @@ public class ModBlocks { asphalt = new BlockGeneric(Material.rock).setBlockName("asphalt").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":asphalt"); reinforced_brick = new BlockGeneric(Material.rock).setBlockName("reinforced_brick").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(8000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_brick"); - reinforced_glass = new ReinforcedBlock(Material.glass).setBlockName("reinforced_glass").setCreativeTab(MainRegistry.blockTab).setLightOpacity(0).setHardness(15.0F).setResistance(200.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_glass"); + reinforced_glass = new ReinforcedBlock(Material.glass).setBlockName("reinforced_glass").setCreativeTab(MainRegistry.blockTab).setLightOpacity(0).setHardness(5.0F).setResistance(200.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_glass"); reinforced_light = new ReinforcedBlock(Material.rock).setBlockName("reinforced_light").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setLightLevel(1.0F).setHardness(15.0F).setResistance(300.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_light"); reinforced_sand = new BlockGeneric(Material.rock).setBlockName("reinforced_sand").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(400.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_sand"); reinforced_lamp_off = new ReinforcedLamp(Material.rock, false).setBlockName("reinforced_lamp_off").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(300.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_lamp_off"); @@ -1019,6 +1027,12 @@ public class ModBlocks { gas_duct = new BlockGasDuct(Material.iron).setBlockName("gas_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_duct_icon"); fluid_duct = new BlockFluidDuct(Material.iron).setBlockName("fluid_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fluid_duct_icon"); + barrel_plastic = new BlockFluidBarrel(Material.iron, 12000).setBlockName("barrel_plastic").setStepSound(Block.soundTypeStone).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_plastic"); + barrel_corroded = new BlockFluidBarrel(Material.iron, 6000).setBlockName("barrel_corroded").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_corroded"); + barrel_iron = new BlockFluidBarrel(Material.iron, 8000).setBlockName("barrel_iron").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_iron"); + barrel_steel = new BlockFluidBarrel(Material.iron, 16000).setBlockName("barrel_steel").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_steel"); + barrel_antimatter = new BlockFluidBarrel(Material.iron, 16000).setBlockName("barrel_antimatter").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_antimatter"); + machine_transformer = new MachineTransformer(Material.iron, 10000L, 1).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer_iron"); machine_transformer_dnt = new MachineTransformer(Material.iron, 1000000000000000L, 1).setBlockName("machine_transformer_dnt").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer"); machine_transformer_20 = new MachineTransformer(Material.iron, 10000L, 20).setBlockName("machine_transformer_20").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer_iron"); @@ -1533,9 +1547,9 @@ public class ModBlocks { GameRegistry.registerBlock(det_cord, det_cord.getUnlocalizedName()); GameRegistry.registerBlock(det_charge, det_charge.getUnlocalizedName()); GameRegistry.registerBlock(det_nuke, det_nuke.getUnlocalizedName()); - GameRegistry.registerBlock(red_barrel, red_barrel.getUnlocalizedName()); - GameRegistry.registerBlock(pink_barrel, pink_barrel.getUnlocalizedName()); - GameRegistry.registerBlock(lox_barrel, lox_barrel.getUnlocalizedName()); + GameRegistry.registerBlock(red_barrel, ItemBlockLore.class, red_barrel.getUnlocalizedName()); + GameRegistry.registerBlock(pink_barrel, ItemBlockLore.class, pink_barrel.getUnlocalizedName()); + GameRegistry.registerBlock(lox_barrel, ItemBlockLore.class, lox_barrel.getUnlocalizedName()); GameRegistry.registerBlock(taint_barrel, taint_barrel.getUnlocalizedName()); GameRegistry.registerBlock(yellow_barrel, yellow_barrel.getUnlocalizedName()); GameRegistry.registerBlock(vitrified_barrel, vitrified_barrel.getUnlocalizedName()); @@ -1624,6 +1638,11 @@ public class ModBlocks { GameRegistry.registerBlock(gas_duct, gas_duct.getUnlocalizedName()); GameRegistry.registerBlock(gas_duct_solid, gas_duct_solid.getUnlocalizedName()); GameRegistry.registerBlock(fluid_duct, fluid_duct.getUnlocalizedName()); + GameRegistry.registerBlock(barrel_plastic, ItemBlockLore.class, barrel_plastic.getUnlocalizedName()); + GameRegistry.registerBlock(barrel_corroded, ItemBlockLore.class, barrel_corroded.getUnlocalizedName()); + GameRegistry.registerBlock(barrel_iron, ItemBlockLore.class, barrel_iron.getUnlocalizedName()); + GameRegistry.registerBlock(barrel_steel, ItemBlockLore.class, barrel_steel.getUnlocalizedName()); + GameRegistry.registerBlock(barrel_antimatter, ItemBlockLore.class, barrel_antimatter.getUnlocalizedName()); GameRegistry.registerBlock(machine_battery_potato, machine_battery_potato.getUnlocalizedName()); GameRegistry.registerBlock(machine_battery, machine_battery.getUnlocalizedName()); GameRegistry.registerBlock(machine_lithium_battery, machine_lithium_battery.getUnlocalizedName()); diff --git a/com/hbm/blocks/bomb/CheaterVirus.java b/com/hbm/blocks/bomb/CheaterVirus.java index 9ff3c09f4..56bbb6626 100644 --- a/com/hbm/blocks/bomb/CheaterVirus.java +++ b/com/hbm/blocks/bomb/CheaterVirus.java @@ -4,6 +4,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.explosion.ExplosionChaos; +import com.hbm.main.MainRegistry; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -33,7 +35,8 @@ public class CheaterVirus extends Block { @Override public void updateTick(World world, int x, int y, int z, Random rand) { - { + + if(MainRegistry.enableVirus){ if(world.getBlock(x + 1, y, z) != ModBlocks.cheater_virus && world.getBlock(x + 1, y, z) != Blocks.air && world.getBlock(x + 1, y, z) != ModBlocks.cheater_virus) { world.setBlock(x + 1, y, z, ModBlocks.cheater_virus); } diff --git a/com/hbm/blocks/bomb/CheaterVirusSeed.java b/com/hbm/blocks/bomb/CheaterVirusSeed.java index 20d2a6b01..7025e9fe2 100644 --- a/com/hbm/blocks/bomb/CheaterVirusSeed.java +++ b/com/hbm/blocks/bomb/CheaterVirusSeed.java @@ -3,6 +3,8 @@ package com.hbm.blocks.bomb; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.main.MainRegistry; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -20,6 +22,9 @@ public class CheaterVirusSeed extends Block { public void breakBlock(World world, int x, int y, int z, Block block, int i) { super.breakBlock(world, x, y, z, block, i); + + if(!MainRegistry.enableVirus) + return; if((world.getBlock(x + 1, y, z) == Blocks.air || world.getBlock(x + 1, y, z) == ModBlocks.cheater_virus || world.getBlock(x + 1, y, z) == ModBlocks.cheater_virus_seed) && (world.getBlock(x - 1, y, z) == Blocks.air || world.getBlock(x - 1, y, z) == ModBlocks.cheater_virus || world.getBlock(x - 1, y, z) == ModBlocks.cheater_virus_seed) && @@ -36,6 +41,9 @@ public class CheaterVirusSeed extends Block { @Override public void updateTick(World world, int x, int y, int z, Random rand) { + + if(!MainRegistry.enableVirus) + return; if((world.getBlock(x + 1, y, z) == Blocks.air || world.getBlock(x + 1, y, z) == ModBlocks.cheater_virus || world.getBlock(x + 1, y, z) == ModBlocks.cheater_virus_seed) && (world.getBlock(x - 1, y, z) == Blocks.air || world.getBlock(x - 1, y, z) == ModBlocks.cheater_virus || world.getBlock(x - 1, y, z) == ModBlocks.cheater_virus_seed) && diff --git a/com/hbm/blocks/bomb/CrystalVirus.java b/com/hbm/blocks/bomb/CrystalVirus.java index f5a741afc..bd12ed61f 100644 --- a/com/hbm/blocks/bomb/CrystalVirus.java +++ b/com/hbm/blocks/bomb/CrystalVirus.java @@ -3,6 +3,7 @@ package com.hbm.blocks.bomb; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.main.MainRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -18,7 +19,8 @@ public class CrystalVirus extends Block { @Override public void updateTick(World world, int x, int y, int z, Random rand) { - { + + if(MainRegistry.enableVirus) { if(world.getBlock(x + 1, y, z) != ModBlocks.crystal_virus && world.getBlock(x + 1, y, z) != Blocks.air && world.getBlock(x + 1, y, z) != ModBlocks.crystal_hardened && world.getBlock(x + 1, y, z) != ModBlocks.crystal_pulsar) { world.setBlock(x + 1, y, z, ModBlocks.crystal_virus); } diff --git a/com/hbm/blocks/machine/BlockFluidBarrel.java b/com/hbm/blocks/machine/BlockFluidBarrel.java new file mode 100644 index 000000000..fa086431e --- /dev/null +++ b/com/hbm/blocks/machine/BlockFluidBarrel.java @@ -0,0 +1,122 @@ +package com.hbm.blocks.machine; + +import java.util.Random; + +import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.Spaghetti; +import com.hbm.main.MainRegistry; +import com.hbm.tileentity.machine.TileEntityBarrel; + +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class BlockFluidBarrel extends BlockContainer { + + int capacity; + + public BlockFluidBarrel(Material p_i45386_1_, int capacity) { + super(p_i45386_1_); + this.capacity = capacity; + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityBarrel(capacity); + } + + @Override + public int getRenderType(){ + return 334081; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @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()) { + FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_barrel, world, x, y, z); + return true; + + } else { + return false; + } + } + + private final Random field_149933_a = new Random(); + private Random rand; + private static boolean keepInventory; + + @Spaghetti("stop doing that and make a base class for fuck's sake") + @Override + public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) + { + if (!keepInventory) + { + ISidedInventory tileentityfurnace = (ISidedInventory)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); + + if (tileentityfurnace != null) + { + for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1) + { + ItemStack itemstack = tileentityfurnace.getStackInSlot(i1); + + if (itemstack != null) + { + float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + + while (itemstack.stackSize > 0) + { + int j1 = this.field_149933_a.nextInt(21) + 10; + + if (j1 > itemstack.stackSize) + { + j1 = itemstack.stackSize; + } + + itemstack.stackSize -= j1; + EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); + + if (itemstack.hasTagCompound()) + { + entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); + } + + float f3 = 0.05F; + entityitem.motionX = (float)this.field_149933_a.nextGaussian() * f3; + entityitem.motionY = (float)this.field_149933_a.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float)this.field_149933_a.nextGaussian() * f3; + p_149749_1_.spawnEntityInWorld(entityitem); + } + } + } + + p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_); + } + } + + super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); + } + +} diff --git a/com/hbm/handler/FluidTypeHandler.java b/com/hbm/handler/FluidTypeHandler.java index 6e92c5713..a0e70b732 100644 --- a/com/hbm/handler/FluidTypeHandler.java +++ b/com/hbm/handler/FluidTypeHandler.java @@ -8,18 +8,18 @@ public class FluidTypeHandler { NONE (0x888888, 0, 1, 1, "hbmfluid.none"), WATER (0x3333FF, 1, 1, 1, "hbmfluid.water"), - STEAM (0xe5e5e5, 9, 2, 1, "hbmfluid.steam"), - HOTSTEAM (0xE7D6D6, 1, 1, 2, "hbmfluid.hotsteam"), - SUPERHOTSTEAM (0xE7B7B7, 2, 1, 2, "hbmfluid.superhotsteam"), + STEAM (0xe5e5e5, 9, 2, 1, "hbmfluid.steam", true, false, false), + HOTSTEAM (0xE7D6D6, 1, 1, 2, "hbmfluid.hotsteam", true, false, false), + SUPERHOTSTEAM (0xE7B7B7, 2, 1, 2, "hbmfluid.superhotsteam", true, false, false), COOLANT (0xd8fcff, 2, 1, 1, "hbmfluid.coolant"), - LAVA (0xFF3300, 3, 1, 1, "hbmfluid.lava"), + LAVA (0xFF3300, 3, 1, 1, "hbmfluid.lava", true, false, false), DEUTERIUM (0x0000FF, 4, 1, 1, "hbmfluid.deuterium"), TRITIUM (0x000099, 5, 1, 1, "hbmfluid.tritium"), OIL (0x020202, 6, 1, 1, "hbmfluid.oil"), - HOTOIL (0x300900, 8, 2, 1, "hbmfluid.hotoil"), + HOTOIL (0x300900, 8, 2, 1, "hbmfluid.hotoil", true, false, false), HEAVYOIL (0x141312, 2, 2, 1, "hbmfluid.heavyoil"), BITUMEN (0x1f2426, 3, 2, 1, "hbmfluid.bitumen"), @@ -45,21 +45,21 @@ public class FluidTypeHandler { NITAN (0x8018ad, 15, 2, 1, "hbmfluid.nitan"), - UF6 (0xD1CEBE, 14, 1, 1, "hbmfluid.uf6"), - PUF6 (0x4C4C4C, 15, 1, 1, "hbmfluid.puf6"), - SAS3 (0x4ffffc, 14, 2, 1, "hbmfluid.sas3"), + UF6 (0xD1CEBE, 14, 1, 1, "hbmfluid.uf6", false, true, false), + PUF6 (0x4C4C4C, 15, 1, 1, "hbmfluid.puf6", false, true, false), + SAS3 (0x4ffffc, 14, 2, 1, "hbmfluid.sas3", false, true, false), - AMAT (0x010101, 0, 2, 1, "hbmfluid.amat"), - ASCHRAB (0xb50000, 1, 2, 1, "hbmfluid.aschrab"), + AMAT (0x010101, 0, 2, 1, "hbmfluid.amat", false, false, true), + ASCHRAB (0xb50000, 1, 2, 1, "hbmfluid.aschrab", false, false, true), - ACID (0xfff7aa, 10, 2, 1, "hbmfluid.acid"), - WATZ (0x86653E, 11, 2, 1, "hbmfluid.watz"), + ACID (0xfff7aa, 10, 2, 1, "hbmfluid.acid", false, true, false), + WATZ (0x86653E, 11, 2, 1, "hbmfluid.watz", false, true, false), CRYOGEL (0x32ffff, 0, 1, 2, "hbmfluid.cryogel"), HYDROGEN (0x4286f4, 3, 1, 2, "hbmfluid.hydrogen"), OXYGEN (0x98bdf9, 4, 1, 2, "hbmfluid.oxygen"), XENON (0xba45e8, 5, 1, 2, "hbmfluid.xenon"), - BALEFIRE (0x28e02e, 6, 1, 2, "hbmfluid.balefire"); + BALEFIRE (0x28e02e, 6, 1, 2, "hbmfluid.balefire", true, true, false); //Approximate HEX Color of the fluid, used for pipe rendering @@ -72,6 +72,12 @@ public class FluidTypeHandler { private int sheetID; //Unlocalized string ID of the fluid private String name; + //Whether the fluid counts is too hot for certain tanks + private boolean hot; + //Whether the fluid counts as corrosive and requires a steel tank + private boolean corrosive; + //Whether the fluid is antimatter and requires magnetic storage + private boolean antimatter; private FluidType(int color, int x, int y, int sheet, String name) { this.color = color; @@ -80,6 +86,17 @@ public class FluidTypeHandler { this.name = name; this.sheetID = sheet; } + + private FluidType(int color, int x, int y, int sheet, String name, boolean hot, boolean corrosive, boolean antimatter) { + this.color = color; + this.textureX = x; + this.textureY = y; + this.name = name; + this.sheetID = sheet; + this.hot = hot; + this.corrosive = corrosive; + this.antimatter = antimatter; + } public int getColor() { return this.color; @@ -123,6 +140,18 @@ public class FluidTypeHandler { public String getName() { return this.toString(); } + + public boolean isHot() { + return hot; + } + + public boolean isCorrosive() { + return corrosive; + } + + public boolean isAntimatter() { + return antimatter; + } }; //More stuff to follow. diff --git a/com/hbm/inventory/FluidTank.java b/com/hbm/inventory/FluidTank.java index 8b84130c9..76595f40e 100644 --- a/com/hbm/inventory/FluidTank.java +++ b/com/hbm/inventory/FluidTank.java @@ -12,6 +12,7 @@ import com.hbm.lib.RefStrings; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEFluidPacket; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; @@ -72,9 +73,9 @@ public class FluidTank { } //Called on TE update - public void updateTank(int x, int y, int z) { + public void updateTank(int x, int y, int z, int dim) { - PacketDispatcher.wrapper.sendToAll(new TEFluidPacket(x, y, z, fluid, index, type)); + PacketDispatcher.wrapper.sendToAllAround(new TEFluidPacket(x, y, z, fluid, index, type), new TargetPoint(dim, x, y, z, 100)); } //Fills tank from canisters diff --git a/com/hbm/inventory/gui/GUIMachineBattery.java b/com/hbm/inventory/gui/GUIMachineBattery.java index 6139ac1aa..4068751ae 100644 --- a/com/hbm/inventory/gui/GUIMachineBattery.java +++ b/com/hbm/inventory/gui/GUIMachineBattery.java @@ -13,7 +13,7 @@ import com.hbm.tileentity.machine.TileEntityMachineBattery; public class GUIMachineBattery extends GuiInfoContainer { - private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_battery.png"); + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_battery.png"); private TileEntityMachineBattery diFurnace; public GUIMachineBattery(InventoryPlayer invPlayer, TileEntityMachineBattery tedf) { diff --git a/com/hbm/inventory/gui/GUIMachineFluidTank.java b/com/hbm/inventory/gui/GUIMachineFluidTank.java index 69149c6e8..04c14766f 100644 --- a/com/hbm/inventory/gui/GUIMachineFluidTank.java +++ b/com/hbm/inventory/gui/GUIMachineFluidTank.java @@ -14,7 +14,7 @@ import net.minecraft.util.ResourceLocation; public class GUIMachineFluidTank extends GuiInfoContainer { - private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_tank.png"); + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_tank.png"); private TileEntityMachineFluidTank tank; public GUIMachineFluidTank(InventoryPlayer invPlayer, TileEntityMachineFluidTank tedf) { diff --git a/com/hbm/items/special/ItemBlockLore.java b/com/hbm/items/special/ItemBlockLore.java new file mode 100644 index 000000000..2c00fa200 --- /dev/null +++ b/com/hbm/items/special/ItemBlockLore.java @@ -0,0 +1,38 @@ +package com.hbm.items.special; + +import java.util.List; + +import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.generic.RedBarrel; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBlockLore extends ItemBlock { + + public ItemBlockLore(Block p_i45328_1_) { + super(p_i45328_1_); + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { + + if(this.field_150939_a instanceof RedBarrel) + list.add("Static fluid barrel"); + + if(this.field_150939_a == ModBlocks.barrel_plastic) + list.add("Cannot store hot fluids"); + + if(this.field_150939_a == ModBlocks.barrel_iron) + list.add("Will leak when corrosive fluids are stored"); + + if(this.field_150939_a == ModBlocks.barrel_steel) + list.add("Can hold corrosive fluids"); + + if(this.field_150939_a == ModBlocks.barrel_antimatter) + list.add("Can store antimatter"); + } + +} diff --git a/com/hbm/items/special/ItemTaintBlock.java b/com/hbm/items/special/ItemTaintBlock.java index 0676cd247..d8d42b741 100644 --- a/com/hbm/items/special/ItemTaintBlock.java +++ b/com/hbm/items/special/ItemTaintBlock.java @@ -14,8 +14,6 @@ import net.minecraft.util.IIcon; public class ItemTaintBlock extends ItemBlock { - private static final String __OBFID = "CL_00000075"; - public ItemTaintBlock(Block p_i45358_1_) { super(p_i45358_1_); @@ -23,18 +21,12 @@ public class ItemTaintBlock extends ItemBlock this.setHasSubtypes(true); } - /** - * Gets an icon index based on an item's damage value - */ @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int p_77617_1_) { return this.field_150939_a.func_149735_b(2, BlockTaint.func_150032_b(p_77617_1_)); } - /** - * Returns the metadata of the block which this Item (ItemBlock) can place - */ public int getMetadata(int p_77647_1_) { return p_77647_1_; diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index a8f292ec8..46bb49c67 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -228,10 +228,11 @@ public class MainRegistry public static boolean enableBomberShortMode = false; public static boolean enableVaults = true; public static boolean enableRads = true; - public static boolean enableCataclysm = true; + public static boolean enableCataclysm = false; public static boolean enableExtendedLogging = false; public static boolean enableHardcoreTaint = false; public static boolean enableGuns = true; + public static boolean enableVirus = true; public static int uraniumSpawn = 6; public static int thoriumSpawn = 7; @@ -534,6 +535,7 @@ public class MainRegistry GameRegistry.registerTileEntity(TileEntityCableSwitch.class, "tileentity_he_switch"); GameRegistry.registerTileEntity(TileEntitySoyuzLauncher.class, "tileentity_soyuz_launcher"); GameRegistry.registerTileEntity(TileEntityTesla.class, "tileentity_tesla_coil"); + GameRegistry.registerTileEntity(TileEntityBarrel.class, "tileentity_fluid_barrel"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); @@ -1541,6 +1543,7 @@ public class MainRegistry enableExtendedLogging = config.get(CATEGORY_GENERAL, "1.18_enableExtendedLogging", false).getBoolean(false); enableHardcoreTaint = config.get(CATEGORY_GENERAL, "1.19_enableHardcoreTaint", false).getBoolean(false); enableGuns = config.get(CATEGORY_GENERAL, "1.20_enableGuns", true).getBoolean(true); + enableVirus = config.get(CATEGORY_GENERAL, "1.21_enableVirus", false).getBoolean(false); final String CATEGORY_OREGEN = "02_ores"; Property PuraniumSpawn = config.get(CATEGORY_OREGEN, "2.00_uraniumSpawnrate", 6); diff --git a/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java b/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java index cc8564018..0315e4615 100644 --- a/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java +++ b/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java @@ -167,7 +167,7 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven tanks[1].loadTank(2, 3, slots); for (int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); power = Library.chargeTEFromItems(slots, 5, power, maxPower); diff --git a/com/hbm/tileentity/bomb/TileEntityLaunchTable.java b/com/hbm/tileentity/bomb/TileEntityLaunchTable.java index 8f06b66f0..0c901b82d 100644 --- a/com/hbm/tileentity/bomb/TileEntityLaunchTable.java +++ b/com/hbm/tileentity/bomb/TileEntityLaunchTable.java @@ -169,7 +169,7 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory tanks[1].loadTank(2, 3, slots); for (int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); power = Library.chargeTEFromItems(slots, 5, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityAMSBase.java b/com/hbm/tileentity/machine/TileEntityAMSBase.java index 35e9eb7de..5239f0bb9 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -260,7 +260,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS tanks[3].setType(6, 7, slots); for(int i = 0; i < 4; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); int f1 = 0, f2 = 0, f3 = 0, f4 = 0; int booster = 0; diff --git a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java index 7c279954c..95fb53ed6 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java @@ -217,7 +217,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, if(!locked) { tank.setType(0, 1, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(power > 0) { //" - (maxHeat / 2)" offsets center to 50% instead of 0% diff --git a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index 8e848868d..9161ebea5 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -219,7 +219,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, if(!locked) { tank.setType(0, 1, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(power > 0) { //" - (maxHeat / 2)" offsets center to 50% instead of 0% diff --git a/com/hbm/tileentity/machine/TileEntityBarrel.java b/com/hbm/tileentity/machine/TileEntityBarrel.java new file mode 100644 index 000000000..ed1046218 --- /dev/null +++ b/com/hbm/tileentity/machine/TileEntityBarrel.java @@ -0,0 +1,103 @@ +package com.hbm.tileentity.machine; + +import java.util.ArrayList; +import java.util.List; + +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.FluidTank; +import com.hbm.lib.Library; +import com.hbm.tileentity.TileEntityMachineBase; + +public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcceptor, IFluidSource { + + public FluidTank tank; + public int mode = 0; + public int age = 0; + public List list = new ArrayList(); + + public TileEntityBarrel(int capacity) { + super(6); + tank = new FluidTank(FluidType.NONE, capacity, 0); + } + + @Override + public String getName() { + return "container.barrel"; + } + + @Override + public void updateEntity() { + + if(!worldObj.isRemote) { + + tank.setType(0, 1, slots); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + } + } + + @Override + public void setFillstate(int fill, int index) { + tank.setFill(fill); + } + + @Override + public void setType(FluidType type, int index) { + tank.setTankType(type); + } + + @Override + public int getMaxFluidFill(FluidType type) { + return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; + } + + @Override + public void fillFluidInit(FluidType type) { + fillFluid(this.xCoord, this.yCoord + 1, this.zCoord, getTact(), type); + fillFluid(this.xCoord, this.yCoord - 1, this.zCoord, getTact(), type); + } + + @Override + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { + Library.transmitFluid(x, y, z, newTact, this, worldObj, type); + } + + @Override + public boolean getTact() { + if (age >= 0 && age < 10) { + return true; + } + + return false; + } + + @Override + public int getFluidFill(FluidType type) { + return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; + } + + @Override + public void setFluidFill(int i, FluidType type) { + if(type.name().equals(tank.getTankType().name())) + tank.setFill(i); + } + + @Override + public List getFluidList(FluidType type) { + return this.list; + } + + @Override + public void clearFluidList(FluidType type) { + this.list.clear(); + } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } +} diff --git a/com/hbm/tileentity/machine/TileEntityCoreEmitter.java b/com/hbm/tileentity/machine/TileEntityCoreEmitter.java index 20b8c23b7..470e61ee7 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreEmitter.java +++ b/com/hbm/tileentity/machine/TileEntityCoreEmitter.java @@ -53,7 +53,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements ICon watts = MathHelper.clamp_int(watts, 1, 100); long demand = maxPower * watts / 2000; - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); beam = 0; @@ -109,6 +109,12 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements ICon if(b != Blocks.air) { + if(b.getMaterial().isLiquid()) { + worldObj.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "random.fizz", 1.0F, 1.0F); + worldObj.setBlockToAir(x, y, z); + break; + } + float hardness = b.getExplosionResistance(null); if(hardness < 6000 && worldObj.rand.nextInt(20) == 0) { worldObj.func_147480_a(x, y, z, false); diff --git a/com/hbm/tileentity/machine/TileEntityCoreInjector.java b/com/hbm/tileentity/machine/TileEntityCoreInjector.java index 8724008b1..dc256cb9a 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreInjector.java +++ b/com/hbm/tileentity/machine/TileEntityCoreInjector.java @@ -88,8 +88,8 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl this.markDirty(); - tanks[0].updateTank(xCoord, yCoord, zCoord); - tanks[1].updateTank(xCoord, yCoord, zCoord); + tanks[0].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + tanks[1].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); NBTTagCompound data = new NBTTagCompound(); data.setInteger("beam", beam); diff --git a/com/hbm/tileentity/machine/TileEntityCoreReceiver.java b/com/hbm/tileentity/machine/TileEntityCoreReceiver.java index b8457ec2a..a877e2da8 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreReceiver.java +++ b/com/hbm/tileentity/machine/TileEntityCoreReceiver.java @@ -43,7 +43,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements ISo if (!worldObj.isRemote) { - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); power += joules * 5000; diff --git a/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/com/hbm/tileentity/machine/TileEntityFWatzCore.java index f28908f37..054bf268a 100644 --- a/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -347,7 +347,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, tanks[2].loadTank(4, 6, slots); for(int i = 0; i < 3; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } if(this.isRunning() && (tanks[1].getFill() <= 0 || tanks[2].getFill() <= 0 || !hasFuse() || getSingularityType() == 0) || cooldown || !this.isStructureValid(worldObj)) diff --git a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java index e85c76d36..8aaadf3f7 100644 --- a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java @@ -989,7 +989,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve tanks[2].loadTank(3, 11, slots); for(int i = 0; i < 3; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(slots[2] != null && slots[2].getItem() == ModItems.tritium_deuterium_cake) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineBoiler.java b/com/hbm/tileentity/machine/TileEntityMachineBoiler.java index 969ab0229..7c6776ba0 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineBoiler.java +++ b/com/hbm/tileentity/machine/TileEntityMachineBoiler.java @@ -239,7 +239,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento tanks[1].unloadTank(5, 6, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); boolean flag1 = false; diff --git a/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java b/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java index 98b41ea00..52fc4667e 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java +++ b/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java @@ -249,7 +249,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide tanks[1].unloadTank(5, 6, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(heat > 2000) { heat -= 30; diff --git a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java index 556681b6b..afaacfdf6 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java @@ -288,7 +288,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv power = Library.chargeTEFromItems(slots, 0, power, maxPower); tank.loadTank(2, 5, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if (canProcess()) { process(); diff --git a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 6c1ed0983..0e50d890d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -307,7 +307,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve tanks[3].unloadTank(10, 12, slots); for(int i = 0; i < 4; i++) { - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } FluidStack[] inputs = MachineRecipes.getFluidInputFromTempate(slots[4]); diff --git a/com/hbm/tileentity/machine/TileEntityMachineCoal.java b/com/hbm/tileentity/machine/TileEntityMachineCoal.java index 008128e5a..27c2aa3da 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCoal.java @@ -236,7 +236,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory //Water tank.loadTank(0, 3, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); //Battery Item power = Library.chargeItemsFromTE(slots, 2, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index 5ba356582..a5948aa71 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -222,7 +222,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento //Tank Management tank.setType(3, 4, slots); tank.loadTank(0, 1, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); FluidType type = tank.getTankType(); if(type.name().equals(FluidType.NITAN.name())) diff --git a/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java index f0b9a2d4d..5bb557b9f 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java +++ b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java @@ -206,7 +206,7 @@ public class TileEntityMachineFluidTank extends TileEntity implements ISidedInve tank.loadTank(2, 3, slots); tank.setType(0, 1, slots); tank.unloadTank(4, 5, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index 97fe4ed0a..a5aba4f27 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -283,7 +283,7 @@ public class TileEntityMachineGasCent extends TileEntity implements ISidedInvent power = Library.chargeTEFromItems(slots, 0, power, maxPower); tank.setType(1, 2, slots); tank.loadTank(3, 4, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(canProcess()) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java index 74d199cd0..b3cdef8c3 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java @@ -221,7 +221,7 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven if(!worldObj.isRemote) { tank.loadTank(1, 2, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(tank.getFill() >= 10) { tank.setFill(tank.getFill() - 10); diff --git a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java index 70a432e4d..f75eb8a2b 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java @@ -290,7 +290,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve tanks[1].loadTank(10, 13, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); //Batteries power = Library.chargeItemsFromTE(slots, 11, power, powerMax); diff --git a/com/hbm/tileentity/machine/TileEntityMachineInserter.java b/com/hbm/tileentity/machine/TileEntityMachineInserter.java index 6105a31e6..30e968532 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineInserter.java +++ b/com/hbm/tileentity/machine/TileEntityMachineInserter.java @@ -221,9 +221,9 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven tanks[0].setType(1, 2, slots); tanks[1].setType(4, 5, slots); tanks[2].setType(7, 8, slots); - tanks[0].updateTank(xCoord, yCoord, zCoord); - tanks[1].updateTank(xCoord, yCoord, zCoord); - tanks[2].updateTank(xCoord, yCoord, zCoord); + tanks[0].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + tanks[1].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + tanks[2].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java index 245fdeac3..16d3f5589 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java +++ b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java @@ -250,7 +250,7 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent this.tanks[1].unloadTank(3, 4, slots); for(int i = 0; i < 2; i++) { - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } power = Library.chargeTEFromItems(slots, 0, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java b/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java index 45e39e1cf..4338ad233 100644 --- a/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java @@ -194,7 +194,7 @@ public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInven { tank.loadTank(0, 1, slots); tank.unloadTank(2, 3, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } } diff --git a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java index 8dd2c6994..3a38c87b3 100644 --- a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java @@ -253,7 +253,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven this.tanks[1].unloadTank(3, 4, slots); for(int i = 0; i < 2; i++) { - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } power = Library.chargeTEFromItems(slots, 0, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java b/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java index 990bbb51a..0598c1859 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java @@ -195,6 +195,7 @@ public class TileEntityMachineReactorLarge extends TileEntity NBTTagList list = new NBTTagList(); tanks[0].writeToNBT(nbt, "water"); tanks[1].writeToNBT(nbt, "coolant"); + tanks[2].writeToNBT(nbt, "steam"); nbt.setInteger("type", type.getID()); for (int i = 0; i < slots.length; i++) { @@ -525,7 +526,7 @@ public class TileEntityMachineReactorLarge extends TileEntity } for (int i = 0; i < 3; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(worldObj.getBlock(xCoord, yCoord, zCoord - 2) == ModBlocks.reactor_ejector && worldObj.getBlockMetadata(xCoord, yCoord, zCoord - 2) == 2) tryEjectInto(xCoord, yCoord, zCoord - 3); diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index 1266fecfb..1e834620d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -419,7 +419,7 @@ public class TileEntityMachineReactorSmall extends TileEntity } for (int i = 0; i < 3; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, rods, 0)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, retracting ? 1 : 0, 1)); diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java index 13cb7e7d8..9116c1c55 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java @@ -371,7 +371,7 @@ public class TileEntityMachineReactorSmallOld extends TileEntity } for (int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); // Batteries power = Library.chargeItemsFromTE(slots, 11, power, powerMax); diff --git a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java index 33fd96d0b..ea636ac54 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java @@ -295,7 +295,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven tanks[4].unloadTank(9, 10, slots); for(int i = 0; i < 5; i++) { - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } if(sulfur >= maxSulfur) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java index e35fc9adf..762027ba0 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java @@ -227,7 +227,7 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide //Tank Management tank.setType(11, 12, slots); tank.loadTank(9, 10, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); FluidType type = tank.getTankType(); if(type.name().equals(FluidType.NITAN.name())) diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index f54bcb15b..d85ab0559 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -251,7 +251,7 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent tanks[1].unloadTank(5, 6, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); } diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index 72a8a210d..049c1e504 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -238,7 +238,7 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven //Tank Management tank.loadTank(0, 1, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); isRunning = false; diff --git a/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java b/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java index ac696d466..a9a1fd157 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java +++ b/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java @@ -196,7 +196,7 @@ public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInvent { tank.loadTank(0, 1, slots); tank.unloadTank(2, 3, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } } diff --git a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java index 10692b8c2..a8ef702e0 100644 --- a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java @@ -221,7 +221,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv tanks[1].loadTank(32, 33, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(hasFuse()) diff --git a/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java b/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java index 58e6d33f8..d6b82b955 100644 --- a/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java +++ b/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java @@ -149,7 +149,7 @@ public class TileEntitySoyuzLauncher extends TileEntity implements ISidedInvento tanks[1].loadTank(2, 3, slots); for (int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); power = Library.chargeTEFromItems(slots, 5, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityWatzCore.java b/com/hbm/tileentity/machine/TileEntityWatzCore.java index 61c1ef21f..8293436fd 100644 --- a/com/hbm/tileentity/machine/TileEntityWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -574,7 +574,7 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I power = Library.chargeItemsFromTE(slots, 37, power, maxPower); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); tank.unloadTank(36, 39, slots); if(slots[36] != null && slots[36].getItem() == ModItems.titanium_filter && slots[36].getItemDamage() + 100 <= slots[36].getMaxDamage())