Browse Source

Fixed Hoppers picking up Snow Golem Poop

Gregorius Techneticies 7 months ago
parent
commit
3945f2b1b0
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 4C7DC365E9F99806

+ 1
- 1
CHANGELOG.md View File

@@ -32,7 +32,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
32 32
 [FIXED] Reactor Rods in general were not ON/OFF sensitive.
33 33
 [FIXED] The Running-Possible Sensors now also return Redstone when the Output happens to be blocked at that moment.
34 34
 [FIXED] Made Tooltips for Power Input/Output of Machines now have a special verbiage for a Minimum of "1 Unit per Tick" or less, by saying "up to MAX per Tick" instead.
35
-[ADDED] Snow Golems can have their poop picked up by GT6 Hoppers automatically, without constantly breaking the Block.
35
+[ADDED] Snow Golems can have their poop picked up by GT6 Hoppers automatically without constantly breaking a Snow Layer Block. Also works with Et Futurums silent replacement for Snow Golems, yes I luckily noticed that...
36 36
 [ADDED] Reactors can use Distilled Water as Coolant, but that uses a different System so beware. Also it is not tested or finished yet! Also Reactor Explosions are disabled yet again until.
37 37
 [ADDED] Geiger Counter Sensor courtesy of Erik3003.
38 38
 

+ 1
- 7
src/main/java/gregapi/GT_API_Proxy.java View File

@@ -447,18 +447,12 @@ public abstract class GT_API_Proxy extends Abstract_Proxy implements IGuiHandler
447 447
 		Block tBlock = aEvent.entityLiving.worldObj.getBlock(tX, tY, tZ);
448 448
 		if (tBlock instanceof IBlockOnHeadInside) ((IBlockOnHeadInside)tBlock).onHeadInside(aEvent.entityLiving, aEvent.entityLiving.worldObj, tX, tY, tZ);
449 449
 
450
-		DEB.println("TEST START: " + aEvent.entityLiving.getClass());
451 450
 		if (aEvent.entityLiving.onGround) {
452
-			DEB.println("TEST 1: " + aEvent.entityLiving.getClass());
453 451
 			tY = UT.Code.roundDown(aEvent.entityLiving.boundingBox.minY-0.001F);
454 452
 			tBlock = aEvent.entityLiving.worldObj.getBlock(tX, tY, tZ);
455 453
 			if (IL.EtFu_Path.equal(tBlock) && BlocksGT.Paths != null && aEvent.entityLiving.worldObj.setBlock(tX, tY, tZ, BlocksGT.Paths, 0, 2)) tBlock = BlocksGT.Paths;
456
-			if (tBlock instanceof IBlockOnWalkOver) {
457
-				DEB.println("TEST 2: " + aEvent.entityLiving.getClass());
458
-				((IBlockOnWalkOver)tBlock).onWalkOver(aEvent.entityLiving, aEvent.entityLiving.worldObj, tX, tY, tZ);
459
-			}
454
+			if (tBlock instanceof IBlockOnWalkOver) ((IBlockOnWalkOver)tBlock).onWalkOver(aEvent.entityLiving, aEvent.entityLiving.worldObj, tX, tY, tZ);
460 455
 		}
461
-		DEB.println("TEST END: " + aEvent.entityLiving.getClass());
462 456
 	}
463 457
 	
464 458
 	@SubscribeEvent

+ 1
- 3
src/main/java/gregtech/tileentity/inventories/MultiTileEntityHopper.java View File

@@ -155,9 +155,7 @@ public class MultiTileEntityHopper extends TileEntityBase09FacingSingle implemen
155 155
 	
156 156
 	@Override
157 157
 	public void onWalkOver2(EntityLivingBase aEntity) {
158
-		DEB.println("TEST A: " + aEntity.getClass());
159
-		if (aEntity.getClass() == EntitySnowman.class) {
160
-			DEB.println("TEST B: " + aEntity.getClass());
158
+		if (aEntity.getClass() == EntitySnowman.class || "EntityNewSnowGolem".equalsIgnoreCase(UT.Reflection.getLowercaseClass(aEntity))) {
161 159
 			int i = getSizeInventory(); while (--i>=0) if (addStackToSlot(i, ST.make(Items.snowball, 1, 0))) break;
162 160
 		}
163 161
 	}

+ 1
- 1
src/main/java/gregtech/tileentity/inventories/MultiTileEntityQueueHopper.java View File

@@ -142,7 +142,7 @@ public class MultiTileEntityQueueHopper extends TileEntityBase09FacingSingle imp
142 142
 	
143 143
 	@Override
144 144
 	public void onWalkOver2(EntityLivingBase aEntity) {
145
-		if (aEntity.getClass() == EntitySnowman.class) {
145
+		if (aEntity.getClass() == EntitySnowman.class || "EntityNewSnowGolem".equalsIgnoreCase(UT.Reflection.getLowercaseClass(aEntity))) {
146 146
 			addStackToSlot(getSizeInventory()-1, ST.make(Items.snowball, 1, 0));
147 147
 		}
148 148
 	}

Loading…
Cancel
Save