diff --git a/assets/hbm/textures/blocks/inserter_side.png b/assets/hbm/textures/blocks/inserter_side.png new file mode 100644 index 000000000..528fcd142 Binary files /dev/null and b/assets/hbm/textures/blocks/inserter_side.png differ diff --git a/assets/hbm/textures/blocks/inserter_top.png b/assets/hbm/textures/blocks/inserter_top.png new file mode 100644 index 000000000..703d13408 Binary files /dev/null and b/assets/hbm/textures/blocks/inserter_top.png differ diff --git a/assets/hbm/textures/gui/gui_inserter.png b/assets/hbm/textures/gui/gui_inserter.png new file mode 100644 index 000000000..0f93eadef Binary files /dev/null and b/assets/hbm/textures/gui/gui_inserter.png differ diff --git a/com/hbm/items/food/ItemPill.java b/com/hbm/items/food/ItemPill.java index e924d4101..5fbfe69e8 100644 --- a/com/hbm/items/food/ItemPill.java +++ b/com/hbm/items/food/ItemPill.java @@ -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); } } } diff --git a/com/hbm/tileentity/TileEntityMachineGenerator.java b/com/hbm/tileentity/TileEntityMachineGenerator.java index 071cb1e44..ee92af52c 100644 --- a/com/hbm/tileentity/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/TileEntityMachineGenerator.java @@ -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) {