Finally fixed TF saplings

The previous fix may dupe saplings on grow, probably caused by code in ForgeHooks.

Author: HaHaWTH

src/main/java/io/wdsj/hybridfix/mixin/late/the_twilight_forest/sapling/BlockTFSaplingMixin.java

@@ -1,11 +1,16 @@
 package io.wdsj.hybridfix.mixin.late.the_twilight_forest.sapling;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
 import io.wdsj.hybridfix.duck.bridge.IWorldGetter;
 import io.wdsj.hybridfix.util.hybrid.HybridReflectionUtils;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
 import net.minecraftforge.common.util.BlockSnapshot;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -22,56 +27,40 @@
 import java.util.List;
 import java.util.Random;
 
-@Mixin(value = BlockTFSapling.class, remap = false)
+@Mixin(value = BlockTFSapling.class)
 public abstract class BlockTFSaplingMixin {
-    @Unique private boolean hybridFix$isBoneMeal = true;
+    @Unique
+    private boolean hybridFix$isBoneMeal = true;
     @Inject(
             method = "updateTick",
             at = @At(
-                value = "INVOKE",
-                target = "Ltwilightforest/block/BlockTFSapling;grow(Lnet/minecraft/world/World;Ljava/util/Random;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;)V"
-            ),
-            remap = true
+                    value = "INVOKE",
+                    target = "Ltwilightforest/block/BlockTFSapling;grow(Lnet/minecraft/world/World;Ljava/util/Random;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;)V"
+            )
     )
-    public void beforeTickGrow(World worldIn, BlockPos pos, IBlockState state, Random rand, CallbackInfo ci) {
+    private void beforeNaturalGrow(World worldIn, BlockPos pos, IBlockState state, Random rand, CallbackInfo ci) {
         hybridFix$isBoneMeal = false;
     }
 
     @Inject(
-            method = "grow",
-            at = @At(
-                    value = "HEAD"
-            ),
-            remap = true
-    )
-    public void onGrowHead(World worldIn, Random rand, BlockPos pos, IBlockState state, CallbackInfo ci) {
-        HybridReflectionUtils.setCaptureTreeGeneration(worldIn, true);
-    }
-
-    @Inject(
-            method = "grow",
+            method = "updateTick",
             at = @At(
-                    value = "RETURN"
-            ),
-            remap = true
+                    value = "INVOKE",
+                    target = "Ltwilightforest/block/BlockTFSapling;grow(Lnet/minecraft/world/World;Ljava/util/Random;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;)V",
+                    shift = At.Shift.AFTER
+            )
     )
