add ConfiguredFeatureMixin

platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java

@@ -40,7 +40,6 @@ import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.fabric.handle.FabricItemHandle;
 import com.dfsek.terra.fabric.handle.FabricWorldHandle;
 import com.dfsek.terra.fabric.mixin.GeneratorTypeAccessor;
-import com.dfsek.terra.fabric.world.FabricTree;
 import com.dfsek.terra.fabric.world.TerraBiomeSource;
 import com.dfsek.terra.fabric.world.features.PopulatorFeature;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGeneratorWrapper;
@@ -451,7 +450,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
 
         private void injectTree(CheckedRegistry<Tree> registry, String id, ConfiguredFeature<?, ?> tree) {
             try {
-                registry.add(id, new FabricTree(tree, id));
+                registry.add(id, (Tree) tree);
             } catch(DuplicateEntryException ignore) {
             }
         }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.world;
+package com.dfsek.terra.fabric.mixin.implementations;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.world.Tree;
@@ -6,34 +6,37 @@ import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.profiler.ProfileFrame;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.world.StructureWorldAccess;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.FeatureConfig;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Implements;
+import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 
 import java.util.Locale;
 import java.util.Random;
 
-public class FabricTree implements Tree {
+@Mixin(ConfiguredFeature.class)
-    private final ConfiguredFeature<?, ?> delegate;
+@Implements(@Interface(iface = Tree.class, prefix = "terra$"))
-    private final String id;
+public abstract class ConfiguredFeatureMixin {
+    @Shadow
+    public abstract boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos);
 
-    public FabricTree(ConfiguredFeature<?, ?> delegate, String id) {
+    @SuppressWarnings("ConstantConditions")
-        this.delegate = delegate;
+    public boolean terra$plant(Location l, Random r) {
-        this.id = id;
+        String id = BuiltinRegistries.CONFIGURED_FEATURE.getId((ConfiguredFeature<?, ?>) (Object) this).toString();
-    }
-
-    @Override
-    @SuppressWarnings("try")
-    public boolean plant(Location l, Random r) {
         try(ProfileFrame ignore = TerraFabricPlugin.getInstance().getProfiler().profile("fabric_tree:" + id.toLowerCase(Locale.ROOT))) {
             StructureWorldAccess fabricWorldAccess = ((StructureWorldAccess) l.getWorld());
             ChunkGenerator generatorWrapper = (ChunkGenerator) l.getWorld().getGenerator();
-            return delegate.generate(fabricWorldAccess, generatorWrapper, r, new BlockPos(l.getBlockX(), l.getBlockY(), l.getBlockZ()));
+            return generate(fabricWorldAccess, generatorWrapper, r, new BlockPos(l.getBlockX(), l.getBlockY(), l.getBlockZ()));
         }
     }
 
-    @Override
+    public MaterialSet terra$getSpawnable() {
-    public MaterialSet getSpawnable() {
         return MaterialSet.get(TerraFabricPlugin.getInstance().getWorldHandle().createBlockData("minecraft:grass_block"),
                 TerraFabricPlugin.getInstance().getWorldHandle().createBlockData("minecraft:podzol"),
                 TerraFabricPlugin.getInstance().getWorldHandle().createBlockData("minecraft:mycelium"));

platforms/fabric/src/main/resources/terra.mixins.json

@@ -7,6 +7,7 @@
     "GeneratorOptionsMixin",
     "implementations.BiomeMixin",
     "implementations.ChunkGeneratorMixin",
+    "implementations.ConfiguredFeatureMixin",
     "implementations.block.BlockEntityMixin",
     "implementations.block.BlockMixin",
     "implementations.block.state.LootableContainerBlockEntityMixin",