xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed nuclear generator coolant bug, added inserter textures, plan c fix

Browse Source
This commit is contained in:
HbmMods 2017-08-31 23:48:56 +02:00
parent b09ac815f3
commit 21909b1ef2
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/hbm/textures/blocks/inserter_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 423 B

BIN
assets/hbm/textures/blocks/inserter_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 546 B

BIN
assets/hbm/textures/gui/gui_inserter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

6
com/hbm/items/food/ItemPill.java
View File

@ -37,7 +37,11 @@ public class ItemPill extends ItemFood {
}
if(this == ModItems.plan_c) {
player.attackEntityFrom(rand.nextBoolean() ? ModDamageSource.euthanizedSelf : ModDamageSource.euthanizedSelf2, Float.POSITIVE_INFINITY);
player.attackEntityFrom(rand.nextBoolean() ? ModDamageSource.euthanizedSelf : ModDamageSource.euthanizedSelf2, 100);
player.attackEntityFrom(rand.nextBoolean() ? ModDamageSource.euthanizedSelf : ModDamageSource.euthanizedSelf2, 100);
player.attackEntityFrom(rand.nextBoolean() ? ModDamageSource.euthanizedSelf : ModDamageSource.euthanizedSelf2, 100);
player.attackEntityFrom(rand.nextBoolean() ? ModDamageSource.euthanizedSelf : ModDamageSource.euthanizedSelf2, 100);
player.attackEntityFrom(rand.nextBoolean() ? ModDamageSource.euthanizedSelf : ModDamageSource.euthanizedSelf2, 100);
}
}
}

4
com/hbm/tileentity/TileEntityMachineGenerator.java
View File

@ -467,7 +467,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve
this.tanks[1].setFill(tanks[1].getFill() - 2);
}
if(this.heat < 10 && this.tanks[1].getFill() != 0)
if(this.heat < 10 && heat != 0 && this.tanks[1].getFill() != 0)
{
this.heat--;
this.tanks[1].setFill(tanks[1].getFill() - 1);
@ -500,7 +500,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve
public void attemptHeat(int i) {
Random rand = new Random();
int j = rand.nextInt(i);
int j = rand.nextInt(i + 1);
if(this.tanks[1].getFill() - j >= 0)
{