-    // Afterglow >_<
-    public void afterGrow(World worldIn, Random rand, BlockPos pos, IBlockState state, CallbackInfo ci) {
+    private void afterNaturalGrow(World worldIn, BlockPos pos, IBlockState state, Random rand, CallbackInfo ci) {
         HybridReflectionUtils.setCaptureTreeGeneration(worldIn, false);
+        hybridFix$isBoneMeal = true;
         if (!worldIn.capturedBlockSnapshots.isEmpty()) {
             Location location = new Location(((IWorldGetter)worldIn).getWorld(), pos.getX(), pos.getY(), pos.getZ());
             List<BlockState> blockstates = new ObjectArrayList<>(worldIn.capturedBlockSnapshots.size());
             for (BlockSnapshot snapshot : worldIn.capturedBlockSnapshots) {
                 blockstates.add(HybridReflectionUtils.newBlockStateFromBlockSnapshot(snapshot));
             }
             worldIn.capturedBlockSnapshots.clear();
-            StructureGrowEvent event;
-            if (!hybridFix$isBoneMeal) {
-                event = new StructureGrowEvent(location, TreeType.TREE, false, null, blockstates);
-                hybridFix$isBoneMeal = true;
-            } else {
-                event = new StructureGrowEvent(location, TreeType.TREE, true, null, blockstates);
-            }
+            StructureGrowEvent event = new StructureGrowEvent(location, TreeType.TREE, false, null, blockstates);
             Bukkit.getPluginManager().callEvent(event);
             if (!event.isCancelled()) {
                 for (BlockState blockstate : blockstates) {
@@ -80,4 +69,52 @@ public void afterGrow(World worldIn, Random rand, BlockPos pos, IBlockState stat
             }
         }
     }
+
+    @WrapOperation(
+            method = "grow",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/gen/feature/WorldGenerator;generate(Lnet/minecraft/world/World;Ljava/util/Random;Lnet/minecraft/util/math/BlockPos;)Z"
+            )
+    )
+    public boolean onGenerate(WorldGenerator instance, World world, Random random, BlockPos blockPos, Operation<Boolean> original, @Share("canGen") LocalBooleanRef canGen) {
+        HybridReflectionUtils.setCaptureTreeGeneration(world, true);
+        boolean result = original.call(instance, world, random, blockPos);
+        canGen.set(result);
+        return result;
+    }
+
+    @Inject(
+            method = "grow",
+            at = @At(
+                    value = "HEAD"
+            )
+    )
+    public void setTypeOnGrow(World world, Random rand, BlockPos pos, IBlockState state, CallbackInfo ci) {
+        if (hybridFix$isBoneMeal) {
+            world.captureBlockSnapshots = false; // Check ForgeHooks, hybrids are disgusting
+            world.capturedBlockSnapshots.clear();
+            HybridReflectionUtils.setTreeType(TreeType.TREE);
+        }
+    }
+
+    @Inject(
+            method = "grow",
+            at = @At(
+                    value = "RETURN"
+            )
+    )
+    // Afterglow >_<
+    public void afterGrow(World world, Random rand, BlockPos pos, IBlockState state, CallbackInfo ci, @Share("canGen") LocalBooleanRef canGen) {
+        if (!canGen.get()) {
+            HybridReflectionUtils.setTreeType(null);
+            HybridReflectionUtils.setCaptureTreeGeneration(world, false);
+            List<BlockSnapshot> pending = new ObjectArrayList<>();
+            pending.addAll(world.capturedBlockSnapshots);
+            for (BlockSnapshot snapshot : pending) {
+                snapshot.restore(true);
+            }
+            world.capturedBlockSnapshots.clear();
+        }
+    }
 }

src/main/java/io/wdsj/hybridfix/util/hybrid/HybridReflectionUtils.java

@@ -1,8 +1,10 @@
 package io.wdsj.hybridfix.util.hybrid;
 
 import io.wdsj.hybridfix.HybridFix;
+import net.minecraft.block.BlockSapling;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.BlockSnapshot;
+import org.bukkit.TreeType;
 import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockState;
 
 import java.lang.invoke.MethodHandle;
@@ -12,11 +14,21 @@
 
 public class HybridReflectionUtils {
     private static final Field FIELD_WORLD_CAPTURE_TREE_GENERATION = getField(World.class, "captureTreeGeneration");
+    private static final Field FIELD_BLOCK_SAPLING_TREE_TYPE = getField(BlockSapling.class, "treeType");
     private static final MethodHandle CONSTRUCTOR_CRAFT_BLOCK_STATE = getConstructorHandle(CraftBlockState.class, BlockSnapshot.class);
 
     public static void setCaptureTreeGeneration(World world, boolean value) {
         setBooleanField(FIELD_WORLD_CAPTURE_TREE_GENERATION, world, value);
     }
+
+    public static TreeType getTreeType() { // Currently unused
+        return (TreeType) getFieldValue(FIELD_BLOCK_SAPLING_TREE_TYPE, null);
+    }
+
+    public static void setTreeType(TreeType treeType) {
+        setField(FIELD_BLOCK_SAPLING_TREE_TYPE, null, treeType);
+    }
+
     public static CraftBlockState newBlockStateFromBlockSnapshot(BlockSnapshot snapshot) {
         assert CONSTRUCTOR_CRAFT_BLOCK_STATE != null;
         try {
@@ -44,7 +56,17 @@ private static Field getField(Class<?> clazz, String fieldName) {
             return null;
         }
     }
-    private static void setField(Field field, Object instance, Object... value) {
+
+    private static Object getFieldValue(Field field, Object instance) {
+        try {
+            return field.get(instance);
+        } catch (Exception e) {
+            HybridFix.LOGGER.warn("Error occurred while getting field {}", field.getName(), e);
+            return null;
+        }
+    }
+
+    private static void setField(Field field, Object instance, Object value) {
         try {
             field.set(instance, value);
         } catch (Exception e) {