Fix mana spreader entity ID leak (#162)

.editorconfig

@@ -1,4 +0,0 @@
-root = true
-
-[*.java]
-indent_style = tab

src/main/java/vazkii/botania/common/block/BlockAlfPortal.java

@@ -62,10 +62,13 @@ public class BlockAlfPortal extends BlockModContainer<TileAlfPortal> implements
 
 	@Override
 	public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) {
-		boolean did = ((TileAlfPortal) world.getTileEntity(x, y, z)).onWanded();
-		if(did && player != null)
-			player.addStat(ModAchievements.elfPortalOpen, 1);
-		return did;
+		if(!world.isRemote) {
+			boolean did = ((TileAlfPortal) world.getTileEntity(x, y, z)).onWanded();
+			if(did && player != null)
+				player.addStat(ModAchievements.elfPortalOpen, 1);
+			return did;
+		}
+		return true;
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java

@@ -167,7 +167,8 @@ public class TileAlfPortal extends TileMod {
 		} else closeNow = false;
 
 		if(closeNow) {
-			worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 1 | 2);
+			if(!worldObj.isRemote)
+				worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 1 | 2);
 			for(int i = 0; i < 36; i++)
 				blockParticle(meta);
 			closeNow = false;
@@ -175,7 +176,8 @@ public class TileAlfPortal extends TileMod {
 			if(newMeta == 0)
 				for(int i = 0; i < 36; i++)
 					blockParticle(meta);
-			worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2);
+			if(!worldObj.isRemote)
+				worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2);
 		} else if(explode) {
 			worldObj.createExplosion(null, xCoord + .5, yCoord + 2.0, zCoord + .5, 3f, true);
 			explode = false;

src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java

@@ -10,7 +10,6 @@
  */
 package vazkii.botania.common.block.tile;
 
-import com.gtnewhorizon.gtnhlib.item.ItemStackNBT;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -184,17 +183,17 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
 
 	@Override
 	public void updateEntity() {
-		if (getBlockMetadata() < PYLON_LOCATIONS.length)
-			for (int[] pylon : PYLON_LOCATIONS[getBlockMetadata()]) {
+		if(getBlockMetadata() < PYLON_LOCATIONS.length)
+			for(int[] pylon : PYLON_LOCATIONS[getBlockMetadata()]) {
 				TileEntity tile = worldObj.getTileEntity(xCoord + pylon[0], yCoord + pylon[1], zCoord + pylon[2]);
-				if (tile instanceof TilePylon tilePylon)
-					tilePylon.activated = false;
+				if(tile instanceof TilePylon)
+					((TilePylon) tile).activated = false;
 			}
 
-		if (!canEnchanterExist(worldObj, xCoord, yCoord, zCoord, getBlockMetadata())) {
+		if(!canEnchanterExist(worldObj, xCoord, yCoord, zCoord, getBlockMetadata())) {
 
 			worldObj.setBlock(xCoord, yCoord, zCoord, Blocks.lapis_block, 0, 1 | 2);
-			for (int i = 0; i < 50; i++) {
+			for(int i = 0; i < 50; i++) {
 				float red = (float) Math.random();
 				float green = (float) Math.random();
 				float blue = (float) Math.random();
@@ -203,99 +202,104 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
 			worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:enchanterBlock", 0.5F, 10F);
 		}
 
-		switch (stage) {
-			case 1 -> { // Get books
-				if (stageTicks % 20 == 0) {
-					List<EntityItem> items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord - 2, yCoord, zCoord - 2, xCoord + 3, yCoord + 1, zCoord + 3));
-					int count = items.size();
-					boolean addedEnch = false;
+		switch(stage) {
+		case 1 : { // Get books
+			if(stageTicks % 20 == 0) {
+				List<EntityItem> items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord - 2, yCoord, zCoord - 2, xCoord + 3, yCoord + 1, zCoord + 3));
+				int count = items.size();
+				boolean addedEnch = false;
 
-					if (count > 0 && !worldObj.isRemote) {
-						for (EntityItem entity : items) {
-							ItemStack item = entity.getEntityItem();
-							if (item.getItem() == Items.enchanted_book) {
-								NBTTagList enchants = Items.enchanted_book.func_92110_g(item);
-								if (enchants != null && enchants.tagCount() > 0) {
-									NBTTagCompound enchant = enchants.getCompoundTagAt(0);
-									short enchantId = enchant.getShort("id");
-									short enchantLvl = enchant.getShort("lvl");
-									if (!hasEnchantAlready(enchantId) && isEnchantmentValid(enchantId)) {
-										this.enchants.add(new EnchantmentData(enchantId, enchantLvl));
-										worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:ding", 1F, 1F);
-										addedEnch = true;
-										break;
-									}
+				if(count > 0 && !worldObj.isRemote) {
+					for(EntityItem entity : items) {
+						ItemStack item = entity.getEntityItem();
+						if(item.getItem() == Items.enchanted_book) {
+							NBTTagList enchants = Items.enchanted_book.func_92110_g(item);
+							if(enchants != null && enchants.tagCount() > 0) {
+								NBTTagCompound enchant = enchants.getCompoundTagAt(0);
+								short enchantId = enchant.getShort("id");
+								short enchantLvl = enchant.getShort("lvl");
+								if(!hasEnchantAlready(enchantId) && isEnchantmentValid(enchantId)) {
+									this.enchants.add(new EnchantmentData(enchantId, enchantLvl));
+									worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:ding", 1F, 1F);
+									addedEnch = true;
+									break;
 								}
 							}
 						}
 					}
+				}
 
-					if (!addedEnch) {
-						if (enchants.isEmpty())
-							stage = 0;
-						else advanceStage();
+				if(!addedEnch) {
+					if(enchants.isEmpty())
+						stage = 0;
+					else advanceStage();
+				}
+			}
+			break;
+		}
+		case 2 : { // Get Mana
+			for(int[] pylon : PYLON_LOCATIONS[getBlockMetadata()]) {
+				TilePylon pylonTile = (TilePylon) worldObj.getTileEntity(xCoord + pylon[0], yCoord + pylon[1], zCoord + pylon[2]);
+				if(pylonTile != null) {
+					pylonTile.activated = true;
+					pylonTile.centerX = xCoord;
+					pylonTile.centerY = yCoord;
+					pylonTile.centerZ = zCoord;
+				}
+			}
+
+			if(manaRequired == -1) {
+				manaRequired = 0;
+				for(EnchantmentData data : enchants) {
+					Enchantment ench = Enchantment.enchantmentsList[data.enchant];
+					manaRequired += (int) (5000F * ((15 - Math.min(15, ench.getWeight())) * 1.05F) * ((3F + data.level * data.level) * 0.25F) * (0.9F + enchants.size() * 0.05F));
+				}
+			} else if(mana >= manaRequired) {
+				manaRequired = 0;
+				for(int[] pylon : PYLON_LOCATIONS[getBlockMetadata()])
+					((TilePylon) worldObj.getTileEntity(xCoord + pylon[0], yCoord + pylon[1], zCoord + pylon[2])).activated = false;
+
+				advanceStage();
+			} else {
+				ISparkEntity spark = getAttachedSpark();
+				if(spark != null) {
+					List<ISparkEntity> sparkEntities = SparkHelper.getSparksAround(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5);
+					for(ISparkEntity otherSpark : sparkEntities) {
+						if(spark == otherSpark)
+							continue;
+
+						if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool)
+							otherSpark.registerTransfer(spark);
 					}
 				}
 			}
-			case 2 -> { // Get Mana
-				for (int[] pylon : PYLON_LOCATIONS[getBlockMetadata()]) {
-					TilePylon pylonTile = (TilePylon) worldObj.getTileEntity(xCoord + pylon[0], yCoord + pylon[1], zCoord + pylon[2]);
-					if (pylonTile != null) {
-						pylonTile.activated = true;
-						pylonTile.centerX = xCoord;
-						pylonTile.centerY = yCoord;
-						pylonTile.centerZ = zCoord;
-					}
-				}
 
-				if (manaRequired == -1) {
-					manaRequired = 0;
-					for (EnchantmentData data : enchants) {
-						Enchantment ench = Enchantment.enchantmentsList[data.enchant];
-						manaRequired += (int) (5000F * ((15 - Math.min(15, ench.getWeight())) * 1.05F) * ((3F + data.level * data.level) * 0.25F) * (0.9F + enchants.size() * 0.05F));
-					}
-				} else if (mana >= manaRequired) {
-					manaRequired = 0;
-					for (int[] pylon : PYLON_LOCATIONS[getBlockMetadata()])
-						((TilePylon) worldObj.getTileEntity(xCoord + pylon[0], yCoord + pylon[1], zCoord + pylon[2])).activated = false;
+			break;
+		}
+		case 3 : { // Enchant
+			if(stageTicks >= 100) {
+				for(EnchantmentData data : enchants)
+					if(EnchantmentHelper.getEnchantmentLevel(data.enchant, itemToEnchant) == 0)
+						itemToEnchant.addEnchantment(Enchantment.enchantmentsList[data.enchant], data.level);
 
-					advanceStage();
-				} else {
-					ISparkEntity spark = getAttachedSpark();
-					if (spark != null) {
-						List<ISparkEntity> sparkEntities = SparkHelper.getSparksAround(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5);
-						for (ISparkEntity otherSpark : sparkEntities) {
-							if (spark == otherSpark)
-								continue;
+				enchants.clear();
+				manaRequired = -1;
+				mana = 0;
 
-							if (otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool)
-								otherSpark.registerTransfer(spark);
-						}
-					}
-				}
+				craftingFanciness();
+				advanceStage();
 			}
-			case 3 -> { // Enchant
-				if (stageTicks >= 100) {
-					for (EnchantmentData data : enchants)
-						if (EnchantmentHelper.getEnchantmentLevel(data.enchant, itemToEnchant) == 0) {
-							ItemStackNBT.enchant(itemToEnchant, data.enchant, data.level);
-						}
+			break;
+		}
+		case 4 : { // Reset
+			if(stageTicks >= 20)
+				advanceStage();
 
-					enchants.clear();
-					manaRequired = -1;
-					mana = 0;
-
-					craftingFanciness();
-					advanceStage();
-				}
-			}
-			case 4 -> { // Reset
-				if (stageTicks >= 20)
-					advanceStage();
-			}
+			break;
+		}
 		}
 
-		if (stage != 0)
+		if(stage != 0)
 			stageTicks++;
 	}
 
@@ -384,12 +388,12 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
 
 		enchants.clear();
 		String enchStr = cmp.getString(TAG_ENCHANTS);
-		if (!enchStr.isEmpty()) {
+		if(!enchStr.isEmpty()) {
 			String[] enchTokens = enchStr.split(",");
-			for (String token : enchTokens) {
+			for(String token : enchTokens) {
 				String[] entryTokens = token.split(":");
-				short id = Short.parseShort(entryTokens[0]);
-				short lvl = Short.parseShort(entryTokens[1]);
+				int id = Integer.parseInt(entryTokens[0]);
+				int lvl = Integer.parseInt(entryTokens[1]);
 				enchants.add(new EnchantmentData(id, lvl));
 			}
 		}
@@ -475,9 +479,9 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
 
 	private static class EnchantmentData {
 
-		public short enchant, level;
+		public int enchant, level;
 
-		public EnchantmentData(short enchant, short level) {
+		public EnchantmentData(int enchant, int level) {
 			this.enchant = enchant;
 			this.level = level;
 		}

src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java

@@ -464,8 +464,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
 	}
 
 	public EntityManaBurst getBurst(boolean fake) {
-		EntityManaBurst burst = new EntityManaBurst(this, fake);
-
 		boolean dreamwood = isDreamwood();
 		boolean ultra = isULTRA_SPREADER();
 		int maxMana = ultra ? 640 : dreamwood ? 240 : 160;
@@ -480,29 +478,31 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
 		if(lens != null && lens.getItem() instanceof ILensEffect)
 			((ILensEffect) lens.getItem()).apply(lens, props);
 
-		burst.setSourceLens(lens);
-		if(getCurrentMana() >= props.maxMana || fake) {
-			if(mapmakerOverride) {
-				burst.setColor(mmForcedColor);
-				burst.setMana(mmForcedManaPayload);
-				burst.setStartingMana(mmForcedManaPayload);
-				burst.setMinManaLoss(mmForcedTicksBeforeManaLoss);
-				burst.setManaLossPerTick(mmForcedManaLossPerTick);
-				burst.setGravity(mmForcedGravity);
-				burst.setMotion(burst.motionX * mmForcedVelocityMultiplier, burst.motionY * mmForcedVelocityMultiplier, burst.motionZ * mmForcedVelocityMultiplier);
-			} else {
-				burst.setColor(props.color);
-				burst.setMana(props.maxMana);
-				burst.setStartingMana(props.maxMana);
-				burst.setMinManaLoss(props.ticksBeforeManaLoss);
-				burst.setManaLossPerTick(props.manaLossPerTick);
-				burst.setGravity(props.gravity);
-				burst.setMotion(burst.motionX * props.motionModifier, burst.motionY * props.motionModifier, burst.motionZ * props.motionModifier);
-			}
+		if(getCurrentMana() < props.maxMana && !fake)
+			return null;
 
-			return burst;
+		// Construct the entity only after the mana check, every new Entity takes a global entity ID
+		EntityManaBurst burst = new EntityManaBurst(this, fake);
+		burst.setSourceLens(lens);
+		if(mapmakerOverride) {
+			burst.setColor(mmForcedColor);
+			burst.setMana(mmForcedManaPayload);
+			burst.setStartingMana(mmForcedManaPayload);
+			burst.setMinManaLoss(mmForcedTicksBeforeManaLoss);
+			burst.setManaLossPerTick(mmForcedManaLossPerTick);
+			burst.setGravity(mmForcedGravity);
+			burst.setMotion(burst.motionX * mmForcedVelocityMultiplier, burst.motionY * mmForcedVelocityMultiplier, burst.motionZ * mmForcedVelocityMultiplier);
+		} else {
+			burst.setColor(props.color);
+			burst.setMana(props.maxMana);
+			burst.setStartingMana(props.maxMana);
+			burst.setMinManaLoss(props.ticksBeforeManaLoss);
+			burst.setManaLossPerTick(props.manaLossPerTick);
+			burst.setGravity(props.gravity);
+			burst.setMotion(burst.motionX * props.motionModifier, burst.motionY * props.motionModifier, burst.motionZ * props.motionModifier);
 		}
-		return null;
+
+		return burst;
 	}
 
 	public ILensControl getLensController(ItemStack stack) {