diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 757673c91..ee05a8c76 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -82,6 +82,7 @@ chem.PUF6=Plutoniumhexafluoritproduktion chem.BP_BIOGAS=Biogasherstellung chem.BP_BIOFUEL=Biodieselumesterung chem.SAS3=Schrabidiumtrisulfatherstellung +chem.NITAN=NITAN-Supertreibstoff mischen item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -110,11 +111,13 @@ death.attack.flamethrower=%1$s wurde von %2$s gegrillt. death.attack.plasma=%1$s wurde von %2$s eingeäschert. death.attack.ice=%1$s wurde von %2$s in ein Eis am Stiel verwandelt. death.attack.cheater=%1$s's Innereien wurden zu Hafer. (???) -death.attack.laser=%1$s wurde von %2$s in Asche verwandet. +death.attack.laser=%1$s wurde von %2$s zerbröselt. death.attack.rubble=%1$s wurde von Schutt zerquetscht. death.attack.shrapnel=%1$s wurde von einem Schrapnell zerfetzt. death.attack.teleporter=%1$s wurde ins Nichts teleportiert. death.attack.blackhole=%1$s wurde spaghettifiziert. +death.attack.blender=%1$s wurde in kleine, mundgerechte Stücke geschnitten. +death.attack.meteorite=%1$s wurde von einem fallenden Stein aus dem Weltall erschlagen. item.redstone_sword.name=Redstoneschwert item.big_sword.name=Großes Schwert @@ -182,6 +185,7 @@ item.turret_control.name=Geschützsteuerung item.turret_chip.name=Geschütz-KI-Chip tile.bomb_multi.name=Mehrzweckbombe +tile.rejuvinator.name=Regenerationsmaschine tile.flame_war.name=Flamewar aus der Box tile.float_bomb.name=Schwebebombe @@ -411,6 +415,7 @@ item.ingot_desh.name=Deshbarren item.nugget_desh.name=Deshnugget item.powder_desh.name=Deshstaub item.powder_desh_mix.name=Deshmischung +item.powder_nitan_mix.name=Nitaniummischung item.solid_fuel.name=Festbrennstoff @@ -678,6 +683,8 @@ item.inf_antischrabidium.name=Unendlicher Antischrabidiumtank item.oil_canola.name=Rohes Canola-Öl +item.pellet_coal.name=Dichter Kohlecluster + item.canister_empty.name=Leerer Kanister item.canister_smear.name=Industrieölkanister item.canister_canola.name=Schmiermittelkanister diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index fbe901f2e..f2be84df7 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -82,6 +82,7 @@ chem.PUF6=Plutonium Hexafluoride Production chem.BP_BIOGAS=Biogas Production chem.BP_BIOFUEL=Biofuel Transesterification chem.SAS3=Schrabidium Trisulfide Production +chem.NITAN=NITAN Super Fuel Mixing item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -115,6 +116,8 @@ death.attack.rubble=%1$s was squashed by debris. death.attack.shrapnel=%1$s was ragged by a shrapnel. death.attack.teleporter=%1$s was teleported into nothingness. death.attack.blackhole=%1$s was spaghettified. +death.attack.blender=%1$s was chopped in small, bite-sized pieces. +death.attack.meteorite=%1$s was hit by a falling rock from outer space. item.redstone_sword.name=Redstone Sword item.big_sword.name=Great Sword @@ -174,6 +177,7 @@ tile.nuke_prototype.name=The Prototype tile.nuke_custom.name=Custom Nuke tile.bomb_multi.name=Multi Purpose Bomb +tile.rejuvinator.name=Rejuvination Device tile.flame_war.name=Flame War in a Box tile.float_bomb.name=Levitation Bomb @@ -411,6 +415,7 @@ item.ingot_desh.name=Desh Ingot item.nugget_desh.name=Desh Nugget item.powder_desh.name=Desh Powder item.powder_desh_mix.name=Desh Mixture +item.powder_nitan_mix.name=Nitanium Mixture item.solid_fuel.name=Solid Fuel @@ -678,6 +683,8 @@ item.inf_antischrabidium.name=Infinite Antischrabidium Tank item.oil_canola.name=Raw Canola Oil +item.pellet_coal.name=Dense Coal Cluster + item.canister_empty.name=Empty Canister item.canister_smear.name=Industrial Oil Canister item.canister_canola.name=Engine Lubricant diff --git a/assets/hbm/textures/blocks/turret_flamer.png b/assets/hbm/textures/blocks/turret_flamer.png index 961ef7948..471bf68f3 100644 Binary files a/assets/hbm/textures/blocks/turret_flamer.png and b/assets/hbm/textures/blocks/turret_flamer.png differ diff --git a/assets/hbm/textures/blocks/turret_heavy.png b/assets/hbm/textures/blocks/turret_heavy.png index 6f0ebb755..7922fff7b 100644 Binary files a/assets/hbm/textures/blocks/turret_heavy.png and b/assets/hbm/textures/blocks/turret_heavy.png differ diff --git a/assets/hbm/textures/blocks/turret_light.png b/assets/hbm/textures/blocks/turret_light.png index 69db22eb2..cefc65660 100644 Binary files a/assets/hbm/textures/blocks/turret_light.png and b/assets/hbm/textures/blocks/turret_light.png differ diff --git a/assets/hbm/textures/blocks/turret_rocket.png b/assets/hbm/textures/blocks/turret_rocket.png index f3220fd1e..0a5a4c414 100644 Binary files a/assets/hbm/textures/blocks/turret_rocket.png and b/assets/hbm/textures/blocks/turret_rocket.png differ diff --git a/assets/hbm/textures/blocks/turret_tau.png b/assets/hbm/textures/blocks/turret_tau.png index f5b449b7a..19be1105c 100644 Binary files a/assets/hbm/textures/blocks/turret_tau.png and b/assets/hbm/textures/blocks/turret_tau.png differ diff --git a/assets/hbm/textures/gui/fluids2.png b/assets/hbm/textures/gui/fluids2.png index 75641be0b..1b56d122e 100755 Binary files a/assets/hbm/textures/gui/fluids2.png and b/assets/hbm/textures/gui/fluids2.png differ diff --git a/assets/hbm/textures/items/chem_icon_NITAN.png b/assets/hbm/textures/items/chem_icon_NITAN.png new file mode 100644 index 000000000..cae26a5f0 Binary files /dev/null and b/assets/hbm/textures/items/chem_icon_NITAN.png differ diff --git a/assets/hbm/textures/items/powder_nitan_mix.png b/assets/hbm/textures/items/powder_nitan_mix.png new file mode 100644 index 000000000..aae036fbd Binary files /dev/null and b/assets/hbm/textures/items/powder_nitan_mix.png differ diff --git a/assets/hbm/textures/models/tank_NITAN.png b/assets/hbm/textures/models/tank_NITAN.png new file mode 100644 index 000000000..6b6bd88b2 Binary files /dev/null and b/assets/hbm/textures/models/tank_NITAN.png differ diff --git a/assets/hbm/textures/models/tank_SAS3.png b/assets/hbm/textures/models/tank_SAS3.png new file mode 100644 index 000000000..59cbfbb70 Binary files /dev/null and b/assets/hbm/textures/models/tank_SAS3.png differ diff --git a/com/hbm/blocks/bomb/BombRejuvinator.java b/com/hbm/blocks/bomb/BombRejuvinator.java index 02aab9d2c..5a276ed04 100644 --- a/com/hbm/blocks/bomb/BombRejuvinator.java +++ b/com/hbm/blocks/bomb/BombRejuvinator.java @@ -19,6 +19,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -65,8 +66,8 @@ public class BombRejuvinator extends Block implements IBomb { @Override public void explode(World worldObj, int x1, int y1, int z1) { + worldObj.setBlock(x1, y1, z1, Blocks.air); if (!worldObj.isRemote) { - worldObj.setBlockToAir(x1, y1, z1); try { Chunk oldChunk = worldObj.getChunkFromBlockCoords(x1, z1); diff --git a/com/hbm/entity/logic/EntityNukeExplosionMK3.java b/com/hbm/entity/logic/EntityNukeExplosionMK3.java index 1e26411a4..fc33af4fe 100644 --- a/com/hbm/entity/logic/EntityNukeExplosionMK3.java +++ b/com/hbm/entity/logic/EntityNukeExplosionMK3.java @@ -96,7 +96,7 @@ public class EntityNukeExplosionMK3 extends Entity { this.did = true; } - speed = 20; + speed = 100; boolean flag = false; boolean flag2 = false; diff --git a/com/hbm/entity/projectile/EntityBullet.java b/com/hbm/entity/projectile/EntityBullet.java index 063e5fd4e..d99b9da0b 100644 --- a/com/hbm/entity/projectile/EntityBullet.java +++ b/com/hbm/entity/projectile/EntityBullet.java @@ -65,6 +65,7 @@ public class EntityBullet extends Entity implements IProjectile { private boolean isTau = false; private boolean instakill = false; private boolean rad = false; + public boolean antidote = false; public EntityBullet(World p_i1753_1_) { super(p_i1753_1_); @@ -515,6 +516,9 @@ public class EntityBullet extends Entity implements IProjectile { } } + if(antidote) + entitylivingbase.clearActivePotions(); + if (this.knockbackStrength > 0) { f4 = MathHelper .sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); diff --git a/com/hbm/handler/nei/CMBFurnaceRecipeHandler.java b/com/hbm/handler/nei/CMBFurnaceRecipeHandler.java index f085de149..0786dfd8b 100644 --- a/com/hbm/handler/nei/CMBFurnaceRecipeHandler.java +++ b/com/hbm/handler/nei/CMBFurnaceRecipeHandler.java @@ -107,7 +107,7 @@ public class CMBFurnaceRecipeHandler extends TemplateRecipeHandler { transferRectsGui = new LinkedList(); guiGui = new LinkedList>(); - transferRects.add(new RecipeTransferRect(new Rectangle(74 + 6 + 18, 23 + 9, 24, 18), "cmbsmelting")); + transferRects.add(new RecipeTransferRect(new Rectangle(74 + 6 + 18, 23, 24, 18), "cmbsmelting")); transferRectsGui.add(new RecipeTransferRect(new Rectangle(74 + 6 + 18, 23, 24, 18), "cmbsmelting")); guiGui.add(GUIMachineCMBFactory.class); RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects); diff --git a/com/hbm/interfaces/IConsumer.java b/com/hbm/interfaces/IConsumer.java index 6578ee8ef..d22718dc5 100644 --- a/com/hbm/interfaces/IConsumer.java +++ b/com/hbm/interfaces/IConsumer.java @@ -2,9 +2,9 @@ package com.hbm.interfaces; public interface IConsumer { - void setPower(int i); + void setPower(long i); - int getPower(); + long getPower(); - int getMaxPower(); + long getMaxPower(); } diff --git a/com/hbm/interfaces/IFactory.java b/com/hbm/interfaces/IFactory.java index b70c90df1..d52b293cf 100644 --- a/com/hbm/interfaces/IFactory.java +++ b/com/hbm/interfaces/IFactory.java @@ -7,7 +7,7 @@ public interface IFactory { boolean isStructureValid(World world); - public int getPowerScaled(int i); + public long getPowerScaled(long i); public int getProgressScaled(int i); diff --git a/com/hbm/interfaces/IReactor.java b/com/hbm/interfaces/IReactor.java index e049d109f..c0da0b7fd 100644 --- a/com/hbm/interfaces/IReactor.java +++ b/com/hbm/interfaces/IReactor.java @@ -14,7 +14,7 @@ public interface IReactor { int getCoolantScaled(int i); - int getPowerScaled(int i); + long getPowerScaled(long i); int getHeatScaled(int i); diff --git a/com/hbm/interfaces/ISource.java b/com/hbm/interfaces/ISource.java index 873b34bda..2474573bf 100644 --- a/com/hbm/interfaces/ISource.java +++ b/com/hbm/interfaces/ISource.java @@ -9,8 +9,8 @@ public interface ISource { void ffgeua(int x, int y, int z, boolean newTact); boolean getTact(); - int getSPower(); - void setSPower(int i); + long getSPower(); + void setSPower(long i); List getList(); void clearList(); } diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index dc6019e76..8ca07cc62 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -3796,6 +3796,9 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.powder_schrabidium, 1)); list.add(new ItemStack(ModItems.sulfur, 2)); break; + case NITAN: + list.add(new ItemStack(ModItems.powder_nitan_mix, 2)); + break; default: break; } @@ -3955,6 +3958,9 @@ public class MachineRecipes { case SAS3: input[0] = new FluidStack(2000, FluidType.ACID); break; + case NITAN: + input[0] = new FluidStack(600, FluidType.KEROSENE); + break; default: break; } @@ -4139,6 +4145,9 @@ public class MachineRecipes { case SAS3: input[0] = new FluidStack(1000, FluidType.SAS3); break; + case NITAN: + input[0] = new FluidStack(1000, FluidType.NITAN); + break; default: break; } diff --git a/com/hbm/inventory/container/ContainerConverterHeRf.java b/com/hbm/inventory/container/ContainerConverterHeRf.java index 1dad729c0..6bd525daa 100644 --- a/com/hbm/inventory/container/ContainerConverterHeRf.java +++ b/com/hbm/inventory/container/ContainerConverterHeRf.java @@ -23,7 +23,6 @@ public class ContainerConverterHeRf extends Container { @Override public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); - crafting.sendProgressBarUpdate(this, 0, this.diFurnace.power); crafting.sendProgressBarUpdate(this, 1, this.diFurnace.storage.getEnergyStored()); } @@ -46,27 +45,17 @@ public class ContainerConverterHeRf extends Container { { ICrafting par1 = (ICrafting)this.crafters.get(i); - if(this.water != this.diFurnace.power) - { - par1.sendProgressBarUpdate(this, 0, this.diFurnace.power); - } - if(this.flux != this.diFurnace.storage.getEnergyStored()) { par1.sendProgressBarUpdate(this, 1, this.diFurnace.storage.getEnergyStored()); } } - this.water = this.diFurnace.power; this.flux = this.diFurnace.storage.getEnergyStored(); } @Override public void updateProgressBar(int i, int j) { - if(i == 0) - { - diFurnace.power = j; - } if(i == 1) { diFurnace.storage.setEnergyStored(j); diff --git a/com/hbm/inventory/container/ContainerConverterRfHe.java b/com/hbm/inventory/container/ContainerConverterRfHe.java index 50ce092f9..a6f7fb286 100644 --- a/com/hbm/inventory/container/ContainerConverterRfHe.java +++ b/com/hbm/inventory/container/ContainerConverterRfHe.java @@ -23,7 +23,6 @@ public class ContainerConverterRfHe extends Container { @Override public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); - crafting.sendProgressBarUpdate(this, 0, this.diFurnace.power); crafting.sendProgressBarUpdate(this, 1, this.diFurnace.storage.getEnergyStored()); } @@ -46,18 +45,12 @@ public class ContainerConverterRfHe extends Container { { ICrafting par1 = (ICrafting)this.crafters.get(i); - if(this.water != this.diFurnace.power) - { - par1.sendProgressBarUpdate(this, 0, this.diFurnace.power); - } - if(this.flux != this.diFurnace.storage.getEnergyStored()) { par1.sendProgressBarUpdate(this, 1, this.diFurnace.storage.getEnergyStored()); } } - this.water = this.diFurnace.power; this.flux = this.diFurnace.storage.getEnergyStored(); } diff --git a/com/hbm/inventory/container/ContainerCoreAdvanced.java b/com/hbm/inventory/container/ContainerCoreAdvanced.java index 51ee81aff..7b6f6ca78 100644 --- a/com/hbm/inventory/container/ContainerCoreAdvanced.java +++ b/com/hbm/inventory/container/ContainerCoreAdvanced.java @@ -73,7 +73,7 @@ public class ContainerCoreAdvanced extends Container { public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); crafting.sendProgressBarUpdate(this, 0, this.diFurnace.progress); - crafting.sendProgressBarUpdate(this, 1, this.diFurnace.power); + crafting.sendProgressBarUpdate(this, 1, (int)this.diFurnace.power); } @Override @@ -134,12 +134,12 @@ public class ContainerCoreAdvanced extends Container { if(this.power != this.diFurnace.power) { - par1.sendProgressBarUpdate(this, 1, this.diFurnace.power); + par1.sendProgressBarUpdate(this, 1, (int)this.diFurnace.power); } } this.progress = this.diFurnace.progress; - this.power = this.diFurnace.power; + this.power = (int)this.diFurnace.power; } @Override diff --git a/com/hbm/inventory/container/ContainerCoreTitanium.java b/com/hbm/inventory/container/ContainerCoreTitanium.java index 205a72533..7bc363b4f 100644 --- a/com/hbm/inventory/container/ContainerCoreTitanium.java +++ b/com/hbm/inventory/container/ContainerCoreTitanium.java @@ -67,7 +67,7 @@ public class ContainerCoreTitanium extends Container { public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); crafting.sendProgressBarUpdate(this, 0, this.diFurnace.progress); - crafting.sendProgressBarUpdate(this, 1, this.diFurnace.power); + crafting.sendProgressBarUpdate(this, 1, (int)this.diFurnace.power); } @Override @@ -127,12 +127,12 @@ public class ContainerCoreTitanium extends Container { if(this.power != this.diFurnace.power) { - par1.sendProgressBarUpdate(this, 1, this.diFurnace.power); + par1.sendProgressBarUpdate(this, 1, (int)this.diFurnace.power); } } this.progress = this.diFurnace.progress; - this.power = this.diFurnace.power; + this.power = (int)this.diFurnace.power; } @Override diff --git a/com/hbm/inventory/container/ContainerMachineDeuterium.java b/com/hbm/inventory/container/ContainerMachineDeuterium.java index eec91e41a..dd5fffa31 100644 --- a/com/hbm/inventory/container/ContainerMachineDeuterium.java +++ b/com/hbm/inventory/container/ContainerMachineDeuterium.java @@ -106,14 +106,8 @@ private TileEntityMachineDeuterium nukeBoy; { par1.sendProgressBarUpdate(this, 2, this.nukeBoy.sulfur); } - - if(this.power != this.nukeBoy.power) - { - par1.sendProgressBarUpdate(this, 3, this.nukeBoy.power); - } } - this.power = this.nukeBoy.power; this.progress = this.nukeBoy.process; this.water = this.nukeBoy.water; this.sulfur = this.nukeBoy.sulfur; diff --git a/com/hbm/inventory/container/ContainerMachineGasFlare.java b/com/hbm/inventory/container/ContainerMachineGasFlare.java index ad74f2ba3..01bb5effc 100644 --- a/com/hbm/inventory/container/ContainerMachineGasFlare.java +++ b/com/hbm/inventory/container/ContainerMachineGasFlare.java @@ -39,7 +39,6 @@ public class ContainerMachineGasFlare extends Container { @Override public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); - crafting.sendProgressBarUpdate(this, 0, this.testNuke.power); } @Override diff --git a/com/hbm/inventory/container/ContainerMachineRefinery.java b/com/hbm/inventory/container/ContainerMachineRefinery.java index 6452f2038..0f1999299 100644 --- a/com/hbm/inventory/container/ContainerMachineRefinery.java +++ b/com/hbm/inventory/container/ContainerMachineRefinery.java @@ -60,7 +60,6 @@ public class ContainerMachineRefinery extends Container { @Override public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); - crafting.sendProgressBarUpdate(this, 0, this.testNuke.power); } @Override diff --git a/com/hbm/inventory/container/ContainerReiXMainframe.java b/com/hbm/inventory/container/ContainerReiXMainframe.java index ce83b79ee..46bca8ef6 100644 --- a/com/hbm/inventory/container/ContainerReiXMainframe.java +++ b/com/hbm/inventory/container/ContainerReiXMainframe.java @@ -34,7 +34,6 @@ public class ContainerReiXMainframe extends Container { @Override public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); - crafting.sendProgressBarUpdate(this, 0, this.diFurnace.power); } @Override @@ -74,29 +73,4 @@ public class ContainerReiXMainframe extends Container { public boolean canInteractWith(EntityPlayer player) { return diFurnace.isUseableByPlayer(player); } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for(int i = 0; i < this.crafters.size(); i++) - { - ICrafting par1 = (ICrafting)this.crafters.get(i); - - if(this.power != this.diFurnace.power) - { - par1.sendProgressBarUpdate(this, 0, this.diFurnace.power); - } - } - - this.power = this.diFurnace.power; - } - - @Override - public void updateProgressBar(int i, int j) { - if(i == 0) - { - diFurnace.power = j; - } - } } diff --git a/com/hbm/inventory/gui/GUIConverterHeRf.java b/com/hbm/inventory/gui/GUIConverterHeRf.java index 724b27e49..cd68c4c83 100644 --- a/com/hbm/inventory/gui/GUIConverterHeRf.java +++ b/com/hbm/inventory/gui/GUIConverterHeRf.java @@ -35,12 +35,12 @@ public class GUIConverterHeRf extends GuiContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 28, guiTop + 69 - i, 176, 52 - i, 12, i); } if(diFurnace.storage.getEnergyStored() > 0) { - int i = diFurnace.getFluxScaled(52); + int i = (int)diFurnace.getFluxScaled(52); drawTexturedModalRect(guiLeft + 136, guiTop + 69 - i, 188, 52 - i, 12, i); } } diff --git a/com/hbm/inventory/gui/GUIConverterRfHe.java b/com/hbm/inventory/gui/GUIConverterRfHe.java index 53688126d..4e49bac3c 100644 --- a/com/hbm/inventory/gui/GUIConverterRfHe.java +++ b/com/hbm/inventory/gui/GUIConverterRfHe.java @@ -35,7 +35,7 @@ public class GUIConverterRfHe extends GuiContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 136, guiTop + 69 - i, 188, 52 - i, 12, i); } diff --git a/com/hbm/inventory/gui/GUICoreAdvanced.java b/com/hbm/inventory/gui/GUICoreAdvanced.java index 7cf9a1ef7..8f7224c26 100644 --- a/com/hbm/inventory/gui/GUICoreAdvanced.java +++ b/com/hbm/inventory/gui/GUICoreAdvanced.java @@ -40,7 +40,7 @@ public class GUICoreAdvanced extends GuiContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 62, guiTop + 72, 0, 240, i, 16); } diff --git a/com/hbm/inventory/gui/GUICoreTitanium.java b/com/hbm/inventory/gui/GUICoreTitanium.java index 3098f4e9d..17199a94f 100644 --- a/com/hbm/inventory/gui/GUICoreTitanium.java +++ b/com/hbm/inventory/gui/GUICoreTitanium.java @@ -40,7 +40,7 @@ public class GUICoreTitanium extends GuiContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 62, guiTop + 72, 0, 240, i, 16); } diff --git a/com/hbm/inventory/gui/GUIFWatzCore.java b/com/hbm/inventory/gui/GUIFWatzCore.java index bc18f0888..ace43e47e 100644 --- a/com/hbm/inventory/gui/GUIFWatzCore.java +++ b/com/hbm/inventory/gui/GUIFWatzCore.java @@ -33,6 +33,7 @@ public class GUIFWatzCore extends GuiInfoContainer { diFurnace.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 88 - 70, 16, 70); diFurnace.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 88 - 70, 16, 70); diFurnace.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 88 - 70, 16, 70); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 106 - 88, 16, 88, diFurnace.power, diFurnace.maxPower); } @Override @@ -49,7 +50,7 @@ public class GUIFWatzCore extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int k = diFurnace.getPowerScaled(88); + int k = (int)diFurnace.getPowerScaled(88); drawTexturedModalRect(guiLeft + 26, guiTop + 106 - k, 192, 88 - k, 16, k); if(diFurnace.isRunning()) diff --git a/com/hbm/inventory/gui/GUIFusionMultiblock.java b/com/hbm/inventory/gui/GUIFusionMultiblock.java index 5cfecfb90..24acef870 100644 --- a/com/hbm/inventory/gui/GUIFusionMultiblock.java +++ b/com/hbm/inventory/gui/GUIFusionMultiblock.java @@ -33,6 +33,7 @@ public class GUIFusionMultiblock extends GuiInfoContainer { diFurnace.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 88 - 70, 16, 70); diFurnace.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 88 - 70, 16, 70); diFurnace.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 88 - 70, 16, 70); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 88 - 88, 16, 88, diFurnace.power, diFurnace.maxPower); } @Override @@ -49,7 +50,7 @@ public class GUIFusionMultiblock extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int k = diFurnace.getPowerScaled(88); + int k = (int)diFurnace.getPowerScaled(88); drawTexturedModalRect(guiLeft + 26, guiTop + 88 - k, 192, 88 - k, 16, k); if(diFurnace.isRunning()) diff --git a/com/hbm/inventory/gui/GUIIGenerator.java b/com/hbm/inventory/gui/GUIIGenerator.java index 70fd8c627..b95d7ded1 100644 --- a/com/hbm/inventory/gui/GUIIGenerator.java +++ b/com/hbm/inventory/gui/GUIIGenerator.java @@ -73,7 +73,7 @@ public class GUIIGenerator extends GuiInfoContainer { } if(diFurnace.power > 0) { - int j = diFurnace.getPowerScaled(88); + int j = (int)diFurnace.getPowerScaled(88); drawTexturedModalRect(guiLeft + 152, guiTop + 106 - j, 196, 88 - j, 16, j); } if(diFurnace.burn > 0) diff --git a/com/hbm/inventory/gui/GUILaunchPadTier1.java b/com/hbm/inventory/gui/GUILaunchPadTier1.java index 6c7da385c..5e3c00fcf 100644 --- a/com/hbm/inventory/gui/GUILaunchPadTier1.java +++ b/com/hbm/inventory/gui/GUILaunchPadTier1.java @@ -12,7 +12,7 @@ import com.hbm.inventory.container.ContainerLaunchPadTier1; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityLaunchPad; -public class GUILaunchPadTier1 extends GuiContainer { +public class GUILaunchPadTier1 extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_launch_pad.png"); private TileEntityLaunchPad diFurnace; @@ -25,6 +25,13 @@ public class GUILaunchPadTier1 extends GuiContainer { this.ySize = 166; } + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 53, 160, 16, diFurnace.power, diFurnace.maxPower); + } + @Override protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName()); @@ -39,7 +46,7 @@ public class GUILaunchPadTier1 extends GuiContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int j1 = diFurnace.getPowerScaled(160); + int j1 = (int)diFurnace.getPowerScaled(160); drawTexturedModalRect(guiLeft + 8, guiTop + 53, 8, 166, j1, 16); } } diff --git a/com/hbm/inventory/gui/GUIMachineAssembler.java b/com/hbm/inventory/gui/GUIMachineAssembler.java index 64fa8d44b..b8076e623 100644 --- a/com/hbm/inventory/gui/GUIMachineAssembler.java +++ b/com/hbm/inventory/gui/GUIMachineAssembler.java @@ -46,7 +46,7 @@ public class GUIMachineAssembler extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int i = assembler.getPowerScaled(52); + int i = (int)assembler.getPowerScaled(52); drawTexturedModalRect(guiLeft + 116, guiTop + 70 - i, 176, 52 - i, 16, i); int j = assembler.getProgressScaled(83); diff --git a/com/hbm/inventory/gui/GUIMachineBattery.java b/com/hbm/inventory/gui/GUIMachineBattery.java index 21ae888de..bea37065a 100644 --- a/com/hbm/inventory/gui/GUIMachineBattery.java +++ b/com/hbm/inventory/gui/GUIMachineBattery.java @@ -48,7 +48,7 @@ public class GUIMachineBattery extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerRemainingScaled(52); + int i = (int)diFurnace.getPowerRemainingScaled(52); drawTexturedModalRect(guiLeft + 62, guiTop + 69 - i, 176, 52 - i, 52, i); } } diff --git a/com/hbm/inventory/gui/GUIMachineCMBFactory.java b/com/hbm/inventory/gui/GUIMachineCMBFactory.java index cbe60463e..77c0acf3a 100644 --- a/com/hbm/inventory/gui/GUIMachineCMBFactory.java +++ b/com/hbm/inventory/gui/GUIMachineCMBFactory.java @@ -49,7 +49,7 @@ public class GUIMachineCMBFactory extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 69 - i, 176, 52 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIMachineChemplant.java b/com/hbm/inventory/gui/GUIMachineChemplant.java index 4a77057b1..219736d3a 100644 --- a/com/hbm/inventory/gui/GUIMachineChemplant.java +++ b/com/hbm/inventory/gui/GUIMachineChemplant.java @@ -53,7 +53,7 @@ public class GUIMachineChemplant extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int i = chemplant.getPowerScaled(52); + int i = (int)chemplant.getPowerScaled(52); drawTexturedModalRect(guiLeft + 44, guiTop + 70 - i, 176, 52 - i, 16, i); int j = chemplant.getProgressScaled(90); diff --git a/com/hbm/inventory/gui/GUIMachineCoal.java b/com/hbm/inventory/gui/GUIMachineCoal.java index 8a46aecef..913e0af54 100644 --- a/com/hbm/inventory/gui/GUIMachineCoal.java +++ b/com/hbm/inventory/gui/GUIMachineCoal.java @@ -49,7 +49,7 @@ public class GUIMachineCoal extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 152, guiTop + 69 - i, 176, 52 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIMachineCyclotron.java b/com/hbm/inventory/gui/GUIMachineCyclotron.java index 1d21b22d6..234c88544 100644 --- a/com/hbm/inventory/gui/GUIMachineCyclotron.java +++ b/com/hbm/inventory/gui/GUIMachineCyclotron.java @@ -46,7 +46,7 @@ public class GUIMachineCyclotron extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int k = diFurnace.getPowerScaled(88); + int k = (int)diFurnace.getPowerScaled(88); drawTexturedModalRect(guiLeft + 152, guiTop + 106 - k, 212, 88 - k, 16, k); int l = diFurnace.getProgressScaled(36); diff --git a/com/hbm/inventory/gui/GUIMachineDeuterium.java b/com/hbm/inventory/gui/GUIMachineDeuterium.java index 1116ff30c..8cb89c89f 100644 --- a/com/hbm/inventory/gui/GUIMachineDeuterium.java +++ b/com/hbm/inventory/gui/GUIMachineDeuterium.java @@ -50,7 +50,7 @@ public class GUIMachineDeuterium extends GuiContainer { } if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 88 - i, 176, 52 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIMachineDiesel.java b/com/hbm/inventory/gui/GUIMachineDiesel.java index edf9d969f..0123e91f8 100644 --- a/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -49,7 +49,7 @@ public class GUIMachineDiesel extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 152, guiTop + 69 - i, 176, 52 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIMachineElectricFurnace.java b/com/hbm/inventory/gui/GUIMachineElectricFurnace.java index c18e4dc47..b11b0aeba 100644 --- a/com/hbm/inventory/gui/GUIMachineElectricFurnace.java +++ b/com/hbm/inventory/gui/GUIMachineElectricFurnace.java @@ -47,7 +47,7 @@ public class GUIMachineElectricFurnace extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.hasPower()) { - int i = diFurnace.getPowerRemainingScaled(52); + int i = (int)diFurnace.getPowerRemainingScaled(52); drawTexturedModalRect(guiLeft + 20, guiTop + 69 - i, 200, 52 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIMachineGasFlare.java b/com/hbm/inventory/gui/GUIMachineGasFlare.java index b43d00477..9bcbdc3de 100644 --- a/com/hbm/inventory/gui/GUIMachineGasFlare.java +++ b/com/hbm/inventory/gui/GUIMachineGasFlare.java @@ -48,7 +48,7 @@ public class GUIMachineGasFlare extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int j = flare.getPowerScaled(52); + int j = (int)flare.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 69 - j, 176, 52 - j, 16, j); Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); diff --git a/com/hbm/inventory/gui/GUIMachineGenerator.java b/com/hbm/inventory/gui/GUIMachineGenerator.java index 6903c2747..ce2e97821 100644 --- a/com/hbm/inventory/gui/GUIMachineGenerator.java +++ b/com/hbm/inventory/gui/GUIMachineGenerator.java @@ -50,7 +50,7 @@ public class GUIMachineGenerator extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.hasPower()) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 62, guiTop + 88 - i, 224, 52 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIMachineMiningDrill.java b/com/hbm/inventory/gui/GUIMachineMiningDrill.java index 4f8cdf228..6818a70aa 100644 --- a/com/hbm/inventory/gui/GUIMachineMiningDrill.java +++ b/com/hbm/inventory/gui/GUIMachineMiningDrill.java @@ -47,7 +47,7 @@ public class GUIMachineMiningDrill extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 69 - i, 176, 52 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIMachineOilWell.java b/com/hbm/inventory/gui/GUIMachineOilWell.java index ffb1e8ed5..3ea92142a 100644 --- a/com/hbm/inventory/gui/GUIMachineOilWell.java +++ b/com/hbm/inventory/gui/GUIMachineOilWell.java @@ -49,7 +49,7 @@ public class GUIMachineOilWell extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int i = derrick.getPowerScaled(52); + int i = (int)derrick.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 70 - i, 176, 52 - i, 16, i); int k = derrick.warning; diff --git a/com/hbm/inventory/gui/GUIMachinePumpjack.java b/com/hbm/inventory/gui/GUIMachinePumpjack.java index d1bdf467e..3bab81daf 100644 --- a/com/hbm/inventory/gui/GUIMachinePumpjack.java +++ b/com/hbm/inventory/gui/GUIMachinePumpjack.java @@ -51,7 +51,7 @@ public class GUIMachinePumpjack extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int i = derrick.getPowerScaled(52); + int i = (int)derrick.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 70 - i, 176, 52 - i, 16, i); int k = derrick.warning; diff --git a/com/hbm/inventory/gui/GUIMachineRTG.java b/com/hbm/inventory/gui/GUIMachineRTG.java index 41b074d05..09fe1fe68 100644 --- a/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/com/hbm/inventory/gui/GUIMachineRTG.java @@ -53,7 +53,7 @@ public class GUIMachineRTG extends GuiInfoContainer { } if(rtg.hasPower()) { - int i = rtg.getPowerScaled(52); + int i = (int)rtg.getPowerScaled(52); drawTexturedModalRect(guiLeft + 152, guiTop + 69 - i, 192, 52 - i, 16, i); } } diff --git a/com/hbm/inventory/gui/GUIMachineRefinery.java b/com/hbm/inventory/gui/GUIMachineRefinery.java index aeac6ac85..22ffb4f93 100644 --- a/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -52,7 +52,7 @@ public class GUIMachineRefinery extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int j = refinery.getPowerScaled(52); + int j = (int)refinery.getPowerScaled(52); drawTexturedModalRect(guiLeft + 8, guiTop + 70 - j, 176, 52 - j, 16, j); Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); diff --git a/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java b/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java index d8b946b67..3d8989515 100644 --- a/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java +++ b/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java @@ -12,7 +12,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -public class GUIMachineSchrabidiumTransmutator extends GuiContainer { +public class GUIMachineSchrabidiumTransmutator extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_transmutator.png"); private TileEntityMachineSchrabidiumTransmutator diFurnace; @@ -25,6 +25,13 @@ public class GUIMachineSchrabidiumTransmutator extends GuiContainer { this.ySize = 222; } + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 106 - 88, 16, 88, diFurnace.power, diFurnace.maxPower); + } + @Override protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName()); @@ -41,7 +48,7 @@ public class GUIMachineSchrabidiumTransmutator extends GuiContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.getPower() > 0) { - int i = diFurnace.getPowerScaled(88); + int i = (int)diFurnace.getPowerScaled(88); drawTexturedModalRect(guiLeft + 8, guiTop + 106 - i, 176, 88 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIMachineShredder.java b/com/hbm/inventory/gui/GUIMachineShredder.java index 11df2e518..7f19a1f0d 100644 --- a/com/hbm/inventory/gui/GUIMachineShredder.java +++ b/com/hbm/inventory/gui/GUIMachineShredder.java @@ -47,7 +47,7 @@ public class GUIMachineShredder extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(88); + int i = (int)diFurnace.getPowerScaled(88); drawTexturedModalRect(guiLeft + 8, guiTop + 106 - i, 176, 160 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIMachineTurbofan.java b/com/hbm/inventory/gui/GUIMachineTurbofan.java index 07837e30b..bd0e5669a 100644 --- a/com/hbm/inventory/gui/GUIMachineTurbofan.java +++ b/com/hbm/inventory/gui/GUIMachineTurbofan.java @@ -32,6 +32,7 @@ public class GUIMachineTurbofan extends GuiInfoContainer { super.drawScreen(mouseX, mouseY, f); diFurnace.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 53, guiTop + 69 - 52, 34, 52); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 152 - 9, guiTop + 69 - 52, 16, 52, diFurnace.power, diFurnace.maxPower); } @Override @@ -49,7 +50,7 @@ public class GUIMachineTurbofan extends GuiInfoContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); + int i = (int)diFurnace.getPowerScaled(52); drawTexturedModalRect(guiLeft + 152 - 9, guiTop + 69 - i, 176 + 16, 52 - i, 16, i); } diff --git a/com/hbm/inventory/gui/GUIReactorMultiblock.java b/com/hbm/inventory/gui/GUIReactorMultiblock.java index 9b32ecc41..6e1eec6a9 100644 --- a/com/hbm/inventory/gui/GUIReactorMultiblock.java +++ b/com/hbm/inventory/gui/GUIReactorMultiblock.java @@ -32,6 +32,7 @@ public class GUIReactorMultiblock extends GuiInfoContainer { diFurnace.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 70 - 52, 16, 52); diFurnace.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 70 - 52, 16, 52); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 44, guiTop + 88 - 70, 16, 70, diFurnace.power, diFurnace.maxPower); } @Override @@ -48,7 +49,7 @@ public class GUIReactorMultiblock extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int k = diFurnace.getPowerScaled(70); + int k = (int)diFurnace.getPowerScaled(70); drawTexturedModalRect(guiLeft + 44, guiTop + 88 - k, 208, 70 - k, 16, k); int l = diFurnace.getHeatScaled(142); diff --git a/com/hbm/inventory/gui/GUIWatzCore.java b/com/hbm/inventory/gui/GUIWatzCore.java index a3c4f04ca..1214eb457 100644 --- a/com/hbm/inventory/gui/GUIWatzCore.java +++ b/com/hbm/inventory/gui/GUIWatzCore.java @@ -32,6 +32,7 @@ public class GUIWatzCore extends GuiInfoContainer { super.drawScreen(mouseX, mouseY, f); diFurnace.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 106 - 18 - 70, 16, 70); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 106 - 70, 16, 70, diFurnace.power, diFurnace.maxPower); } @Override @@ -54,7 +55,7 @@ public class GUIWatzCore extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int l = diFurnace.getPowerScaled(70); + int l = (int)diFurnace.getPowerScaled(70); drawTexturedModalRect(guiLeft + 152, guiTop + 106 - 18 - l, 192, 70 - l, 16, l); Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 3caef05b3..0c7eafa32 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -202,6 +202,7 @@ public class ModItems { public static Item powder_actinium; public static Item powder_desh; public static Item powder_desh_mix; + public static Item powder_nitan_mix; public static Item fragment_neodymium; public static Item fragment_cobalt; @@ -1232,6 +1233,7 @@ public class ModItems { powder_lanthanium = new ItemCustomLore().setUnlocalizedName("powder_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lanthanium"); powder_actinium = new ItemCustomLore().setUnlocalizedName("powder_actinium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_actinium"); powder_desh_mix = new Item().setUnlocalizedName("powder_desh_mix").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_desh_mix"); + powder_nitan_mix = new Item().setUnlocalizedName("powder_nitan_mix").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_nitan_mix"); powder_desh = new Item().setUnlocalizedName("powder_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_desh"); powder_lithium_tiny = new Item().setUnlocalizedName("powder_lithium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lithium_tiny"); powder_neodymium_tiny = new Item().setUnlocalizedName("powder_neodymium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neodymium_tiny"); @@ -2203,6 +2205,7 @@ public class ModItems { GameRegistry.registerItem(powder_actinium, powder_actinium.getUnlocalizedName()); GameRegistry.registerItem(powder_desh_mix, powder_desh_mix.getUnlocalizedName()); GameRegistry.registerItem(powder_desh, powder_desh.getUnlocalizedName()); + GameRegistry.registerItem(powder_nitan_mix, powder_nitan_mix.getUnlocalizedName()); GameRegistry.registerItem(dust, dust.getUnlocalizedName()); GameRegistry.registerItem(powder_lithium_tiny, powder_lithium_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_neodymium_tiny, powder_neodymium_tiny.getUnlocalizedName()); diff --git a/com/hbm/items/tool/ItemChemistryTemplate.java b/com/hbm/items/tool/ItemChemistryTemplate.java index cd996ebbb..835bc5fe7 100644 --- a/com/hbm/items/tool/ItemChemistryTemplate.java +++ b/com/hbm/items/tool/ItemChemistryTemplate.java @@ -60,6 +60,7 @@ public class ItemChemistryTemplate extends Item { ASPHALT, COOLANT, DESH, + NITAN, PEROXIDE, CIRCUIT_4, CIRCUIT_5, @@ -156,6 +157,8 @@ public class ItemChemistryTemplate extends Item { return 50; case DESH: return 300; + case NITAN: + return 50; case PEROXIDE: return 50; case CIRCUIT_4: diff --git a/com/hbm/items/tool/ItemGeigerCounter.java b/com/hbm/items/tool/ItemGeigerCounter.java index 190ca8560..ff3ad82f0 100644 --- a/com/hbm/items/tool/ItemGeigerCounter.java +++ b/com/hbm/items/tool/ItemGeigerCounter.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.items.ModItems; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -134,12 +135,16 @@ public class ItemGeigerCounter extends Item { return i * level; } - /*@Override - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer player, World world, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f0, float f1, float f2) { - if(!world.isRemote) - player.travelToDimension(1); - return true; - }*/ + if(world.getBlock(x, y, z) == ModBlocks.block_red_copper) { + player.inventory.consumeInventoryItem(ModItems.geiger_counter); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.survey_scanner)); + return true; + } + + return false; + } } diff --git a/com/hbm/items/tool/ItemSurveyScanner.java b/com/hbm/items/tool/ItemSurveyScanner.java index d4e136a04..ac7ce8e34 100644 --- a/com/hbm/items/tool/ItemSurveyScanner.java +++ b/com/hbm/items/tool/ItemSurveyScanner.java @@ -4,6 +4,7 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IBomb; +import com.hbm.items.ModItems; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; @@ -356,4 +357,15 @@ public class ItemSurveyScanner extends Item { return stack; } + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f0, float f1, float f2) + { + if(world.getBlock(x, y, z) == ModBlocks.block_beryllium && player.inventory.hasItem(ModItems.polaroid)) { + player.travelToDimension(1); + return true; + } + + return false; + } } \ No newline at end of file diff --git a/com/hbm/items/weapon/GunEuthanasia.java b/com/hbm/items/weapon/GunEuthanasia.java index fe2562348..d6532efe6 100644 --- a/com/hbm/items/weapon/GunEuthanasia.java +++ b/com/hbm/items/weapon/GunEuthanasia.java @@ -61,6 +61,7 @@ public class GunEuthanasia extends Item { EntityBullet entityarrow = new EntityBullet(world, player, 3.0F, 2, 8, deadly == 0, false); entityarrow.setDamage(1 + rand.nextInt(3)); + entityarrow.antidote = true; //world.playSoundAtEntity(player, "random.explode", 1.0F, 1.5F + (rand.nextFloat() / 4)); world.playSoundAtEntity(player, "hbm:weapon.rifleShoot", 1.0F, 0.8F + (rand.nextFloat() * 0.4F)); diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index a8a381b90..b9d5ff1a4 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -496,7 +496,7 @@ public class Library { return list; } - public static int chargeItemsFromTE(ItemStack[] slots, int index, int power, int maxPower) { + public static long chargeItemsFromTE(ItemStack[] slots, int index, long power, long maxPower) { if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { @@ -639,7 +639,7 @@ public class Library { return power; } - public static int chargeTEFromItems(ItemStack[] slots, int index, int power, int maxPower) { + public static long chargeTEFromItems(ItemStack[] slots, int index, long power, long maxPower) { if(slots[index] != null && slots[index].getItem() == ModItems.battery_creative) { @@ -935,7 +935,7 @@ public class Library { int size = that.getList().size(); if(size > 0) { - int part = that.getSPower() / size; + long part = that.getSPower() / size; for(IConsumer consume : that.getList()) { if(consume.getPower() < consume.getMaxPower()) diff --git a/com/hbm/lib/ModDamageSource.java b/com/hbm/lib/ModDamageSource.java index c9ae97a22..7e142c7b4 100644 --- a/com/hbm/lib/ModDamageSource.java +++ b/com/hbm/lib/ModDamageSource.java @@ -30,6 +30,7 @@ public class ModDamageSource extends DamageSource { public static DamageSource shrapnel = (new DamageSource("shrapnel")).setProjectile(); public static DamageSource blackhole = (new DamageSource("blackhole")).setDamageIsAbsolute().setDamageBypassesArmor(); public static DamageSource turbofan = (new DamageSource("blender")).setDamageIsAbsolute().setDamageBypassesArmor(); + public static DamageSource meteorite = (new DamageSource("meteorite")).setDamageIsAbsolute().setDamageBypassesArmor(); public ModDamageSource(String p_i1566_1_) { super(p_i1566_1_); diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 0a4f648a4..292b46572 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.26 PRE (ME)"; + public static final String VERSION = "1.0.26"; //HBM's Beta Naming Convention: //V T (X-Y-Z) //V -> next release version diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 4f91976a9..f09673fc6 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -695,6 +695,12 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator, 1), new Object[] { " SS", "DDD", "TCB", 'S', "plateSteel", 'D', ModItems.plate_dalekanium, 'T', "plateTitanium", 'C', ModItems.circuit_gold, 'B', ModItems.battery_lithium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator_ammo, 16), new Object[] { "PCP", "DDD", "PCP", 'P', "plateSteel", 'C', ModItems.coil_copper, 'D', "dustLithium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_light_ammo, 1), new Object[] { " L ", "IGI", "ICI", 'L', "plateLead", 'I', "plateIron", 'C', "plateCopper", 'G', Items.gunpowder })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_heavy_ammo, 1), new Object[] { "LGC", "LGC", "LGC", 'L', "plateLead", 'C', "plateCopper", 'G', Items.gunpowder })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_rocket_ammo, 1), new Object[] { "TS ", "SGS", " SR", 'T', Blocks.tnt, 'S', "plateSteel", 'G', Items.gunpowder, 'R', "dustRedstone" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_flamer_ammo, 1), new Object[] { "FSF", "FPF", "FPF", 'F', ModItems.gun_immolator_ammo, 'S', ModItems.pipes_steel, 'P', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_tau_ammo, 1), new Object[] { "AAA", "AUA", "AAA", 'A', ModItems.gun_xvl1456_ammo, 'U', "blockUranium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_generic, 4), new Object[] { "RS ", "ITI", " I ", 'I', "plateIron", 'R', ModItems.wire_red_copper, 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt) })); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_strong, 2), new Object[] { " G ", "SGS", " S ", 'G', ModItems.grenade_generic, 'S', Items.gunpowder }); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_frag, 2), new Object[] { " G ", "WGW", " K ", 'G', ModItems.grenade_generic, 'W', Item.getItemFromBlock(Blocks.planks), 'K', Item.getItemFromBlock(Blocks.gravel) }); @@ -800,6 +806,7 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.therm_exo), 1), new Object[] { "TGT", "TUT", "TGT", 'T', "plateTitanium", 'U', ModItems.thermo_unit_exo, 'G', ModItems.circuit_gold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.det_cord), 8), new Object[] { "TNT", "NGN", "TNT", 'T', "plateIron", 'N', "dustNiter", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.det_charge), 1), new Object[] { "PDP", "DTD", "PDP", 'P', "plateSteel", 'D', ModBlocks.det_cord, 'T', Blocks.tnt })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.rejuvinator), 1), new Object[] { "TDT", "PCP", "TST", 'P', ModItems.pipes_steel, 'T', ModBlocks.factory_titanium_hull, 'D', "ingotDesh", 'S', "ingotSchrabidium", 'C', Items.clock })); //GameRegistry.addRecipe(new ItemStack(ModItems.gadget_core, 1), new Object[] { "PPP", "PUP", "PPP", 'P', ModItems.nugget_pu239, 'U', ModItems.nugget_u238 }); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gadget_explosive, 16), new Object[] { "ATP", "ATW", "ATP", 'P', "plateTitanium", 'A', "plateAluminum", 'T', Item.getItemFromBlock(Blocks.tnt), 'W', ModItems.wire_gold })); @@ -982,6 +989,10 @@ public class CraftingManager { //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_neptunium, ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.powder_caesium }); //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.powder_cerium }); //} + + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 1), new Object[] { "dustNeptunium", "dustIodine", "dustThorium", "dustAstatine", "dustNeodymium", "dustCaesium" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 1), new Object[] { "dustStrontium", "dustCobalt", "dustBromine", "dustTennessine", "dustNiobium", "dustCerium" })); + GameRegistry.addRecipe(new ItemStack(ModItems.canister_petroil, 9), new Object[] { "RRR", "RLR", "RRR", 'R', ModItems.canister_reoil, 'L', ModItems.canister_canola }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_lc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustLapis" })); diff --git a/com/hbm/packet/AuxElectricityPacket.java b/com/hbm/packet/AuxElectricityPacket.java index f30241460..b5372cc2b 100644 --- a/com/hbm/packet/AuxElectricityPacket.java +++ b/com/hbm/packet/AuxElectricityPacket.java @@ -20,14 +20,14 @@ public class AuxElectricityPacket implements IMessage { int x; int y; int z; - int charge; + long charge; public AuxElectricityPacket() { } - public AuxElectricityPacket(int x, int y, int z, int charge) + public AuxElectricityPacket(int x, int y, int z, long charge) { this.x = x; this.y = y; @@ -40,7 +40,7 @@ public class AuxElectricityPacket implements IMessage { x = buf.readInt(); y = buf.readInt(); z = buf.readInt(); - charge = buf.readInt(); + charge = buf.readLong(); } @Override @@ -48,7 +48,7 @@ public class AuxElectricityPacket implements IMessage { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); - buf.writeInt(charge); + buf.writeLong(charge); } public static class Handler implements IMessageHandler { diff --git a/com/hbm/tileentity/bomb/TileEntityLaunchPad.java b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java index b9ed56736..561ee5e56 100644 --- a/com/hbm/tileentity/bomb/TileEntityLaunchPad.java +++ b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java @@ -22,8 +22,8 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, public ItemStack slots[]; - public int power; - public final int maxPower = 100000; + public long power; + public final long maxPower = 100000; private static final int[] slots_top = new int[] {0}; private static final int[] slots_bottom = new int[] {2}; @@ -133,7 +133,7 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -151,7 +151,7 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); NBTTagList list = new NBTTagList(); - nbt.setInteger("power", power); + nbt.setLong("power", power); for(int i = 0; i < slots.length; i++) { @@ -182,7 +182,7 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -204,19 +204,19 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityConverterHeRf.java b/com/hbm/tileentity/machine/TileEntityConverterHeRf.java index fef96bd61..1972cdc25 100644 --- a/com/hbm/tileentity/machine/TileEntityConverterHeRf.java +++ b/com/hbm/tileentity/machine/TileEntityConverterHeRf.java @@ -11,8 +11,8 @@ import net.minecraftforge.common.util.ForgeDirection; public class TileEntityConverterHeRf extends TileEntity implements IConsumer, IEnergyProvider { - public int power; - public final int maxPower = 1000000; + public long power; + public final long maxPower = 1000000; public EnergyStorage storage = new EnergyStorage(4000000, 2500000, 2500000); //Thanks to the great people of Fusion Warfare for helping me with this part. @@ -98,25 +98,25 @@ public class TileEntityConverterHeRf extends TileEntity implements IConsumer, IE } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } - public int getFluxScaled(int i) { + public long getFluxScaled(long i) { return (storage.getEnergyStored() * i) / storage.getMaxEnergyStored(); } diff --git a/com/hbm/tileentity/machine/TileEntityConverterRfHe.java b/com/hbm/tileentity/machine/TileEntityConverterRfHe.java index 43bcf6bf8..ff203393a 100644 --- a/com/hbm/tileentity/machine/TileEntityConverterRfHe.java +++ b/com/hbm/tileentity/machine/TileEntityConverterRfHe.java @@ -14,8 +14,8 @@ import net.minecraftforge.common.util.ForgeDirection; public class TileEntityConverterRfHe extends TileEntity implements ISource, IEnergyReceiver { - public int power; - public final int maxPower = 1000000; + public long power; + public final long maxPower = 1000000; public List list = new ArrayList(); public int age = 0; public EnergyStorage storage = new EnergyStorage(4000000, 2500000, 2500000); @@ -118,7 +118,7 @@ public class TileEntityConverterRfHe extends TileEntity implements ISource, IEne return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -127,12 +127,12 @@ public class TileEntityConverterRfHe extends TileEntity implements ISource, IEne } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java b/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java index a04b83f0a..9aae734a3 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java +++ b/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java @@ -18,7 +18,7 @@ import net.minecraft.world.World; public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventory, IFactory, IConsumer { public int progress = 0; - public int power = 0; + public long power = 0; public int soundCycle = 0; public final static int processTime = 100; public final static int maxPower = (int)((ItemBattery)ModItems.factory_core_advanced).getMaxCharge(); @@ -211,7 +211,7 @@ public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventor } @Override - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -632,18 +632,18 @@ public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventor } } @Override - public void setPower(int i) { + public void setPower(long i) { if(this.slots[22] != null && this.slots[22].getItem() == ModItems.factory_core_advanced) { - ((ItemBattery)slots[22].getItem()).setCharge(slots[22], i); + ((ItemBattery)slots[22].getItem()).setCharge(slots[22], (int)i); } } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } } diff --git a/com/hbm/tileentity/machine/TileEntityCoreTitanium.java b/com/hbm/tileentity/machine/TileEntityCoreTitanium.java index 3b3fc2060..fa39bc14d 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreTitanium.java +++ b/com/hbm/tileentity/machine/TileEntityCoreTitanium.java @@ -18,7 +18,7 @@ import net.minecraft.world.World; public class TileEntityCoreTitanium extends TileEntity implements ISidedInventory, IFactory, IConsumer { public int progress = 0; - public int power = 0; + public long power = 0; public int soundCycle = 0; public final static int processTime = 200; public final static int maxPower = (int)((ItemBattery)ModItems.factory_core_titanium).getMaxCharge(); @@ -211,7 +211,7 @@ public class TileEntityCoreTitanium extends TileEntity implements ISidedInventor } @Override - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -446,18 +446,18 @@ public class TileEntityCoreTitanium extends TileEntity implements ISidedInventor } } @Override - public void setPower(int i) { + public void setPower(long i) { if(this.slots[22] != null && this.slots[22].getItem() == ModItems.factory_core_titanium) { - ((ItemBattery)slots[22].getItem()).setCharge(slots[22], i); + ((ItemBattery)slots[22].getItem()).setCharge(slots[22], (int)i); } } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/com/hbm/tileentity/machine/TileEntityFWatzCore.java index 190caff87..1b2fce23c 100644 --- a/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -28,8 +28,8 @@ import net.minecraft.world.World; public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, IReactor, ISource, IFluidContainer, IFluidAcceptor { - public int power; - public final static int maxPower = 100000000; + public long power; + public final static long maxPower = 100000000; public boolean cooldown = false; public FluidTank tanks[]; @@ -162,7 +162,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); tanks[0].readFromNBT(nbt, "cool"); tanks[1].readFromNBT(nbt, "amat"); tanks[2].readFromNBT(nbt, "aschrab"); @@ -184,7 +184,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); tanks[0].writeToNBT(nbt, "cool"); tanks[1].writeToNBT(nbt, "amat"); tanks[2].writeToNBT(nbt, "aschrab"); @@ -227,7 +227,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, } @Override - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power/100 * i) / (maxPower/100); } @@ -405,12 +405,12 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java index 0445d9f88..cbf6978bf 100644 --- a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java @@ -28,8 +28,8 @@ import net.minecraft.world.World; public class TileEntityFusionMultiblock extends TileEntity implements ISidedInventory, IReactor, ISource, IFluidContainer, IFluidAcceptor { - public int power; - public final static int maxPower = 100000000; + public long power; + public final static long maxPower = 100000000; private ItemStack slots[]; public int age = 0; public List list = new ArrayList(); @@ -157,7 +157,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); tanks[0].readFromNBT(nbt, "water"); tanks[1].readFromNBT(nbt, "deut"); tanks[2].readFromNBT(nbt, "trit"); @@ -179,7 +179,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); tanks[0].writeToNBT(nbt, "water"); tanks[1].writeToNBT(nbt, "deut"); tanks[2].writeToNBT(nbt, "trit"); @@ -968,7 +968,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve } @Override - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -1228,12 +1228,12 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineAssembler.java b/com/hbm/tileentity/machine/TileEntityMachineAssembler.java index 07409df56..d024fe81e 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineAssembler.java +++ b/com/hbm/tileentity/machine/TileEntityMachineAssembler.java @@ -31,8 +31,8 @@ public class TileEntityMachineAssembler extends TileEntity implements ISidedInve private ItemStack slots[]; - public int power; - public static final int maxPower = 100000; + public long power; + public static final long maxPower = 100000; public int progress; public int maxProgress = 100; public float rotation = 0; @@ -154,7 +154,7 @@ public class TileEntityMachineAssembler extends TileEntity implements ISidedInve super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -171,7 +171,7 @@ public class TileEntityMachineAssembler extends TileEntity implements ISidedInve @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -203,7 +203,7 @@ public class TileEntityMachineAssembler extends TileEntity implements ISidedInve return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -589,19 +589,19 @@ public class TileEntityMachineAssembler extends TileEntity implements ISidedInve } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineBattery.java b/com/hbm/tileentity/machine/TileEntityMachineBattery.java index 801233f3f..ec2c0fe6e 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineBattery.java +++ b/com/hbm/tileentity/machine/TileEntityMachineBattery.java @@ -21,8 +21,8 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent private ItemStack slots[]; - public int power = 0; - public final int maxPower = 1000000; + public long power = 0; + public final long maxPower = 1000000; public boolean conducts = false; @@ -147,7 +147,7 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("power"); + this.power = nbt.getLong("power"); this.conducts = nbt.getBoolean("conducts"); slots = new ItemStack[getSizeInventory()]; @@ -165,7 +165,7 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); nbt.setBoolean("conducts", conducts); NBTTagList list = new NBTTagList(); @@ -208,7 +208,7 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent return false; } - public int getPowerRemainingScaled(int i) { + public long getPowerRemainingScaled(long i) { return (power * i) / maxPower; } @@ -235,13 +235,13 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @@ -374,17 +374,17 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java index f561d804e..4a33cb83e 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java @@ -23,10 +23,10 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv private ItemStack slots[]; - public int power = 0; + public long power = 0; public int process = 0; public int soundCycle = 0; - public static final int maxPower = 100000; + public static final long maxPower = 100000; public static final int processSpeed = 200; public FluidTank tank; @@ -158,7 +158,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); tank.readFromNBT(nbt, "watz"); process = nbt.getShort("process"); slots = new ItemStack[getSizeInventory()]; @@ -177,7 +177,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); tank.writeToNBT(nbt, "watz"); nbt.setShort("process", (short) process); NBTTagList list = new NBTTagList(); @@ -220,7 +220,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -304,19 +304,19 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 9f885d872..af69b1e7e 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -42,8 +42,8 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve private ItemStack slots[]; - public int power; - public static final int maxPower = 100000; + public long power; + public static final long maxPower = 100000; public int progress; public int maxProgress = 100; public float rotation = 0; @@ -173,7 +173,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); slots = new ItemStack[getSizeInventory()]; tanks[0].readFromNBT(nbt, "input1"); @@ -195,7 +195,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); NBTTagList list = new NBTTagList(); tanks[0].writeToNBT(nbt, "input1"); @@ -232,7 +232,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -767,19 +767,19 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineCoal.java b/com/hbm/tileentity/machine/TileEntityMachineCoal.java index 5d9f76e16..1187286a9 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCoal.java @@ -30,9 +30,9 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory private ItemStack slots[]; - public int power; + public long power; public int burnTime; - public static final int maxPower = 100000; + public static final long maxPower = 100000; public int age = 0; public List list = new ArrayList(); public FluidTank tank; @@ -156,7 +156,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); tank.readFromNBT(nbt, "water"); slots = new ItemStack[getSizeInventory()]; @@ -174,7 +174,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); tank.writeToNBT(nbt, "water"); NBTTagList list = new NBTTagList(); @@ -214,7 +214,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -353,12 +353,12 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java b/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java index bf61f8115..c16cb439f 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java @@ -36,10 +36,10 @@ public class TileEntityMachineCyclotron extends TileEntity implements ISidedInve private ItemStack slots[]; - public int power; + public long power; public int progress; public int soundCycle = 0; - public static final int maxPower = 1000000000; + public static final long maxPower = 1000000000; public static final int processTime = 690; public boolean isOn = false; public int age = 0; @@ -151,7 +151,7 @@ public class TileEntityMachineCyclotron extends TileEntity implements ISidedInve super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("power"); + this.power = nbt.getLong("power"); this.progress = nbt.getInteger("progress"); this.isOn = nbt.getBoolean("isOn"); slots = new ItemStack[getSizeInventory()]; @@ -168,7 +168,7 @@ public class TileEntityMachineCyclotron extends TileEntity implements ISidedInve @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); nbt.setInteger("progress", progress); nbt.setBoolean("isOn", isOn); NBTTagList list = new NBTTagList(); @@ -543,8 +543,8 @@ public class TileEntityMachineCyclotron extends TileEntity implements ISidedInve return 0; } - public int getPowerScaled(int i) { - return ((power / 1000) * i) / (maxPower / 1000); + public long getPowerScaled(long i) { + return (power * i) / maxPower; } public int getProgressScaled(int i) { @@ -587,12 +587,12 @@ public class TileEntityMachineCyclotron extends TileEntity implements ISidedInve } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java b/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java index ceb44a8ee..325fe9191 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java @@ -17,12 +17,12 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve private ItemStack slots[]; - public int power = 0; + public long power = 0; public int water = 0; public int sulfur = 0; public int process = 0; public static final int maxFill = 1000; - public static final int maxPower = 100000; + public static final long maxPower = 100000; public static final int processSpeed = 200; private static final int[] slots_top = new int[] {3}; @@ -152,7 +152,7 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); water = nbt.getInteger("water"); sulfur = nbt.getInteger("sulfur"); process = nbt.getInteger("process"); @@ -172,7 +172,7 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); nbt.setInteger("water", water); nbt.setInteger("sulfur", sulfur); nbt.setInteger("process", process); @@ -216,7 +216,7 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -334,19 +334,19 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index 9f444a327..05b934b29 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -29,9 +29,9 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento private ItemStack slots[]; - public int power; + public long power; public int soundCycle = 0; - public static final int maxPower = 15000; + public static final long maxPower = 50000; public int powerCap = 15000; public int age = 0; public List list = new ArrayList(); @@ -151,7 +151,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); this.powerCap = nbt.getInteger("powerCap"); tank.readFromNBT(nbt, "fuel"); slots = new ItemStack[getSizeInventory()]; @@ -168,7 +168,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); nbt.setInteger("powerCap", powerCap); tank.writeToNBT(nbt, "fuel"); NBTTagList list = new NBTTagList(); @@ -206,7 +206,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / powerCap; } @@ -247,6 +247,8 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento return 300; if(type.name().equals(FluidType.BIOFUEL.name())) return 400; + if(type.name().equals(FluidType.NITAN.name())) + return 2500; return 0; } @@ -305,12 +307,12 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java b/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java index 8b1f6a98f..c03a2d2bf 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java @@ -20,8 +20,8 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid private ItemStack slots[]; public int dualCookTime; - public int power; - public static final int maxPower = 100000; + public long power; + public static final long maxPower = 100000; public static final int processingSpeed = 100; private static final int[] slots_top = new int[] {1}; @@ -139,7 +139,7 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); this.dualCookTime = nbt.getInteger("cookTime"); slots = new ItemStack[getSizeInventory()]; @@ -157,7 +157,7 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); nbt.setInteger("cookTime", dualCookTime); NBTTagList list = new NBTTagList(); @@ -200,7 +200,7 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid return (dualCookTime * i) / processingSpeed; } - public int getPowerRemainingScaled(int i) { + public long getPowerRemainingScaled(long i) { return (power * i) / maxPower; } @@ -317,19 +317,19 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java index 33b4da062..9d91cdd0a 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java @@ -33,9 +33,8 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven private ItemStack slots[]; - public int power; - public static final int maxPower = 100000; - public static final int maxGas = 64 * 50; + public long power; + public static final long maxPower = 100000; public int age = 0; public List list = new ArrayList(); public FluidTank tank; @@ -157,7 +156,7 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); tank.readFromNBT(nbt, "gas"); slots = new ItemStack[getSizeInventory()]; @@ -175,7 +174,7 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); tank.writeToNBT(nbt, "gas"); NBTTagList list = new NBTTagList(); @@ -208,7 +207,7 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -288,12 +287,12 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven } @Override - public int getSPower() { + public long getSPower() { return this.power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java index c158a4258..fa7237ad2 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java @@ -34,8 +34,8 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve public int heat; public final int heatMax = 100000; - public int power; - public final int powerMax = 100000; + public long power; + public final long powerMax = 100000; public boolean isLoaded = false; public int age = 0; public List list = new ArrayList(); @@ -172,7 +172,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); heat = nbt.getInteger("heat"); slots = new ItemStack[getSizeInventory()]; tanks[0].readFromNBT(nbt, "water"); @@ -192,7 +192,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); nbt.setInteger("heat", heat); NBTTagList list = new NBTTagList(); tanks[0].writeToNBT(nbt, "water"); @@ -256,7 +256,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / powerMax; } @@ -557,12 +557,12 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java b/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index b9a506b8d..451afc1b3 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -29,7 +29,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv private ItemStack slots[]; - public int power; + public long power; public int torque; public int heat; public int water; @@ -38,7 +38,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv public int burn; public int soundCycle = 0; public float rotation; - public static final int maxPower = 100000; + public static final long maxPower = 100000; public static final int maxTorque = 2500; public static final int maxHeat = 7500; public static final int maxWater = 10000; @@ -152,7 +152,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("power"); + this.power = nbt.getLong("power"); this.torque = nbt.getInteger("torque"); this.heat = nbt.getInteger("heat"); this.water = nbt.getInteger("water"); @@ -173,7 +173,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); nbt.setInteger("torque", torque); nbt.setInteger("heat", heat); nbt.setInteger("water", water); @@ -577,7 +577,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv return (torque * i) / maxTorque; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -630,12 +630,12 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java index f38906027..c2c2f5643 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java +++ b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java @@ -34,9 +34,9 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn private ItemStack slots[]; - public int power; + public long power; public int warning; - public static final int maxPower = 100000; + public static final long maxPower = 100000; int age = 0; int timer = 50; int radius = 100; @@ -163,7 +163,7 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -180,7 +180,7 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -212,7 +212,7 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -859,19 +859,19 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java index 05db412b4..9947a80de 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java +++ b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java @@ -40,10 +40,10 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent private ItemStack slots[]; - public int power; + public long power; public int warning; public int warning2; - public static final int maxPower = 100000; + public static final long maxPower = 100000; public int age = 0; public int age2 = 0; public List list1 = new ArrayList(); @@ -169,7 +169,7 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); this.age = nbt.getInteger("age"); this.tanks[0].readFromNBT(nbt, "oil"); @@ -191,7 +191,7 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); nbt.setInteger("age", age); this.tanks[0].writeToNBT(nbt, "oil"); @@ -228,7 +228,7 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -426,19 +426,19 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java index e96cae667..d0a23acd6 100644 --- a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java @@ -38,10 +38,10 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven private ItemStack slots[]; - public int power; + public long power; public int warning; public int warning2; - public static final int maxPower = 100000; + public static final long maxPower = 100000; public int age = 0; public int age2 = 0; public List list1 = new ArrayList(); @@ -169,7 +169,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); this.age = nbt.getInteger("age"); this.rotation = nbt.getInteger("rotation"); @@ -192,7 +192,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); nbt.setInteger("age", age); nbt.setInteger("rotation", rotation); @@ -230,7 +230,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -429,19 +429,19 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineRTG.java b/com/hbm/tileentity/machine/TileEntityMachineRTG.java index 235edf929..8f1a1d1dd 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineRTG.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRTG.java @@ -22,8 +22,8 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, public int heat; public final int heatMax = 75; - public int power; - public final int powerMax = 90000; + public long power; + public final long powerMax = 90000; public int age = 0; public List list = new ArrayList(); @@ -189,7 +189,7 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / powerMax; } @@ -265,12 +265,12 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java index 907815b13..243810481 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java @@ -30,10 +30,10 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven private ItemStack slots[]; - public int power = 0; + public long power = 0; public int sulfur = 0; public static final int maxSulfur = 1000; - public static final int maxPower = 100000; + public static final long maxPower = 100000; public int age = 0; public FluidTank[] tanks; public List list1 = new ArrayList(); @@ -170,7 +170,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); tanks[0].readFromNBT(nbt, "input"); tanks[1].readFromNBT(nbt, "heavy"); tanks[2].readFromNBT(nbt, "naphtha"); @@ -193,7 +193,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); tanks[0].writeToNBT(nbt, "input"); tanks[1].writeToNBT(nbt, "heavy"); tanks[2].writeToNBT(nbt, "naphtha"); @@ -311,24 +311,24 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java b/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java index 2ad016dfa..9cffb954d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java @@ -20,10 +20,10 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme private ItemStack slots[]; - public int power = 0; + public long power = 0; public int process = 0; public int soundCycle = 0; - public static final int maxPower = 5000000; + public static final long maxPower = 5000000; public static final int processSpeed = 60; Random rand = new Random(); @@ -145,7 +145,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); process = nbt.getShort("process"); slots = new ItemStack[getSizeInventory()]; @@ -161,7 +161,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); nbt.setShort("process", (short) process); NBTTagList list = new NBTTagList(); @@ -205,7 +205,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -285,19 +285,19 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineShredder.java b/com/hbm/tileentity/machine/TileEntityMachineShredder.java index 4bb783c0e..349390fd2 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineShredder.java +++ b/com/hbm/tileentity/machine/TileEntityMachineShredder.java @@ -19,10 +19,10 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven private ItemStack slots[]; - public int power; + public long power; public int progress; public int soundCycle = 0; - public static final int maxPower = 10000; + public static final long maxPower = 10000; public static final int processingSpeed = 60; private static final int[] slots_top = new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8}; @@ -139,7 +139,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -156,7 +156,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -384,22 +384,22 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven } @Override - public void setPower(int i) { + public void setPower(long i) { this.power = i; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @Override - public int getPower() { + public long getPower() { return this.power; } @Override - public int getMaxPower() { + public long getMaxPower() { return TileEntityMachineShredder.maxPower; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineTeleporter.java b/com/hbm/tileentity/machine/TileEntityMachineTeleporter.java index d4e693bf7..31d331f7f 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTeleporter.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTeleporter.java @@ -13,7 +13,7 @@ import net.minecraft.util.AxisAlignedBB; public class TileEntityMachineTeleporter extends TileEntity implements IConsumer { - public int power = 0; + public long power = 0; public int targetX = 0; public int targetY = 0; public int targetZ = 0; @@ -26,7 +26,7 @@ public class TileEntityMachineTeleporter extends TileEntity implements IConsumer public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); targetX = nbt.getInteger("x1"); targetY = nbt.getInteger("y1"); targetZ = nbt.getInteger("z1"); @@ -38,7 +38,7 @@ public class TileEntityMachineTeleporter extends TileEntity implements IConsumer public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); nbt.setInteger("x1", targetX); nbt.setInteger("y1", targetY); nbt.setInteger("z1", targetZ); @@ -91,17 +91,17 @@ public class TileEntityMachineTeleporter extends TileEntity implements IConsumer } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index 9f8c9881d..de02605ae 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -40,9 +40,9 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven private ItemStack slots[]; - public int power; + public long power; public int soundCycle = 0; - public static final int maxPower = 150000; + public static final long maxPower = 150000; public int age = 0; public List list = new ArrayList(); public FluidTank tank; @@ -157,7 +157,7 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getInteger("powerTime"); + this.power = nbt.getLong("powerTime"); tank.readFromNBT(nbt, "fuel"); slots = new ItemStack[getSizeInventory()]; @@ -173,7 +173,7 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("powerTime", power); + nbt.setLong("powerTime", power); tank.writeToNBT(nbt, "fuel"); NBTTagList list = new NBTTagList(); @@ -203,7 +203,7 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -515,12 +515,12 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java index 512429668..07a6d6239 100644 --- a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java @@ -45,8 +45,8 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv public int heat; public final static int heatMax = 1000000; - public int power; - public final static int maxPower = 1000000; + public long power; + public final static long maxPower = 1000000; private ItemStack slots[]; public int age = 0; public List list = new ArrayList(); @@ -177,7 +177,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv tanks[0].readFromNBT(nbt, "water"); tanks[1].readFromNBT(nbt, "coolant"); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); heat = nbt.getInteger("heat"); slots = new ItemStack[getSizeInventory()]; @@ -198,7 +198,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv super.writeToNBT(nbt); tanks[0].writeToNBT(nbt, "water"); tanks[1].writeToNBT(nbt, "coolant"); - nbt.setInteger("power", power); + nbt.setLong("power", power); nbt.setInteger("heat", heat); NBTTagList list = new NBTTagList(); @@ -624,7 +624,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv return false; } - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power * i) / maxPower; } @@ -702,12 +702,12 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/tileentity/machine/TileEntityReiXMainframe.java b/com/hbm/tileentity/machine/TileEntityReiXMainframe.java index 610dab55b..02612f05e 100644 --- a/com/hbm/tileentity/machine/TileEntityReiXMainframe.java +++ b/com/hbm/tileentity/machine/TileEntityReiXMainframe.java @@ -16,12 +16,12 @@ public class TileEntityReiXMainframe extends TileEntity implements ISidedInvento private ItemStack slots[]; - public int power = 0; + public long power = 0; public int waste = 0; public int process = 0; public int soundCycle = 0; public static final int maxFill = 1000; - public static final int maxPower = 10000; + public static final long maxPower = 10000; public static final int processSpeed = 200; private static final int[] slots_top = new int[] { 0, 2 }; @@ -218,19 +218,19 @@ public class TileEntityReiXMainframe extends TileEntity implements ISidedInvento } @Override - public void setPower(int i) { + public void setPower(long i) { power = i; } @Override - public int getPower() { + public long getPower() { return power; } @Override - public int getMaxPower() { + public long getMaxPower() { return maxPower; } } diff --git a/com/hbm/tileentity/machine/TileEntityWatzCore.java b/com/hbm/tileentity/machine/TileEntityWatzCore.java index 678c7acee..d4d2f662b 100644 --- a/com/hbm/tileentity/machine/TileEntityWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -33,8 +33,8 @@ import net.minecraft.world.World; public class TileEntityWatzCore extends TileEntity implements ISidedInventory, IReactor, ISource, IFluidContainer, IFluidSource { - public int power; - public final static int maxPower = 100000000; + public long power; + public final static long maxPower = 100000000; public int heat; public int heatMultiplier; @@ -172,7 +172,7 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getInteger("power"); + power = nbt.getLong("power"); tank.readFromNBT(nbt, "watz"); slots = new ItemStack[getSizeInventory()]; @@ -192,7 +192,7 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", power); + nbt.setLong("power", power); tank.writeToNBT(nbt, "watz"); NBTTagList list = new NBTTagList(); @@ -500,7 +500,7 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I } @Override - public int getPowerScaled(int i) { + public long getPowerScaled(long i) { return (power/100 * i) / (maxPower/100); } @@ -705,12 +705,12 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I } @Override - public int getSPower() { + public long getSPower() { return power; } @Override - public void setSPower(int i) { + public void setSPower(long i) { this.power = i; } diff --git a/com/hbm/world/Meteorite.java b/com/hbm/world/Meteorite.java index bc41bbe2d..046119064 100644 --- a/com/hbm/world/Meteorite.java +++ b/com/hbm/world/Meteorite.java @@ -5,10 +5,14 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.explosion.ExplosionLarge; +import com.hbm.lib.ModDamageSource; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -16,6 +20,13 @@ public class Meteorite { public void generate(World world, Random rand, int x, int y, int z) { + List list = (List)world.getEntitiesWithinAABBExcludingEntity(null, + AxisAlignedBB.getBoundingBox(x - 7.5, y - 7.5, z - 7.5, x + 7.5, y + 7.5, z + 7.5)); + + for(Entity e : list) { + e.attackEntityFrom(ModDamageSource.meteorite, 1000); + } + switch(rand.nextInt(500)) { case 0: //Meteor-only tiny meteorite @@ -50,6 +61,7 @@ public class Meteorite { case 4: //Bamboozle world.createExplosion(null, x + 0.5, y + 0.5, z + 0.5, 15F, true); + ExplosionLarge.spawnRubble(world, x, y, z, 25); return; case 5: //Large treasure-only meteorite @@ -72,6 +84,15 @@ public class Meteorite { list6.add(new ItemStack(ModBlocks.block_meteor_treasure)); generateBox(world, rand, x, y, z, list6); return; + case 8: + //Large nuclear meteorite + List list7 = new ArrayList(); + list7.add(new ItemStack(ModBlocks.block_meteor_treasure)); + List list8 = new ArrayList(); + list8.add(new ItemStack(ModBlocks.toxic_block)); + generateSphere7x7(world, rand, x, y, z, list7); + generateSphere5x5(world, rand, x, y, z, list8); + return; } switch(rand.nextInt(3)) {