diff --git a/build.gradle b/build.gradle index ad9359432..e935d3dff 100644 --- a/build.gradle +++ b/build.gradle @@ -237,7 +237,7 @@ subprojects { p -> } // Add core - if (p != project(":core")) { + if (p != project(":api") && p != project(":core")) { customModule(project(":core")) { // Remove Junit test libraries exclude group: "org.junit.jupiter", module: "junit-jupiter" @@ -247,7 +247,7 @@ subprojects { p -> } // Add the api - if (p != project(":api") && p != project(":core")) { + if (p != project(":api")) { implementation(project(":api")) { // Remove Junit test libraries exclude group: "org.junit.jupiter", module: "junit-jupiter" 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 9be851f54..b31465f17 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 @@ -24,10 +24,10 @@ package com.seibel.lod.common.wrappers.worldGeneration; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; import com.seibel.lod.core.level.IServerLevel; import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.enums.config.ELightGenerationMode; +import com.seibel.lod.api.items.enums.config.ELightGenerationMode; import com.seibel.lod.core.logging.ConfigBasedLogger; import com.seibel.lod.core.logging.ConfigBasedSpamLogger; -import com.seibel.lod.core.enums.config.EDistanceGenerationMode; +import com.seibel.lod.api.items.enums.config.EDistanceGenerationMode; import com.seibel.lod.core.pos.DhChunkPos; import com.seibel.lod.core.util.objects.EventTimer; import com.seibel.lod.core.util.LodUtil; 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 1eaef55d2..150a05384 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 @@ -26,7 +26,7 @@ import java.util.function.Consumer; import com.seibel.lod.core.util.objects.UncheckedInterruptedException; import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.enums.config.ELightGenerationMode; +import com.seibel.lod.api.items.enums.config.ELightGenerationMode; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.pos.DhChunkPos; import com.seibel.lod.core.util.objects.EventTimer; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java index a0fcc16ad..2d9b0d608 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.EmptyChunkGenerator; -import com.seibel.lod.core.enums.config.ELightGenerationMode; +import com.seibel.lod.api.items.enums.config.ELightGenerationMode; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import net.minecraft.client.Minecraft; diff --git a/coreSubProjects b/coreSubProjects index 1bfc6db8b..c80a5b102 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 1bfc6db8b45358d257ae67f5cfa2ab3dd2732831 +Subproject commit c80a5b102db273c167d9fe3276260e129500b695