Add Creative pump, fix TNT Kahur shots, remove Combustor debug code

unascribed-archive · Feb 18, 2015 · 87aa78a · 87aa78a
1 parent 32f8a3f
commit 87aa78a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/com/gameminers/farrago/kahur/MineralColor.java b/src/main/java/com/gameminers/farrago/kahur/MineralColor.java
@@ -4,6 +4,7 @@
 import net.minecraft.init.Items;
 
 import com.gameminers.farrago.selector.ItemSelector;
+import com.gameminers.farrago.selector.NullSelector;
 import com.gameminers.farrago.selector.OreSelector;
 import com.gameminers.farrago.selector.Selector;
 
@@ -40,6 +41,7 @@ public enum MineralColor {
 			 new ItemSelector(Items.ender_pearl)), 	0x258474, 200, "Ender Pearl [Mobs, Predictable]"),
 	PLATINUM(new OreSelector("ingotPlatinum"), 		0x67D4F6, 450, "Platinum [Mobs, Predictable]"),
 	IRIDIUM (new OreSelector("ingotIridium"), 		0xAAAAAA, 650, "Iridium [Mobs, Predictable]"),
+	CREATIVE(new NullSelector(),					0xFF00FF,32767,"Creative [Mobs, Predictable, Virtually Indestructible]"),
 	;
 	private final Selector selector;
 	private final int color;

diff --git a/src/main/java/com/gameminers/farrago/kahur/entity/EntityKahurProjectile.java b/src/main/java/com/gameminers/farrago/kahur/entity/EntityKahurProjectile.java
@@ -181,7 +181,9 @@ protected void onImpact(MovingObjectPosition pos) {
 			}
 		}
 		if (Block.getBlockFromItem(getItem().getItem()) == Blocks.tnt) {
-			worldObj.createExplosion(this, posX, posY, posZ, 2.7f, true);
+			if (!this.worldObj.isRemote) {
+				worldObj.createExplosion(this, posX, posY, posZ, 2.7f, true);
+			}
 			return;
 		}
 		if (getItem().getItem() == Item.getItemFromBlock(Blocks.torch)) {

diff --git a/src/main/java/com/gameminers/farrago/tileentity/TileEntityCombustor.java b/src/main/java/com/gameminers/farrago/tileentity/TileEntityCombustor.java
@@ -275,7 +275,6 @@ public void smeltItem() {
 			if (worldObj.isRemote) {
 				EnumFacing p_82488_1_ = EnumFacing.values()[worldObj.getBlockMetadata(xCoord, yCoord, zCoord)];
 				int meta = p_82488_1_.getFrontOffsetX() + 1 + (p_82488_1_.getFrontOffsetZ() + 1) * 3;
-				System.out.println(meta);
 				int j2 = meta % 3 - 1;
                 int j1 = meta / 3 % 3 - 1;
                 double d1 = (double)xCoord + (double)j2 * 0.6D + 0.5D;