Refactored BlockPlaceEvent and BlockChangeDelegate. Adds BUKKIT-5558

23 classes have been removed as they are no longer needed using the new
capture logic. This should help quite a bit with future MC updates.

BlockPlaceEvent Refactor

Before calling Item.interactWith, a recording flag is turned on for
setTypeAndData to capture a blockstate for each block that attempts to be set.
When a block place event is cancelled, the recorded blockstate, stack
size, and metadata will revert back to the captured state. If the event is
not cancelled, a notification will be sent to clients and block physics
will be updated.

BlockChangeDelegate Refactor

Now that we have the ability to capture blockstates through world, there
is no need to modify world gen classes with BlockChangeDelegate. Instead
we will simply capture blocks during world generation in order to "replay"
all of the captured blockstates to send back to delegates.
StructureGrowDelegate and BlockSapling.TreeGenerator have also been
removed as part of this change. BlockSapling and BlockMushroom will
capture blockstates the same as block placement and revert back any grow
events if needed.

1 files changed, 5 insertions, 12 deletions

diff --git a/src/main/java/net/minecraft/server/WorldGenMegaTreeAbstract.java b/src/main/java/net/minecraft/server/WorldGenMegaTreeAbstract.java
index cabbb9f5..0fd21716 100644
--- a/src/main/java/net/minecraft/server/WorldGenMegaTreeAbstract.java
+++ b/src/main/java/net/minecraft/server/WorldGenMegaTreeAbstract.java
@@ -2,8 +2,6 @@ package net.minecraft.server;
 
 import java.util.Random;
 
-import org.bukkit.craftbukkit.CraftBlockChangeDelegate; // CraftBukkit
-
 public abstract class WorldGenMegaTreeAbstract extends WorldGenTreeAbstract {
 
     protected final int a;
@@ -29,8 +27,7 @@ public abstract class WorldGenMegaTreeAbstract extends WorldGenTreeAbstract {
         return i;
     }
 
-    // CraftBukkit - Changed world to CraftBlockChangeDelegate
-    private boolean b(CraftBlockChangeDelegate world, Random random, int i, int j, int k, int l) {
+    private boolean b(World world, Random random, int i, int j, int k, int l) {
         boolean flag = true;
 
         if (j >= 1 && j + l + 1 <= 256) {
@@ -67,8 +64,7 @@ public abstract class WorldGenMegaTreeAbstract extends WorldGenTreeAbstract {
         }
     }
 
-    // CraftBukkit - Change world to CraftBlockChangeDelegate
-    private boolean c(CraftBlockChangeDelegate world, Random random, int i, int j, int k) {
+    private boolean c(World world, Random random, int i, int j, int k) {
         Block block = world.getType(i, j - 1, k);
 
         if ((block == Blocks.GRASS || block == Blocks.DIRT) && j >= 2) {
@@ -82,13 +78,11 @@ public abstract class WorldGenMegaTreeAbstract extends WorldGenTreeAbstract {
         }
     }
 
-    // CraftBukkit - Change world to CraftBlockChangeDelegate
-    protected boolean a(CraftBlockChangeDelegate world, Random random, int i, int j, int k, int l) {
+    protected boolean a(World world, Random random, int i, int j, int k, int l) {
         return this.b(world, random, i, j, k, l) && this.c(world, random, i, j, k);
     }
 
-    // CraftBukkit - Change world to CraftBlockChangeDelegate
-    protected void a(CraftBlockChangeDelegate world, int i, int j, int k, int l, Random random) {
+    protected void a(World world, int i, int j, int k, int l, Random random) {
         int i1 = l * l;
 
         for (int j1 = i - l; j1 <= i + l + 1; ++j1) {
@@ -110,8 +104,7 @@ public abstract class WorldGenMegaTreeAbstract extends WorldGenTreeAbstract {
         }
     }
 
-    // CraftBukkit - Change world to CraftBlockChangeDelegate
-    protected void b(CraftBlockChangeDelegate world, int i, int j, int k, int l, Random random) {
+    protected void b(World world, int i, int j, int k, int l, Random random) {
         int i1 = l * l;
 
         for (int j1 = i - l; j1 <= i + l; ++j1) {