diff --git a/.run/Fabric Client & Server.run.xml b/.run/Fabric Client & Server.run.xml new file mode 100644 index 000000000..64f9e649c --- /dev/null +++ b/.run/Fabric Client & Server.run.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.run/Forge Client & Server.run.xml b/.run/Forge Client & Server.run.xml new file mode 100644 index 000000000..b4a666058 --- /dev/null +++ b/.run/Forge Client & Server.run.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.run/Forge Client (gradle).run.xml b/.run/Forge Client (gradle).run.xml new file mode 100644 index 000000000..312b3ef1c --- /dev/null +++ b/.run/Forge Client (gradle).run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/.run/Forge Server (gradle).run.xml b/.run/Forge Server (gradle).run.xml new file mode 100644 index 000000000..4690ddf5d --- /dev/null +++ b/.run/Forge Server (gradle).run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/.run/Neoforge Client & Server.run.xml b/.run/Neoforge Client & Server.run.xml new file mode 100644 index 000000000..bb344d523 --- /dev/null +++ b/.run/Neoforge Client & Server.run.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.run/Neoforge Client (gradle).run.xml b/.run/Neoforge Client (gradle).run.xml new file mode 100644 index 000000000..660a648ed --- /dev/null +++ b/.run/Neoforge Client (gradle).run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/.run/Neoforge Server (gradle).run.xml b/.run/Neoforge Server (gradle).run.xml new file mode 100644 index 000000000..52f2fee38 --- /dev/null +++ b/.run/Neoforge Server (gradle).run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java index 3557945a5..3aeeab7d6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java @@ -22,7 +22,7 @@ package com.seibel.distanthorizons.common.wrappers; import com.seibel.distanthorizons.common.wrappers.gui.ClassicConfigGUI; import com.seibel.distanthorizons.common.wrappers.gui.LangWrapper; import com.seibel.distanthorizons.common.wrappers.level.KeyedClientLevelManager; -import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftDedicatedServerWrapper; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftServerWrapper; import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager; import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui; import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper; @@ -60,7 +60,7 @@ public class DependencySetup //@Environment(EnvType.SERVER) public static void createServerBindings() { - SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftDedicatedServerWrapper.INSTANCE); + SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftServerWrapper.INSTANCE); } //@Environment(EnvType.CLIENT) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftServerWrapper.java similarity index 58% rename from common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftServerWrapper.java index 3439c34fc..39fc3ad67 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftServerWrapper.java @@ -6,19 +6,34 @@ import net.minecraft.server.dedicated.DedicatedServer; import java.io.File; //@Environment(EnvType.SERVER) -public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper +public class MinecraftServerWrapper implements IMinecraftSharedWrapper { - public static final MinecraftDedicatedServerWrapper INSTANCE = new MinecraftDedicatedServerWrapper(); - private MinecraftDedicatedServerWrapper() { } + public static final MinecraftServerWrapper INSTANCE = new MinecraftServerWrapper(); + public DedicatedServer dedicatedServer = null; + + + //=============// + // constructor // + //=============// + + private MinecraftServerWrapper() { } + + + + //=========// + // methods // + //=========// + @Override public boolean isDedicatedServer() { return true; } + @Override public File getInstallationDirectory() { if (this.dedicatedServer == null) { - throw new IllegalStateException("Trying to get Installation Direction before Dedicated server complete initialization!"); + throw new IllegalStateException("Trying to get Installation Direction before Dedicated server completed initialization!"); } #if MC_VER < MC_1_21_1 @@ -28,4 +43,8 @@ public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper #endif } + @Override + public boolean isWorldInitialized() + { return this.dedicatedServer.getWorldData().overworldData().isInitialized(); } + } diff --git a/coreSubProjects b/coreSubProjects index 45fc36543..6d6cbd8a4 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 45fc36543be4c474e8a141f75464750f4a92eeaa +Subproject commit 6d6cbd8a44ecc27e18d3227c7ab6edb921cf1068