diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java index 6685b8f59..bb505cfd2 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java @@ -5,7 +5,7 @@ import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper; import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper; import com.seibel.lod.core.handlers.IReflectionHandler; import com.seibel.lod.core.handlers.ReflectionHandler; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index ed28983c2..bacd880ed 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -10,9 +10,9 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.seibel.lod.common.wrappers.misc.LightMapWrapper; import com.seibel.lod.core.api.ApiShared; import com.seibel.lod.core.api.ClientApi; -import com.seibel.lod.core.api.ModAccessorApi; +import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.SingletonHandler; import net.minecraft.client.renderer.LightTexture; @@ -154,12 +154,12 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper @Override public HashSet getVanillaRenderedChunks() { - ISodiumAccessor sodium = ModAccessorApi.get(ISodiumAccessor.class); + ISodiumAccessor sodium = ModAccessorHandler.get(ISodiumAccessor.class); if (sodium != null) { return sodium.getNormalRenderedChunks(); } - IOptifineAccessor optifine = ModAccessorApi.get(IOptifineAccessor.class); + IOptifineAccessor optifine = ModAccessorHandler.get(IOptifineAccessor.class); if (optifine != null) { HashSet pos = optifine.getNormalRenderedChunks(); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index d71758f8a..2c797b3c5 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -25,10 +25,10 @@ import com.seibel.lod.core.builders.lodBuilding.LodBuilder; import com.seibel.lod.core.builders.lodBuilding.LodBuilderConfig; import com.seibel.lod.core.enums.config.DistanceGenerationMode; import com.seibel.lod.core.enums.config.LightGenerationMode; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.objects.lod.LodDimension; import com.seibel.lod.core.util.GridList; import com.seibel.lod.core.util.LodThreadFactory; -import com.seibel.lod.core.util.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java index 26e0d5aa9..f0d13d8b6 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java @@ -8,8 +8,8 @@ import java.util.concurrent.TimeUnit; import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.PrefEvent; import com.seibel.lod.core.api.ApiShared; import com.seibel.lod.core.enums.config.LightGenerationMode; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper.Steps; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java index e77ff713c..069c0606f 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java @@ -3,8 +3,8 @@ package com.seibel.lod.common.wrappers.worldGeneration; import com.mojang.datafixers.DataFixer; import com.seibel.lod.core.builders.lodBuilding.LodBuilder; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.objects.lod.LodDimension; -import com.seibel.lod.core.util.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper; import net.minecraft.core.Registry; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java index 15b06f6ef..7a272233a 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java @@ -1,6 +1,6 @@ package com.seibel.lod.common.wrappers.worldGeneration.mimicObject; -import com.seibel.lod.core.api.ModAccessorApi; +import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor; import net.minecraft.world.level.BlockGetter; @@ -15,7 +15,7 @@ public class LightGetterAdaptor implements LightChunkGetter { public LightGetterAdaptor(BlockGetter heightAccessor) { this.heightGetter = heightAccessor; - shouldReturnNull = ModAccessorApi.get(IStarlightAccessor.class) != null; + shouldReturnNull = ModAccessorHandler.get(IStarlightAccessor.class) != null; } public void setRegion(LightedWorldGenRegion region) { diff --git a/core b/core index e6f8c0d65..d84d53589 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit e6f8c0d65fec7ed4d3131535f9f5abd3b4c64b91 +Subproject commit d84d535896a911340cc661e349a7f813ce0b0c9b diff --git a/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java b/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java index 3ce98f2b5..c238f165d 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java @@ -21,12 +21,11 @@ package com.seibel.lod.fabric; import com.seibel.lod.core.api.ClientApi; import com.seibel.lod.core.api.EventApi; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.mojang.blaze3d.platform.InputConstants; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; import com.seibel.lod.common.wrappers.world.DimensionTypeWrapper; import com.seibel.lod.common.wrappers.world.WorldWrapper; - -import com.seibel.lod.core.util.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/Main.java b/fabric/src/main/java/com/seibel/lod/fabric/Main.java index 03a074343..346132e7a 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/Main.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/Main.java @@ -23,8 +23,8 @@ import com.seibel.lod.common.LodCommonMain; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.api.ApiShared; import com.seibel.lod.core.api.ClientApi; -import com.seibel.lod.core.api.ModAccessorApi; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; @@ -74,13 +74,13 @@ public class Main implements ClientModInitializer client_proxy = new ClientProxy(); client_proxy.registerEvents(); if (SingletonHandler.get(IModChecker.class).isModLoaded("sodium")) { - ModAccessorApi.bind(ISodiumAccessor.class, new SodiumAccessor()); + ModAccessorHandler.bind(ISodiumAccessor.class, new SodiumAccessor()); } if (SingletonHandler.get(IModChecker.class).isModLoaded("starlight")) { - ModAccessorApi.bind(IStarlightAccessor.class, new StarlightAccessor()); + ModAccessorHandler.bind(IStarlightAccessor.class, new StarlightAccessor()); } if (SingletonHandler.get(IModChecker.class).isModLoaded("optifine")) { - ModAccessorApi.bind(IOptifineAccessor.class, new OptifineAccessor()); + ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor()); } } diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java index 24bba6bcc..26fe25a70 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.mojang.blaze3d.systems.RenderSystem; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import net.minecraft.client.Camera; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java index 7b44f7ae2..31f222020 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java @@ -3,7 +3,7 @@ package com.seibel.lod.fabric.mixins; import com.seibel.lod.common.wrappers.config.ConfigGui; import com.seibel.lod.common.wrappers.config.TexturedButtonWidget; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import net.minecraft.client.gui.screens.OptionsScreen; import net.minecraft.client.gui.screens.Screen; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/DependencySetup.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/DependencySetup.java index 656f6e88a..d9486d44f 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/DependencySetup.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/DependencySetup.java @@ -1,7 +1,7 @@ package com.seibel.lod.fabric.wrappers; import com.seibel.lod.common.LodCommonMain; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java index 6d037bafb..0c649fbea 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java @@ -3,7 +3,7 @@ package com.seibel.lod.fabric.wrappers.modAccessor; import java.util.HashSet; import java.util.stream.Collectors; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper; import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java index d7f84563b..652a89e20 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java @@ -25,9 +25,9 @@ import com.seibel.lod.common.wrappers.config.ConfigGui; import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.api.ApiShared; -import com.seibel.lod.core.api.ModAccessorApi; import com.seibel.lod.core.handlers.ReflectionHandler; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; import com.seibel.lod.forge.networking.NetworkHandler; @@ -86,7 +86,7 @@ public class ForgeMain implements LodForgeMethodCaller private void onClientStart(final FMLClientSetupEvent event) { if (ReflectionHandler.instance.optifinePresent()) { - ModAccessorApi.bind(IOptifineAccessor.class, new OptifineAccessor()); + ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor()); } ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class, diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java index b0b66496f..666672162 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.mojang.blaze3d.systems.RenderSystem; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import net.minecraft.client.Camera; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java index 704005a68..71366df9d 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java @@ -3,7 +3,7 @@ package com.seibel.lod.forge.mixins; import com.seibel.lod.common.wrappers.config.ConfigGui; import com.seibel.lod.common.wrappers.config.TexturedButtonWidget; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import net.minecraft.client.gui.screens.OptionsScreen; import net.minecraft.client.gui.screens.Screen; diff --git a/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java b/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java index 3646b238b..53c8b6794 100644 --- a/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java +++ b/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java @@ -2,7 +2,7 @@ package com.seibel.lod.forge.wrappers; import com.seibel.lod.common.LodCommonMain; import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton; -import com.seibel.lod.core.util.SingletonHandler; +import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; /**