From 7ca02a945dfed35ac994ed431399808fcd4272a7 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 21 Nov 2021 20:17:12 -0700 Subject: [PATCH] cleanup --- common/addons/chunk-generator-noise-3d | 2 +- common/addons/config-structure | 2 +- common/addons/language-yaml | 2 +- common/addons/manifest-addon-loader | 2 +- common/addons/structure-terrascript-loader | 2 +- .../main/java/com/dfsek/terra/AbstractPlatform.java | 13 ++----------- .../com/dfsek/terra/event/EventManagerImpl.java | 4 +--- .../terra/event/FunctionalEventHandlerImpl.java | 1 - .../lifecycle/server/GeneratorOptionsMixin.java | 2 -- 9 files changed, 8 insertions(+), 22 deletions(-) diff --git a/common/addons/chunk-generator-noise-3d b/common/addons/chunk-generator-noise-3d index 51b30fb81..b85bc70f1 160000 --- a/common/addons/chunk-generator-noise-3d +++ b/common/addons/chunk-generator-noise-3d @@ -1 +1 @@ -Subproject commit 51b30fb818daa2dd8e6a15308f15cd4ee68e4b5b +Subproject commit b85bc70f1424d86bbb568a9345e58c800fc6cf3f diff --git a/common/addons/config-structure b/common/addons/config-structure index 04865538b..ba6b654f9 160000 --- a/common/addons/config-structure +++ b/common/addons/config-structure @@ -1 +1 @@ -Subproject commit 04865538bfa596f361c7364c607b492bbe754451 +Subproject commit ba6b654f97316cf6987360dba61e4e39a125879b diff --git a/common/addons/language-yaml b/common/addons/language-yaml index b9f98da05..5957a2bf7 160000 --- a/common/addons/language-yaml +++ b/common/addons/language-yaml @@ -1 +1 @@ -Subproject commit b9f98da059b4daa9513c09151170f5239fd76d71 +Subproject commit 5957a2bf7dbf6f6c2487d31d189fa127e0090964 diff --git a/common/addons/manifest-addon-loader b/common/addons/manifest-addon-loader index c5db2fcd2..e89c17508 160000 --- a/common/addons/manifest-addon-loader +++ b/common/addons/manifest-addon-loader @@ -1 +1 @@ -Subproject commit c5db2fcd23c8cd16b1ad836fbb9ae7dac7c356bb +Subproject commit e89c175081921387008e258a67e861d6a9c0bc22 diff --git a/common/addons/structure-terrascript-loader b/common/addons/structure-terrascript-loader index 355e02402..3f89e60de 160000 --- a/common/addons/structure-terrascript-loader +++ b/common/addons/structure-terrascript-loader @@ -1 +1 @@ -Subproject commit 355e024025e9906f76c2c1c4332081549b597c6c +Subproject commit 3f89e60dea9f583cb95f39f275000ff4d6586705 diff --git a/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java b/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java index 83360fd03..16cd2d84f 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java +++ b/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 checkedConfigRegistry = new CheckedRegistryImpl<>(configRegistry); @@ -174,12 +174,7 @@ public abstract class AbstractPlatform implements Platform { addonList.add(internalAddon); - getPlatformAddon().ifPresent(addonList::add); - - platformAddon().ifPresent(baseAddon -> { - baseAddon.initialize(); - addonList.add(baseAddon); - }); + platformAddon().ifPresent(addonList::add); BootstrapAddonLoader bootstrapAddonLoader = new BootstrapAddonLoader(this); @@ -226,10 +221,6 @@ public abstract class AbstractPlatform implements Platform { logger.info("Finished initialization."); } - protected Optional getPlatformAddon() { - return Optional.empty(); - } - @Override public void register(TypeRegistry registry) { loaders.register(registry); diff --git a/common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java b/common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java index 764778946..1a0641b4c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java +++ b/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, EventHandler> handlers = new HashMap<>(); - private final Platform platform; - public EventManagerImpl(Platform platform) { - this.platform = platform; + public EventManagerImpl() { registerHandler(FunctionalEventHandler.class, new FunctionalEventHandlerImpl()); // default handler } diff --git a/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java b/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java index 333981ca0..3ba854a3e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java +++ b/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; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java index 1eac6ce0e..90ef6156b 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java +++ b/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 dimensionTypes = registryManager.get(Registry.DIMENSION_TYPE_KEY); Registry biomeRegistry = registryManager.get(Registry.BIOME_KEY); - Registry chunkGeneratorSettings = registryManager.get(Registry.CHUNK_GENERATOR_SETTINGS_KEY); SimpleRegistry dimensionOptions = DimensionType.createDefaultDimensionOptions(registryManager, l, false);