From 8bfe624f97686d455861d0e4438f051055cb67cb Mon Sep 17 00:00:00 2001 From: coolGi Date: Fri, 3 Jun 2022 17:13:28 +0930 Subject: [PATCH] Renamed Main to ForgeMain and added some config ui comment stuff --- .../seibel/lod/common/wrappers/DependencySetup.java | 4 ++++ .../seibel/lod/fabric/{Main.java => FabricMain.java} | 7 ++++--- .../lod/fabric/mixins/MixinDedicatedServer.java | 4 ---- .../com/seibel/lod/fabric/mixins/MixinMinecraft.java | 5 ----- .../lod/fabric/mixins/client/MixinClientLevel.java | 12 ------------ .../lod/fabric/mixins/events/MixinBlockUpdate.java | 6 ------ .../lod/fabric/mixins/events/MixinServerLevel.java | 5 ----- .../lod/fabric/wrappers/FabricDependencySetup.java | 2 -- fabric/src/main/resources/fabric.mod.json | 4 ++-- .../main/java/com/seibel/lod/forge/ForgeMain.java | 5 +++-- 10 files changed, 13 insertions(+), 41 deletions(-) rename fabric/src/main/java/com/seibel/lod/fabric/{Main.java => FabricMain.java} (95%) 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 fd695c0aa..881ce1176 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 @@ -30,6 +30,8 @@ import com.seibel.lod.core.handlers.ReflectionHandler; 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.config.ILodConfigWrapperSingleton; +import com.seibel.lod.core.wrapperInterfaces.config.LodConfigWrapperSingleton; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; @@ -46,6 +48,8 @@ import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; public class DependencySetup { public static void createInitialBindings() { + SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE); // TODO: Remove + SingletonHandler.bind(IConfigWrapper.class, ConfigWrapper.INSTANCE); SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE); if (!SharedApi.inDedicatedEnvironment) diff --git a/fabric/src/main/java/com/seibel/lod/fabric/Main.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java similarity index 95% rename from fabric/src/main/java/com/seibel/lod/fabric/Main.java rename to fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java index a0fe0d91e..37acfbf7f 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/Main.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java @@ -51,7 +51,7 @@ import java.lang.invoke.MethodHandles; * @author Ran * @version 12-1-2021 */ -public class Main implements ClientModInitializer, DedicatedServerModInitializer +public class FabricMain implements ClientModInitializer, DedicatedServerModInitializer { // This is a client mod so it should implement ClientModInitializer and in fabric.mod.json it should have "environment": "client" // Once it works on servers change the implement to ModInitializer and in fabric.mod.json it should be "environment": "*" @@ -68,7 +68,7 @@ public class Main implements ClientModInitializer, DedicatedServerModInitializer public void onInitializeClient() { SharedApi.inDedicatedEnvironment = false; init(); - ClientLifecycleEvents.CLIENT_STARTED.register(Main::postInit); + ClientLifecycleEvents.CLIENT_STARTED.register(FabricMain::postInit); } @Override @@ -94,6 +94,7 @@ public class Main implements ClientModInitializer, DedicatedServerModInitializer FabricDependencySetup.finishBinding(); LodCommonMain.initConfig(); LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION); + if (!SharedApi.inDedicatedEnvironment) { client_proxy = new FabricClientProxy(); client_proxy.registerEvents(); @@ -111,6 +112,6 @@ public class Main implements ClientModInitializer, DedicatedServerModInitializer ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor()); } ModAccessorHandler.finishBinding(); - LOGGER.info("Mod Initialized"); + LOGGER.info(ModInfo.READABLE_NAME + " Initialized"); } } diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinDedicatedServer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinDedicatedServer.java index 83c7e56b1..784f9311f 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinDedicatedServer.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinDedicatedServer.java @@ -19,12 +19,8 @@ package com.seibel.lod.fabric.mixins; -import com.seibel.lod.fabric.Main; import net.minecraft.server.dedicated.DedicatedServer; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(DedicatedServer.class) @Deprecated // Please use the OnServerLoadEvent in core instead, or diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinMinecraft.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinMinecraft.java index feb7f6888..485915ebc 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinMinecraft.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinMinecraft.java @@ -19,13 +19,8 @@ package com.seibel.lod.fabric.mixins; -import com.seibel.lod.fabric.Main; import net.minecraft.client.Minecraft; -import net.minecraft.client.main.GameConfig; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; /** * Loads the mod after minecraft loads. diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java index 789bca07c..b7fb3f061 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java @@ -22,27 +22,15 @@ package com.seibel.lod.fabric.mixins.client; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; import com.seibel.lod.common.wrappers.world.WorldWrapper; import com.seibel.lod.core.api.internal.a7.ClientApi; -import com.seibel.lod.core.api.internal.a7.SharedApi; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.fabric.Main; import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.client.renderer.LevelRenderer; #if POST_MC_1_18_2 -import net.minecraft.core.Holder; #endif -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.profiling.ProfilerFiller; -import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.LevelChunk; -import net.minecraft.world.level.dimension.DimensionType; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.util.function.Supplier; - /** * This class is used for world loading events * @author Ran diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java index 18b7cd6f7..0aa6a3452 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java @@ -19,16 +19,10 @@ package com.seibel.lod.fabric.mixins.events; -import com.seibel.lod.fabric.Main; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; /** * If someone has a better way to do this then please let me know. diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java index 2d23c8a2a..678163a79 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java @@ -19,13 +19,8 @@ package com.seibel.lod.fabric.mixins.events; -import com.seibel.lod.fabric.Main; import net.minecraft.server.level.ServerLevel; -import net.minecraft.util.ProgressListener; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; /** * This class is used for world saving events diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java index 919b7d0d5..533326bc8 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java @@ -40,8 +40,6 @@ public class FabricDependencySetup public static void createInitialBindings() { SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE); - - SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE); } public static void finishBinding() { diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index a224970bf..eb2ea32ba 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -19,10 +19,10 @@ "environment": "*", "entrypoints": { "client": [ - "com.seibel.lod.fabric.Main" + "com.seibel.lod.fabric.FabricMain" ], "server": [ - "com.seibel.lod.fabric.Main" + "com.seibel.lod.fabric.FabricMain" ], "modmenu": [ 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 07591b134..11e0e6b99 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java @@ -79,11 +79,12 @@ public class ForgeMain implements LodForgeMethodCaller private void init(final FMLCommonSetupEvent event) { // make sure the dependencies are set up before the mod needs them - LodCommonMain.startup(this, !FMLLoader.getDist().isClient()); +// LodCommonMain.startup(this, !FMLLoader.getDist().isClient()); + LodCommonMain.startup(this); ForgeDependencySetup.createInitialBindings(); ForgeDependencySetup.finishBinding(); LodCommonMain.initConfig(); - LOGGER.info("Distant Horizons initializing..."); + LOGGER.info(ModInfo.READABLE_NAME + " initializing..."); } public ForgeMain()