Threaded antimatter

BuiltBrokenModding · Oct 8, 2018 · 369bf4a · 369bf4a
1 parent fa06907
commit 369bf4a
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 18 deletions.
diff --git a/src/main/java/icbm/classic/content/explosive/blast/BlastRedmatter.java b/src/main/java/icbm/classic/content/explosive/blast/BlastRedmatter.java
@@ -6,6 +6,7 @@
 import icbm.classic.content.entity.EntityExplosion;
 import icbm.classic.content.entity.EntityExplosive;
 import icbm.classic.content.entity.EntityFlyingBlock;
+import icbm.classic.content.explosive.blast.threaded.BlastAntimatter;
 import icbm.classic.lib.transform.region.Cube;
 import icbm.classic.lib.transform.rotation.EulerAngle;
 import icbm.classic.lib.transform.vector.Location;

diff --git a/...tent/explosive/blast/BlastAntimatter.java → ...osive/blast/threaded/BlastAntimatter.java b/...tent/explosive/blast/BlastAntimatter.java → ...osive/blast/threaded/BlastAntimatter.java
@@ -1,13 +1,19 @@
-package icbm.classic.content.explosive.blast;
+package icbm.classic.content.explosive.blast.threaded;
 
 import icbm.classic.client.ICBMSounds;
 import icbm.classic.content.entity.EntityExplosion;
+import icbm.classic.content.explosive.blast.BlastRedmatter;
+import icbm.classic.content.explosive.thread2.IThreadWork;
+import icbm.classic.content.explosive.thread2.ThreadWorkBlast;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
 
-public class BlastAntimatter extends Blast
+import java.util.List;
+
+public class BlastAntimatter extends BlastThreaded
 {
     private boolean destroyBedrock;
 
@@ -32,7 +38,40 @@ public void doPreExplode()
     }
 
     @Override
-    public void doExplode()
+    protected IThreadWork getWorkerTask()
+    {
+        return new ThreadWorkBlast((steps, edits) -> doRun(steps, edits), edits -> onWorkerThreadComplete(edits));
+    }
+
+    protected void onWorkerThreadComplete(List<BlockPos> edits)
+    {
+        if (world instanceof WorldServer)
+        {
+            ((WorldServer) world).addScheduledTask(() -> {
+                doExplode();
+                destroyBlocks(edits); //TODO break up into chunks
+                doPostExplode();
+            });
+        }
+    }
+
+    public void destroyBlock(BlockPos blockPos)
+    {
+        IBlockState blockState = world.getBlockState(blockPos);
+        if (!blockState.getBlock().isAir(blockState, world, blockPos))
+        {
+            final double dist = position.distance(blockPos);
+            if (dist < this.getBlastRadius() - 1 || world().rand.nextFloat() > 0.7)
+            {
+                if (blockState.getBlockHardness(this.world(), blockPos) >= 0 || destroyBedrock)
+                {
+                    world.setBlockToAir(blockPos);
+                }
+            }
+        }
+    }
+
+    public boolean doRun(int loops, List<BlockPos> edits)
     {
         if (!this.world().isRemote)
         {
@@ -47,26 +86,20 @@ public void doExplode()
 
                         if (dist < this.getBlastRadius())
                         {
-                            IBlockState blockState = world.getBlockState(blockPos);
-
-                            if (!blockState.getBlock().isAir(blockState, world, blockPos))
-                            {
-                                if (!this.destroyBedrock && blockState.getBlockHardness(this.world(), blockPos) < 0)
-                                {
-                                    continue;
-                                }
-
-                                if (dist < this.getBlastRadius() - 1 || world().rand.nextFloat() > 0.7)
-                                {
-                                    world.setBlockToAir(blockPos);
-                                }
-                            }
+                            edits.add(blockPos);
                         }
                     }
 
                 }
             }
         }
+        return false;
+    }
+
+    @Override
+    public void doExplode()
+    {
+        super.doExplode();
 
         // TODO: Render antimatter shockwave
         /*
@@ -84,6 +117,7 @@ public void doExplode()
     @Override
     public void doPostExplode()
     {
+        super.doPostExplode();
         this.doDamageEntities(this.getBlastRadius() * 2, Integer.MAX_VALUE);
     }
 

diff --git a/src/main/java/icbm/classic/content/explosive/handlers/ExAntimatter.java b/src/main/java/icbm/classic/content/explosive/handlers/ExAntimatter.java
@@ -2,7 +2,7 @@
 
 import icbm.classic.config.ConfigBlast;
 import icbm.classic.lib.transform.vector.Pos;
-import icbm.classic.content.explosive.blast.BlastAntimatter;
+import icbm.classic.content.explosive.blast.threaded.BlastAntimatter;
 import icbm.classic.prefab.tile.EnumTier;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;