speed up explosions, add saving logic to explosives, fix global state bug

Author: FalsePattern

src/main/java/gregtech/common/entities/GT_Entity_Explosive.java

@@ -16,6 +16,7 @@
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityTNTPrimed;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 
@@ -92,9 +93,6 @@ public void onUpdate() {
             this.setDead();
             if (!this.worldObj.isRemote) {
                 this.doExplode();
-                if (preCalc != null) {
-                    this.preCalc.finalizeExplosion();
-                }
             }
         } else {
             final int n = rand.nextInt(2) + 1;
@@ -118,12 +116,19 @@ public void onUpdate() {
     protected void writeEntityToNBT(final NBTTagCompound compound) {
         super.writeEntityToNBT(compound);
         compound.setInteger("initialFuse", initialFuse);
+        compound.setInteger("fuse", fuse);
         compound.setInteger("meta", metadata);
         compound.setDouble("rX", realX);
         compound.setDouble("rY", realY);
         compound.setDouble("rZ", realZ);
         compound.setInteger("tier", tier.getTier());
         compound.setInteger("typeIndex", tier.getTierTrackIndex());
+        if (explosion != null) {
+            compound.setTag("explosion", explosion.serializeNBT());
+        }
+        if (preCalc != null) {
+            compound.setTag("preCalc", preCalc.serializeNBT());
+        }
     }
 
     /**
@@ -136,14 +141,20 @@ protected void writeEntityToNBT(final NBTTagCompound compound) {
     protected void readEntityFromNBT(final NBTTagCompound compound) {
         super.readEntityFromNBT(compound);
         this.initialFuse = compound.getInteger("initialFuse");
+        this.fuse        = compound.getInteger("fuse");
         this.metadata    = compound.getInteger("meta");
         this.realX       = compound.getDouble("rX");
         this.realY       = compound.getDouble("rY");
         this.realZ       = compound.getDouble("rZ");
         this.tier        = getTier(compound);
-        if (!worldObj.isRemote && explosion == null) {
-            // Uncomment this to *somewhat* fix the issue of re-logging or crashing deleting explosives. The calculations appear to be messed up though in doing so
-//            createAndInitExplosion();
+        if (compound.hasKey("explosion")) {
+            val exp = compound.getCompoundTag("explosion");
+            explosion = tier.createExplosion(this);
+            explosion.deserializeNBT(exp);
+            if (compound.hasKey("preCalc")) {
+                val pre = compound.getCompoundTag("preCalc");
+                preCalc = GT_Explosion_PreCalculation.deserializeNBT(explosion, pre);
+            }
         }
     }
 

src/main/java/gregtech/common/misc/explosions/GT_Explosion.java

@@ -14,6 +14,9 @@
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagIntArray;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
@@ -22,6 +25,8 @@
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 
+import net.minecraftforge.common.util.Constants;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -33,9 +38,7 @@
 @Getter
 public abstract class GT_Explosion<TierType extends Enum<TierType> & IGT_ExplosiveTier<TierType>> extends Explosion {
 
-    protected final List<ItemStack> harvested = new ArrayList<>();
-
-    protected final Set<ChunkPosition> seen = new HashSet<>(), targeted = new HashSet<>();
+    protected final Set<ChunkPosition> targeted = new HashSet<>();
 
     private final GT_Entity_Explosive gtExplosive;
 
@@ -52,6 +55,33 @@ public GT_Explosion(
         this.isSmoking   = true;
     }
 
+    public NBTTagCompound serializeNBT() {
+        val nbt = new NBTTagCompound();
+        val targeted = new NBTTagList();
+        nbt.setTag("targeted", targeted);
+        for (val pos: this.targeted) {
+            targeted.appendTag(new NBTTagIntArray(serializePos(pos)));
+        }
+        return nbt;
+    }
+
+    public void deserializeNBT(NBTTagCompound nbt) {
+        targeted.clear();
+        val t = nbt.getTagList("targeted", Constants.NBT.TAG_INT_ARRAY);
+        int length = t.tagCount();
+        for (int i = 0; i < length; i++) {
+            targeted.add(deserializePos(t.func_150306_c(i)));
+        }
+    }
+
+    public static int[] serializePos(final ChunkPosition pos) {
+        return new int[]{pos.chunkPosX, pos.chunkPosY, pos.chunkPosZ};
+    }
+
+    public static ChunkPosition deserializePos(final int[] nbt) {
+        return new ChunkPosition(nbt[0], nbt[1], nbt[2]);
+    }
+
     public int getX() {
         return (int) explosionX;
     }
@@ -122,6 +152,7 @@ public void doExplosionB(final boolean shouldDoParticles) {
         } else {
             blocksToDestroy = targeted;
         }
+        val harvested = new HashSet<ItemStack>();
         for (ChunkPosition position : blocksToDestroy) {
             int   i, j, k, meta;
             Block block;
@@ -136,12 +167,12 @@ public void doExplosionB(final boolean shouldDoParticles) {
             }
             if (block.getMaterial() != Material.air) {
                 if (block.canDropFromExplosion(this)) {
-                    getDrops(block, i, j, k, meta);
+                    getDrops(harvested, block, i, j, k, meta);
                 }
                 destroyBlock(block, i, j, k);
             }
         }
-        processDrops();
+        processDrops(harvested);
     }
 
     protected void explosionPost() {
@@ -240,7 +271,7 @@ protected void doParticles(final float x, final float y, final float z) {
         pubWorld.spawnParticle("smoke", d0, d1, d2, d3, d4, d5);
     }
 
-    protected void getDrops(final Block block, final int x, final int y, final int z, final int metadata) {
+    protected void getDrops(Set<ItemStack> harvested, final Block block, final int x, final int y, final int z, final int metadata) {
         if (!pubWorld.isRemote) {
             final float          chance = getDropChance(block);
             ArrayList<ItemStack> items  = block.getDrops(pubWorld, x, y, z, metadata, getFortune());
@@ -252,7 +283,7 @@ protected void destroyBlock(final Block block, final int i, final int j, final i
         block.onBlockExploded(pubWorld, i, j, k, this);
     }
 
-    protected void processDrops() {
+    protected void processDrops(Set<ItemStack> harvested) {
         harvested.forEach(this::spawnItem);
     }
 
@@ -291,7 +322,7 @@ protected boolean hasEncountered(final int x, final int y, final int z) {
     }
 
     protected boolean hasEncountered(final ChunkPosition pos) {
-        return seen.contains(pos) || targeted.contains(pos);
+        return targeted.contains(pos);
     }
 
     protected float getRayPower() {