mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-03-12 04:35:36 +00:00
Power system upgrade, nitan mix, final touch
This commit is contained in:
HbmMods
parent
3b939d8b31
commit
b96d6d06f5
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 172 B After Width: | Height: | Size: 272 B |
Binary file not shown.
|
Before Width: | Height: | Size: 176 B After Width: | Height: | Size: 226 B |
Binary file not shown.
|
Before Width: | Height: | Size: 173 B After Width: | Height: | Size: 251 B |
Binary file not shown.
|
Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 247 B |
Binary file not shown.
|
Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 258 B |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
BIN
assets/hbm/textures/items/chem_icon_NITAN.png
Normal file
BIN
assets/hbm/textures/items/chem_icon_NITAN.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 248 B |
BIN
assets/hbm/textures/items/powder_nitan_mix.png
Normal file
BIN
assets/hbm/textures/items/powder_nitan_mix.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 242 B |
BIN
assets/hbm/textures/models/tank_NITAN.png
Normal file
BIN
assets/hbm/textures/models/tank_NITAN.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
BIN
assets/hbm/textures/models/tank_SAS3.png
Normal file
BIN
assets/hbm/textures/models/tank_SAS3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
@ -19,6 +19,7 @@ import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@ -65,8 +66,8 @@ public class BombRejuvinator extends Block implements IBomb {
|
||||
|
||||
@Override
|
||||
public void explode(World worldObj, int x1, int y1, int z1) {
|
||||
worldObj.setBlock(x1, y1, z1, Blocks.air);
|
||||
if (!worldObj.isRemote) {
|
||||
worldObj.setBlockToAir(x1, y1, z1);
|
||||
try {
|
||||
Chunk oldChunk = worldObj.getChunkFromBlockCoords(x1, z1);
|
||||
|
||||
|
||||
@ -96,7 +96,7 @@ public class EntityNukeExplosionMK3 extends Entity {
|
||||
this.did = true;
|
||||
}
|
||||
|
||||
speed = 20;
|
||||
speed = 100;
|
||||
|
||||
boolean flag = false;
|
||||
boolean flag2 = false;
|
||||
|
||||
@ -65,6 +65,7 @@ public class EntityBullet extends Entity implements IProjectile {
|
||||
private boolean isTau = false;
|
||||
private boolean instakill = false;
|
||||
private boolean rad = false;
|
||||
public boolean antidote = false;
|
||||
|
||||
public EntityBullet(World p_i1753_1_) {
|
||||
super(p_i1753_1_);
|
||||
@ -515,6 +516,9 @@ public class EntityBullet extends Entity implements IProjectile {
|
||||
}
|
||||
}
|
||||
|
||||
if(antidote)
|
||||
entitylivingbase.clearActivePotions();
|
||||
|
||||
if (this.knockbackStrength > 0) {
|
||||
f4 = MathHelper
|
||||
.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
|
||||
|
||||
@ -107,7 +107,7 @@ public class CMBFurnaceRecipeHandler extends TemplateRecipeHandler {
|
||||
transferRectsGui = new LinkedList<RecipeTransferRect>();
|
||||
guiGui = new LinkedList<Class<? extends GuiContainer>>();
|
||||
|
||||
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);
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ public interface IReactor {
|
||||
|
||||
int getCoolantScaled(int i);
|
||||
|
||||
int getPowerScaled(int i);
|
||||
long getPowerScaled(long i);
|
||||
|
||||
int getHeatScaled(int i);
|
||||
|
||||
|
||||
@ -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<IConsumer> getList();
|
||||
void clearList();
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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())
|
||||
|
||||
@ -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())
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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());
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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));
|
||||
|
||||
@ -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())
|
||||
|
||||
@ -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_);
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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" }));
|
||||
|
||||
@ -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<AuxElectricityPacket, IMessage> {
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
|
||||
@ -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<IConsumer> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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<IConsumer> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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<IConsumer> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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<IConsumer> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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<IConsumer> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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<IConsumer> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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<IFluidAcceptor> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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<IFluidAcceptor> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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<IConsumer> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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<IFluidAcceptor> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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<IConsumer> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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<IConsumer> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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<Entity> list = (List<Entity>)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<ItemStack> list7 = new ArrayList<ItemStack>();
|
||||
list7.add(new ItemStack(ModBlocks.block_meteor_treasure));
|
||||
List<ItemStack> list8 = new ArrayList<ItemStack>();
|
||||
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)) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user