From b96d6d06f52bd79581d9b74912a852a9a96e00d6 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Tue, 14 Nov 2017 13:49:43 +0100 Subject: [PATCH] Power system upgrade, nitan mix, final touch --- assets/hbm/lang/de_DE.lang | 9 +++++- assets/hbm/lang/en_US.lang | 7 +++++ assets/hbm/textures/blocks/turret_flamer.png | Bin 172 -> 272 bytes assets/hbm/textures/blocks/turret_heavy.png | Bin 176 -> 226 bytes assets/hbm/textures/blocks/turret_light.png | Bin 173 -> 251 bytes assets/hbm/textures/blocks/turret_rocket.png | Bin 174 -> 247 bytes assets/hbm/textures/blocks/turret_tau.png | Bin 174 -> 258 bytes assets/hbm/textures/gui/fluids2.png | Bin 11953 -> 12562 bytes assets/hbm/textures/items/chem_icon_NITAN.png | Bin 0 -> 248 bytes .../hbm/textures/items/powder_nitan_mix.png | Bin 0 -> 242 bytes assets/hbm/textures/models/tank_NITAN.png | Bin 0 -> 2485 bytes assets/hbm/textures/models/tank_SAS3.png | Bin 0 -> 5741 bytes com/hbm/blocks/bomb/BombRejuvinator.java | 3 +- .../entity/logic/EntityNukeExplosionMK3.java | 2 +- com/hbm/entity/projectile/EntityBullet.java | 4 +++ .../handler/nei/CMBFurnaceRecipeHandler.java | 2 +- com/hbm/interfaces/IConsumer.java | 6 ++-- com/hbm/interfaces/IFactory.java | 2 +- com/hbm/interfaces/IReactor.java | 2 +- com/hbm/interfaces/ISource.java | 4 +-- com/hbm/inventory/MachineRecipes.java | 9 ++++++ .../container/ContainerConverterHeRf.java | 11 -------- .../container/ContainerConverterRfHe.java | 7 ----- .../container/ContainerCoreAdvanced.java | 6 ++-- .../container/ContainerCoreTitanium.java | 6 ++-- .../container/ContainerMachineDeuterium.java | 6 ---- .../container/ContainerMachineGasFlare.java | 1 - .../container/ContainerMachineRefinery.java | 1 - .../container/ContainerReiXMainframe.java | 26 ------------------ com/hbm/inventory/gui/GUIConverterHeRf.java | 4 +-- com/hbm/inventory/gui/GUIConverterRfHe.java | 2 +- com/hbm/inventory/gui/GUICoreAdvanced.java | 2 +- com/hbm/inventory/gui/GUICoreTitanium.java | 2 +- com/hbm/inventory/gui/GUIFWatzCore.java | 3 +- .../inventory/gui/GUIFusionMultiblock.java | 3 +- com/hbm/inventory/gui/GUIIGenerator.java | 2 +- com/hbm/inventory/gui/GUILaunchPadTier1.java | 11 ++++++-- .../inventory/gui/GUIMachineAssembler.java | 2 +- com/hbm/inventory/gui/GUIMachineBattery.java | 2 +- .../inventory/gui/GUIMachineCMBFactory.java | 2 +- .../inventory/gui/GUIMachineChemplant.java | 2 +- com/hbm/inventory/gui/GUIMachineCoal.java | 2 +- .../inventory/gui/GUIMachineCyclotron.java | 2 +- .../inventory/gui/GUIMachineDeuterium.java | 2 +- com/hbm/inventory/gui/GUIMachineDiesel.java | 2 +- .../gui/GUIMachineElectricFurnace.java | 2 +- com/hbm/inventory/gui/GUIMachineGasFlare.java | 2 +- .../inventory/gui/GUIMachineGenerator.java | 2 +- .../inventory/gui/GUIMachineMiningDrill.java | 2 +- com/hbm/inventory/gui/GUIMachineOilWell.java | 2 +- com/hbm/inventory/gui/GUIMachinePumpjack.java | 2 +- com/hbm/inventory/gui/GUIMachineRTG.java | 2 +- com/hbm/inventory/gui/GUIMachineRefinery.java | 2 +- .../GUIMachineSchrabidiumTransmutator.java | 11 ++++++-- com/hbm/inventory/gui/GUIMachineShredder.java | 2 +- com/hbm/inventory/gui/GUIMachineTurbofan.java | 3 +- .../inventory/gui/GUIReactorMultiblock.java | 3 +- com/hbm/inventory/gui/GUIWatzCore.java | 3 +- com/hbm/items/ModItems.java | 3 ++ com/hbm/items/tool/ItemChemistryTemplate.java | 3 ++ com/hbm/items/tool/ItemGeigerCounter.java | 17 ++++++++---- com/hbm/items/tool/ItemSurveyScanner.java | 12 ++++++++ com/hbm/items/weapon/GunEuthanasia.java | 1 + com/hbm/lib/Library.java | 6 ++-- com/hbm/lib/ModDamageSource.java | 1 + com/hbm/lib/RefStrings.java | 2 +- com/hbm/main/CraftingManager.java | 11 ++++++++ com/hbm/packet/AuxElectricityPacket.java | 8 +++--- .../tileentity/bomb/TileEntityLaunchPad.java | 16 +++++------ .../machine/TileEntityConverterHeRf.java | 14 +++++----- .../machine/TileEntityConverterRfHe.java | 10 +++---- .../machine/TileEntityCoreAdvanced.java | 12 ++++---- .../machine/TileEntityCoreTitanium.java | 12 ++++---- .../machine/TileEntityFWatzCore.java | 14 +++++----- .../machine/TileEntityFusionMultiblock.java | 14 +++++----- .../machine/TileEntityMachineAssembler.java | 16 +++++------ .../machine/TileEntityMachineBattery.java | 20 +++++++------- .../machine/TileEntityMachineCMBFactory.java | 16 +++++------ .../machine/TileEntityMachineChemplant.java | 16 +++++------ .../machine/TileEntityMachineCoal.java | 14 +++++----- .../machine/TileEntityMachineCyclotron.java | 16 +++++------ .../machine/TileEntityMachineDeuterium.java | 16 +++++------ .../machine/TileEntityMachineDiesel.java | 16 ++++++----- .../TileEntityMachineElectricFurnace.java | 16 +++++------ .../machine/TileEntityMachineGasFlare.java | 15 +++++----- .../machine/TileEntityMachineGenerator.java | 14 +++++----- .../machine/TileEntityMachineIGenerator.java | 14 +++++----- .../machine/TileEntityMachineMiningDrill.java | 16 +++++------ .../machine/TileEntityMachineOilWell.java | 16 +++++------ .../machine/TileEntityMachinePumpjack.java | 16 +++++------ .../machine/TileEntityMachineRTG.java | 10 +++---- .../machine/TileEntityMachineRefinery.java | 16 +++++------ ...eEntityMachineSchrabidiumTransmutator.java | 16 +++++------ .../machine/TileEntityMachineShredder.java | 16 +++++------ .../machine/TileEntityMachineTeleporter.java | 12 ++++---- .../machine/TileEntityMachineTurbofan.java | 14 +++++----- .../machine/TileEntityReactorMultiblock.java | 14 +++++----- .../machine/TileEntityReiXMainframe.java | 10 +++---- .../machine/TileEntityWatzCore.java | 14 +++++----- com/hbm/world/Meteorite.java | 21 ++++++++++++++ 100 files changed, 393 insertions(+), 340 deletions(-) create mode 100644 assets/hbm/textures/items/chem_icon_NITAN.png create mode 100644 assets/hbm/textures/items/powder_nitan_mix.png create mode 100644 assets/hbm/textures/models/tank_NITAN.png create mode 100644 assets/hbm/textures/models/tank_SAS3.png 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 961ef7948a55f7e9f49655e9694e98c7a3cde107..471bf68f3cc83ce44f40394294836d64d1a8ecfb 100644 GIT binary patch delta 228 zcmV-)YBVpUZDbX`YX*BE24){>?v!!U4P767i+id_W27{l6e&Chr|pM(*V zQlcn|FrQLN0K~Nw=Uk9CZ=kgn`@>pm(KL-Coa0000*M?96_yxFnt zN#xV){EJ3z~ce~8xXLwvrlQTE_lGuB{wOFQCgycnS)Kq htT2Kh=qM{QKf@F!`Hl5kU!7wB0#8>zmvv4FO#oA|EVTdt diff --git a/assets/hbm/textures/blocks/turret_light.png b/assets/hbm/textures/blocks/turret_light.png index 69db22eb2e9cb0d25efff6904e848453470b4aac..cefc65660c54637a90acea806a6036d316c59116 100644 GIT binary patch delta 207 zcmV;=05Jcp0s8@vG=H*5L_t(IjqQ;k62dSLMPHb@o`)0U1XUO$CnzEghI(Rgf!MYkd-GM$pbplbMT_wWDncNhLx#Qn4nH?s=>RaFIJOi0Zs0Bda|z4wu<>zbk{ z@ZQt+J$atfGz|dGIR%gblx3-2BCT~05kw@JY~Ii21I{^hI7lCZ48l0Pn|w6@cwDYA z(RQ*PK-YC@T5pm$f57?%>JzE8j{8rK*S2lcC6AaAExmPpJOO`XNl3r6GP(c&002ov JPDHLkV1ii{TW$aV delta 128 zcmV-`0Du4c0j&X$GMIVg=IEo`Mx+6FW8`zVHvDnu1;HB@# zCl3Pf^9oh1s#?8FT7wsw88OC74WN`F00AK9EUh7>d%GU}k&=;0}(&$j)ru$bATd zVb%dJ;RFmXBz1ZQ!izC+(7|tN+WzgI7XG|NQ52fzxdK>g)mp2*CO)_wb_%dLT?HUX z5(O~E&~+Vs-xEawOpjh|5;uvK8mt zqS+7d+n)}+aN5{3jR2%+s-gVM!6$rwfV?XDSHk@IbzLuy7-A|4edITI0FUNROe>bE Q(EtDd07*qoM6N<$f-bmW_W%F@ delta 129 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 YK6&lswTtG!KRJMm^v(3Db)Dk>4-Kn`Jpcdz literal 11953 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 Q4m!k8-&C*symR#b0+1G-(f|Me 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 0000000000000000000000000000000000000000..cae26a5f0433aa39a5e478492e0ab73e331cc3ff GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfpSoM^Y2pZIWa4J_t~@^B`<}Tf#C2H@yU|+jARmytQ6*&u_3eW z`#V`@lW3E+@+*=~1~JE2l9#;mYRyhdNJxnIm94pPp94c8Tl;^59=+w~1U~I|OnO^i z623v9xZ|U-Rf3avLBWB%>Lo5JV584;%+yFc*tAaK?gVCbfptYd$$;)ehD~fbMG|cS nZ_`uK@25mK7e!p;V_;a4>G1R)>s?u((-}Nn{an^LB{Ts5#Y$U4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aae036fbd56d357bf18926fdbefb21e78ac8b8f3 GIT binary patch literal 242 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 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)) {