From 21909b1ef2c1746de244fab0ad88a6a42f8ad14c Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Thu, 31 Aug 2017 23:48:56 +0200
Subject: [PATCH] Fixed nuclear generator coolant bug, added inserter textures,
 plan c fix

---
 assets/hbm/textures/blocks/inserter_side.png     | Bin 0 -> 423 bytes
 assets/hbm/textures/blocks/inserter_top.png      | Bin 0 -> 546 bytes
 assets/hbm/textures/gui/gui_inserter.png         | Bin 0 -> 2245 bytes
 com/hbm/items/food/ItemPill.java                 |   6 +++++-
 .../tileentity/TileEntityMachineGenerator.java   |   4 ++--
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 assets/hbm/textures/blocks/inserter_side.png
 create mode 100644 assets/hbm/textures/blocks/inserter_top.png
 create mode 100644 assets/hbm/textures/gui/gui_inserter.png

diff --git a/assets/hbm/textures/blocks/inserter_side.png b/assets/hbm/textures/blocks/inserter_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..528fcd142717749e6df35df380d65155ae22dde9
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0004ANkl<ZIE{^xvCiT!5QIO+s||8Rg~Suk@DRLzML|nTM*|^>jh$S<dFA{+
zC*4YxH=CLDjMwgTIxW*QvDs{hF#^!{JpeJrUwONW2$E9b{eI(|W1eRKQc3{K^Gr&K
zQVOLM!?YYxRRG3uG-9o#lva7p*=ivKRQ02vuH9}2K+YKvp_IZnj`V%ccDp6UNC<&(
z9I0Una?X@etci1uZ*jd|Nhu*Bc<<K=a?UvCI3AB*$(PFoRb^QgRQ1!KRZwrd#`%0E
z=gi@7uv*u3rU0O838fUvpU)>bXZs$80pQmmT`6T{0pRg?7+{(vBiB$>TjIS(RaX|A
za}2}4G)=%~#LKdn)zu}o3VzDn@ApQmQxOq6-Fv@QP%Yf=_b)TR6tuBY5M$(ayWzbz
zpokD-{P_KQ^X(L*?e==TP}P4v>Go-xf@+}!)b15reb+sNVE?5B{!ji>!5<q;|G~wI
R;Hv-t002ovPDHLkV1g-!z7zle

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/blocks/inserter_top.png b/assets/hbm/textures/blocks/inserter_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..703d13408d5142f1993ed041a25a780981e8a520
GIT binary patch
literal 546
zcmV+-0^R+IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0005mNkl<ZIE{^xO>5gg5QZOVH!D>ICzxOy2W)V_CtuuSPX6IN_25%Yi!Ubj
zEnp*p>B0KIyV{j{NLI)#g$@im%;!7%POw}qo6F@w9LH#_0f?dq0Il_3cK4N1B8@Rr
zRYed4)O8JjF$RFTt}({ooWnWS=5%YMQVM{wEZaiwGsaxm*4oyWBne8XcLZJsg8=~6
zTBMXX=P1jPD2lkdyF+VDk|dO6iI*0EwHD_bi#Udx8;-ZPEYg%Fj`{iUz+;v{6!Got
z4Py*aN`w&C2&}ab1oWSu=>ye#4#50l+OO3Lr4&umpp-%gL8z3%YZOHsdp!X5`#k_z
zma$&1$+C=NuSXb$bccp?#5u>8GzDNd9J1ML*zI=AW;60UXOX5YtzJUs+|>&GqTqZ!
z15i~J)>`sB2jEkOC9k0n;%bGjPfr9vz-F^yG#W7;kJ)aw6h*;mJZ`D<_aVCo03Nf9
zJkOa<r<7$$(=<#blQwpevK=UdKzan$TCBA+O3{CLVSj(m>~!L@wfq<k8J*7%1n*3B
z<O+e-n(uXu5CVHRZ~&x~=+{?LrI1p#SLtop?N$^8N~wRIboaDd1l>>c3BJ2emLGfj
kH%XE<F1v~UWB-ZZH?7Ao<E&AQegFUf07*qoM6N<$f}+sy?f?J)

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/gui/gui_inserter.png b/assets/hbm/textures/gui/gui_inserter.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f93eadef5c73d0001c04e408220c61991d8fce8
GIT binary patch
literal 2245
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
O1iqel58m$ZAN~p2tNUdD

literal 0
HcmV?d00001

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)
 		{