cleanup

common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java

@@ -77,7 +77,7 @@ public abstract class AbstractPlatform implements Platform {
     private static final Logger logger = LoggerFactory.getLogger(AbstractPlatform.class);
     
     private static final MutableBoolean LOADED = new MutableBoolean(false);
-    private final EventManager eventManager = new EventManagerImpl(this);
+    private final EventManager eventManager = new EventManagerImpl();
     private final ConfigRegistry configRegistry = new ConfigRegistry();
     
     private final CheckedRegistry<ConfigPack> checkedConfigRegistry = new CheckedRegistryImpl<>(configRegistry);
@@ -174,12 +174,7 @@ public abstract class AbstractPlatform implements Platform {
         
         addonList.add(internalAddon);
         
-        getPlatformAddon().ifPresent(addonList::add);
+        platformAddon().ifPresent(addonList::add);
-        
-        platformAddon().ifPresent(baseAddon -> {
-            baseAddon.initialize();
-            addonList.add(baseAddon);
-        });
         
         BootstrapAddonLoader bootstrapAddonLoader = new BootstrapAddonLoader(this);
         
@@ -226,10 +221,6 @@ public abstract class AbstractPlatform implements Platform {
         logger.info("Finished initialization.");
     }
     
-    protected Optional<BaseAddon> getPlatformAddon() {
-        return Optional.empty();
-    }
-    
     @Override
     public void register(TypeRegistry registry) {
         loaders.register(registry);

common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java

@@ -29,10 +29,8 @@ import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 
 public class EventManagerImpl implements EventManager {
     private final Map<Class<?>, EventHandler> handlers = new HashMap<>();
-    private final Platform platform;
     
-    public EventManagerImpl(Platform platform) {
+    public EventManagerImpl() {
-        this.platform = platform;
         registerHandler(FunctionalEventHandler.class, new FunctionalEventHandlerImpl()); // default handler
     }
     

common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java

@@ -28,7 +28,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.event.events.Event;
 import com.dfsek.terra.api.event.events.FailThroughEvent;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java

@@ -25,7 +25,6 @@ import net.minecraft.world.biome.Biome;
 import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.GeneratorOptions;
-import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -75,7 +74,6 @@ public abstract class GeneratorOptionsMixin {
             boolean generateStructures = generate_structures == null || Boolean.parseBoolean(generate_structures);
             Registry<DimensionType> dimensionTypes = registryManager.get(Registry.DIMENSION_TYPE_KEY);
             Registry<Biome> biomeRegistry = registryManager.get(Registry.BIOME_KEY);
-            Registry<ChunkGeneratorSettings> chunkGeneratorSettings = registryManager.get(Registry.CHUNK_GENERATOR_SETTINGS_KEY);
             SimpleRegistry<DimensionOptions> dimensionOptions = DimensionType.createDefaultDimensionOptions(registryManager,
                                                                                                             l, false);