remove Tree

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

@@ -20,29 +20,21 @@ package com.dfsek.terra.fabric;
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.version.Version;
 import com.dfsek.tectonic.exception.ConfigException;
-
-import com.dfsek.terra.api.addon.BaseAddon;
-
-import com.dfsek.terra.api.util.generic.pair.Pair.Mutable;
-
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
-import com.dfsek.terra.api.world.Tree;
+import com.dfsek.terra.api.util.generic.pair.Pair.Mutable;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions;
 import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
@@ -73,22 +65,6 @@ public final class FabricAddon implements BaseAddon {
                              } catch(ConfigException e) {
                                  logger.error("Error loading config template", e);
                              }
-            
-                             if(template.doRegistryInjection()) {
-                                 logger.info("Injecting structures into Terra");
-                
-                                 BuiltinRegistries.CONFIGURED_FEATURE.getEntries().forEach(entry -> {
-                                     if(!template.getExcludedRegistryFeatures().contains(entry.getKey().getValue())) {
-                                         try {
-                                             event.getPack()
-                                                  .getCheckedRegistry(Tree.class)
-                                                  .register(entry.getKey().getValue().toString(), (Tree) entry.getValue());
-                                             logger.info("Injected ConfiguredFeature {} as Tree.", entry.getKey().getValue());
-                                         } catch(DuplicateEntryException ignored) {
-                                         }
-                                     }
-                                 });
-                             }
                              templates.put(event.getPack(), Mutable.of(template, null));
                          })
                          .global();

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

@@ -1,65 +0,0 @@
-/*
- * This file is part of Terra.
- *
- * Terra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Terra is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.dfsek.terra.fabric.mixin.implementations;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.registry.BuiltinRegistries;
-import net.minecraft.world.ServerWorldAccess;
-import net.minecraft.world.StructureWorldAccess;
-import net.minecraft.world.gen.chunk.ChunkGenerator;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-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;
-import java.util.Set;
-
-import com.dfsek.terra.api.block.BlockType;
-import com.dfsek.terra.api.profiler.ProfileFrame;
-import com.dfsek.terra.api.util.collection.MaterialSet;
-import com.dfsek.terra.api.util.vector.Vector3;
-import com.dfsek.terra.api.world.Tree;
-import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.fabric.FabricEntryPoint;
-
-
-@Mixin(ConfiguredFeature.class)
-@Implements(@Interface(iface = Tree.class, prefix = "terra$", remap = Interface.Remap.NONE))
-public abstract class ConfiguredFeatureMixin {
-    @Shadow
-    public abstract boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos);
-    
-    @SuppressWarnings({ "ConstantConditions", "try" })
-    public boolean terra$plant(Vector3 l, World world, Random r) {
-        String id = BuiltinRegistries.CONFIGURED_FEATURE.getId((ConfiguredFeature<?, ?>) (Object) this).toString();
-        try(ProfileFrame ignore = FabricEntryPoint.getPlatform().getProfiler().profile("fabric_tree:" + id.toLowerCase(Locale.ROOT))) {
-            StructureWorldAccess fabricWorldAccess = ((StructureWorldAccess) world);
-            ChunkGenerator generatorWrapper = ((ServerWorldAccess) world).toServerWorld().getChunkManager().getChunkGenerator();
-            return generate(fabricWorldAccess, generatorWrapper, r, new BlockPos(l.getBlockX(), l.getBlockY(), l.getBlockZ()));
-        }
-    }
-    
-    public Set<BlockType> terra$getSpawnable() {
-        return MaterialSet.get(FabricEntryPoint.getPlatform().getWorldHandle().createBlockData("minecraft:grass_block"),
-                               FabricEntryPoint.getPlatform().getWorldHandle().createBlockData("minecraft:podzol"),
-                               FabricEntryPoint.getPlatform().getWorldHandle().createBlockData("minecraft:mycelium"));
-    }
-}

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

@@ -11,7 +11,6 @@
         "access.MobSpawnerLogicAccessor",
         "access.StateAccessor",
         "implementations.BiomeMixin",
-        "implementations.ConfiguredFeatureMixin",
         "implementations.block.BlockEntityMixin",
         "implementations.block.BlockMixin",
         "implementations.block.state.LootableContainerBlockEntityMixin",